Not static state, still failing

Author: nicolas-grekas

src/Symfony/Component/HttpClient/Response/AmpResponse.php

@@ -19,6 +19,7 @@
 use Amp\Http\Client\Request;
 use Amp\Http\Client\Response;
 use Psr\Log\LoggerInterface;
+use Revolt\EventLoop;
 use Symfony\Component\HttpClient\Chunk\FirstChunk;
 use Symfony\Component\HttpClient\Chunk\InformationalChunk;
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
@@ -32,6 +33,7 @@
 
 use function Amp\async;
 use function Amp\delay;
+use function Amp\Future\awaitFirst;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -49,8 +51,6 @@ final class AmpResponse implements ResponseInterface, StreamableInterface
     private ?array $options;
     private \Closure $onProgress;
 
-    private static ?DeferredCancellation $delay = null;
-
     /**
      * @internal
      */
@@ -105,7 +105,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti
         };
 
         $multi->lastTimeout = null;
-        $multi->openHandles[$id] = $id;
+        $multi->openHandles[$id] = new DeferredFuture();
         ++$multi->responseCount;
 
         $this->canary = new Canary(static function () use ($canceller, $multi, $id) {
@@ -181,18 +181,31 @@ private static function perform(ClientState $multi, array &$responses = null): v
      */
     private static function select(ClientState $multi, float $timeout): int
     {
-        self::$delay ??= new DeferredCancellation();
-        delay($timeout, true, self::$delay->getCancellation());
+        $delay = new DeferredFuture();
+        $id = EventLoop::delay($timeout, $delay->complete(...));
+
+        awaitFirst((function () use ($delay, $multi) {
+            yield $delay->getFuture();
+
+            foreach ($multi->openHandles as $deferred) {
+                yield $deferred->getFuture();
+            }
+        })());
 
-        return null === self::$delay ? 1 : 0;
+        try {
+            return $delay->isComplete() ? 0 : 1;
+        } finally {
+            EventLoop::cancel($id);
+        }
     }
 
     private static function generateResponse(Request $request, AmpClientState $multi, string $id, array &$info, array &$headers, DeferredCancellation $canceller, array &$options, \Closure $onProgress, &$handle, ?LoggerInterface $logger, float &$pause): void
     {
         $request->setInformationalResponseHandler(static function (Response $response) use ($multi, $id, &$info, &$headers) {
             self::addResponseHeaders($response, $info, $headers);
             $multi->handlesActivity[$id][] = new InformationalChunk($response->getStatus(), $response->getHeaders());
-            self::stopLoop();
+            $multi->openHandles[$id]->complete();
+            $multi->openHandles[$id] = new DeferredFuture();
         });
 
         try {
@@ -209,7 +222,7 @@ private static function generateResponse(Request $request, AmpClientState $multi
             if ('HEAD' === $response->getRequest()->getMethod() || \in_array($info['http_code'], [204, 304], true)) {
                 $multi->handlesActivity[$id][] = null;
                 $multi->handlesActivity[$id][] = null;
-                self::stopLoop();
+                $multi->openHandles[$id]->complete();
 
                 return;
             }
@@ -221,7 +234,8 @@ private static function generateResponse(Request $request, AmpClientState $multi
             $body = $response->getBody();
 
             while (true) {
-                self::stopLoop();
+                $multi->openHandles[$id]->complete();
+                $multi->openHandles[$id] = new DeferredFuture();
 
                 if (0 < $pause) {
                     delay($pause, true, $canceller->getCancellation());
@@ -244,7 +258,7 @@ private static function generateResponse(Request $request, AmpClientState $multi
             $info['download_content_length'] = $info['size_download'];
         }
 
-        self::stopLoop();
+        $multi->openHandles[$id]->complete();
     }
 
     private static function followRedirects(Request $originRequest, AmpClientState $multi, array &$info, array &$headers, DeferredCancellation $canceller, array $options, \Closure $onProgress, &$handle, ?LoggerInterface $logger, float &$pause): ?Response
@@ -421,12 +435,4 @@ private static function getPushedResponse(Request $request, AmpClientState $mult
             return $response;
         }
     }
-
-    private static function stopLoop(): void
-    {
-        if (null !== self::$delay) {
-            self::$delay->cancel();
-            self::$delay = null;
-        }
-    }
 }