This commit is contained in:
2020-11-27 14:26:34 +08:00
parent 74607a4a43
commit e6ac6d1a09
2 changed files with 13 additions and 7 deletions
+11 -3
View File
@@ -37,9 +37,7 @@ class OnRequest extends Callback
public function onHandler(Request $request, Response $response)
{
try {
Coroutine::defer(function () {
fire(Event::EVENT_AFTER_REQUEST, [$sRequest ?? null]);
});
Coroutine::defer([$this, 'onDefer']);
/** @var HRequest $sRequest */
[$sRequest, $sResponse] = [HRequest::create($request), HResponse::create($response)];
if ($sRequest->is('favicon.ico')) {
@@ -52,6 +50,16 @@ class OnRequest extends Callback
}
}
/**
* @throws \Snowflake\Exception\ComponentException
*/
public function onDefer()
{
fire(Event::EVENT_AFTER_REQUEST);
}
/**
* @param $response
* @throws Exception
+2 -4
View File
@@ -481,9 +481,9 @@ class Router extends Application implements RouterInterface
} else if (!($node = $this->find_path(\request()))) {
$response = send(self::NOT_FOUND, 404);
} else {
var_dump($node);
$response = send($node->dispatch(), 200);
}
var_dump($response);
} catch (ExitException $exception) {
$response = send($exception->getMessage(), $exception->getCode());
} catch (\Throwable $exception) {
@@ -492,9 +492,7 @@ class Router extends Application implements RouterInterface
if (!isset($node) || !($node instanceof Node)) {
return;
}
if ($node->hasAfter()) {
$node->afterDispatch($response ?? null);
}
$node->hasAfter() && $node->afterDispatch($response ?? null);
}
}