修复临时设置服务器到请求上下文后的恢复 (#637)

* 修复临时设置服务器到请求上下文后的恢复 * 修复临时设置服务器到请求上下文后的恢复 * 修复测试
imiphp · Nov 8, 2023 · 8936a21 · 8936a21
1 parent b3e6027
commit 8936a21
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 40 deletions.
diff --git a/src/Components/swoole/src/Listener/AfterWorkerStart.php b/src/Components/swoole/src/Listener/AfterWorkerStart.php
@@ -37,11 +37,13 @@ public function handle(WorkerStartEventParam $e): void
 
             ImiCommand::getOutput()->writeln('<info>App Inited</info>');
         }
+        $originServer = RequestContext::get('server');
         foreach (ServerManager::getServers() as $name => $server)
         {
             RequestContext::set('server', $server);
             Server::getInstance($name);
         }
+        RequestContext::set('server', $originServer);
         $httpRouteInit = new HttpRouteInit();
         $httpRouteInit->handle($e);
     }

diff --git a/src/Components/swoole/src/Server/ConnectionContext/Listener/AppInit.php b/src/Components/swoole/src/Server/ConnectionContext/Listener/AppInit.php
@@ -37,6 +37,7 @@ public function handle(EventParam $e): void
                 $this->outputServerInfo();
             }
         }
+        $originServer = RequestContext::get('server');
         foreach (ServerManager::getServers(ISwooleServer::class) as $server)
         {
             if ($server->isLongConnection())
@@ -52,6 +53,7 @@ public function handle(EventParam $e): void
                 }
             }
         }
