as2252258/kiri-http-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

eee

Browse Source
This commit is contained in:
whwyy
2023-12-03 01:26:55 +08:00
parent bbfd7367d0
commit be035ed69f
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Handler/OnRequest.php
+13 -23
View File
@@ -6,14 +6,12 @@ namespace Kiri\Server\Handler;
use Exception; use Exception;
use Kiri; use Kiri;
use Kiri\Router\Constrict\Stream;
use Kiri\Di\Inject\Container; use Kiri\Di\Inject\Container;
use Kiri\Di\Context; use Kiri\Di\Context;
use Kiri\Di\Interface\ResponseEmitterInterface; use Kiri\Di\Interface\ResponseEmitterInterface;
use Kiri\Router\Base\ExceptionHandlerDispatcher; use Kiri\Router\Base\ExceptionHandlerDispatcher;
use Kiri\Router\Constrict\ConstrictRequest; use Kiri\Router\Constrict\ConstrictRequest as CQ;
use Kiri\Router\Constrict\ConstrictResponse; use Kiri\Router\Constrict\ConstrictResponse;
use Kiri\Router\Constrict\Uri;
use Kiri\Router\DataGrip; use Kiri\Router\DataGrip;
use Kiri\Router\Interface\ExceptionHandlerInterface; use Kiri\Router\Interface\ExceptionHandlerInterface;
use Kiri\Router\Interface\OnRequestInterface; use Kiri\Router\Interface\OnRequestInterface;
@@ -23,6 +21,7 @@ use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\RequestInterface; use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use ReflectionException; use ReflectionException;
use Swoole\Http\Request; use Swoole\Http\Request;
use Swoole\Http\Response; use Swoole\Http\Response;
@@ -87,15 +86,12 @@ class OnRequest implements OnRequestInterface
*/ */
public function onRequest(Request $request, Response $response): void public function onRequest(Request $request, Response $response): void
{ {
/** @var CQ $PsrRequest */
try { try {
/** @var ConstrictRequest $PsrRequest */ $PsrRequest = $this->initRequestAndResponse($request);
$PsrRequest = Context::set(RequestInterface::class, $this->createConstrictRequest($request));
/** @var ConstrictResponse $PsrResponse */ $PsrResponse = $this->router->query($request->server['path_info'], $request->getMethod())
Context::set(ResponseInterface::class, new ConstrictResponse($this->response->contentType)); ->run($PsrRequest);
/** @var $PsrResponse */
$PsrResponse = $this->router->query($request->server['path_info'], $request->getMethod())->run($PsrRequest);
} catch (Throwable $throwable) { } catch (Throwable $throwable) {
$PsrResponse = $this->exception->emit($throwable, $this->constrictResponse); $PsrResponse = $this->exception->emit($throwable, $this->constrictResponse);
} finally { } finally {
@@ -106,21 +102,15 @@ class OnRequest implements OnRequestInterface
/** /**
* @param Request $request * @param Request $request
* @return ConstrictRequest * @return ServerRequestInterface
*/ */
protected function createConstrictRequest(Request $request): ConstrictRequest public function initRequestAndResponse(Request $request): ServerRequestInterface
{ {
return (new ConstrictRequest())->withHeaders($request->header ?? []) $response = new ConstrictResponse($this->response->contentType);
->withUri(new Uri($request))
->withProtocolVersion($request->server['server_protocol']) Context::set(ResponseInterface::class, $response);
->withCookieParams($request->cookie ?? [])
->withServerParams($request->server) return Context::set(RequestInterface::class, CQ::builder($request));
->withQueryParams($request->get ?? [])
->withBody(new Stream($request->getContent()))
->withParsedBody($request)
->withUploadedFiles($request->files ?? [])
->withMethod($request->getMethod());
} }
} }