eee

core/Websocket.php

@@ -5,6 +5,7 @@ namespace Coroutine\Server;
 use Kiri\Di\Context;
 use Kiri\Di\Inject\Container;
 use Kiri\Router\Constrict\ConstrictRequest;
+use Kiri\Router\Router;
 use Psr\Http\Message\RequestInterface;
 use Swoole\Coroutine;
 use Swoole\Coroutine\Http\Server;
@@ -38,16 +39,12 @@ abstract class Websocket
 		$server = new Server($config->host, $config->port, false);
 		$this->configureServer($server);
 
-		$server->handle($config->normalizePath($config->websocketPath), fn(Request $request, Response $ws) => $this->handler($request, $ws));
-		if ($config->exposeOnlineLists) {
-			$server->handle($config->normalizePath($config->onlineListPath), fn(Request $request, Response $ws) => $this->getLists($request, $ws));
-		}
+		$server->handle('/', fn(Request $request, Response $ws) => $this->handler($request, $ws));
 
 		echo 'websocket server start at ' . $config->host . ':' . $config->port . PHP_EOL;
 		$server->start();
 	}
 
-
 	/**
 	 * @param Request  $request
 	 * @param Response $ws
@@ -87,7 +84,6 @@ abstract class Websocket
 	{
 		$upgraded = false;
 		$userId   = null;
-		$fd = null;
 
 		try {
 			$psr7Request = $this->authorizeConnection($request);
@@ -268,13 +264,7 @@ abstract class Websocket
 			default => 'Internal Server Error',
 		};
 
-		error_log(sprintf(
-			'[%s] %s in %s:%d',
-			static::class,
-			$throwable->getMessage(),
-			$throwable->getFile(),
-			$throwable->getLine(),
-		));
+		error_log(sprintf('[%s] %s in %s:%d', static::class, $throwable->getMessage(), $throwable->getFile(), $throwable->getLine()));
 
 		if ($upgraded) {
 			@$ws->close();