eee

core/Config.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace Coroutine\Server;
+
+class Config
+{
+
+	public int $port {
+		get => $this->port;
+
+		set(int $value) {
+			$this->port = $value;
+		}
+	}
+
+
+	public string $host {
+		get => $this->host;
+
+
+		set(string $value) {
+			$this->host = $value;
+		}
+	}
+
+
+	public string $authKey {
+		get => $this->authKey;
+
+		set(string $value) {
+			$this->authKey = $value;
+		}
+	}
+
+
+	public int $writeTimeout {
+		    get => $this->writeTimeout;
+
+        set(int $value) {
+            $this->writeTimeout = $value;
+        }
+    }
+
+
+    public int $maxCoroutine {
+        get => $this->maxCoroutine;
+
+        set(int $value) {
+            $this->maxCoroutine = $value;
+        }
+    }
+
+
+	public int $readTimeout {
+		get => $this->readTimeout;
+
+		set(int $value) {
+			$this->readTimeout = $value;
+		}
+	}
+
+
+    public int $maxPackageSize {
+        get => $this->maxPackageSize;
+
+        set(int $value) {
+            $this->maxPackageSize = $value;
+        }
+    }
+
+
+    public int $maxFrameSize {
+        get => $this->maxFrameSize;
+
+        set(int $value) {
+            $this->maxFrameSize = $value;
+        }
+	}
+}

core/QueueLoop.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace Coroutine\Server;
-
-use Kiri\Di\Inject\Container;
-use Kiri\NoSql\Redis;
-use Swoole\Coroutine;
-use Swoole\Coroutine\Http\Client;
-
-class QueueLoop
-{
-
-	#[Container(Transport::class)]
-	public Transport $transport;
-
-	/**
-	 * @return void
-	 */
-	public function loop(): void
-	{
-		$this->cleanOnline();
-		$redis = \Kiri::getDi()->get(Redis::class);
-		if ($redis instanceof Redis) {
-			$data = $redis->blPop(\config('redis.key'), 10);
-			if (!empty($data)) {
-				[$key, $data] = $data;
-				$json = json_decode($data, true);
-
-				$this->transport->send($json['userId'], json_encode($json['data']));
-			}
-		} else {
-			Coroutine::sleep(0.05);
-		}
-		$this->loop();
-	}
-
-
-	/**
-	 * @return void
-	 */
-	public function cleanOnline(): void
-	{
-		$client = new Client(config('notice.host'), config('notice.port'));
-		$client->post('/cleanOnline', []);
-		$client->close();
-	}
-}

core/Struct.php

@@ -1,18 +1,21 @@
 <?php
+
 namespace Coroutine\Server;
 
+use Kiri\Router\Base\AuthorizationInterface;
+use Swoole\Http\Request;
 use Swoole\Http\Response;
 
 class Struct
 {
-	public mixed    $user;
+	public AuthorizationInterface $user;
-	public int      $fd;
+	public Request                $request;
-	public Response $ws;
+	public Response               $ws;
 
-	public function __construct(mixed $user, int $fd, Response $ws)
+	public function __construct(AuthorizationInterface $user, Request $request, Response $ws)
 	{
-		$this->fd   = $fd;
+		$this->request = $request;
-		$this->user = $user;
+		$this->user    = $user;
-		$this->ws   = $ws;
+		$this->ws      = $ws;
 	}
 }

core/Transport.php

