优化 Http2Client

Author: Yurunsoft

src/YurunHttp/Http2/SwooleClient.php

@@ -144,15 +144,17 @@ public function getHttpHandler()
      */
     public function close()
     {
-        $this->http2Client = null;
-        $url = ($this->ssl ? 'https://' : 'http://') . $this->host . ':' . $this->port;
-        $this->handler->getHttp2ConnectionManager()->closeConnection($url);
+        $this->recvCo = false;
         $recvChannels = &$this->recvChannels;
         foreach ($recvChannels as $channel)
         {
             $channel->close();
         }
         $recvChannels = [];
+        $this->requestMap = [];
+        $this->http2Client = null;
+        $url = ($this->ssl ? 'https://' : 'http://') . $this->host . ':' . $this->port;
+        $this->handler->getHttp2ConnectionManager()->closeConnection($url);
     }
 
     /**
@@ -180,14 +182,17 @@ public function send($request, $pipeline = false, $dropRecvResponse = false)
         $request = $request->withAttribute(Attributes::HTTP2_PIPELINE, $pipeline);
         $this->handler->buildRequest($request, $http2Client, $http2Request);
         $streamId = $http2Client->send($http2Request);
-        if (!$streamId)
+        if ($streamId)
         {
-            $this->close();
+            if (!$dropRecvResponse)
+            {
+                $this->recvChannels[$streamId] = new Channel(1);
+                $this->requestMap[$streamId] = $request;
+            }
         }
-        if (!$dropRecvResponse)
+        else
         {
-            $this->recvChannels[$streamId] = new Channel(1);
-            $this->requestMap[$streamId] = $request;
+            $this->close();
         }
 
         return $streamId;
@@ -230,7 +235,7 @@ public function end($streamId)
     public function recv($streamId = -1, $timeout = null)
     {
         $recvCo = $this->recvCo;
-        if (!$recvCo || (true !== $recvCo && !Coroutine::exists($recvCo)))
+        if (!$recvCo || !Coroutine::exists($recvCo))
         {
             $this->startRecvCo();
         }
@@ -243,12 +248,6 @@ public function recv($streamId = -1, $timeout = null)
         {
             $recvChannels[$streamId] = $channel = new Channel(-1 === $streamId ? $this->serverPushQueueLength : 1);
         }
-        $swooleResponse = $channel->pop(null === $timeout ? -1 : $timeout);
-        if (-1 !== $streamId)
-        {
-            unset($recvChannels[$streamId]);
-            $channel->close();
-        }
         $requestMap = &$this->requestMap;
         if (isset($requestMap[$streamId]))
         {
@@ -259,6 +258,15 @@ public function recv($streamId = -1, $timeout = null)
         {
             $request = null;
         }
+        $swooleResponse = $channel->pop(null === $timeout ? -1 : $timeout);
+        if ($this->recvCo === $recvCo)
+        {
+            if (-1 !== $streamId)
+            {
+                unset($recvChannels[$streamId]);
+                $channel->close();
+            }
+        }
         $response = $this->handler->buildHttp2Response($request, $this->http2Client, $swooleResponse);
 
         return $response;
@@ -286,13 +294,12 @@ private function startRecvCo()
         {
             return false;
         }
-        $recvCo = &$this->recvCo;
-        $recvCo = true;
 
-        return $recvCo = Coroutine::create(function () {
+        return Coroutine::create(function () {
+            $this->recvCo = $coid = Coroutine::getCid();
             $http2Client = &$this->http2Client;
             $recvChannels = &$this->recvChannels;
-            while ($this->isConnected())
+            while ($coid === $this->recvCo && $this->isConnected())
             {
                 if ($this->timeout > 0)
                 {
@@ -302,6 +309,10 @@ private function startRecvCo()
                 {
                     $swooleResponse = $http2Client->recv();
                 }
+                if ($coid !== $this->recvCo)
+                {
+                    return;
+                }
                 if (!$swooleResponse)
                 {
                     if ($this->ping())