diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php index 0f830568..5d2b6858 100644 --- a/HttpServer/Events/OnRequest.php +++ b/HttpServer/Events/OnRequest.php @@ -10,7 +10,6 @@ use HttpServer\Exception\ExitException; use HttpServer\Http\Request as HRequest; use HttpServer\Http\Response as HResponse; use ReflectionException; -use Snowflake\Core\Json; use Snowflake\Event; use Snowflake\Exception\ComponentException; use Snowflake\Exception\NotFindClassException; @@ -50,7 +49,7 @@ class OnRequest extends Callback if ($exception instanceof ExitException) { return \send($exception->getMessage(), $exception->getCode()); } - return $this->sendErrorMessage($exception); + return $this->sendErrorMessage($request, $response, $exception); } } @@ -69,50 +68,26 @@ class OnRequest extends Callback /** - * @param $response - * @throws Exception - */ - public static function shutdown($response) - { - try { - $error = error_get_last(); - if (!isset($error['type'])) { - return; - } - $types = [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR]; - if (!in_array($error['type'], $types)) { - return; - } - $message = $error['message'] . ':' . microtime(true); - if ($response instanceof Response) { - $response->status(500); - $response->end($message); - } - } catch (\ErrorException $exception) { - $logger = Snowflake::app()->getLogger(); - $logger->write($exception->getMessage(), 'shutdown'); - } finally { - unset($response); - } - } - - /** + * @param $sRequest + * @param $sResponse * @param $exception * @return bool|string * @throws ComponentException * @throws Exception */ - protected function sendErrorMessage($exception): bool|string + protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string { - - $sRequest = \request(); - $sResponse = \response(); + $params = Snowflake::app()->getLogger()->exception($exception); + if ($sResponse instanceof Response) { + $sResponse->header('Access-Control-Allow-Origin', '*'); + $sResponse->status(200); + return $sResponse->end($params); + } $sResponse->addHeader('Access-Control-Allow-Origin', '*'); $sResponse->addHeader('Access-Control-Allow-Headers', $sRequest->headers->get('access-control-request-headers')); $sResponse->addHeader('Access-Control-Request-Method', $sRequest->headers->get('access-control-request-method')); - $params = Snowflake::app()->getLogger()->exception($exception); return $sResponse->send($params, 200); } diff --git a/HttpServer/Exception/ExitException.php b/HttpServer/Exception/ExitException.php index b073a2e8..fd3cc914 100644 --- a/HttpServer/Exception/ExitException.php +++ b/HttpServer/Exception/ExitException.php @@ -5,6 +5,7 @@ namespace HttpServer\Exception; +use JetBrains\PhpStorm\Pure; use Throwable; /** @@ -20,7 +21,7 @@ class ExitException extends \Exception * @param int $code * @param Throwable|null $previous */ - public function __construct($message = "", $code = 0, Throwable $previous = null) + #[Pure] public function __construct($message = "", $code = 0, Throwable $previous = null) { parent::__construct($message, $code, $previous); } diff --git a/HttpServer/Http/Request.php b/HttpServer/Http/Request.php index 572f121d..c684fe44 100644 --- a/HttpServer/Http/Request.php +++ b/HttpServer/Http/Request.php @@ -454,7 +454,7 @@ class Request extends HttpService if (!empty($request->post)) { $sRequest->params->setPosts($request->post ?? []); } - $sRequest->headers = Snowflake::createObject(HttpHeaders::class, [array_merge($request->server, $request->header ?? [])]); + $sRequest->headers = Snowflake::createObject(HttpHeaders::class, [merge($request->server, $request->header)]); $sRequest->parseUri(); return $sRequest; diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php index 61023d44..94bf081a 100644 --- a/HttpServer/Route/Router.php +++ b/HttpServer/Route/Router.php @@ -472,14 +472,13 @@ class Router extends HttpService implements RouterInterface public function dispatch(): mixed { if (!($node = $this->find_path(\request()))) { - return send(self::NOT_FOUND, 404); - } else { - send($response = $node->dispatch(), 200); - if (!$node->hasAfter()) { - return null; - } - return $node->afterDispatch($response); + return send(self::NOT_FOUND); } + send($response = $node->dispatch(), 200); + if (!$node->hasAfter()) { + return null; + } + return $node->afterDispatch($response); } diff --git a/System/Abstracts/BaseObject.php b/System/Abstracts/BaseObject.php index a90144ac..42426498 100644 --- a/System/Abstracts/BaseObject.php +++ b/System/Abstracts/BaseObject.php @@ -210,23 +210,17 @@ class BaseObject implements Configure */ public function error(mixed $message, $method = null, $file = null) { + $socket = Snowflake::app()->getLogger(); if (!empty($file)) { - echo "\033[41;37m[ERROR][" . date('Y-m-d H:i:s') . ']: ' . $file . "\033[0m"; - echo PHP_EOL; + $socket->output("\033[41;37m[ERROR][" . date('Y-m-d H:i:s') . ']: ' . $file . PHP_EOL . "\033[0m"); } if (!is_string($message)) { $message = print_r($message, true); } - $content = (empty($method) ? '' : $method . ': ') . $message; - $length = strlen('[ERROR][2021-02-20 08:32:02]:'); + $message = "\033[41;37m" . PHP_EOL . "[ERROR][" . date('Y-m-d H:i:s') . ']: ' . $content . PHP_EOL . "\033[0m"; - $message = "\033[41;37m" . PHP_EOL . "[ERROR][" . date('Y-m-d H:i:s') . ']: ' . PHP_EOL . "\033[0m"; - $message .= "\033[41;37m" . str_pad($content, $length, ' ', STR_PAD_LEFT) . "\033[0m"; - $message .= PHP_EOL; - - $socket = Snowflake::app()->getLogger(); $socket->output($message); } diff --git a/function.php b/function.php index e8786648..008239d6 100644 --- a/function.php +++ b/function.php @@ -511,7 +511,7 @@ if (!function_exists('send')) { * @return bool|Response|stdClass|string * @throws Exception */ - function send($context, $statusCode = 200): Response|bool|string|stdClass + function send($context, $statusCode = 404): Response|bool|string|stdClass { return \response()->send($context, $statusCode); }