删除tcp,websocket session

we7coreteam · Feb 24, 2022 · 671f551 · 671f551
1 parent df1a0ed
commit 671f551
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 137 deletions.
diff --git a/Src/App.php b/Src/App.php
@@ -30,7 +30,7 @@
  */
 class App {
 	public const NAME = 'w7-rangine';
-	public const VERSION = '2.5.7';
+	public const VERSION = '2.5.8';
 
 	public static $self;
 	protected $appNamespace;

diff --git a/Src/Core/Listener/PipeMessageListener.php b/Src/Core/Listener/PipeMessageListener.php
@@ -12,7 +12,7 @@
 
 namespace W7\Core\Listener;
 
-use Swoole\Http\Server;
+use Swoole\Server;
 use W7\Core\Message\Message;
 use W7\Core\Server\ServerEvent;
 

diff --git a/Src/Core/Listener/TaskListener.php b/Src/Core/Listener/TaskListener.php
@@ -12,7 +12,7 @@
 
 namespace W7\Core\Listener;
 
-use Swoole\Http\Server;
+use Swoole\Server;
 use Swoole\Server\Task;
 use W7\Core\Exception\HandlerExceptions;
 use W7\Core\Helper\Traiter\TaskDispatchTrait;

diff --git a/Src/Tcp/Listener/AfterWorkerStopListener.php b/Src/Tcp/Listener/AfterWorkerStopListener.php
diff --git a/Src/Tcp/Listener/BeforeStartListener.php b/Src/Tcp/Listener/BeforeStartListener.php
@@ -22,7 +22,7 @@
 class BeforeStartListener extends ListenerAbstract {
 	public function run(...$params) {
 		$this->registerRouter();
-		$this->registerMiddleware();
+//		$this->registerMiddleware();
 	}
 
 	private function registerRouter() {

diff --git a/Src/Tcp/Listener/CloseListener.php b/Src/Tcp/Listener/CloseListener.php
@@ -16,7 +16,6 @@
 use W7\Core\Listener\ListenerAbstract;
 use W7\Core\Server\ServerEnum;
 use W7\Core\Server\ServerEvent;
-use W7\Tcp\Collector\FdCollector;
 
 class CloseListener extends ListenerAbstract {
 	public function run(...$params) {
@@ -25,8 +24,6 @@ public function run(...$params) {
 	}
 
 	private function onClose(Server $server, int $fd, int $reactorId): void {
-		FdCollector::instance()->delete($fd);
-
 		$this->getEventDispatcher()->dispatch(ServerEvent::ON_USER_AFTER_CLOSE, [$server, $fd, $reactorId, ServerEnum::TYPE_TCP]);
 	}
 }
diff --git a/Src/Tcp/Listener/ConnectListener.php b/Src/Tcp/Listener/ConnectListener.php
@@ -13,35 +13,18 @@
 namespace W7\Tcp\Listener;
 
 use Swoole\Server;
-use W7\Contract\Session\SessionInterface;
 use W7\Core\Listener\ListenerAbstract;
 use W7\Core\Server\ServerEnum;
 use W7\Core\Server\ServerEvent;
-use W7\Http\Message\Outputer\TcpResponseOutputer;
 use W7\Http\Message\Server\Request as Psr7Request;
-use W7\Http\Message\Server\Response as Psr7Response;
-use W7\Tcp\Collector\FdCollector;
 
 class ConnectListener extends ListenerAbstract {
 	public function run(...$params) {
 		[$server, $fd, $reactorId] = $params;
-		return $this->onConnect($server, $fd, $reactorId);
+		$this->onConnect($server, $fd, $reactorId);
 	}
 
 	private function onConnect(Server $server, $fd, $reactorId) {
-		/**
-		 * @var Psr7Request $psr7Request
-		 */
-		$psr7Request = new Psr7Request('', '');
-		$psr7Response = new Psr7Response();
-		$psr7Response->setOutputer(new TcpResponseOutputer($server, $fd));
-
-		//TCP session guarantees that data is shared in this connection, and Response cannot delegate SessionID, so there is no data shared between two connections
-		$psr7Request->session = $this->getContainer()->clone(SessionInterface::class);
-		$psr7Request->session->start($psr7Request);
-
-		FdCollector::instance()->set($fd, [$psr7Request, $psr7Response]);
-
-		$this->getEventDispatcher()->dispatch(ServerEvent::ON_USER_AFTER_OPEN, [$server, $fd, $psr7Request, ServerEnum::TYPE_TCP]);
+		$this->getEventDispatcher()->dispatch(ServerEvent::ON_USER_AFTER_OPEN, [$server, $fd, new Psr7Request('', ''), ServerEnum::TYPE_TCP]);
 	}
 }
diff --git a/Src/Tcp/Listener/ReceiveListener.php b/Src/Tcp/Listener/ReceiveListener.php
@@ -14,9 +14,9 @@
 
 use Swoole\Server;
 use W7\Core\Listener\ListenerAbstract;
+use W7\Http\Message\Outputer\TcpResponseOutputer;
 use W7\Http\Message\Server\Request as Psr7Request;
 use W7\Http\Message\Server\Response as Psr7Response;
-use W7\Tcp\Collector\FdCollector;
 use W7\Tcp\Server\Dispatcher as RequestDispatcher;
 
 class ReceiveListener extends ListenerAbstract {
@@ -26,23 +26,30 @@ public function run(...$params) {
 		$this->dispatch($server, $reactorId, $fd, $data);
 	}
 
+	//待优化 session
+	protected function getRequestAndResponse(Server $server, $fd) {
+		$psr7Request = new Psr7Request('POST', '/');
+		$psr7Request = $psr7Request->withAttribute('fd', $fd);
+
+		$psr7Response = new Psr7Response();
+		$psr7Response->setOutputer(new TcpResponseOutputer($server, $fd));
+
+		return [$psr7Request, $psr7Response];
+	}
+
 	private function dispatch(Server $server, $reactorId, $fd, $data) {
-		$this->getContext()->setContextDataByKey('fd', $fd);
 		$this->getContext()->setContextDataByKey('reactorid', $reactorId);
 		$this->getContext()->setContextDataByKey('workid', $server->worker_id);
 		$this->getContext()->setContextDataByKey('coid', $this->getContext()->getCoroutineId());
 
-		$collector = FdCollector::instance()->get($fd, []);
-
 		/**
 		 * @var Psr7Request $psr7Request
 		 */
-		$psr7Request = $collector[0];
-		$psr7Request = $psr7Request->loadFromTcpData($data);
 		/**
 		 * @var Psr7Response $psr7Response
 		 */
-		$psr7Response = $collector[1];
+		[$psr7Request, $psr7Response] = $this->getRequestAndResponse($server, $fd);
+		$psr7Request = $psr7Request->loadFromTcpData($data);
 
 		/**
 		 * @var RequestDispatcher $dispatcher

diff --git a/Src/WebSocket/Listener/AfterWorkerStopListener.php b/Src/WebSocket/Listener/AfterWorkerStopListener.php
diff --git a/Src/WebSocket/Listener/BeforeStartListener.php b/Src/WebSocket/Listener/BeforeStartListener.php
@@ -22,7 +22,7 @@
 class BeforeStartListener extends ListenerAbstract {
 	public function run(...$params) {
 		$this->registerRouter();
-		$this->registerMiddleware();
+//		$this->registerMiddleware();
 	}
 
 	private function registerRouter() {

diff --git a/Src/WebSocket/Listener/CloseListener.php b/Src/WebSocket/Listener/CloseListener.php
@@ -16,8 +16,6 @@
 use W7\Core\Listener\ListenerAbstract;
 use W7\Core\Server\ServerEnum;
 use W7\Core\Server\ServerEvent;
-use W7\Http\Message\Server\Request as Psr7Request;
-use W7\WebSocket\Collector\FdCollector;
 
 class CloseListener extends ListenerAbstract {
 	public function run(...$params) {
@@ -26,18 +24,6 @@ public function run(...$params) {
 	}
 
 	private function onClose(Server $server, int $fd, int $reactorId): void {
-		$fdCollector = FdCollector::instance();
-		$collector =  $fdCollector->get($fd, []);
-		if ($collector) {
-			/**
-			 * @var Psr7Request $psr7Request
-			 */
-			$psr7Request = $collector[0];
-			$psr7Request->session->close();
-		}
-
-		$fdCollector->delete($fd);
-
 		$this->getEventDispatcher()->dispatch(ServerEvent::ON_USER_AFTER_CLOSE, [$server, $fd, $reactorId, ServerEnum::TYPE_WEBSOCKET]);
 	}
 }
diff --git a/Src/WebSocket/Listener/HandShakeListener.php b/Src/WebSocket/Listener/HandShakeListener.php
@@ -15,14 +15,12 @@
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use W7\App;
-use W7\Contract\Session\SessionInterface;
 use W7\Core\Listener\ListenerAbstract;
 use W7\Core\Server\ServerEnum;
 use W7\Core\Server\ServerEvent;
 use W7\Http\Message\Outputer\SwooleResponseOutputer;
 use W7\Http\Message\Server\Request as Psr7Request;
 use W7\Http\Message\Server\Response as Psr7Response;
-use W7\WebSocket\Collector\FdCollector;
 
 class HandShakeListener extends ListenerAbstract {
 	public function run(...$params) {
@@ -73,26 +71,13 @@ private function handshake(Request $request, Response $response) {
 
 		$response = $psr7Response->withHeaders($headers)->withStatus(101);
 
-		$psr7Request->session = $this->getContainer()->clone(SessionInterface::class);
-		$psr7Request->session->start($psr7Request);
-		$response = $psr7Request->session->replenishResponse($response);
-
 		try {
-			$localIps = swoole_get_local_ip();
-			$psr7Request->session->set('fd', $request->fd);
-			$psr7Request->session->set('server', [
-				'ip' => array_values($localIps)[0] ?? '',
-				'mac' => swoole_get_local_mac()[array_keys($localIps)[0] ?? 0] ?? ''
-			]);
-
 			$this->getEventDispatcher()->dispatch(ServerEnum::TYPE_WEBSOCKET . ':' . ServerEvent::ON_OPEN, [App::$server->getServer(), $psr7Request]);
 		} catch (\Throwable $e) {
 			$this->getLogger()->debug($e->getMessage(), ['exception' => $e]);
 			return false;
 		}
 
-		FdCollector::instance()->set($request->fd, [$psr7Request, $response]);
-
 		$response->send();
 		return true;
 	}

diff --git a/Src/WebSocket/Listener/MessageListener.php b/Src/WebSocket/Listener/MessageListener.php
@@ -18,7 +18,6 @@
 use W7\Http\Message\Outputer\WebSocketResponseOutputer;
 use W7\Http\Message\Server\Request as Psr7Request;
 use W7\Http\Message\Server\Response as Psr7Response;
-use W7\WebSocket\Collector\FdCollector;
 use W7\WebSocket\Server\Dispatcher;
 
 class MessageListener extends ListenerAbstract {
@@ -27,28 +26,34 @@ public function run(...$params) {
 		$this->onMessage($server, $frame);
 	}
 
-	private function onMessage(Server $server, SwooleFrame $frame): bool {
+	//待优化 session
+	protected function getRequestAndResponse(Server $server, SwooleFrame $frame) {
+		$psr7Request = new Psr7Request('POST', '/');
+		$psr7Request = $psr7Request->withAttribute('fd', $frame->fd);
+
+		$psr7Response = new Psr7Response();
+		$psr7Response->setOutputer(new WebSocketResponseOutputer($server, $frame->fd));
+
+		return [$psr7Request, $psr7Response];
+	}
+
+	private function onMessage(Server $server, SwooleFrame $frame) {
 		$this->getContext()->setContextDataByKey('workid', $server->worker_id);
 		$this->getContext()->setContextDataByKey('coid', $this->getContext()->getCoroutineId());
 
-		$collector = FdCollector::instance()->get($frame->fd, []);
-
 		/**
 		 * @var Psr7Request $psr7Request
 		 */
-		$psr7Request = $collector[0];
-		$psr7Request = $psr7Request->loadFromWSFrame($frame);
 		/**
 		 * @var Psr7Response $psr7Response
 		 */
-		$psr7Response = $collector[1];
-		$psr7Response->setOutputer(new WebSocketResponseOutputer($server, $frame->fd));
+		[$psr7Request, $psr7Response] = $this->getRequestAndResponse($server, $frame);
+		$psr7Request = $psr7Request->withAttribute('frame', $frame);
+		$psr7Request = $psr7Request->loadFromWSFrame($frame);
 
 		$dispatcher = $this->getContainer()->get(Dispatcher::class);
 		$psr7Response = $dispatcher->dispatch($psr7Request, $psr7Response);
 
 		$psr7Response->send();
-
-		return true;
 	}
 }