改名

HttpServer/Events/OnRequest.php

@@ -6,6 +6,7 @@ namespace HttpServer\Events;
 
 use Exception;
 use HttpServer\Abstracts\Callback;
+use HttpServer\Exception\ExitException;
 use HttpServer\Http\Context;
 use HttpServer\Http\Request as HRequest;
 use HttpServer\Http\Response as HResponse;
@@ -60,6 +61,8 @@ class OnRequest extends Callback
 				return $sResponse->send($sRequest->isNotFound(), 200);
 			}
 			return Snowflake::app()->getRouter()->dispatch();
+		} catch (ExitException $exception) {
+			return send($exception->getMessage(), $exception->getCode());
 		} catch (Error | \Throwable $exception) {
 			return $this->sendErrorMessage($exception);
 		} finally {

HttpServer/Route/Router.php

@@ -471,23 +471,19 @@ class Router extends Application implements RouterInterface
 
 
 	/**
-	 * @return mixed|void
+	 * @return mixed
 	 * @throws
 	 */
-	public function dispatch()
+	public function dispatch(): mixed
 	{
-		try {
-			if (!($node = $this->find_path(\request()))) {
-				return send(self::NOT_FOUND, 404);
+		if (!($node = $this->find_path(\request()))) {
+			return send(self::NOT_FOUND, 404);
+		} else {
+			send($response = $node->dispatch(), 200);
+			if (!$node->hasAfter()) {
+				return null;
 			}
-			send($node->dispatch(), 200);
-			if ($node->hasAfter()) {
-				$node->afterDispatch(\request());
-			}
-		} catch (ExitException $exception) {
-			send($exception->getMessage(), $exception->getCode());
-		} catch (\Throwable $exception) {
-			send($this->exception($exception), 200);
+			return $node->afterDispatch($response);
 		}
 	}