变更

src/Response.php

@@ -8,7 +8,12 @@ use Kiri\Di\Context;
 use Kiri\Router\Constrict\ConstrictResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
+use ReflectionException;
 
+
+/**
+ * 
+ */
 class Response implements ResponseInterface
 {
 
@@ -19,6 +24,24 @@ class Response implements ResponseInterface
 	public ContentType $contentType = ContentType::JSON;
 
 
+	/**
+	 * @var string|SwooleHttpResponseEmitterInterface
+	 */
+	public string|SwooleHttpResponseEmitterInterface $emmit = SwooleHttpResponseEmitterInterface::class;
+
+
+	/**
+	 * @return void
+	 * @throws ReflectionException
+	 */
+	public function init(): void
+	{
+		if (is_string($this->emmit)) {
+			$this->emmit = di($this->emmit);
+		}
+	}
+
+
 	/**
 	 * @param ContentType $contentType
 	 * @return Response

src/Server.php

@@ -1,157 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Kiri\Router;
-
-
-use Exception;
-use Kiri;
-use Kiri\Router\Base\Middleware as MiddlewareManager;
-use Kiri\Di\Context;
-use Kiri\Router\Interface\ExceptionHandlerInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
-use Swoole\Http\Request;
-use Kiri\Di\Inject\Service;
-use Swoole\Http\Response;
-use Kiri\Router\Constrict\ConstrictRequest;
-use Kiri\Router\Constrict\ConstrictResponse;
-use Kiri\Router\Constrict\Uri;
-use Kiri\Router\Interface\OnRequestInterface;
-use Kiri\Router\Base\ExceptionHandlerDispatcher;
-
-
-/**
- *
- */
-class Server implements OnRequestInterface
-{
-
-
-	/**
-	 * @var RouterCollector
-	 */
-	public RouterCollector $router;
-
-
-	/**
-	 * @var ExceptionHandlerInterface
-	 */
-	public ExceptionHandlerInterface $exception;
-
-	/**
-	 * @var HttpResponseEmitter
-	 */
-	public HttpResponseEmitter $emitter;
-
-
-	/**
-	 * @var \Kiri\Router\Request
-	 */
-	#[Service('request')]
-	public RequestInterface $request;
-
-
-	/**
-	 * @var \Kiri\Router\Response
-	 */
-	#[Service('response')]
-	public ResponseInterface $response;
-
-
-	/**
-	 * @throws Exception
-	 */
-	public function init(): void
-	{
-		$container = Kiri::getDi();
-		$this->emitter = $container->get(HttpResponseEmitter::class);
-
-		$exception = $this->request->exception;
-		if (!in_array(ExceptionHandlerInterface::class, class_implements($exception))) {
-			$exception = ExceptionHandlerDispatcher::class;
-		}
-		$this->exception = $container->get($exception);
-
-		$this->router = $container->get(DataGrip::class)->get(ROUTER_TYPE_HTTP);
-	}
-
-
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 * @throws Exception
-	 */
-	public function onRequest(Request $request, Response $response): void
-	{
-		try {
-			/** @var ConstrictRequest $PsrRequest */
-			$PsrRequest = $this->initRequestAndResponse($request);
-
-			$request_uri = $request->getMethod() == 'OPTIONS' ? '/*' : $request->server['request_uri'];
-			$dispatcher = $this->router->query($request_uri, $request->getMethod());
-
-			$middleware = [];
-			if (!($dispatcher instanceof Kiri\Router\Base\NotFoundController)) {
-				$middlewareManager = \Kiri::getDi()->get(MiddlewareManager::class);
-
-				$middleware = $middlewareManager->get($dispatcher->getClass(), $dispatcher->getMethod());
-			}
-
-			$PsrResponse = (new HttpRequestHandler($middleware, $dispatcher))->handle($PsrRequest);
-		} catch (\Throwable $throwable) {
-			error($throwable);
-			$PsrResponse = $this->exception->emit($throwable, di(ConstrictResponse::class));
-		} finally {
-			$this->emitter->sender($PsrResponse, $response);
-		}
-	}
-
-
-	/**
-	 * @param Request $request
-	 * @return RequestInterface
-	 * @throws Exception
-	 */
-	private function initRequestAndResponse(Request $request): RequestInterface
-	{
-		/** @var ConstrictResponse $PsrResponse */
-		$PsrResponse = Context::set(ResponseInterface::class, new ConstrictResponse());
-		$PsrResponse->withContentType($this->response->contentType);
-
-		$serverRequest = (new ConstrictRequest())->withDataHeaders($request->getData())
-			->withUri(static::parse($request))
-			->withProtocolVersion($request->server['server_protocol'])
-			->withCookieParams($request->cookie ?? [])
-			->withQueryParams($request->get ?? [])
-			->withUploadedFiles($request->files ?? [])
-			->withMethod($request->getMethod())
-			->withParsedBody($request->post ?? []);
-
-		/** @var ConstrictRequest $PsrRequest */
-		return Context::set(RequestInterface::class, $serverRequest);
-	}
-
-
-	/**
-	 * @param Request $request
-	 * @return UriInterface
-	 */
-	public static function parse(Request $request): UriInterface
-	{
-		$uri = new Uri();
-		$uri->withQuery($request->server['query_string'] ?? '')
-			->withPath($request->server['path_info'])
-			->withPort($request->server['server_port']);
-		if (isset($request->server['https']) && $request->server['https'] !== 'off') {
-			$uri->withScheme('https');
-		} else {
-			$uri->withScheme('http');
-		}
-		return $uri;
-	}
-
-
-
-}

src/ServerRequest.php

@@ -0,0 +1,96 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiri\Router;
+
+
+use Exception;
+use Kiri;
+use Kiri\Di\Interface\ResponseEmitterInterface;
+use Kiri\Router\Base\Middleware as MiddlewareManager;
+use Kiri\Router\Interface\ExceptionHandlerInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Kiri\Di\Inject\Service;
+use Kiri\Router\Constrict\ConstrictResponse;
+use Kiri\Router\Base\ExceptionHandlerDispatcher;
+
+
+/**
+ *
+ */
+class ServerRequest
+{
+
+
+	/**
+	 * @var RouterCollector
+	 */
+	public RouterCollector $router;
+
+
+	/**
+	 * @var ExceptionHandlerInterface
+	 */
+	public ExceptionHandlerInterface $exception;
+
+
+	/**
+	 * @var ResponseEmitterInterface
+	 */
+	public ResponseEmitterInterface $emitter;
+
+
+	/**
+	 * @var Request
+	 */
+	#[Service('request')]
+	public RequestInterface $request;
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function init(): void
+	{
+		$container = Kiri::getDi();
+		$exception = $this->request->exception;
+		if (!in_array(ExceptionHandlerInterface::class, class_implements($exception))) {
+			$exception = ExceptionHandlerDispatcher::class;
+		}
+		$this->exception = $container->get($exception);
+		$this->router = $container->get(DataGrip::class)->get(ROUTER_TYPE_HTTP);
+
+		$this->emitter = Kiri::service()->get('response')->emmit;
+	}
+
+
+	/**
+	 * @param ServerRequestInterface $request
+	 * @param object $response
+	 * @return void
+	 * @throws
+	 */
+	public function onServerRequest(ServerRequestInterface $request, object $response): void
+	{
+		try {
+			$request_uri = $request->getMethod() == 'OPTIONS' ? '/*' : $request->getUri()->getPath();
+			$dispatcher = $this->router->query($request_uri, $request->getMethod());
+
+			$middleware = [];
+			if (!($dispatcher instanceof Kiri\Router\Base\NotFoundController)) {
+				$middlewareManager = \Kiri::getDi()->get(MiddlewareManager::class);
+
+				$middleware = $middlewareManager->get($dispatcher->getClass(), $dispatcher->getMethod());
+			}
+
+			$PsrResponse = (new HttpRequestHandler($middleware, $dispatcher))->handle($request);
+		} catch (\Throwable $throwable) {
+			error($throwable);
+			$PsrResponse = $this->exception->emit($throwable, di(ConstrictResponse::class));
+		} finally {
+			$this->emitter->sender($PsrResponse, $response);
+		}
+	}
+
+}

src/StreamResponse.php

@@ -3,8 +3,10 @@ declare(strict_types=1);
 
 namespace Kiri\Router;
 
-use Psr\Http\Message\ResponseInterface;
 
+/**
+ *
+ */
 class StreamResponse extends Response
 {
 

src/SwooleHttpResponseEmitterInterface.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 namespace Kiri\Router;
 
 use Exception;
-use Kiri\Di\Interface\ResponseEmitter;
+use Kiri\Di\Interface\ResponseEmitterInterface;
 use Psr\Http\Message\ResponseInterface;
 
 
-class HttpResponseEmitter implements ResponseEmitter
+class SwooleHttpResponseEmitterInterface implements ResponseEmitterInterface
 {
 
 

src/SwowHttpResponseEmitterInterface.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Kiri\Router;
+
+use Kiri\Di\Interface\ResponseEmitterInterface;
+use Psr\Http\Message\ResponseInterface;
+
+class SwowHttpResponseEmitterInterface implements ResponseEmitterInterface
+{
+
+
+	/**
+	 * @param Response $proxy
+	 * @param object $response
+	 * @return void
+	 */
+	public function sender(ResponseInterface $proxy, object $response): void
+	{
+		// TODO: Implement sender() method.
+		$proxy->withHeader('Server', 'Swow');
+		$response->sendHttpResponse($proxy);
+	}
+
+}