@@ -50,18 +50,48 @@ class Transport
 
 
 	/**
-	 * @param int      $fd
+	 * @param int $fd
 	 * @return void
 	 */
 	public function remove(int $fd): void
 	{
-		if ($this->clients[$fd]) {
+		if ($this->has($fd)) {
-			$this->clients[$fd]->ws->close();
+			$this->clients[$fd]?->ws->close();
 		}
 		unset($this->clients[$fd]);
 	}
 
 
+	/**
+	 * @param int $fd
+	 * @return Struct|null
+	 */
+	public function getClientId(int $fd): ?Struct
+	{
+		return array_find($this->clients, fn($client) => $client->fd == $fd);
+	}
+
+
+	/**
+	 * @param int $fd
+	 * @return Struct|null
+	 */
+	public function getUserId(int $fd): ?Struct
+	{
+		return $this->clients[$fd] ?? null;
+	}
+
+
+	/**
+	 * @param int $fd
+	 * @return bool
+	 */
+	public function has(int $fd): bool
+	{
+		return isset($this->clients[$fd]);
+	}
+
+
 	/**
 	 * @return array
 	 */
@@ -71,7 +101,7 @@ class Transport
 		foreach ($this->clients as $fd => $client) {
 			$array[] = [
 				'userId'   => $fd,
-				'nickname' => $client->user['nickname'],
+				'nickname' => $client->user->getNickname(),
 			];
 		}
 		return $array;

core/Websocket.php

@@ -4,17 +4,13 @@ namespace Coroutine\Server;
 
 use Kiri\Di\Inject\Container;
 use Kiri\Router\Constrict\ConstrictRequest;
-use Kiri\Server\Contract\OnDisconnectInterface;
-use Kiri\Server\Contract\OnMessageInterface;
-use Swoole\Coroutine;
 use Swoole\Coroutine\Http\Server;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\WebSocket\CloseFrame;
-use Swoole\WebSocket\Frame;
 use Throwable;
 
-abstract class Websocket implements OnMessageInterface, OnDisconnectInterface
+abstract class Websocket
 {
 
 	#[Container(Transport::class)]
@@ -22,50 +18,28 @@ abstract class Websocket implements OnMessageInterface, OnDisconnectInterface
 
 
 	/**
-	 * @var Server
+	 * @var Config
 	 */
-	private Server $server;
+	public Config $config {
-
+		get {
-
+			return $this->config;
-	/**
+		}
-	 * @return Server
-	 */
-	public function getServer(): Server
-	{
-		return $this->server;
-	}
-
-	/**
-	 * @param string $host
-	 * @param int    $port
-	 * @return void
-	 */
-	public function start(string $host, int $port): void
-	{
-		$this->clearAllOnlineUsers();
-		$this->queueLoop();
-		$this->server = new Server($host, $port, false);
-		$this->server->handle('/websocket', function (Request $request, Response $ws) {
-			$this->WebsocketHandler($request, $ws);
-		});
-		$this->server->handle('/online/lists', function (Request $request, Response $ws) {
-			$data = json_encode($this->transport->getLists(), JSON_UNESCAPED_UNICODE);
-			$ws->end($data);
-		});
-		echo 'websocket server start at ' . $host . ':' . $port . PHP_EOL;
-		$this->server->start();
 	}
 
 
 	/**
+	 * @param Config $config
 	 * @return void
 	 */
-	private function queueLoop(): void
+	public function start(Config $config): void
 	{
-		Coroutine::create(function () {
+		$this->config = $config;
-			$QueueLoop = \Kiri::getDi()->get(QueueLoop::class);
+		$this->onStart();
-			$QueueLoop->loop();
+		$server = new Server($config->host, $config->port, false);
-		});
+		$server->handle('/websocket', fn(Request $request, Response $ws) => $this->handler($request, $ws));
+		$server->handle('/online/lists', fn(Request $request, Response $ws) => $this->getLists($request, $ws));
+		echo 'websocket server start at ' . $config->host . ':' . $config->port . PHP_EOL;
+		$server->start();
 	}
 
 	/**
@@ -73,33 +47,48 @@ abstract class Websocket implements OnMessageInterface, OnDisconnectInterface
 	 * @param Response $ws
 	 * @return void
 	 */
-	public function WebsocketHandler(Request $request, Response $ws): void
+	public function getLists(Request $request, Response $ws): void
+	{
+		$data = json_encode($this->transport->getLists(), JSON_UNESCAPED_UNICODE);
+		$ws->end($data);
+	}
+
+
+
+	/**
+	 * @param Request  $request
+	 * @param Response $ws
+	 * @return void
+	 */
+	public function handler(Request $request, Response $ws): void
 	{
 		try {
 			$psr7Request = ConstrictRequest::builder($request);
-			if (!$psr7Request->hasQuery('auth')) {
+			if (!$psr7Request->hasQuery($this->config->authKey)) {
-				throw new \Exception('Auth fail.', 401);
+				throw new \Exception('Params required.');
 			}
 
-			if (!$this->onAuthority($psr7Request, $ws)) {
+			if (!$this->onConnected($psr7Request) || $psr7Request->getAuthority() == null) {
-				throw new \Exception('Auth fail.', 401);
+				throw new \Exception('Token error, unable to obtain user.');
 			}
 
-			if ($psr7Request->getAuthority() == null || !$ws->upgrade()) {
+			if ($this->transport->has($psr7Request->getAuthority()->getUniqueId())) {
-				throw new \Exception('Auth fail.', 401);
+				$this->transport->remove($psr7Request->getAuthority()->getUniqueId());
 			}
+
+			if (!$ws->upgrade()) {
+				throw new \Exception('Connection upgrade to websocket failed.');
+			}
+
 			$userId = $psr7Request->getAuthority()->getUniqueId();
-
 			$ws->push($userId);
-			$user = [
+			defer(function () use ($userId) {
-				'nickname' => $psr7Request->getAuthority()->getNickname(),
+				$this->transport->remove($userId);
-				'avatar'   => $psr7Request->getAuthority()->getAvatar(),
+			});
-			];
 
-			if (!$this->onConnected($psr7Request)) {
+			$this->transport->add($userId, new Struct($psr7Request->getAuthority(), $request, $ws));
-				throw new \Exception('Auth fail.', 401);
+
-			}
+			$this->onBeforeMessageLoop();
-			$this->transport->add($userId, new Struct($user, $request->fd, $ws));
 
 			while (true) {
 				$frame = $ws->recv();
@@ -108,28 +97,39 @@ abstract class Websocket implements OnMessageInterface, OnDisconnectInterface
 					break;
 				}
 
-				$this->onMessage($this->server, $frame);
+				$this->onMessage($psr7Request, $frame->data);
 			}
-			$this->onDisconnect($this->server, $userId);
 		} catch (Throwable $throwable) {
-			echo sprintf("Message: %s \n
+			$this->throwable($ws, $throwable);
-			   File: %s \n
-			   Line: %d \n", $throwable->getMessage(), $throwable->getFile(), $throwable->getLine());
-			$ws->setStatusCode(500);
-			$ws->end($throwable->getMessage());
-			$ws->close();
 		} finally {
 			if (isset($userId)) {
-				$this->transport->remove($userId);
+				$this->onDisconnect($userId);
 			}
 		}
 	}
 
 
+	abstract public function onBeforeMessageLoop(): void;
+
+
 	/**
+	 * @param           $ws
+	 * @param Throwable $throwable
 	 * @return void
 	 */
-	abstract public function clearAllOnlineUsers(): void;
+	private function throwable($ws, Throwable $throwable): void
+	{
+		$error = sprintf("Message: %s \n
+			   File: %s \n
+			   Line: %d \n", $throwable->getMessage(), $throwable->getFile(), $throwable->getLine());
+
+		$ws->setStatusCode(500);
+		$ws->end($throwable->getMessage());
+		$ws->close();
+
+		echo $error;
+	}
+
 
 
 	/**
@@ -140,24 +140,21 @@ abstract class Websocket implements OnMessageInterface, OnDisconnectInterface
 
 
 	/**
-	 * @param ConstrictRequest $request
+	 * @return void
-	 * @param Response         $ws
-	 * @return bool
 	 */
-	abstract public function onAuthority(ConstrictRequest $request, Response $ws): bool;
+	abstract public function onStart(): void;
 
 
 	/**
-	 * @param \Swoole\Server|Server $server
+	 * @param ConstrictRequest $psr7Request
-	 * @param Frame                 $frame
+	 * @param string           $frame
 	 * @return void
 	 */
-	abstract public function onMessage(\Swoole\Server|Server $server, Frame $frame): void;
+	abstract public function onMessage(ConstrictRequest $psr7Request, string $frame): void;
 
 	/**
-	 * @param \Swoole\WebSocket\Server|Server $server
+	 * @param int $userId
-	 * @param int                             $fd
 	 * @return void
 	 */
-	abstract public function onDisconnect(\Swoole\WebSocket\Server|Server $server, int $fd): void;
+	abstract public function onDisconnect(int $userId): void;
 }

test.php

@@ -1,12 +1,9 @@
 <?php
 
 
+use Coroutine\Server\Config;
 use Coroutine\Server\Websocket;
 use Kiri\Router\Constrict\ConstrictRequest;
-use Swoole\Coroutine\Http\Client;
-use Swoole\Coroutine\Http\Server;
-use Swoole\Http\Response;
-use Swoole\WebSocket\Frame;
 use function Co\run;
 
 
@@ -15,112 +12,72 @@ class Test extends Websocket
 
 
 	/**
+	 * 对链接进行认证的地方
+	 * 需要调用$request->withAuthority($authorization);方法将认证后的用户与链接进行关联
+	 *
 	 * @param ConstrictRequest $request
 	 * @return bool
 	 */
 	public function onConnected(ConstrictRequest $request): bool
 	{
 		// TODO: Implement onConnected() method.
-		$this->stateChange($request->getAuthority()->getUniqueId(), 1);
+
-		return true;
+		// $request->withAuthority($authorization);
+
+		return false;
 	}
 
 
 	/**
-	 * @param ConstrictRequest $request
+	 *
-	 * @param Response         $ws
+	 * 客户端发送的消息回调
-	 * @return bool
+	 *
-	 */
+	 * @param ConstrictRequest $psr7Request
-	public function onAuthority(ConstrictRequest $request, Response $ws): bool
+	 * @param string           $frame
-	{
-		// TODO: Implement onAuthority() method.
-		$auth   = $request->get['auth'] ?? '';
-		$client = new Client(config('user.host'), config('user.port'), true);
-		$client->post('/handshake', [
-			'token' => $auth,
-			'fd'    => $request->fd,
-			'ip'    => current(swoole_get_local_ip()),
-		]);
-		$client->close();
-		if ($client->getStatusCode() != 200) {
-			return false;
-		} else {
-			$request->withAuthority(json_decode($client->body));
-			return true;
-		}
-	}
-
-	/**
-	 * @param \Swoole\Server|Server $server
-	 * @param Frame                 $frame
 	 * @return void
 	 */
-	public function onMessage(\Swoole\Server|Server $server, Frame $frame): void
+	public function onMessage(ConstrictRequest $psr7Request, string $frame): void
 	{
 		// TODO: Implement onMessage() method.
 	}
 
 
 	/**
-	 * @param Server|\Swoole\WebSocket\Server $server
+	 * 消息循环之前调用的函数(此时链接已加入管理中)
-	 * @param int                             $fd
 	 * @return void
+	 *
 	 */
-	public function onDisconnect(Server|\Swoole\WebSocket\Server $server, int $fd): void
+	public function onBeforeMessageLoop(): void
 	{
-		// TODO: Implement onDisconnect() method.
+		// TODO: Implement onBeforeMessageLoop() method.
-		$this->stateChange($fd, 0);
-	}
-
-
-
-	/**
-	 * @return void
-	 */
-	public function clearAllOnlineUsers(): void
-	{
-		$request = [
-			'query'  => [
-				'bool' => [
-					'filter' => [['term' => ['is_online' => 1]]],
-				],
-			],
-			'script' => [
-				'source' => "ctx._source['is_online'] = 0",
-				'lang'   => 'painless',
-			],
-		];
-		$client  = new Client(config('es_host'), +config('es_port'));
-		$client->setData(json_encode($request, JSON_NUMERIC_CHECK));
-		$client->setHeaders(['Content-Type' => 'application/json']);
-		$client->setMethod('POST');
-		$client->execute('/' . config('es_key') . '/_update_by_query');
-		$client->close();
 	}
 
 
 	/**
 	 * @param int $userId
-	 * @param int $status
 	 * @return void
 	 */
-	private function stateChange(int $userId, int $status): void
+	public function onDisconnect(int $userId): void
 	{
-		$data   = [
+		// TODO: Implement onDisconnect() method.
-			'doc' => [
-				'is_online' => $status,
-			],
-		];
-		$client = new Client(config('es_host'), +config('es_port'));
-		$client->setData(json_encode($data));
-		$client->setHeaders(['Content-Type' => 'application/json']);
-		$client->setMethod('POST');
-		$client->execute('/' . config('es_key') . '/_doc/' . $userId . '/_update');
-		$client->close();
 	}
+
+
+	/**
+	 * @return void
+	 */
+	public function onStart(): void
+	{
+	}
+
 }
 
 run(function () {
+	$config          = new Config;
+	$config->port    = 9501;
+	$config->host    = '0.0.0.0';
+	$config->authKey = 'access_token';
+
 	$websocket = Kiri::getDi()->get(Test::class);
-	$websocket->start('0.0.0.0', 9504);
+	$websocket->start($config);
 });