改名

HttpServer/Events/OnHandshake.php

@@ -7,6 +7,7 @@ namespace HttpServer\Events;
 use Annotation\Route\Socket;
 use Exception;
 use HttpServer\Abstracts\Callback;
+use HttpServer\Http\Request;
 use Snowflake\Abstracts\Config;
 use Snowflake\Event;
 use Snowflake\Exception\ComponentException;
@@ -108,14 +109,12 @@ class OnHandshake extends Callback
 			}
 			$router = Snowflake::app()->getRouter();
 
-			$context = Config::get('router', false, ROUTER_TREE);
+			$sRequest = Request::create($request);
-			var_dump($context);
+			$sRequest->uri = '/' . Socket::HANDSHAKE . '::event';
-			if ($context === ROUTER_TREE) {
+			$sRequest->headers->replace('request_method', 'sw::socket');
-				$node = $router->tree_search(explode('/', Socket::HANDSHAKE . '::event'), 'sw::socket');
+			$sRequest->parseUri();;
-			} else {
+
-				$node = $router->search('/' . Socket::HANDSHAKE . '::event', 'sw::socket');
+			if (($node = $router->find_path($sRequest)) === null) {
-			}
-			if ($node === null) {
 				return $this->disconnect($response, 502);
 			}
 			return $node->dispatch($request, $response);

HttpServer/Route/Router.php

@@ -500,7 +500,7 @@ class Router extends HttpService implements RouterInterface
 	 * 树干搜索
 	 * @throws ConfigException
 	 */
-	private function find_path(Request $request): ?Node
+	public function find_path(Request $request): ?Node
 	{
 		$useTree = Config::get('router', false, ROUTER_TREE);
 		if ($useTree === ROUTER_TREE) {