From 1894eefaccc17b20ad108c7c864144d8760b3fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 1 Sep 2020 03:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http-server/Events/WebSocket.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/http-server/Events/WebSocket.php b/http-server/Events/WebSocket.php index c184d60d..4d7bd2c2 100644 --- a/http-server/Events/WebSocket.php +++ b/http-server/Events/WebSocket.php @@ -89,13 +89,14 @@ class WebSocket extends Server $event = Snowflake::get()->event; if ($event->exists(Event::SERVER_MESSAGE)) { $frame->data = $event->trigger(Event::SERVER_MESSAGE, [$server, $frame]); + } else { + $frame->data = json_decode($frame->data, true); } - $json = json_decode($frame->data, true); /** @var AWebsocket $manager */ $manager = Snowflake::get()->annotation->get('websocket'); - $path = $manager->getName(AWebsocket::MESSAGE, $json['route']); - $manager->runWith($path, [$frame->fd, $server]); + $path = $manager->getName(AWebsocket::MESSAGE, $frame->data['route']); + $manager->runWith($path, [$frame, $server]); } catch (Exception $exception) { $this->application->addError($exception->getMessage(), 'websocket'); } finally {