改名

2020-09-01 03:55:37 +08:00
parent aa07ca22b4
commit e5192e779d
1 changed files with 5 additions and 8 deletions
@@ -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 */