This commit is contained in:
as2252258@163.com
2021-04-24 17:40:34 +08:00
parent 7e348cc1ca
commit 25b78fd0c5
2 changed files with 75 additions and 66 deletions
+3
View File
@@ -53,6 +53,9 @@ class OnMessage extends Callback
$event->trigger($name, [$frame, $server]);
} catch (\Throwable $exception) {
$this->addError($exception, 'websocket');
if (!swoole()->exist($frame->fd)) {
return;
}
$server->send($frame->fd, $exception->getMessage());
}
}
+7 -1
View File
@@ -48,7 +48,7 @@ class OnReceive extends Callback
public function onHandler(Server $server, int $fd, int $reID, string $data): mixed
{
try {
defer(function (){
defer(function () {
fire(Event::SYSTEM_RESOURCE_RELEASES);
});
$request = $this->_request($fd, $data, $reID);
@@ -60,12 +60,18 @@ class OnReceive extends Callback
if (empty($dispatch)) {
$dispatch = Json::encode(['state' => 0, 'message' => 'ok']);
}
if ($server->exist($fd)) {
return $server->send($fd, $dispatch);
}
return $dispatch;
} catch (\Throwable $exception) {
$this->addError($exception, 'receive');
$error = ['state' => 500, 'message' => $exception->getMessage()];
if ($server->exist($fd)) {
return $server->send($fd, Json::encode($error));
}
return Json::encode($error);
}
}