This commit is contained in:
2021-04-20 12:15:15 +08:00
parent b781bf8425
commit 7de975ab34
2 changed files with 10 additions and 7 deletions
+8 -6
View File
@@ -121,10 +121,10 @@ class OnHandshake extends Callback
$router = Snowflake::app()->getRouter(); $router = Snowflake::app()->getRouter();
$sRequest = $this->sRequest($request); [$sRequest, $sResponse] = $this->sRequest($request, $response);
if (($node = $router->find_path($sRequest)) !== null) { if (($node = $router->find_path($sRequest)) !== null) {
return $node->dispatch($sRequest, Response::create($response)); return $node->dispatch($sRequest, $sResponse);
} }
return $this->disconnect($response, 404); return $this->disconnect($response, 404);
} }
@@ -132,11 +132,12 @@ class OnHandshake extends Callback
/** /**
* @param $request * @param $request
* @return Request * @param SResponse $response
* @throws ReflectionException * @return array
* @throws NotFindClassException * @throws NotFindClassException
* @throws ReflectionException
*/ */
private function sRequest($request): Request private function sRequest($request, SResponse $response): array
{ {
/** @var Request $sRequest */ /** @var Request $sRequest */
$sRequest = Request::create($request); $sRequest = Request::create($request);
@@ -150,7 +151,8 @@ class OnHandshake extends Callback
$sRequest->params = new HttpParams([], $request->get, []); $sRequest->params = new HttpParams([], $request->get, []);
$sRequest->parseUri(); $sRequest->parseUri();
return $sRequest;
return [$sRequest, Response::create($response)];
} }
+2 -1
View File
@@ -279,7 +279,8 @@ class Response extends HttpService
$ciResponse->response = $response; $ciResponse->response = $response;
$ciResponse->startTime = microtime(true); $ciResponse->startTime = microtime(true);
$ciResponse->format = self::JSON; $ciResponse->format = self::JSON;
return Context::setContext('response', $ciResponse); Context::setContext('response', $ciResponse);
return $ciResponse;
} }