改名

http-handler/Abstracts/Middleware.php

@@ -2,11 +2,19 @@
 
 namespace Http\Handler\Abstracts;
 
+use Annotation\Inject;
 use Psr\Http\Server\MiddlewareInterface;
+use Server\Constrict\ResponseInterface;
 
+
+/**
+ *
+ */
 abstract class Middleware implements MiddlewareInterface
 {
 
 
+	#[Inject(ResponseInterface::class)]
+	public ResponseInterface $response;
 
 }

http-handler/CoreMiddleware.php

@@ -20,14 +20,9 @@ class CoreMiddleware extends Middleware
 	 */
 	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
 	{
-		// TODO: Implement process() method.
-
-		\response()->withAccessControlAllowOrigin('*')
+		$this->response->withAccessControlAllowOrigin('*')
 			->withAccessControlRequestMethod($request->getAccessControlRequestMethod())
 			->withAccessControlAllowHeaders($request->getAccessControlAllowHeaders());
-
-		var_dump(get_called_class());
-
 		return $handler->handle($request);
 	}
 

http-server/Service/Http.php

@@ -5,15 +5,14 @@ namespace Server\Service;
 
 use Annotation\Inject;
 use Exception;
-use Http\Handler\Context;
 use Http\Handler\Abstracts\HandlerManager;
+use Http\Handler\Abstracts\MiddlewareManager;
+use Http\Handler\Context;
 use Http\Handler\Dispatcher;
 use Http\Handler\Handler;
 use Http\Handler\Router;
-use Http\Message\ContentType;
 use Http\Message\ServerRequest;
 use Http\Message\Stream;
-use Http\Handler\Abstracts\MiddlewareManager;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
@@ -130,12 +129,13 @@ class Http implements OnCloseInterface, OnConnectInterface, OnRequestInterface
 		$PsrResponse = Context::setContext(ResponseInterface::class, new \Http\Message\Response());
 
 		$PsrRequest = Context::setContext(RequestInterface::class, ServerRequest::createServerRequest($request));
-
+		if ($PsrRequest->isMethod('OPTIONS')) {
+			$request->server['request_uri'] = '/*';
+		}
 		return [$PsrRequest, $PsrResponse];
 	}
 
 
-
 	/**
 	 * @param Server $server
 	 * @param int $fd