Merge pull request #10 from MammatusPHP/no-need-to-double-tap-the-context-close

No need to double tap context close

Author: WyriHaximus

composer.json

@@ -22,6 +22,7 @@
     "react/async": "^4.3",
     "react/event-loop": "^1.5",
     "react/promise": "^3.2",
+    "react/promise-timer": "^1.11",
     "roave/better-reflection": "^6.26",
     "wyrihaximus/broadcast-contracts": "^1.3",
     "wyrihaximus/generative-composer-plugin-tooling": "^1",

composer.lock

@@ -20,6 +20,7 @@
 use function React\Async\async;
 use function React\Async\await;
 use function React\Promise\all;
+use function React\Promise\Timer\sleep;
 use function WyriHaximus\React\futurePromise;
 
 final class Consumer extends AbstractList implements Listener
@@ -37,8 +38,6 @@ public function __construct(
     public function close(): void
     {
         $this->running = false;
-
-        $this->context->close();
     }
 
     /** @return PromiseInterface<mixed> */
@@ -49,7 +48,9 @@ public function setupConsumer(Worker $worker): PromiseInterface
             throw new RuntimeException('Worker instance must be instance of ' . WorkerContract::class);
         }
 
-        $promises = [];
+        $promises = [
+            sleep(0.1),
+        ];
         for ($i = 0; $i < $worker->concurrency; $i++) {
             $this->logger->info('Starting consumer ' . $i . ' of ' . $worker->concurrency . ' for ' . $worker->class);
             $promises[] = async(fn () => $this->consume($worker, $workerInstance))();

src/Consumer.php

@@ -8,15 +8,20 @@
 use Mammatus\LifeCycleEvents\Shutdown;
 use WyriHaximus\Broadcast\Contracts\AsyncListener;
 
+use function React\Async\await;
+use function React\Promise\Timer\sleep;
+
 final class CloseContext implements AsyncListener
 {
     public function __construct(
         private readonly Context $context,
     ) {
     }
 
-    public function stop(Shutdown $event): void
+    public function shutdown(Shutdown $event): void
     {
+        await(sleep(0.1));
+
         $this->context->close();
     }
 }

src/LifeCycle/CloseContext.php

@@ -27,8 +27,6 @@ public function runHappy(): void
 
         $container->expects('get')->with(Noop::class)->once()->andReturn(new Noop());
 
-        $context->expects('close')->once();
-
         $logger->expects('info')->with('Starting consumer 0 of 1 for ' . Noop::class)->atLeast()->once();
 
         $exitCode = (new App($consumer, $logger))->run(Noop::class);
@@ -47,8 +45,6 @@ public function runAngry(): void
         $exception = new RuntimeException('Ik ben boos!');
         $container->expects('get')->with(Noop::class)->once()->andReturn(new Angry($exception));
 
-        $context->expects('close')->once();
-
         $logger->expects('info')->with('Starting consumer 0 of 1 for ' . Noop::class)->atLeast()->once();
 
         $exitCode = (new App($consumer, $logger))->run(Noop::class);

tests/AppTest.php

@@ -23,7 +23,6 @@ public function consumeHappy(): void
     {
         [$consumer, $container, $context, $internalConsumer, $logger] = ConsumerFactory::create(ConsumerFactory::CREATE_CONSUMER_EXPECTED);
         $container->expects('get')->with(Noop::class)->once()->andReturn(new Noop());
-        $context->expects('close')->once();
         $logger->expects('info')->with('Starting consumer 0 of 1 for ' . Noop::class)->atLeast()->once();
 
         $message = new Message();
@@ -53,7 +52,6 @@ public function invalidJson(): void
 
         [$consumer, $container, $context, $internalConsumer, $logger] = ConsumerFactory::create(ConsumerFactory::CREATE_CONSUMER_EXPECTED);
         $container->expects('get')->with(Noop::class)->once()->andReturn(new Noop());
-        $context->expects('close')->once();
         $logger->expects('info')->with('Starting consumer 0 of 1 for ' . Noop::class)->atLeast()->once();
 
         $message = new Message();

tests/ConsumerTest.php

@@ -32,8 +32,6 @@ public function runHappy(): void
 
         $container->expects('get')->with(Noop::class)->atLeast()->once()->andReturn(new Noop());
 
-        $context->expects('close')->once();
-
         $eventDispatcher = Mockery::mock(EventDispatcherInterface::class);
 
         $logger->expects('debug')->with('Starting queue manager')->once();
@@ -58,8 +56,6 @@ public function runAngry(): void
         [$consumer, $container, $context, $internalConsumer, $logger] = ConsumerFactory::create(ConsumerFactory::CREATE_CONSUMER_EXPECTED);
         $internalConsumer->expects('receiveNoWait')->between(0, PHP_INT_MAX);
 
-        $context->expects('close')->once();
-
         $eventDispatcher = Mockery::mock(EventDispatcherInterface::class);
 
         $exception = new RuntimeException('Ik ben boos!');