From e5192e779db3f04069832a0968bd328d4f4264d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 1 Sep 2020 03:55:37 +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 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/http-server/Events/WebSocket.php b/http-server/Events/WebSocket.php index 947c1c70..c184d60d 100644 --- a/http-server/Events/WebSocket.php +++ b/http-server/Events/WebSocket.php @@ -70,9 +70,6 @@ class WebSocket extends Server $this->application->set(WebSocket::class, $this); $this->application->set(Pool::class, $pool); - $annotation = $this->application->annotation; - $annotation->register('websocket', AWebsocket::class); - ServerManager::set($this, $settings, $this->application, $events, $config); } @@ -85,14 +82,14 @@ class WebSocket extends Server public function onMessage(Server $server, Frame $frame) { try { - $event = Snowflake::get()->event; - if ($event->exists(Event::SERVER_MESSAGE)) { - $event->trigger(Event::SERVER_MESSAGE, [$server, $frame]); - return; - } if ($frame->opcode == 0x08) { return; } + + $event = Snowflake::get()->event; + if ($event->exists(Event::SERVER_MESSAGE)) { + $frame->data = $event->trigger(Event::SERVER_MESSAGE, [$server, $frame]); + } $json = json_decode($frame->data, true); /** @var AWebsocket $manager */