From 5bfe8401f574c7b855eeb5ff446e74497804304d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Tue, 11 Oct 2022 18:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Contract/OnCloseInterface.php             |  7 +-
 .../Contract/OnDisconnectInterface.php        | 15 ++++
 .../Contract/OnHandshakeInterface.php         |  4 +-
 .../Contract/OnMessageInterface.php           |  5 +-
 .../Contract/OnOpenInterface.php              |  6 +-
 kiri-websocket-server/Server.php              | 81 +++++++++----------
 6 files changed, 57 insertions(+), 61 deletions(-)
 create mode 100644 kiri-websocket-server/Contract/OnDisconnectInterface.php

diff --git a/kiri-websocket-server/Contract/OnCloseInterface.php b/kiri-websocket-server/Contract/OnCloseInterface.php
index 253c8385..ee001924 100644
--- a/kiri-websocket-server/Contract/OnCloseInterface.php
+++ b/kiri-websocket-server/Contract/OnCloseInterface.php
@@ -3,20 +3,15 @@
 namespace Kiri\Websocket\Contract;
 
 
-use Swoole\WebSocket\Frame;
-use Swoole\WebSocket\Server;
-use Swoole\Coroutine\Http\Server as CoroutineServer;
-
 interface OnCloseInterface
 {
 
 
 	/**
-	 * @param Server|CoroutineServer $server
 	 * @param int $fd
 	 * @return void
 	 */
-	public function onClose(Server|CoroutineServer $server, int $fd): void;
+	public function OnClose(int $fd): void;
 
 
 }
diff --git a/kiri-websocket-server/Contract/OnDisconnectInterface.php b/kiri-websocket-server/Contract/OnDisconnectInterface.php
new file mode 100644
index 00000000..45b39043
--- /dev/null
+++ b/kiri-websocket-server/Contract/OnDisconnectInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Kiri\Websocket\Contract;
+
+interface OnDisconnectInterface
+{
+
+
+	/**
+	 * @param int $fd
+	 */
+    public function OnDisconnect(int $fd): void;
+
+
+}
diff --git a/kiri-websocket-server/Contract/OnHandshakeInterface.php b/kiri-websocket-server/Contract/OnHandshakeInterface.php
index 5deba3d8..0276a107 100644
--- a/kiri-websocket-server/Contract/OnHandshakeInterface.php
+++ b/kiri-websocket-server/Contract/OnHandshakeInterface.php
@@ -13,9 +13,9 @@ interface OnHandshakeInterface
 	/**
 	 * @param Request $request
 	 * @param Response $response
-	 * @return int
+	 * @return void
 	 */
-	public function onHandshake(Request $request, Response $response): int;
+	public function OnHandshake(Request $request, Response $response): void;
 
 
 }
diff --git a/kiri-websocket-server/Contract/OnMessageInterface.php b/kiri-websocket-server/Contract/OnMessageInterface.php
index 37387fb7..275b0dfc 100644
--- a/kiri-websocket-server/Contract/OnMessageInterface.php
+++ b/kiri-websocket-server/Contract/OnMessageInterface.php
@@ -4,19 +4,16 @@ namespace Kiri\Websocket\Contract;
 
 
 use Swoole\WebSocket\Frame;
-use Swoole\WebSocket\Server;
-use Swoole\Coroutine\Http\Server as CoroutineServer;
 
 interface OnMessageInterface
 {
 
 
 	/**
-	 * @param Server|CoroutineServer $server
 	 * @param Frame $frame
 	 * @return void
 	 */
-	public function onMessage(Server|CoroutineServer $server, Frame $frame): void;
+	public function OnMessage(Frame $frame): void;
 
 
 }
diff --git a/kiri-websocket-server/Contract/OnOpenInterface.php b/kiri-websocket-server/Contract/OnOpenInterface.php
index 24cc7186..f2254a75 100644
--- a/kiri-websocket-server/Contract/OnOpenInterface.php
+++ b/kiri-websocket-server/Contract/OnOpenInterface.php
@@ -4,20 +4,16 @@ namespace Kiri\Websocket\Contract;
 
 
 use Swoole\Http\Request;
-use Swoole\WebSocket\Frame;
-use Swoole\WebSocket\Server;
-use Swoole\Coroutine\Http\Server as CoroutineServer;
 
 interface OnOpenInterface
 {
 
 
 	/**
-	 * @param Server|CoroutineServer $server
 	 * @param Request $request
 	 * @return void
 	 */
-	public function onOpen(Server|CoroutineServer $server, Request $request): void;
+	public function onOpen(Request $request): void;
 
 
 }
diff --git a/kiri-websocket-server/Server.php b/kiri-websocket-server/Server.php
index 372ddfa1..9f1d77dd 100644
--- a/kiri-websocket-server/Server.php
+++ b/kiri-websocket-server/Server.php
@@ -3,7 +3,6 @@
 namespace Kiri\Websocket;
 
 use Closure;
-use Co\WaitGroup;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
@@ -23,14 +22,13 @@ use Kiri\Message\Handler\RouterCollector;
 use Kiri\Message\ResponseEmitter;
 use Kiri\Message\ServerRequest;
 use Kiri\Message\Constrict\Response as CResponse;
