改名

2021-04-26 12:32:38 +08:00
parent 9ae3dc8f8a
commit 0db6782135
3 changed files with 528 additions and 526 deletions
@@ -9,6 +9,7 @@ use HttpServer\Abstracts\Callback;
 use HttpServer\Exception\ExitException;
 use HttpServer\Http\Request as HRequest;
 use HttpServer\Http\Response as HResponse;
+use HttpServer\Route\Router;
 use Snowflake\Error\Logger;
 use Snowflake\Event;
 use Snowflake\Snowflake;
@@ -24,87 +25,88 @@ class OnRequest extends Callback
 {


-    public Event $event;
-    public Logger $logger;
+	public Event $event;
+	public Logger $logger;


-    /**
-     * @throws Exception
-     */
-    public function init()
-    {
-        $this->event = Snowflake::app()->getEvent();
-    }
+	public Router $router;


-    /**
-     * @param Request $request
-     * @param Response $response
-     * @return void
-     * @throws Exception
-     */
-    public function onHandler(Request $request, Response $response): mixed
-    {
-        try {
-            defer(function () {
-                fire(Event::SYSTEM_RESOURCE_RELEASES);
-            });
-            /** @var HRequest $request */
-            [$request, $response] = OnRequest::createContext($request, $response);
-
-            $this->event->dispatch(Event::EVENT_BEFORE_REQUEST, [$request]);
-
-            $result = $request->dispatch();
-
-            $this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$request, $result]);
-
-            return $result;
-        } catch (ExitException | Error | \Throwable $exception) {
-            $this->addError($exception, 'throwable');
-            return $this->sendErrorMessage($request, $response, $exception);
-        }
-    }
+	/**
+	 * @throws Exception
+	 */
+	public function init()
+	{
+		$this->event = Snowflake::app()->getEvent();
+		$this->router = Snowflake::app()->getRouter();
+	}


-    /**
-     * @param $request
-     * @param $response
-     * @return array
-     */
-    public static function createContext($request, $response): array
-    {
-        return [HRequest::create($request), HResponse::create($response)];
-    }
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 * @return void
+	 * @throws Exception
+	 */
+	public function onHandler(Request $request, Response $response): mixed
+	{
+		try {
+			defer(function () {
+				fire(Event::SYSTEM_RESOURCE_RELEASES);
+			});
+			/** @var HRequest $request */
+			/** @var HResponse $response */
+			[$request, $response] = OnRequest::createContext($request, $response);
+			if ($request->is('favicon.ico')) {
+				return $response->send('', 404);
+			}
+			return $this->router->dispatch();
+		} catch (ExitException | Error | \Throwable $exception) {
+			$this->addError($exception, 'throwable');
+			return $this->sendErrorMessage($request, $response, $exception);
+		}
+	}


-    /**
-     * @param $sRequest
-     * @param $sResponse
-     * @param $exception
-     * @return bool|string
-     * @throws Exception
-     */
-    protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string
-    {
-        $this->addError($exception, 'throwable');
-        if ($sResponse instanceof Response) {
-            [$sRequest, $sResponse] = [HRequest::create($sRequest), HResponse::create($sResponse)];
-        }
+	/**
+	 * @param $request
+	 * @param $response
+	 * @return array
+	 */
+	public static function createContext($request, $response): array
+	{
+		return [HRequest::create($request), HResponse::create($response)];
+	}

-        $this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$sRequest, $exception]);

-        $headers = $sRequest->headers->get('access-control-request-headers');
-        $methods = $sRequest->headers->get('access-control-request-method');
+	/**
+	 * @param $sRequest
+	 * @param $sResponse
+	 * @param $exception
+	 * @return bool|string
+	 * @throws Exception
+	 */
+	protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string
+	{
+		$this->addError($exception, 'throwable');
+		if ($sResponse instanceof Response) {
+			[$sRequest, $sResponse] = [HRequest::create($sRequest), HResponse::create($sResponse)];
+		}

-        $sResponse->addHeader('Access-Control-Allow-Origin', '*');
-        $sResponse->addHeader('Access-Control-Allow-Headers', $headers);
-        $sResponse->addHeader('Access-Control-Request-Method', $methods);
+		$this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$sRequest, $exception]);

-        if (!($exception instanceof ExitException)) {
-            return $sResponse->send(\logger()->exception($exception), 200);
-        } else {
-            return $sResponse->send($exception->getMessage(), 200);
-        }
-    }
+		$headers = $sRequest->headers->get('access-control-request-headers');
+		$methods = $sRequest->headers->get('access-control-request-method');
+
+		$sResponse->addHeader('Access-Control-Allow-Origin', '*');
+		$sResponse->addHeader('Access-Control-Allow-Headers', $headers);
+		$sResponse->addHeader('Access-Control-Request-Method', $methods);
+
+		if (!($exception instanceof ExitException)) {
+			return $sResponse->send(\logger()->exception($exception), 200);
+		} else {
+			return $sResponse->send($exception->getMessage(), 200);
+		}
+	}

 }