修复、更新文档、测试

imiphp · Nov 25, 2023 · 0fb558b · 0fb558b
1 parent fe06b3e
commit 0fb558b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 36 deletions.
diff --git a/doc/core/requestContext.md b/doc/core/requestContext.md
@@ -67,3 +67,21 @@ $result = \Imi\RequestContext::remember('myKey3', function () {
     return 1 + 2;
 });
 ```
+
+### 推迟执行
+
+当协程释放时触发，先进后出
+
+```php
+use function Yurun\Swoole\Coroutine\goWait;
+$result = [];
+goWait(static function () use (&$result): void {
+    RequestContext::defer(static function () use (&$result): void {
+        $result[] = 1;
+    });
+    RequestContext::defer(static function () use (&$result): void {
+        $result[] = 2;
+    });
+}, -1, true);
+var_dump($result); // [2, 1]
+```
diff --git a/src/Components/swoole/src/Context/CoroutineContextManager.php b/src/Components/swoole/src/Context/CoroutineContextManager.php
@@ -9,7 +9,6 @@
 use Imi\Core\Context\Exception\ContextExistsException;
 use Imi\Core\Context\Exception\ContextNotFoundException;
 use Imi\Event\Event;
-use Imi\Log\Log;
 use Imi\Swoole\Util\Coroutine;
 
 /**
@@ -36,7 +35,7 @@ public function create(string|int $id, array $data = []): ContextData
             if (!($swooleContext[static::class]['destroyBinded'] ?? false))
             {
                 $swooleContext[static::class]['destroyBinded'] = true;
-                Coroutine::defer($this->__destroy(...));
+                Coroutine::defer(fn () => $this->destroy($id));
             }
             $context = $swooleContext[static::class]['context'] ?? null;
             if ($context)
@@ -79,6 +78,8 @@ public function destroy(string|int $id): bool
             {
                 return false;
             }
+            // TODO: 实现新的连接管理器后移除
+            Event::trigger('IMI.REQUEST_CONTENT.DESTROY');
             /** @var ContextData $context */
             $context = $swooleContext[static::class]['context'];
             $deferCallbacks = $context->getDeferCallbacks();
@@ -92,6 +93,8 @@ public function destroy(string|int $id): bool
         }
         elseif (isset($this->contexts[$id]))
         {
+            // TODO: 实现新的连接管理器后移除
+            Event::trigger('IMI.REQUEST_CONTENT.DESTROY');
             $deferCallbacks = $this->contexts[$id]->getDeferCallbacks();
             while (!$deferCallbacks->isEmpty())
             {
@@ -119,7 +122,7 @@ public function get(string|int $id, bool $autoCreate = false): ContextData
             if (!($swooleContext[static::class]['destroyBinded'] ?? false))
             {
                 $swooleContext[static::class]['destroyBinded'] = true;
-                Coroutine::defer($this->__destroy(...));
+                Coroutine::defer(fn () => $this->destroy($id));
             }
 
             if (!isset($swooleContext[static::class]['context']))
@@ -172,27 +175,4 @@ public function getCurrentId(): string|int
     {
         return (string) Coroutine::getCid();
     }
-
-    /**
-     * 销毁当前请求的上下文.
-     *
-     * 不要手动调用！不要手动调用！不要手动调用！
-     */
-    public function __destroy(): void
-    {
-        try
-        {
-            // TODO: 实现新的连接管理器后移除
-            Event::trigger('IMI.REQUEST_CONTENT.DESTROY');
-            $context = Coroutine::getContext();
-            if (!$context)
-            {
-                unset($this->contexts[Coroutine::getCid()]);
-            }
-        }
-        catch (\Throwable $th)
-        {
-            Log::error($th);
-        }
-    }
 }
diff --git a/src/Components/swoole/tests/unit/Component/Tests/RequestContextTest.php b/src/Components/swoole/tests/unit/Component/Tests/RequestContextTest.php
@@ -7,19 +7,25 @@
 use Imi\RequestContext;
 use Imi\Test\BaseTest;
 
+use function Yurun\Swoole\Coroutine\goWait;
+
 /**
  * @testdox RequestContext
  */
 class RequestContextTest extends BaseTest
 {
     public function testDefer(): void
     {
-        $success = false;
-        RequestContext::defer(static function () use (&$success): void {
-            $success = true;
-        });
-        RequestContext::destroy();
-        $this->assertTrue($success);
+        $result = [];
+        goWait(static function () use (&$result): void {
+            RequestContext::defer(static function () use (&$result): void {
+                $result[] = 1;
+            });
+            RequestContext::defer(static function () use (&$result): void {
+                $result[] = 2;
+            });
+        }, -1, true);
+        $this->assertEquals([2, 1], $result);
     }
 
     public function testRemember(): void

diff --git a/tests/unit/Component/Tests/RequestContextTest.php b/tests/unit/Component/Tests/RequestContextTest.php
@@ -14,12 +14,15 @@ class RequestContextTest extends BaseTest
 {
     public function testDefer(): void
     {
-        $success = false;
-        RequestContext::defer(static function () use (&$success): void {
-            $success = true;
+        $result = [];
+        RequestContext::defer(static function () use (&$result): void {
+            $result[] = 1;
+        });
+        RequestContext::defer(static function () use (&$result): void {
+            $result[] = 2;
         });
         RequestContext::destroy();
-        $this->assertTrue($success);
+        $this->assertEquals([2, 1], $result);
     }
 
     public function testRemember(): void