fix(http): properly close stream when connection is set to 'close'

Author: cclilshy

src/Net/Http/Server/Connection.php

@@ -245,15 +245,13 @@ private function onRequest(array $reqInfo): void
         // 半关闭检测
         $connHeader = $reqInfo['server']['HTTP_CONNECTION'] ?? '';
         $upgradeHeader = $reqInfo['server']['HTTP_UPGRADE'] ?? '';
-        $keepAlive = strtolower($connHeader) === 'keep-alive';
-        $isWebSocketUpgrade = strtolower($upgradeHeader) === 'websocket' &&
-                              str_contains(strtolower($connHeader), 'upgrade');
+        $keepAlive = strtolower($connHeader) !== 'close';
+        $isWebSocketUpgrade = strtolower($upgradeHeader) === 'websocket' && str_contains(strtolower($connHeader), 'upgrade');
 
         if ($keepAlive || $isWebSocketUpgrade) {
             $response->withHeader('Connection', $keepAlive ? 'keep-alive' : 'Upgrade');
         } else {
             $response->withHeader('Connection', 'close');
-            $this->stream->shutdownRead();
         }
 
         try {
@@ -263,6 +261,8 @@ private function onRequest(array $reqInfo): void
         } catch (Throwable $exception) {
             $req->respond($exception->getMessage(), [], 500);
             $this->reset();
+        } finally {
+            ($keepAlive || $isWebSocketUpgrade) || $this->disconnect();
         }
     }
 

src/Net/WebSocket/Server/Server.php

@@ -80,9 +80,16 @@ private function handleWebSocketRequest(Request $request): ?Connection
             return null;
         }
 
+        if (!$this->performHandshake($request)) {
+            $request->respond('Bad Request', [], 400);
+            return null;
+        }
+
+        $connection = new Connection($request->conn->stream, $request);
+
         if (isset($this->onRequest)) {
             try {
-                $result = ($this->onRequest)($request);
+                $result = ($this->onRequest)($request, $connection);
                 if ($result === false) {
                     $request->respond('Forbidden', [], 403);
                     return null;
@@ -93,13 +100,6 @@ private function handleWebSocketRequest(Request $request): ?Connection
             }
         }
 
-        if (!$this->performHandshake($request)) {
-            $request->respond('Bad Request', [], 400);
-            return null;
-        }
-
-        $connection = new Connection($request->conn->stream, $request);
-
         if (isset($this->onConnect)) {
             $handler = $this->onConnect;
             go(fn () => $handler($connection));