diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php index 798a7200..e7435c6c 100644 --- a/HttpServer/Http/Response.php +++ b/HttpServer/Http/Response.php @@ -194,15 +194,11 @@ class Response extends HttpService /** * @param mixed $content - * @param int $statusCode - * @param null $format * @return Response */ - public function setContent(mixed $content, int $statusCode = 200, $format = null): static + public function setContent(mixed $content): static { $this->endData = $content; - $this->setStatusCode($statusCode); - $this->setFormat($format); return $this; } diff --git a/Server/HTTPServerListener.php b/Server/HTTPServerListener.php index 14981df7..2e221031 100644 --- a/Server/HTTPServerListener.php +++ b/Server/HTTPServerListener.php @@ -6,9 +6,9 @@ use Annotation\Inject; use Exception; use HttpServer\Exception\RequestException; use HttpServer\Http\Request as HSRequest; -use Server\Constrict\Response as CResponse; use HttpServer\Route\Node; use HttpServer\Route\Router; +use Server\Constrict\Response as CResponse; use Server\Events\OnAfterRequest; use Snowflake\Events\EventDispatch; use Swoole\Error; @@ -26,106 +26,105 @@ use Throwable; class HTTPServerListener extends Abstracts\Server { - protected static bool|Port $_http; + protected static bool|Port $_http; - use ListenerHelper; + use ListenerHelper; - /** @var Router|mixed */ - #[Inject('router')] - public Router $router; + /** @var Router|mixed */ + #[Inject('router')] + public Router $router; - /** @var CResponse|mixed */ - #[Inject(CResponse::class)] - public CResponse $response; + /** @var CResponse|mixed */ + #[Inject(CResponse::class)] + public CResponse $response; - /** @var EventDispatch */ - #[Inject(EventDispatch::class)] - public EventDispatch $eventDispatch; + /** @var EventDispatch */ + #[Inject(EventDispatch::class)] + public EventDispatch $eventDispatch; - /** - * UDPServerListener constructor. - * @param Server|Port $server - * @param array|null $settings - * @return Server|Port - * @throws Exception - */ - public function bindCallback(Server|Port $server, ?array $settings = []): Server|Port - { - $this->setEvents(Constant::CONNECT, $settings['events'][Constant::CONNECT] ?? null); + /** + * UDPServerListener constructor. + * @param Server|Port $server + * @param array|null $settings + * @return Server|Port + * @throws Exception + */ + public function bindCallback(Server|Port $server, ?array $settings = []): Server|Port + { + $this->setEvents(Constant::CONNECT, $settings['events'][Constant::CONNECT] ?? null); - $server->set(array_merge($settings['settings'] ?? [], ['enable_unsafe_event' => false])); - if (isset($settings['events'][Constant::REQUEST])) { - $event = $settings['events'][Constant::REQUEST]; - if (is_array($event) && is_string($event[0])) { - $event[0] = di($event[0]); - } - $server->on('request', $event); - } else { - $server->on('request', [$this, 'onRequest']); - } - $server->on('connect', [$this, 'onConnect']); - $server->on('close', [$this, 'onClose']); - return $server; - } + $server->set(array_merge($settings['settings'] ?? [], ['enable_unsafe_event' => false])); + if (isset($settings['events'][Constant::REQUEST])) { + $event = $settings['events'][Constant::REQUEST]; + if (is_array($event) && is_string($event[0])) { + $event[0] = di($event[0]); + } + $server->on('request', $event); + } else { + $server->on('request', [$this, 'onRequest']); + } + $server->on('connect', [$this, 'onConnect']); + $server->on('close', [$this, 'onClose']); + return $server; + } - /** - * @param Server $server - * @param int $fd - * @throws Exception - */ - public function onConnect(Server $server, int $fd) - { - $this->runEvent(Constant::CONNECT, null, [$server, $fd]); - } + /** + * @param Server $server + * @param int $fd + * @throws Exception + */ + public function onConnect(Server $server, int $fd) + { + $this->runEvent(Constant::CONNECT, null, [$server, $fd]); + } - /** - * @param Request $request - * @param Response $response - * @throws Exception - */ - public function onRequest(Request $request, Response $response) - { - try { - $node = $this->router->find_path(HSRequest::create($request)); - if (!($node instanceof Node)) { - throw new RequestException('