适配http2

何平 · 何平 · commit 58dafe38801f · 2023-12-19T17:49:34.000+08:00
diff --git a/cloud-admin/Http2/Parser/Http2Driver.php b/cloud-admin/Http2/Parser/Http2Driver.php
@@ -149,7 +149,7 @@ public function send(int $id, Response $response, Request $request)
                 return;
             }
             $this->sendBody($id, $response, $request);
-            if (! empty($pushStream)) {
+            if (!empty($pushStream)) {
                 foreach ($pushStream as $push) {// 发送推送帧
                     $this->send(...$push);
                 }
@@ -168,7 +168,7 @@ public function send(int $id, Response $response, Request $request)
 
     public function sendBody(int $id, Response $response, Request $request): void
     {
-        if (! in_array($request->path(), $this->streamUrl)) {
+        if (!in_array($request->path(), $this->streamUrl)) {
             if (is_callable($this->onWriteBody)) {
                 // 服务端流模式在此处不停的发送帧
                 $response->http2Driver = $this;
@@ -177,10 +177,10 @@ public function sendBody(int $id, Response $response, Request $request): void
             }
         }
         $body = $response->getBody();
-        if (strlen((string) $body)) {
+        if (strlen((string)$body)) {
             $this->writeData($body, $id);
         }
-        if (! isset($this->streams[$id])) {
+        if (!isset($this->streams[$id])) {
             return;
         }
         $trailers = $response->getTrailers();
@@ -249,7 +249,7 @@ public function sendHeader(int $id, Response $response, Request $request): void
      */
     public function writeData(string $data, int $id): void
     {
-        if (! isset($this->streams[$id])) {
+        if (!isset($this->streams[$id])) {
             var_dump('The stream was closed');
             return;
         }
@@ -264,7 +264,7 @@ public function writeFrame(string $data, int $type, int $flags, int $stream = 0)
 
     public function handlePing(string $data): void
     {
-        if (! $this->pinged) { // 没有ping过就更新
+        if (!$this->pinged) { // 没有ping过就更新
             $this->http2Connection->updateExpirationTime(
                 max($this->http2Connection->getExpirationTime(), time() + 5)
             );
@@ -282,7 +282,7 @@ public function handleStreamWindowIncrement(int $streamId, int $windowSize): voi
         if ($streamId > $this->remoteStreamId) {
             throw new Http2ConnectionException('Stream ID does not exist', Http2Parser::PROTOCOL_ERROR);
         }
-        if (! isset($this->streams[$streamId])) {
+        if (!isset($this->streams[$streamId])) {
             return;
         }
         $stream = $this->streams[$streamId];
@@ -329,7 +329,7 @@ public function handleConnectionWindowIncrement(int $windowSize): void
     public function handleHeaders(int $streamId, array $pseudo, array $headers, bool $ended): void
     {
         foreach ($pseudo as $name => $value) {
-            if (! isset(Http2Parser::KNOWN_REQUEST_PSEUDO_HEADERS[$name])) {
+            if (!isset(Http2Parser::KNOWN_REQUEST_PSEUDO_HEADERS[$name])) {
                 throw new Http2StreamException('Invalid pseudo header', $streamId, Http2Parser::PROTOCOL_ERROR);
             }
         }
@@ -339,7 +339,7 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool
                 throw new Http2StreamException('Stream remote closed', $streamId, Http2Parser::STREAM_CLOSED);
             }
         } else {
-            if (! ($streamId & 1) || $this->remainingStreams-- <= 0 || $streamId <= $this->remoteStreamId) {
+            if (!($streamId & 1) || $this->remainingStreams-- <= 0 || $streamId <= $this->remoteStreamId) {
                 throw new Http2ConnectionException("Invalid stream ID {$streamId}", Http2Parser::PROTOCOL_ERROR);
             }
             $stream = $this->streams[$streamId] = new Http2Stream(Options::getBodySizeLimit(), $this->initialWindowSize);
@@ -350,7 +350,7 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool
             throw new Http2StreamException('Stream already reserved', $streamId, Http2Parser::PROTOCOL_ERROR);
         }
         $stream->state |= Http2Stream::RESERVED;
-        if (! isset($pseudo[':method'], $pseudo[':path'], $pseudo[':scheme'], $pseudo[':authority'])
+        if (!isset($pseudo[':method'], $pseudo[':path'], $pseudo[':scheme'], $pseudo[':authority'])
             || isset($headers['connection'])
             || $pseudo[':path'] === ''
             || (isset($headers['te']) && implode('', $headers['te']) !== 'trailers')
@@ -362,17 +362,17 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool
         $scheme = $pseudo[':scheme'];
         $host = $pseudo[':authority'];
         $query = null;
-        if (! preg_match('#^([A-Z\\d\\.\\-]+|\\[[\\d:]+\\])(?::([1-9]\\d*))?$#i', (string) $host, $matches)) {
+        if (!preg_match('#^([A-Z\\d\\.\\-]+|\\[[\\d:]+\\])(?::([1-9]\\d*))?$#i', (string)$host, $matches)) {
             throw new Http2StreamException('Invalid authority (host) name', $streamId, Http2Parser::PROTOCOL_ERROR);
         }
         $host = $matches[1];
-        $port = isset($matches[2]) ? (int) $matches[2] : $this->http2Connect->getPort();
-        if ($position = strpos((string) $target, '#')) {
-            $target = substr((string) $target, 0, $position);
+        $port = isset($matches[2]) ? (int)$matches[2] : $this->http2Connection->getPort();
+        if ($position = strpos((string)$target, '#')) {
+            $target = substr((string)$target, 0, $position);
         }
-        if ($position = strpos((string) $target, '?')) {
-            $query = substr((string) $target, $position + 1);
-            $target = substr((string) $target, 0, $position);
+        if ($position = strpos((string)$target, '?')) {
+            $query = substr((string)$target, $position + 1);
+            $target = substr((string)$target, 0, $position);
         }
         $headers = array_merge($headers, ['scheme' => $scheme, 'host' => $host, 'port' => $port, 'path' => $target, 'query' => $query, 'method' => $method]);
         $this->pinged = 0;
@@ -392,17 +392,17 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool
                 throw new Http2StreamException('Received multiple content-length headers', $streamId, Http2Parser::PROTOCOL_ERROR);
             }
             $contentLength = $headers['content-length'][0];
-            if (! preg_match('/^0|[1-9][0-9]*$/', (string) $contentLength)) {
+            if (!preg_match('/^0|[1-9][0-9]*$/', (string)$contentLength)) {
                 throw new Http2StreamException('Invalid content-length header value', $streamId, Http2Parser::PROTOCOL_ERROR);
             }
-            $stream->expectedLength = (int) $contentLength;
+            $stream->expectedLength = (int)$contentLength;
         }
         $request = new Request($streamId, $this->http2Connection, $headers);
         $this->streamIdRequestMap[$streamId] = $request;
         // 如果是客户端流模式，这里应该给前端返回头响应
         if (in_array($request->path(), $this->streamUrl)) {
             if (is_callable($this->onRequest)) {
-                $response = ($this->onRequest)($request);
+                $response = ($this->onRequest)($request,$this->http2Connection);
             } else {
                 $response = new Response(200, ['content-type' => 'text/html'], '');
             }
@@ -425,7 +425,7 @@ public function handleData(int $streamId, string $data): void
         if ($stream->state & Http2Stream::REMOTE_CLOSED) {
             throw new Http2StreamException('Stream remote closed', $streamId, Http2Parser::PROTOCOL_ERROR);
         }
-        if (! $length) {
+        if (!$length) {
             return;
         }
         $this->serverWindow -= $length;
@@ -457,7 +457,7 @@ public function handleData(int $streamId, string $data): void
             $request->appendData($data);
         }
         if ($stream->serverWindow <= self::MINIMUM_WINDOW) {
-            if (! isset($this->streams[$streamId])) {
+            if (!isset($this->streams[$streamId])) {
                 return;
             }
             $stream = $this->streams[$streamId];
@@ -478,7 +478,7 @@ public function handleData(int $streamId, string $data): void
      */
     public function handleStreamEnd(int $streamId): void
     {
-        if (! isset($this->streams[$streamId])) {
+        if (!isset($this->streams[$streamId])) {
             return;
         }
         $stream = $this->streams[$streamId];
@@ -488,16 +488,16 @@ public function handleStreamEnd(int $streamId): void
         }
         /** @var Request $request */
         $request = $this->streamIdRequestMap[$streamId];
-        if (! in_array($request->getMethod(), Options::getAllowedMethods())) {
+        if (!in_array($request->getMethod(), Options::getAllowedMethods())) {
             $response = new Response(405); // METHOD_NOT_ALLOWED
         } else {
-            $response = $this->streamIdResponseMap[$streamId];
-            if (! $response instanceof Response) {
+            $response = $this->streamIdResponseMap[$streamId] ?? null;
+            if (!$response instanceof Response) {
                 if (is_callable($this->onRequest)) {
-                    $response = ($this->onRequest)($request);
+                    $response = ($this->onRequest)($request,$this->http2Connection);
                 }
             }
-            if (! $response instanceof Response) {
+            if (!$response instanceof Response) {
                 $response = new Response(404, ['content-type' => 'text/html'], '');
             }
         }
@@ -529,7 +529,7 @@ public function handlePushPromise(int $streamId, int $pushId, array $pseudo, arr
      */
     public function handlePriority(int $streamId, int $parentId, int $weight): void
     {
-        if (! isset($this->streams[$streamId])) {// 为将来的流设置优先级
+        if (!isset($this->streams[$streamId])) {// 为将来的流设置优先级
             // if ($streamId === 0 || !($streamId & 1) || $this->remainingStreams-- <= 0) {
             if ($streamId === 0 || $this->remainingStreams-- <= 0) {  // chrome居然发送了偶数帧过来
                 throw new Http2ConnectionException("Invalid stream ID {$streamId}", Http2Parser::PROTOCOL_ERROR);
@@ -625,6 +625,7 @@ public function handleConnectionException(Http2ConnectionException $exception):
     }
 
     // http1.1升级h2c
+
     /**
      * @throws Http2StreamException
      */
@@ -651,7 +652,7 @@ private function sendPushPromise(Request $request, int $streamId, array $push):
         $id = $this->localStreamId += 2;
         // $this->remoteStreamId = \max($id, $this->remoteStreamId);
         $headers = array_merge(['scheme' => 'https', 'host' => '', 'port' => 443, 'path' => '/', 'query' => '', 'method' => 'GET'], $push['uri'], $mergedHeaders);
-        $request = new Request($this->http2Connection, $this->http2Connection, $headers);
+        $request = new Request($streamId, $this->http2Connection, $headers);
         $this->streams[$id] = new Http2Stream(0, $this->initialWindowSize, Http2Stream::RESERVED | Http2Stream::REMOTE_CLOSED);
         $this->streamIdRequestMap[$id] = $request;
         foreach ($mergedHeaders as $k => $v) {
@@ -680,9 +681,9 @@ private function sendPushPromise(Request $request, int $streamId, array $push):
         }
         $response = null;
         if (is_callable($this->onRequest)) {
-            $response = ($this->onRequest)($request);
+            $response = ($this->onRequest)($request,$this->http2Connection);
         }
-        if (! $response instanceof Response) {
+        if (!$response instanceof Response) {
             $response = new Response(404, ['content-type' => 'text/html'], '');
         }
         $this->streams[$id]->state |= Http2Stream::LOCAL_CLOSED;
@@ -703,7 +704,7 @@ private function sendBufferedData(): void
             if ($this->clientWindow <= 0) {
                 return;
             }
-            if (! strlen($stream->buffer) || $stream->clientWindow <= 0) {
+            if (!strlen($stream->buffer) || $stream->clientWindow <= 0) {
                 continue;
             }
             $this->writeBufferedData($id);
@@ -752,9 +753,9 @@ private function encodeHeaders(array $headers): string
     {
         $input = [];
         foreach ($headers as $field => $values) {
-            $values = (array) $values;
+            $values = (array)$values;
             foreach ($values as $value) {
-                $input[] = [(string) $field, (string) $value];
+                $input[] = [(string)$field, (string)$value];
             }
         }
         return $this->hPack->encode($input);
@@ -765,7 +766,7 @@ private function shutdown(?int $lastId = null, ?Throwable $reason = null): void
         $code = $reason ? $reason->getCode() : Http2Parser::GRACEFUL_SHUTDOWN;
         $lastId ??= $id ?? 0;
         $this->writeFrame(pack('NN', $lastId, $code), Http2Parser::GOAWAY, Http2Parser::NO_FLAG);
-        if (! empty($this->streams)) {
+        if (!empty($this->streams)) {
             if (empty($reason)) {
                 $exception = new ClientException('', 0, $reason);
             } else {
@@ -783,7 +784,7 @@ private function shutdown(?int $lastId = null, ?Throwable $reason = null): void
      */
     private function releaseStream(int $id, ClientException $exception = null): void
     {
-        if (! isset($this->streams[$id])) {
+        if (!isset($this->streams[$id])) {
             return;
         }
         unset($this->streams[$id]);
diff --git a/cloud-admin/Http2/Parser/Request.php b/cloud-admin/Http2/Parser/Request.php
@@ -11,7 +11,6 @@
 
 namespace CloudAdmin\Http2\Parser;
 
-use Swow\Psr7\Server\ServerConnection;
 use function explode;
 use function file_put_contents;
 use function is_array;
@@ -78,8 +77,11 @@ public function get($name = null, $default = null): array
      */
     public function post($name = null, $default = null): mixed
     {
-        if (! isset($this->data['post'])) {
-            $this->parsePost();
+        if (!isset($this->data['post'])) {
+            try {
+                $this->parsePost();
+            } catch (\JsonException $e) {
+            }
         }
         if ($name === null) {
             return $this->data['post'] ?? [];
@@ -93,7 +95,7 @@ public function post($name = null, $default = null): mixed
      */
     public function file($name = null): mixed
     {
-        if (! isset($this->data['files'])) {
+        if (!isset($this->data['files'])) {
             $this->parsePost();
         }
         if ($name === null) {
@@ -104,7 +106,7 @@ public function file($name = null): mixed
 
     public function ip(): string
     {
-        return $this->client->getPeerAddress();
+        return $this->client->getLocalAddress();
     }
 
     public function host(): string
@@ -155,7 +157,7 @@ public function header(string $name = null, mixed $default = null): null|array|s
 
     protected function parsePost(): void
     {
-        if (! $this->rawBody) {
+        if (!$this->rawBody) {
             return;
         }
         $this->data['post'] = $this->data['files'] = [];
@@ -166,7 +168,7 @@ protected function parsePost(): void
             return;
         }
         if (preg_match('/\bjson\b/i', $content_type)) {
-            $this->data['post'] = (array) json_decode($this->rawBody, true, 512, JSON_THROW_ON_ERROR);
+            $this->data['post'] = (array)json_decode($this->rawBody, true, 512, JSON_THROW_ON_ERROR);
         } else {
             parse_str($this->rawBody, $this->data['post']);
         }
@@ -202,15 +204,15 @@ protected function parseUploadFiles(string $http_post_boundary): void
                             $tmp_file = '';
                             $size = strlen($boundary_value);
                             $tmp_upload_dir = './temp/';
-                            if (! $tmp_upload_dir) {
+                            if (!$tmp_upload_dir) {
                                 $error = UPLOAD_ERR_NO_TMP_DIR;
                             } else {
                                 $tmp_file = tempnam($tmp_upload_dir, 'workerman.upload.');
-                                if ($tmp_file === false || ! file_put_contents($tmp_file, $boundary_value)) {
+                                if ($tmp_file === false || !file_put_contents($tmp_file, $boundary_value)) {
                                     $error = UPLOAD_ERR_CANT_WRITE;
                                 }
                             }
-                            if (! isset($files[$key])) {
+                            if (!isset($files[$key])) {
                                 $files[$key] = [];
                             }
                             // Parse upload files.
@@ -232,7 +234,7 @@ protected function parseUploadFiles(string $http_post_boundary): void
                         break;
                     case 'content-type':
                         // add file_type
-                        if (! isset($files[$key])) {
+                        if (!isset($files[$key])) {
                             $files[$key] = [];
                         }
                         $files[$key]['type'] = trim($header_value);
diff --git a/cloud-admin/Http2/Parser/Response.php b/cloud-admin/Http2/Parser/Response.php
@@ -113,7 +113,7 @@ public function getPushes(): array
         return $this->push;
     }
 
-    public function push(string $url, array $header = [])
+    public function push(string $url, array $header = []): void
     {
         $urlInfo = parse_url($url);
         if (is_array($urlInfo)) {
diff --git a/cloud-admin/Http2/Server/Server.php b/cloud-admin/Http2/Server/Server.php

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function send(int $id, Response $response, Request $request)`
`149`	`149`	`return;`
`150`	`150`	`}`
`151`	`151`	`$this->sendBody($id, $response, $request);`
`152`		`- if (! empty($pushStream)) {`
	`152`	`+ if (!empty($pushStream)) {`
`153`	`153`	`foreach ($pushStream as $push) {// 发送推送帧`
`154`	`154`	`$this->send(...$push);`
`155`	`155`	`}`
`@@ -168,7 +168,7 @@ public function send(int $id, Response $response, Request $request)`
`168`	`168`
`169`	`169`	`public function sendBody(int $id, Response $response, Request $request): void`
`170`	`170`	`{`
`171`		`- if (! in_array($request->path(), $this->streamUrl)) {`
	`171`	`+ if (!in_array($request->path(), $this->streamUrl)) {`
`172`	`172`	`if (is_callable($this->onWriteBody)) {`
`173`	`173`	`// 服务端流模式在此处不停的发送帧`
`174`	`174`	`$response->http2Driver = $this;`
`@@ -177,10 +177,10 @@ public function sendBody(int $id, Response $response, Request $request): void`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`$body = $response->getBody();`
`180`		`- if (strlen((string) $body)) {`
	`180`	`+ if (strlen((string)$body)) {`
`181`	`181`	`$this->writeData($body, $id);`
`182`	`182`	`}`
`183`		`- if (! isset($this->streams[$id])) {`
	`183`	`+ if (!isset($this->streams[$id])) {`
`184`	`184`	`return;`
`185`	`185`	`}`
`186`	`186`	`$trailers = $response->getTrailers();`
`@@ -249,7 +249,7 @@ public function sendHeader(int $id, Response $response, Request $request): void`
`249`	`249`	`*/`
`250`	`250`	`public function writeData(string $data, int $id): void`
`251`	`251`	`{`
`252`		`- if (! isset($this->streams[$id])) {`
	`252`	`+ if (!isset($this->streams[$id])) {`
`253`	`253`	`var_dump('The stream was closed');`
`254`	`254`	`return;`
`255`	`255`	`}`
`@@ -264,7 +264,7 @@ public function writeFrame(string $data, int $type, int $flags, int $stream = 0)`
`264`	`264`
`265`	`265`	`public function handlePing(string $data): void`
`266`	`266`	`{`
`267`		`- if (! $this->pinged) { // 没有ping过就更新`
	`267`	`+ if (!$this->pinged) { // 没有ping过就更新`
`268`	`268`	`$this->http2Connection->updateExpirationTime(`
`269`	`269`	`max($this->http2Connection->getExpirationTime(), time() + 5)`
`270`	`270`	`);`
`@@ -282,7 +282,7 @@ public function handleStreamWindowIncrement(int $streamId, int $windowSize): voi`
`282`	`282`	`if ($streamId > $this->remoteStreamId) {`
`283`	`283`	`throw new Http2ConnectionException('Stream ID does not exist', Http2Parser::PROTOCOL_ERROR);`
`284`	`284`	`}`
`285`		`- if (! isset($this->streams[$streamId])) {`
	`285`	`+ if (!isset($this->streams[$streamId])) {`
`286`	`286`	`return;`
`287`	`287`	`}`
`288`	`288`	`$stream = $this->streams[$streamId];`
`@@ -329,7 +329,7 @@ public function handleConnectionWindowIncrement(int $windowSize): void`
`329`	`329`	`public function handleHeaders(int $streamId, array $pseudo, array $headers, bool $ended): void`
`330`	`330`	`{`
`331`	`331`	`foreach ($pseudo as $name => $value) {`
`332`		`- if (! isset(Http2Parser::KNOWN_REQUEST_PSEUDO_HEADERS[$name])) {`
	`332`	`+ if (!isset(Http2Parser::KNOWN_REQUEST_PSEUDO_HEADERS[$name])) {`
`333`	`333`	`throw new Http2StreamException('Invalid pseudo header', $streamId, Http2Parser::PROTOCOL_ERROR);`
`334`	`334`	`}`
`335`	`335`	`}`
`@@ -339,7 +339,7 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool`
`339`	`339`	`throw new Http2StreamException('Stream remote closed', $streamId, Http2Parser::STREAM_CLOSED);`
`340`	`340`	`}`
`341`	`341`	`} else {`
`342`		`- if (! ($streamId & 1) \|\| $this->remainingStreams-- <= 0 \|\| $streamId <= $this->remoteStreamId) {`
	`342`	`+ if (!($streamId & 1) \|\| $this->remainingStreams-- <= 0 \|\| $streamId <= $this->remoteStreamId) {`
`343`	`343`	`throw new Http2ConnectionException("Invalid stream ID {$streamId}", Http2Parser::PROTOCOL_ERROR);`
`344`	`344`	`}`
`345`	`345`	`$stream = $this->streams[$streamId] = new Http2Stream(Options::getBodySizeLimit(), $this->initialWindowSize);`
`@@ -350,7 +350,7 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool`
`350`	`350`	`throw new Http2StreamException('Stream already reserved', $streamId, Http2Parser::PROTOCOL_ERROR);`
`351`	`351`	`}`
`352`	`352`	`$stream->state \|= Http2Stream::RESERVED;`
`353`		`- if (! isset($pseudo[':method'], $pseudo[':path'], $pseudo[':scheme'], $pseudo[':authority'])`
	`353`	`+ if (!isset($pseudo[':method'], $pseudo[':path'], $pseudo[':scheme'], $pseudo[':authority'])`
`354`	`354`	`\|\| isset($headers['connection'])`
`355`	`355`	`\|\| $pseudo[':path'] === ''`
`356`	`356`	`\|\| (isset($headers['te']) && implode('', $headers['te']) !== 'trailers')`
`@@ -362,17 +362,17 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool`
`362`	`362`	`$scheme = $pseudo[':scheme'];`
`363`	`363`	`$host = $pseudo[':authority'];`
`364`	`364`	`$query = null;`
`365`		`- if (! preg_match('#^([A-Z\\d\\.\\-]+\|\\[[\\d:]+\\])(?::([1-9]\\d*))?$#i', (string) $host, $matches)) {`
	`365`	`+ if (!preg_match('#^([A-Z\\d\\.\\-]+\|\\[[\\d:]+\\])(?::([1-9]\\d*))?$#i', (string)$host, $matches)) {`
`366`	`366`	`throw new Http2StreamException('Invalid authority (host) name', $streamId, Http2Parser::PROTOCOL_ERROR);`
`367`	`367`	`}`
`368`	`368`	`$host = $matches[1];`
`369`		`- $port = isset($matches[2]) ? (int) $matches[2] : $this->http2Connect->getPort();`
`370`		`- if ($position = strpos((string) $target, '#')) {`
`371`		`- $target = substr((string) $target, 0, $position);`
	`369`	`+ $port = isset($matches[2]) ? (int)$matches[2] : $this->http2Connection->getPort();`
	`370`	`+ if ($position = strpos((string)$target, '#')) {`
	`371`	`+ $target = substr((string)$target, 0, $position);`
`372`	`372`	`}`
`373`		`- if ($position = strpos((string) $target, '?')) {`
`374`		`- $query = substr((string) $target, $position + 1);`
`375`		`- $target = substr((string) $target, 0, $position);`
	`373`	`+ if ($position = strpos((string)$target, '?')) {`
	`374`	`+ $query = substr((string)$target, $position + 1);`
	`375`	`+ $target = substr((string)$target, 0, $position);`
`376`	`376`	`}`
`377`	`377`	`$headers = array_merge($headers, ['scheme' => $scheme, 'host' => $host, 'port' => $port, 'path' => $target, 'query' => $query, 'method' => $method]);`
`378`	`378`	`$this->pinged = 0;`
`@@ -392,17 +392,17 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool`
`392`	`392`	`throw new Http2StreamException('Received multiple content-length headers', $streamId, Http2Parser::PROTOCOL_ERROR);`
`393`	`393`	`}`
`394`	`394`	`$contentLength = $headers['content-length'][0];`
`395`		`- if (! preg_match('/^0\|[1-9][0-9]*$/', (string) $contentLength)) {`
	`395`	`+ if (!preg_match('/^0\|[1-9][0-9]*$/', (string)$contentLength)) {`
`396`	`396`	`throw new Http2StreamException('Invalid content-length header value', $streamId, Http2Parser::PROTOCOL_ERROR);`
`397`	`397`	`}`
`398`		`- $stream->expectedLength = (int) $contentLength;`
	`398`	`+ $stream->expectedLength = (int)$contentLength;`
`399`	`399`	`}`
`400`	`400`	`$request = new Request($streamId, $this->http2Connection, $headers);`
`401`	`401`	`$this->streamIdRequestMap[$streamId] = $request;`
`402`	`402`	`// 如果是客户端流模式，这里应该给前端返回头响应`
`403`	`403`	`if (in_array($request->path(), $this->streamUrl)) {`
`404`	`404`	`if (is_callable($this->onRequest)) {`
`405`		`- $response = ($this->onRequest)($request);`
	`405`	`+ $response = ($this->onRequest)($request,$this->http2Connection);`
`406`	`406`	`} else {`
`407`	`407`	`$response = new Response(200, ['content-type' => 'text/html'], '');`
`408`	`408`	`}`
`@@ -425,7 +425,7 @@ public function handleData(int $streamId, string $data): void`
`425`	`425`	`if ($stream->state & Http2Stream::REMOTE_CLOSED) {`
`426`	`426`	`throw new Http2StreamException('Stream remote closed', $streamId, Http2Parser::PROTOCOL_ERROR);`
`427`	`427`	`}`
`428`		`- if (! $length) {`
	`428`	`+ if (!$length) {`
`429`	`429`	`return;`
`430`	`430`	`}`
`431`	`431`	`$this->serverWindow -= $length;`
`@@ -457,7 +457,7 @@ public function handleData(int $streamId, string $data): void`
`457`	`457`	`$request->appendData($data);`
`458`	`458`	`}`
`459`	`459`	`if ($stream->serverWindow <= self::MINIMUM_WINDOW) {`
`460`		`- if (! isset($this->streams[$streamId])) {`
	`460`	`+ if (!isset($this->streams[$streamId])) {`
`461`	`461`	`return;`
`462`	`462`	`}`
`463`	`463`	`$stream = $this->streams[$streamId];`
`@@ -478,7 +478,7 @@ public function handleData(int $streamId, string $data): void`
`478`	`478`	`*/`
`479`	`479`	`public function handleStreamEnd(int $streamId): void`
`480`	`480`	`{`
`481`		`- if (! isset($this->streams[$streamId])) {`
	`481`	`+ if (!isset($this->streams[$streamId])) {`
`482`	`482`	`return;`
`483`	`483`	`}`
`484`	`484`	`$stream = $this->streams[$streamId];`
`@@ -488,16 +488,16 @@ public function handleStreamEnd(int $streamId): void`
`488`	`488`	`}`
`489`	`489`	`/** @var Request $request */`
`490`	`490`	`$request = $this->streamIdRequestMap[$streamId];`
`491`		`- if (! in_array($request->getMethod(), Options::getAllowedMethods())) {`
	`491`	`+ if (!in_array($request->getMethod(), Options::getAllowedMethods())) {`
`492`	`492`	`$response = new Response(405); // METHOD_NOT_ALLOWED`
`493`	`493`	`} else {`
`494`		`- $response = $this->streamIdResponseMap[$streamId];`
`495`		`- if (! $response instanceof Response) {`
	`494`	`+ $response = $this->streamIdResponseMap[$streamId] ?? null;`
	`495`	`+ if (!$response instanceof Response) {`
`496`	`496`	`if (is_callable($this->onRequest)) {`
`497`		`- $response = ($this->onRequest)($request);`
	`497`	`+ $response = ($this->onRequest)($request,$this->http2Connection);`
`498`	`498`	`}`
`499`	`499`	`}`
`500`		`- if (! $response instanceof Response) {`
	`500`	`+ if (!$response instanceof Response) {`
`501`	`501`	`$response = new Response(404, ['content-type' => 'text/html'], '');`
`502`	`502`	`}`
`503`	`503`	`}`
`@@ -529,7 +529,7 @@ public function handlePushPromise(int $streamId, int $pushId, array $pseudo, arr`
`529`	`529`	`*/`
`530`	`530`	`public function handlePriority(int $streamId, int $parentId, int $weight): void`
`531`	`531`	`{`
`532`		`- if (! isset($this->streams[$streamId])) {// 为将来的流设置优先级`
	`532`	`+ if (!isset($this->streams[$streamId])) {// 为将来的流设置优先级`
`533`	`533`	`// if ($streamId === 0 \|\| !($streamId & 1) \|\| $this->remainingStreams-- <= 0) {`
`534`	`534`	`if ($streamId === 0 \|\| $this->remainingStreams-- <= 0) { // chrome居然发送了偶数帧过来`
`535`	`535`	`throw new Http2ConnectionException("Invalid stream ID {$streamId}", Http2Parser::PROTOCOL_ERROR);`
`@@ -625,6 +625,7 @@ public function handleConnectionException(Http2ConnectionException $exception):`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`// http1.1升级h2c`
	`628`	`+`
`628`	`629`	`/**`
`629`	`630`	`* @throws Http2StreamException`
`630`	`631`	`*/`
`@@ -651,7 +652,7 @@ private function sendPushPromise(Request $request, int $streamId, array $push):`
`651`	`652`	`$id = $this->localStreamId += 2;`
`652`	`653`	`// $this->remoteStreamId = \max($id, $this->remoteStreamId);`
`653`	`654`	`$headers = array_merge(['scheme' => 'https', 'host' => '', 'port' => 443, 'path' => '/', 'query' => '', 'method' => 'GET'], $push['uri'], $mergedHeaders);`
`654`		`- $request = new Request($this->http2Connection, $this->http2Connection, $headers);`
	`655`	`+ $request = new Request($streamId, $this->http2Connection, $headers);`
`655`	`656`	`$this->streams[$id] = new Http2Stream(0, $this->initialWindowSize, Http2Stream::RESERVED \| Http2Stream::REMOTE_CLOSED);`
`656`	`657`	`$this->streamIdRequestMap[$id] = $request;`
`657`	`658`	`foreach ($mergedHeaders as $k => $v) {`
`@@ -680,9 +681,9 @@ private function sendPushPromise(Request $request, int $streamId, array $push):`
`680`	`681`	`}`
`681`	`682`	`$response = null;`
`682`	`683`	`if (is_callable($this->onRequest)) {`
`683`		`- $response = ($this->onRequest)($request);`
	`684`	`+ $response = ($this->onRequest)($request,$this->http2Connection);`
`684`	`685`	`}`
`685`		`- if (! $response instanceof Response) {`
	`686`	`+ if (!$response instanceof Response) {`
`686`	`687`	`$response = new Response(404, ['content-type' => 'text/html'], '');`
`687`	`688`	`}`
`688`	`689`	`$this->streams[$id]->state \|= Http2Stream::LOCAL_CLOSED;`
`@@ -703,7 +704,7 @@ private function sendBufferedData(): void`
`703`	`704`	`if ($this->clientWindow <= 0) {`
`704`	`705`	`return;`
`705`	`706`	`}`
`706`		`- if (! strlen($stream->buffer) \|\| $stream->clientWindow <= 0) {`
	`707`	`+ if (!strlen($stream->buffer) \|\| $stream->clientWindow <= 0) {`
`707`	`708`	`continue;`
`708`	`709`	`}`
`709`	`710`	`$this->writeBufferedData($id);`
`@@ -752,9 +753,9 @@ private function encodeHeaders(array $headers): string`
`752`	`753`	`{`
`753`	`754`	`$input = [];`
`754`	`755`	`foreach ($headers as $field => $values) {`
`755`		`- $values = (array) $values;`
	`756`	`+ $values = (array)$values;`
`756`	`757`	`foreach ($values as $value) {`
`757`		`- $input[] = [(string) $field, (string) $value];`
	`758`	`+ $input[] = [(string)$field, (string)$value];`
`758`	`759`	`}`
`759`	`760`	`}`
`760`	`761`	`return $this->hPack->encode($input);`
`@@ -765,7 +766,7 @@ private function shutdown(?int $lastId = null, ?Throwable $reason = null): void`
`765`	`766`	`$code = $reason ? $reason->getCode() : Http2Parser::GRACEFUL_SHUTDOWN;`
`766`	`767`	`$lastId ??= $id ?? 0;`
`767`	`768`	`$this->writeFrame(pack('NN', $lastId, $code), Http2Parser::GOAWAY, Http2Parser::NO_FLAG);`
`768`		`- if (! empty($this->streams)) {`
	`769`	`+ if (!empty($this->streams)) {`
`769`	`770`	`if (empty($reason)) {`
`770`	`771`	`$exception = new ClientException('', 0, $reason);`
`771`	`772`	`} else {`
`@@ -783,7 +784,7 @@ private function shutdown(?int $lastId = null, ?Throwable $reason = null): void`
`783`	`784`	`*/`
`784`	`785`	`private function releaseStream(int $id, ClientException $exception = null): void`
`785`	`786`	`{`
`786`		`- if (! isset($this->streams[$id])) {`
	`787`	`+ if (!isset($this->streams[$id])) {`
`787`	`788`	`return;`
`788`	`789`	`}`
`789`	`790`	`unset($this->streams[$id]);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace CloudAdmin\Http2\Parser;`
`13`	`13`
`14`		`-use Swow\Psr7\Server\ServerConnection;`
`15`	`14`	`use function explode;`
`16`	`15`	`use function file_put_contents;`
`17`	`16`	`use function is_array;`
`@@ -78,8 +77,11 @@ public function get($name = null, $default = null): array`
`78`	`77`	`*/`
`79`	`78`	`public function post($name = null, $default = null): mixed`
`80`	`79`	`{`
`81`		`- if (! isset($this->data['post'])) {`
`82`		`- $this->parsePost();`
	`80`	`+ if (!isset($this->data['post'])) {`
	`81`	`+ try {`
	`82`	`+ $this->parsePost();`
	`83`	`+ } catch (\JsonException $e) {`
	`84`	`+ }`
`83`	`85`	`}`
`84`	`86`	`if ($name === null) {`
`85`	`87`	`return $this->data['post'] ?? [];`
`@@ -93,7 +95,7 @@ public function post($name = null, $default = null): mixed`
`93`	`95`	`*/`
`94`	`96`	`public function file($name = null): mixed`
`95`	`97`	`{`
`96`		`- if (! isset($this->data['files'])) {`
	`98`	`+ if (!isset($this->data['files'])) {`
`97`	`99`	`$this->parsePost();`
`98`	`100`	`}`
`99`	`101`	`if ($name === null) {`
`@@ -104,7 +106,7 @@ public function file($name = null): mixed`
`104`	`106`
`105`	`107`	`public function ip(): string`
`106`	`108`	`{`
`107`		`- return $this->client->getPeerAddress();`
	`109`	`+ return $this->client->getLocalAddress();`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`public function host(): string`
`@@ -155,7 +157,7 @@ public function header(string $name = null, mixed $default = null): null\|array\|s`
`155`	`157`
`156`	`158`	`protected function parsePost(): void`
`157`	`159`	`{`
`158`		`- if (! $this->rawBody) {`
	`160`	`+ if (!$this->rawBody) {`
`159`	`161`	`return;`
`160`	`162`	`}`
`161`	`163`	`$this->data['post'] = $this->data['files'] = [];`
`@@ -166,7 +168,7 @@ protected function parsePost(): void`
`166`	`168`	`return;`
`167`	`169`	`}`
`168`	`170`	`if (preg_match('/\bjson\b/i', $content_type)) {`
`169`		`- $this->data['post'] = (array) json_decode($this->rawBody, true, 512, JSON_THROW_ON_ERROR);`
	`171`	`+ $this->data['post'] = (array)json_decode($this->rawBody, true, 512, JSON_THROW_ON_ERROR);`
`170`	`172`	`} else {`
`171`	`173`	`parse_str($this->rawBody, $this->data['post']);`
`172`	`174`	`}`
`@@ -202,15 +204,15 @@ protected function parseUploadFiles(string $http_post_boundary): void`
`202`	`204`	`$tmp_file = '';`
`203`	`205`	`$size = strlen($boundary_value);`
`204`	`206`	`$tmp_upload_dir = './temp/';`
`205`		`- if (! $tmp_upload_dir) {`
	`207`	`+ if (!$tmp_upload_dir) {`
`206`	`208`	`$error = UPLOAD_ERR_NO_TMP_DIR;`
`207`	`209`	`} else {`
`208`	`210`	`$tmp_file = tempnam($tmp_upload_dir, 'workerman.upload.');`
`209`		`- if ($tmp_file === false \|\| ! file_put_contents($tmp_file, $boundary_value)) {`
	`211`	`+ if ($tmp_file === false \|\| !file_put_contents($tmp_file, $boundary_value)) {`
`210`	`212`	`$error = UPLOAD_ERR_CANT_WRITE;`
`211`	`213`	`}`
`212`	`214`	`}`
`213`		`- if (! isset($files[$key])) {`
	`215`	`+ if (!isset($files[$key])) {`
`214`	`216`	`$files[$key] = [];`
`215`	`217`	`}`
`216`	`218`	`// Parse upload files.`
`@@ -232,7 +234,7 @@ protected function parseUploadFiles(string $http_post_boundary): void`
`232`	`234`	`break;`
`233`	`235`	`case 'content-type':`
`234`	`236`	`// add file_type`
`235`		`- if (! isset($files[$key])) {`
	`237`	`+ if (!isset($files[$key])) {`
`236`	`238`	`$files[$key] = [];`
`237`	`239`	`}`
`238`	`240`	`$files[$key]['type'] = trim($header_value);`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function getPushes(): array`
`113`	`113`	`return $this->push;`
`114`	`114`	`}`
`115`	`115`
`116`		`- public function push(string $url, array $header = [])`
	`116`	`+ public function push(string $url, array $header = []): void`
`117`	`117`	`{`
`118`	`118`	`$urlInfo = parse_url($url);`
`119`	`119`	`if (is_array($urlInfo)) {`