From 46aad644e89203365236b9aa2638363c86f27013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Mon, 19 Apr 2021 17:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HttpServer/Events/OnHandshake.php | 20 +++++++++-----------
 HttpServer/Route/Node.php         |  1 -
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php
index 401babc1..5ee1c39b 100644
--- a/HttpServer/Events/OnHandshake.php
+++ b/HttpServer/Events/OnHandshake.php
@@ -96,13 +96,13 @@ class OnHandshake extends Callback
 	{
 		try {
 			$this->execute($request, $response);
-
-			$clientInfo = Snowflake::getWebSocket()->getClientInfo($request->fd);
-
-			$event = Snowflake::app()->getEvent();
-
-			$eventName = 'listen ' . $clientInfo['server_port'] . ' ' . Event::SERVER_HANDSHAKE;
-			$event->trigger($eventName, [$request, $response]);
+//
+//			$clientInfo = Snowflake::getWebSocket()->getClientInfo($request->fd);
+//
+//			$event = Snowflake::app()->getEvent();
+//
+//			$eventName = 'listen ' . $clientInfo['server_port'] . ' ' . Event::SERVER_HANDSHAKE;
+//			$event->trigger($eventName, [$request, $response]);
 		} catch (\Throwable $exception) {
 			$this->addError($exception, 'throwable');
 			$this->disconnect($response, 401);
@@ -139,11 +139,9 @@ class OnHandshake extends Callback
 		$sRequest->parseUri();
 
 		if (($node = $router->find_path($sRequest)) === null) {
-			return $this->disconnect($response, 404);
+			return $node->dispatch($sRequest, Response::create($response));
 		}
-		Response::create($response);
-
-		return $node->dispatch($sRequest, \response());
+		return $this->disconnect($response, 404);
 	}
 
 
diff --git a/HttpServer/Route/Node.php b/HttpServer/Route/Node.php
index 3d4ab2ea..a5f42615 100644
--- a/HttpServer/Route/Node.php
+++ b/HttpServer/Route/Node.php
@@ -560,7 +560,6 @@ class Node extends HttpService
 	 */
 	private function runWith(): mixed
 	{
-		var_dump(func_get_args());
 		return ($this->callback)(...func_get_args());
 
 		return call_user_func($this->callback, ...func_get_args());