as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnMessage.php
+32 -29
View File
@@ -30,41 +30,44 @@ use Swoole\WebSocket\Server;
class OnMessage extends Callback class OnMessage extends Callback
{ {
/** /**
* @param Server $server * @param Server $server
* @param Frame $frame * @param Frame $frame
* @throws * @throws
*/ */
public function onHandler(Server $server, Frame $frame) public function onHandler(Server $server, Frame $frame)
{ {
try { try {
defer(function () { defer(function () {
fire(Event::SYSTEM_RESOURCE_CLEAN); fire(Event::SYSTEM_RESOURCE_CLEAN);
}); });
if ($frame->opcode === 0x08) { if ($frame->opcode === 0x08) {
return; return;
} }
$clientInfo = $server->getClientInfo($frame->fd); $clientInfo = $server->getClientInfo($frame->fd);
$event = Snowflake::app()->getEvent(); $event = Snowflake::app()->getEvent();
if (!$event->exists(($name = $this->getName($clientInfo)))) { if (!$event->exists(($name = $this->getName($clientInfo)))) {
return; return;
} }
$event->trigger($name, [$frame, $server]); $event->trigger($name, [$frame, $server]);
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
$this->addError($exception, 'websocket'); $this->addError($exception, 'websocket');
$server->send($frame->fd, $exception->getMessage()); if (!swoole()->exist($frame->fd)) {
} return;
} }
$server->send($frame->fd, $exception->getMessage());
}
}
/** /**
* @param $clientInfo * @param $clientInfo
* @return string * @return string
*/ */
private function getName($clientInfo): string private function getName($clientInfo): string
{ {
return 'listen ' . $clientInfo['server_port'] . ' ' . Event::SERVER_MESSAGE; return 'listen ' . $clientInfo['server_port'] . ' ' . Event::SERVER_MESSAGE;
} }
} }
HttpServer/Events/OnReceive.php
+43 -37
View File
@@ -22,51 +22,57 @@ use Swoole\Server;
class OnReceive extends Callback class OnReceive extends Callback
{ {
public int $port = 0; public int $port = 0;
public string $host = ''; public string $host = '';
private Router $router; private Router $router;
public function init() public function init()
{ {
$this->router = Snowflake::app()->getRouter(); $this->router = Snowflake::app()->getRouter();
} }
/** /**
* @param Server $server * @param Server $server
* @param int $fd * @param int $fd
* @param int $reID * @param int $reID
* @param string $data * @param string $data
* @return mixed * @return mixed
* @throws Exception * @throws Exception
*/ */
public function onHandler(Server $server, int $fd, int $reID, string $data): mixed public function onHandler(Server $server, int $fd, int $reID, string $data): mixed
{ {
try { try {
defer(function (){ defer(function () {
fire(Event::SYSTEM_RESOURCE_RELEASES); fire(Event::SYSTEM_RESOURCE_RELEASES);
}); });
$request = $this->_request($fd, $data, $reID); $request = $this->_request($fd, $data, $reID);
if (($node = $this->router->find_path($request)) === null) { if (($node = $this->router->find_path($request)) === null) {
return $server->send($fd, Json::encode(['state' => 404])); return $server->send($fd, Json::encode(['state' => 404]));
} }
$dispatch = $node->dispatch(); $dispatch = $node->dispatch();
if (!is_string($dispatch)) $dispatch = Json::encode($dispatch); if (!is_string($dispatch)) $dispatch = Json::encode($dispatch);
if (empty($dispatch)) { if (empty($dispatch)) {
$dispatch = Json::encode(['state' => 0, 'message' => 'ok']); $dispatch = Json::encode(['state' => 0, 'message' => 'ok']);
} }
return $server->send($fd, $dispatch); if ($server->exist($fd)) {
} catch (\Throwable $exception) { return $server->send($fd, $dispatch);
$this->addError($exception, 'receive'); }
$error = ['state' => 500, 'message' => $exception->getMessage()]; return $dispatch;
return $server->send($fd, Json::encode($error)); } 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);
}
}
} }