+        RequestContext::set('server', $originServer);
         if ($serverStart ?? false)
         {
             Log::info('Server start');

diff --git a/src/Components/swoole/src/Server/Listener/OnCloseByFlagRequest.php b/src/Components/swoole/src/Server/Listener/OnCloseByFlagRequest.php
@@ -7,8 +7,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Server;
 use Imi\Swoole\SwooleWorker;
 
@@ -28,7 +26,6 @@ public function handle(EventParam $e): void
         $workerId = $eData['workerId'] ?? -1;
         $data = $eData['data'];
         $serverName = $data['serverName'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
         $result = Server::closeByFlag($data['flag'], $serverName, false);
         if (($data['needResponse'] ?? true) && !SwooleWorker::isWorkerIdProcess($workerId))
         {

diff --git a/src/Components/swoole/src/Server/Listener/OnExistsRequest.php b/src/Components/swoole/src/Server/Listener/OnExistsRequest.php
@@ -7,8 +7,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Server;
 use Imi\Swoole\SwooleWorker;
 
@@ -28,7 +26,6 @@ public function handle(EventParam $e): void
         $workerId = $eData['workerId'] ?? -1;
         $data = $eData['data'];
         $serverName = $data['serverName'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
         $result = false;
         if (isset($data['flag']))
         {

diff --git a/src/Components/swoole/src/Server/Listener/OnSendRawByFlagRequest.php b/src/Components/swoole/src/Server/Listener/OnSendRawByFlagRequest.php
@@ -7,8 +7,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Server;
 use Imi\Swoole\SwooleWorker;
 
@@ -28,7 +26,6 @@ public function handle(EventParam $e): void
         $workerId = $eData['workerId'] ?? -1;
         $data = $eData['data'];
         $serverName = $data['serverName'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
         $result = Server::sendRawByFlag($data['data'], $data['flag'], $serverName, false);
         if (($data['needResponse'] ?? true) && !SwooleWorker::isWorkerIdProcess($workerId))
         {

diff --git a/src/Components/swoole/src/Server/Listener/OnSendRawToAllRequest.php b/src/Components/swoole/src/Server/Listener/OnSendRawToAllRequest.php
@@ -7,8 +7,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Server;
 use Imi\Swoole\SwooleWorker;
 
@@ -28,7 +26,6 @@ public function handle(EventParam $e): void
         $workerId = $eData['workerId'] ?? -1;
         $data = $eData['data'];
         $serverName = $data['serverName'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
         $result = Server::sendRawToAll($data['data'], $serverName, false);
         if (($data['needResponse'] ?? true) && !SwooleWorker::isWorkerIdProcess($workerId))
         {

diff --git a/src/Components/swoole/src/Server/Listener/OnSendToClientIdsRequest.php b/src/Components/swoole/src/Server/Listener/OnSendToClientIdsRequest.php
@@ -7,8 +7,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Server;
 use Imi\Swoole\SwooleWorker;
 
@@ -28,7 +26,6 @@ public function handle(EventParam $e): void
         $workerId = $eData['workerId'] ?? -1;
         $data = $eData['data'];
         $serverName = $data['serverName'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
         $result = Server::sendRaw($data['data'], $data['clientIds'], $serverName, false);
         if (($data['needResponse'] ?? true) && !SwooleWorker::isWorkerIdProcess($workerId))
         {

diff --git a/src/Components/swoole/src/Server/Listener/OnSendToGroupsRequest.php b/src/Components/swoole/src/Server/Listener/OnSendToGroupsRequest.php
@@ -7,8 +7,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Server;
 use Imi\Swoole\SwooleWorker;
 
@@ -28,7 +26,6 @@ public function handle(EventParam $e): void
         $workerId = $eData['workerId'] ?? -1;
         $data = $eData['data'];
         $serverName = $data['serverName'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
         $result = Server::sendRawToGroup($data['groups'], $data['data'], $serverName, false);
         if (($data['needResponse'] ?? true) && !SwooleWorker::isWorkerIdProcess($workerId))
         {

diff --git a/src/Components/swoole/src/Server/Util/Amqp/AmqpServerConsumer.php b/src/Components/swoole/src/Server/Util/Amqp/AmqpServerConsumer.php
@@ -15,7 +15,6 @@
 use Imi\Log\Log;
 use Imi\RequestContext;
 use Imi\Server\Server;
-use Imi\Server\ServerManager;
 use Imi\Swoole\Server\Util\AmqpServerUtil;
 use Imi\Worker;
 
@@ -82,7 +81,6 @@ protected function consume(IMessage $message)
             {
                 $data = json_decode($message->getBody(), true);
                 $serverName = $data['serverName'];
-                RequestContext::set('server', $server = ServerManager::getServer($serverName));
                 switch ($data['action'] ?? null)
                 {
                     case 'sendRawByFlag':

diff --git a/src/Components/workerman/src/Server/Listener/OnCloseByFlagRequest.php b/src/Components/workerman/src/Server/Listener/OnCloseByFlagRequest.php
@@ -8,8 +8,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Workerman\Server\Util\LocalServerUtil;
 
 /**
@@ -26,7 +24,6 @@ public function handle(EventParam $e): void
     {
         $data = $e->getData();
         ['flag' => $flag, 'serverName' => $serverName] = $data['data'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
 
         /** @var LocalServerUtil $serverUtil */
         $serverUtil = App::getBean(LocalServerUtil::class);

diff --git a/src/Components/workerman/src/Server/Listener/OnSendRawByFlagRequest.php b/src/Components/workerman/src/Server/Listener/OnSendRawByFlagRequest.php
@@ -8,8 +8,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Workerman\Server\Util\LocalServerUtil;
 
 /**
@@ -26,7 +24,6 @@ public function handle(EventParam $e): void
     {
         $data = $e->getData();
         ['data' => $data, 'flag' => $flag, 'serverName' => $serverName] = $data['data'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
 
         /** @var LocalServerUtil $serverUtil */
         $serverUtil = App::getBean(LocalServerUtil::class);

diff --git a/src/Components/workerman/src/Server/Listener/OnSendRawToAllRequest.php b/src/Components/workerman/src/Server/Listener/OnSendRawToAllRequest.php
@@ -8,8 +8,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Workerman\Server\Util\LocalServerUtil;
 
 /**
@@ -26,7 +24,6 @@ public function handle(EventParam $e): void
     {
         $data = $e->getData();
         ['data' => $data, 'serverName' => $serverName] = $data['data'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
 
         /** @var LocalServerUtil $serverUtil */
         $serverUtil = App::getBean(LocalServerUtil::class);

diff --git a/src/Components/workerman/src/Server/Listener/OnSendRawToGroupRequest.php b/src/Components/workerman/src/Server/Listener/OnSendRawToGroupRequest.php
@@ -8,8 +8,6 @@
 use Imi\Bean\Annotation\Listener;
 use Imi\Event\EventParam;
 use Imi\Event\IEventListener;
-use Imi\RequestContext;
-use Imi\Server\ServerManager;
 use Imi\Workerman\Server\Util\LocalServerUtil;
 
 /**
@@ -26,7 +24,6 @@ public function handle(EventParam $e): void
     {
         $data = $e->getData();
         ['data' => $data, 'groupName' => $groupName, 'serverName' => $serverName] = $data['data'];
-        RequestContext::set('server', ServerManager::getServer($serverName));
 
         /** @var LocalServerUtil $serverUtil */
         $serverUtil = App::getBean(LocalServerUtil::class);

diff --git a/src/Server/Contract/BaseServer.php b/src/Server/Contract/BaseServer.php
@@ -84,10 +84,7 @@ public function getBean(string $name, ...$params)
         }
         finally
         {
-            if ($server)
-            {
-                $context['server'] = $server;
-            }
+            $context['server'] = $server;
         }
     }
 

diff --git a/src/Server/Http/Listener/HttpRouteInit.php b/src/Server/Http/Listener/HttpRouteInit.php
@@ -188,9 +188,6 @@ protected function parseAnnotations(): void
             }
             unset($context['server']);
         }
-        if ($originServer)
-        {
-            $context['server'] = $originServer;
-        }
+        $context['server'] = $originServer;
     }
 }
diff --git a/src/Server/TcpServer/Listener/TcpRouteInit.php b/src/Server/TcpServer/Listener/TcpRouteInit.php
@@ -40,6 +40,7 @@ private function parseAnnotations(EventParam $e): void
     {
         $controllerParser = TcpControllerParser::getInstance();
         $context = RequestContext::getContext();
+        $originServer = $context['server'] ?? null;
         foreach (ServerManager::getServers(ITcpServer::class) as $name => $server)
         {
             $context['server'] = $server;
@@ -96,5 +97,6 @@ private function parseAnnotations(EventParam $e): void
             }
             unset($context['server']);
         }
+        $context['server'] = $originServer;
     }
 }
diff --git a/src/Server/UdpServer/Listener/UdpRouteInit.php b/src/Server/UdpServer/Listener/UdpRouteInit.php
@@ -40,6 +40,7 @@ private function parseAnnotations(EventParam $e): void
     {
         $controllerParser = UdpControllerParser::getInstance();
         $context = RequestContext::getContext();
+        $originServer = $context['server'] ?? null;
         foreach (ServerManager::getServers() as $name => $server)
         {
             if (Protocol::UDP !== $server->getProtocol())
@@ -100,5 +101,6 @@ private function parseAnnotations(EventParam $e): void
             }
             unset($context['server']);
         }
+        $context['server'] = $originServer;
     }
 }
diff --git a/src/Server/WebSocket/Listener/WSRouteInit.php b/src/Server/WebSocket/Listener/WSRouteInit.php
@@ -40,6 +40,7 @@ private function parseAnnotations(EventParam $e): void
     {
         $controllerParser = WSControllerParser::getInstance();
         $context = RequestContext::getContext();
+        $originServer = $context['server'] ?? null;
         foreach (ServerManager::getServers() as $name => $server)
         {
             if (Protocol::WEBSOCKET !== $server->getProtocol())
@@ -106,5 +107,6 @@ private function parseAnnotations(EventParam $e): void
             }
             unset($context['server']);
         }
+        $context['server'] = $originServer;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,10 +84,7 @@ public function getBean(string $name, ...$params) @@
             }
             finally
             {
-                if ($server)
-                {
-                    $context['server'] = $server;
-                }
+                $context['server'] = $server;
             }
         }
@@ Expand Down @@