-use Kiri\Server\Events\OnShutdown;
 use Kiri\Websocket\Contract\OnCloseInterface;
+use Kiri\Websocket\Contract\OnDisconnectInterface;
 use Kiri\Websocket\Contract\OnHandshakeInterface;
 use Kiri\Websocket\Contract\OnMessageInterface;
 use Kiri\Websocket\Contract\OnOpenInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use ReflectionException;
 use Swoole\Coroutine;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
@@ -39,7 +37,7 @@ use Swoole\WebSocket\Frame;
 use Swoole\WebSocket\Server as WsServer;
 use Swoole\Coroutine\Http\Server as WhServer;
 
-class Server extends Component
+class Server extends Component implements OnHandshakeInterface, OnMessageInterface, OnCloseInterface, OnDisconnectInterface
 {
 
 
@@ -115,7 +113,7 @@ class Server extends Component
 	 */
 	public function init(): void
 	{
-		$exception = Config::get('exception.http', ExceptionHandlerDispatcher::class);
+		$exception = Config::get('exception.websocket', ExceptionHandlerDispatcher::class);
 		if (!in_array(ExceptionHandlerInterface::class, class_implements($exception))) {
 			$exception = ExceptionHandlerDispatcher::class;
 		}
@@ -130,7 +128,7 @@ class Server extends Component
 	 * @return void
 	 * @throws Exception
 	 */
-	public function onHandshake(Request $request, Response $response): void
+	public function OnHandshake(Request $request, Response $response): void
 	{
 		try {
 			/** @var \Kiri\Message\Response $psrResponse */
@@ -145,26 +143,26 @@ class Server extends Component
 			} else if (is_null($handler)) {
 				$psrResponse->withContent('Page not found.')->withStatus(404);
 			} else {
-				$psrResponse = $this->dispatcher->with($handler)->handle($psrRequest);
-
-				$executor = $handler->callback;
-				$response->upgrade();
-				if ($handler instanceof OnHandshakeInterface) {
-					$statusCode = $handler->onHandshake($request, $response);
-					$response->setStatusCode($statusCode);
-					$response->write("connect ok.");
-				}
-				if ($executor instanceof OnOpenInterface) {
-					$executor->onOpen($this->server, $request);
-				}
-				while (true) {
-					$frame = $response->recv();
-					if ($frame === false || $frame instanceof CloseFrame || $frame === '') {
-						$handler->onClose($this->server, $response->fd);
-						break;
-					}
-					$handler->onMessage($this->server, $frame);
-				}
+//				$psrResponse = $this->dispatcher->with($handler)->handle($psrRequest);
+//
+//				$executor = $handler->callback;
+//				$response->upgrade();
+//				if ($handler instanceof OnHandshakeInterface) {
+//					$statusCode = $handler->OnHandshake($request, $response);
+//					$response->setStatusCode($statusCode);
+//					$response->write("connect ok.");
+//				}
+//				if ($executor instanceof OnOpenInterface) {
+//					$executor->onOpen($this->server, $request);
+//				}
+//				while (true) {
+//					$frame = $response->recv();
+//					if ($frame === false || $frame instanceof CloseFrame || $frame === '') {
+//						$handler->onClose($this->server, $response->fd);
+//						break;
+//					}
+//					$handler->onMessage($this->server, $frame);
+//				}
 			}
 		} catch (\Throwable $throwable) {
 			$psrResponse = $this->exception->emit($throwable, di(CResponse::class));
@@ -175,44 +173,39 @@ class Server extends Component
 
 
 	/**
-	 * @param WsServer|Coroutine\Http\Server $server
 	 * @param Frame $frame
 	 * @return void
 	 */
-	public function onMessage(WsServer|WhServer $server, Frame $frame): void
+	public function OnMessage(Frame $frame): void
 	{
-		$handler = $this->handler->callback;
-		if ($handler instanceof OnMessageInterface) {
-			$handler->onMessage($server, $frame);
-		}
 	}
 
 
 	/**
-	 * @param WsServer|Coroutine\Http\Server $server
 	 * @param int $fd
 	 * @return void
 	 */
-	public function onClose(WsServer|WhServer $server, int $fd): void
+	public function OnClose(int $fd): void
 	{
-		$handler = $this->handler->callback;
-		if ($handler instanceof OnCloseInterface) {
-			$handler->onClose($server, $fd);
-		}
 	}
 
 
 	/**
-	 * @param WsServer|WhServer $server
+	 * @param int $fd
+	 * @return void
+	 */
+	public function OnDisconnect(int $fd): void
+	{
+		// TODO: Implement OnDisconnect() method.
+	}
+
+
+	/**
 	 * @param Request $request
 	 * @return void
 	 */
-	public function onOpen(WsServer|WhServer $server, Request $request): void
+	public function OnOpen(Request $request): void
 	{
-		$handler = $this->handler->callback;
-		if ($handler instanceof OnOpenInterface) {
-			$handler->onOpen($server, $request);
-		}
 	}