From a85382f92a6c8e7cda0c4ba172b351c5c7317862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 3 Aug 2021 10:37:31 +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 --- Server/ServerManager.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Server/ServerManager.php b/Server/ServerManager.php index 6f159b16..d8f7e6bf 100644 --- a/Server/ServerManager.php +++ b/Server/ServerManager.php @@ -342,8 +342,10 @@ class ServerManager extends Abstracts\Server $reflect->setEvents(Constant::HANDSHAKE, $settings['events'][Constant::HANDSHAKE] ?? null); $reflect->setEvents(Constant::MESSAGE, $settings['events'][Constant::MESSAGE] ?? null); $reflect->setEvents(Constant::CONNECT, $settings['events'][Constant::CONNECT] ?? null); - - $this->addCloseOrDisconnect($reflect, $settings); + if (swoole_version() >= '4.7') { + $reflect->setEvents(Constant::DISCONNECT, $settings['events'][Constant::DISCONNECT] ?? null); + $this->server->on('disconnect', [$reflect, 'onMessage']); + } } else if ($type === Constant::SERVER_TYPE_UDP) { $reflect = $this->getNewInstance(UDPServerListener::class); $this->server->on('packet', [$reflect, 'onPacket']); @@ -352,12 +354,20 @@ class ServerManager extends Abstracts\Server } else if ($type === Constant::SERVER_TYPE_HTTP) { $reflect = $this->getNewInstance(HTTPServerListener::class); $this->server->on('request', [$reflect, 'onRequest']); - $this->addCloseOrDisconnect($reflect, $settings); + $this->server->on('connect', [$reflect, 'onConnect']); + $this->server->on('close', [$reflect, 'onClose']); + + $reflect->setEvents(Constant::CLOSE, $settings['events'][Constant::CLOSE] ?? null); + $reflect->setEvents(Constant::CONNECT, $settings['events'][Constant::CONNECT] ?? null); } else { $reflect = $this->getNewInstance(TCPServerListener::class); $this->server->on('connect', [$reflect, 'onConnect']); + $this->server->on('close', [$reflect, 'onClose']); $this->server->on('receive', [$reflect, 'onReceive']); - $this->addCloseOrDisconnect($reflect, $settings); + + $reflect->setEvents(Constant::CLOSE, $settings['events'][Constant::CLOSE] ?? null); + $reflect->setEvents(Constant::CONNECT, $settings['events'][Constant::CONNECT] ?? null); + $reflect->setEvents(Constant::RECEIVE, $settings['events'][Constant::RECEIVE] ?? null); } } @@ -374,7 +384,6 @@ class ServerManager extends Abstracts\Server /** * @param string $class * @return object - * @throws NotFindClassException * @throws ReflectionException */ private function getNewInstance(string $class): object