修复：Workerman HTTP 保持长连接遵循 RFC 标准

Author: Yurunsoft

src/Components/workerman/src/Http/Message/WorkermanResponse.php

@@ -6,6 +6,7 @@
 
 use Imi\Server\Http\Message\Response;
 use Imi\Util\Http\Consts\MediaType;
+use Imi\Util\Http\Consts\ResponseHeader;
 use Imi\Util\Http\Consts\StatusCode;
 use Workerman\Connection\TcpConnection;
 use Workerman\Worker;
@@ -17,6 +18,11 @@ class WorkermanResponse extends Response
      */
     protected ?\Workerman\Protocols\Http\Response $workermanResponse = null;
 
+    /**
+     * Workerman 的 http 请求对象
+     */
+    protected ?WorkermanRequest $request = null;
+
     /**
      * Workerman 的 Worker 对象
      */
@@ -37,11 +43,12 @@ class WorkermanResponse extends Response
      */
     protected bool $isBodyWritable = true;
 
-    public function __construct(Worker $worker, TcpConnection $connection, ?\Workerman\Protocols\Http\Response $response = null)
+    public function __construct(Worker $worker, TcpConnection $connection, ?\Workerman\Protocols\Http\Response $response = null, ?WorkermanRequest $request = null)
     {
         $this->workermanResponse = $response;
         $this->worker = $worker;
         $this->connection = $connection;
+        $this->request = $request;
         parent::__construct();
     }
 
@@ -107,9 +114,18 @@ public function send(): self
         if ($this->isBodyWritable())
         {
             $this->isBodyWritable = false;
-            $response = $this->workermanResponse;
-            $response->withBody((string) $this->getBody());
-            $this->connection->send($response);
+            if ($this->shouldKeepAlive())
+            {
+                $this->connection->send($this->workermanResponse->withBody((string) $this->getBody()));
+            }
+            else
+            {
+                $this->connection->close($this->workermanResponse->withBody((string) $this->getBody()));
+            }
+        }
+        elseif (!$this->shouldKeepAlive())
+        {
+            $this->connection->close();
         }
 
         return $this;
@@ -145,9 +161,18 @@ public function sendFile(string $filename, ?string $contentType = null, ?string
         if ($this->isBodyWritable())
         {
             $this->isBodyWritable = false;
-            $response = $this->workermanResponse;
-            $response->withFile($filename, $offset, $length);
-            $this->connection->send($response);
+            if ($this->shouldKeepAlive())
+            {
+                $this->connection->send($this->workermanResponse->withFile($filename, $offset, $length));
+            }
+            else
+            {
+                $this->connection->close($this->workermanResponse->withFile($filename, $offset, $length));
+            }
+        }
+        elseif (!$this->shouldKeepAlive())
+        {
+            $this->connection->close();
         }
 
         return $this;
@@ -176,4 +201,25 @@ public function getConnection(): TcpConnection
     {
         return $this->connection;
     }
+
+    protected function shouldKeepAlive(): bool
+    {
+        if (0 === strcasecmp($this->getHeaderLine(ResponseHeader::CONNECTION), 'close'))
+        {
+            return false;
+        }
+        if ($request = $this->request)
+        {
+            if ($request->getProtocolVersion() >= 1.1)
+            {
+                return 0 !== strcasecmp($request->getHeaderLine('connection'), 'close');
+            }
+            else
+            {
+                return 0 === strcasecmp($request->getHeaderLine('connection'), 'keep-alive');
+            }
+        }
+
+        return true;
+    }
 }

src/Components/workerman/src/Server/Http/Server.php

@@ -67,7 +67,7 @@ protected function bindEvents(): void
                 // @phpstan-ignore-next-line
                 $request = new WorkermanRequest($worker, $connection, $data);
                 // @phpstan-ignore-next-line
-                $response = new WorkermanResponse($worker, $connection, new Response());
+                $response = new WorkermanResponse($worker, $connection, new Response(), $request);
                 RequestContext::muiltiSet([
                     'server'   => $this,
                     'request'  => $request,

src/Components/workerman/tests/unit/AppServer/ApiServer/Controller/IndexController.php

@@ -16,6 +16,7 @@
 use Imi\Util\Http\Consts\StatusCode;
 use Imi\Util\Http\MessageUtil;
 use Imi\Util\Stream\MemoryStream;
+use Imi\Workerman\Http\Message\WorkermanRequest;
 
 /**
  * @Controller(prefix="/")
@@ -355,4 +356,17 @@ public function duplicated1(): void
     public function duplicated2(): void
     {
     }
+
+    /**
+     * @Action
+     */
+    public function connectionId(): array
+    {
+        /** @var WorkermanRequest $request */
+        $request = RequestContext::get('request');
+
+        return [
+            'id' => $request->getConnection()->id,
+        ];
+    }
 }

src/Components/workerman/tests/unit/AppServer/Tests/Http/RequestTest.php

@@ -6,6 +6,7 @@
 
 use Imi\Util\Http\Consts\MediaType;
 use Yurun\Util\HttpRequest;
+use Yurun\Util\YurunHttp\Http\Psr7\Consts\RequestHeader;
 use Yurun\Util\YurunHttp\Http\Psr7\UploadedFile;
 
 /**
@@ -255,4 +256,45 @@ public function testMoreUrlParams(): void
             'page'  => 666,
         ]), $response->body());
     }
+
+    public function testKeepAlive(): void
+    {
+        // HTTP/1.0 Close
+        $http = new HttpRequest();
+        $http->protocolVersion = '1.0';
+        $data1 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $data2 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $this->assertNotNull($data1);
+        $this->assertNotNull($data2);
+        $this->assertNotEquals($data1, $data2);
+
+        // HTTP/1.0 Keep-Alive
+        $http = new HttpRequest();
+        $http->protocolVersion = '1.0';
+        $http->header(RequestHeader::CONNECTION, 'keep-alive');
+        $data1 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $data2 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $this->assertNotNull($data1);
+        $this->assertNotNull($data2);
+        $this->assertEquals($data1, $data2);
+
+        // HTTP/1.1 Close
+        $http = new HttpRequest();
+        $http->protocolVersion = '1.1';
+        $http->header(RequestHeader::CONNECTION, 'close');
+        $data1 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $data2 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $this->assertNotNull($data1);
+        $this->assertNotNull($data2);
+        $this->assertNotEquals($data1, $data2);
+
+        // HTTP/1.1 Keep-Alive
+        $http = new HttpRequest();
+        $http->protocolVersion = '1.1';
+        $data1 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $data2 = $http->get($this->host . 'connectionId')->json(true)['id'] ?? null;
+        $this->assertNotNull($data1);
+        $this->assertNotNull($data2);
+        $this->assertEquals($data1, $data2);
+    }
 }