From 05f9761088e90105c11841b0788a0db25fbdd6c7 Mon Sep 17 00:00:00 2001 From: Savio Resende Date: Wed, 24 Apr 2024 03:26:36 -0500 Subject: [PATCH] Added http only server. --- config/jacked-server.php | 2 +- src/Services/Server.php | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/config/jacked-server.php b/config/jacked-server.php index 53b8bf7..5b9c223 100644 --- a/config/jacked-server.php +++ b/config/jacked-server.php @@ -68,7 +68,7 @@ // ------------------------------------------------------------ 'websocket' => [ - 'enabled' => env('JACKED_SERVER_WEBSOCKET_ENABLED', true), + 'enabled' => env('JACKED_SERVER_WEBSOCKET_ENABLED', false), 'broadcaster' => false, ], diff --git a/src/Services/Server.php b/src/Services/Server.php index a2a0daf..bbcdc8a 100644 --- a/src/Services/Server.php +++ b/src/Services/Server.php @@ -96,14 +96,6 @@ public function run(): void $host = $this->host ?? config('jacked-server.host', '0.0.0.0'); $primaryPort = $ssl ? config('jacked-server.ssl-port', 443) : config('jacked-server.port', 8080); - if (false === config('jacked-server.websocket.enabled', true)) { - // TODO: craft HTTP only server - throw new Exception( - 'WebSockets are not enabled! HTTP only servers are not ' . - 'available yet by Jacked Server.', - ); - } - $this->wsPersistence = array_merge( Conveyor::defaultPersistence(), $this->wsPersistence, @@ -138,6 +130,12 @@ public function run(): void public function handleWsHandshake(Request $request, Response $response): bool { + if (false === config('jacked-server.websocket.enabled', true)) { + $response->status(401); + $response->end('WebSocket Not enabled!'); + return false; + } + $this->logger->info($this->logPrefix . ' Handshake received from ' . $request->fd); // evaluate intention to upgrade to websocket