优化 UDP Middleware 机制

src/Server/UdpServer/Dispatcher.php

@@ -32,7 +32,7 @@ public function dispatch(IPacketData $data)
     protected function getMiddlewares()
     {
         return array_merge($this->middlewares, [
-
+            \Imi\Server\UdpServer\Middleware\ActionWrapMiddleware::class,
         ]);
     }
 }

src/Server/UdpServer/Middleware/ActionWrapMiddleware.php

@@ -0,0 +1,36 @@
+<?php
+namespace Imi\Server\UdpServer\Middleware;
+
+use Imi\RequestContext;
+use Imi\Bean\Annotation\Bean;
+use Imi\Server\UdpServer\PacketHandler;
+use Imi\Server\UdpServer\IPacketHandler;
+use Imi\Server\UdpServer\Message\IPacketData;
+
+/**
+ * @Bean
+ */
+class ActionWrapMiddleware implements IMiddleware
+{
+    /**
+     * 处理方法
+     *
+     * @param IPacketData $data
+     * @param IPacketHandler $handler
+     * @return void
+     */
+    public function process(IPacketData $data, IPacketHandler $handler)
+    {
+        // 获取路由结果
+        $result = RequestContext::get('routeResult');
+        if(null === $result)
+        {
+            return $handler->handle($data);
+        }
+        $middlewares = $result->routeItem->middlewares;
+        $middlewares[] = ActionMiddleware::class;
+        $handler = new PacketHandler($middlewares);
+        return $handler->handle($data);
+    }
+
+}

src/Server/UdpServer/Middleware/RouteMiddleware.php

@@ -32,11 +32,6 @@ public function process(IPacketData $data, IPacketHandler $handler)
         else
         {
             RequestContext::set('routeResult', $result);
-
-            $middlewares = $result->routeItem->middlewares;
-            $middlewares[] = ActionMiddleware::class;
-            $handler = new PacketHandler($middlewares);
-            return $handler->handle($data);
         }
         return $handler->handle($data);
     }

tests/unit/UDPServer/MainServer/Controller/TestController.php

@@ -2,6 +2,7 @@
 namespace Imi\Test\UDPServer\MainServer\Controller;
 
 use Imi\ConnectContext;
+use Imi\RequestContext;
 use Imi\Server\Route\Annotation\Udp\UdpRoute;
 use Imi\Server\Route\Annotation\Udp\UdpAction;
 use Imi\Server\Route\Annotation\Udp\UdpController;
@@ -23,7 +24,8 @@ public function hello()
     {
         $data = $this->data->getFormatData();
         return [
-            'time'    =>    date($data->format, $data->time),
+            'time'              => date($data->format, $data->time),
+            'middlewareData'    => RequestContext::get('middlewareData'),
         ];
     }
 

tests/unit/UDPServer/MainServer/Middleware/Test.php

@@ -1,19 +1,20 @@
 <?php
 namespace Imi\Test\UDPServer\MainServer\Middleware;
 
+use Imi\RequestContext;
 use Imi\Bean\Annotation\Bean;
-use Imi\Server\UDPServer\IReceiveHandler;
-use Imi\Server\UDPServer\Message\IReceiveData;
-use Imi\Server\UDPServer\Middleware\IMiddleware;
+use Imi\Server\UdpServer\IPacketHandler;
+use Imi\Server\UdpServer\Message\IPacketData;
+use Imi\Server\UdpServer\Middleware\IMiddleware;
 
 /**
  * @Bean
  */
 class Test implements IMiddleware
 {
-    public function process(IReceiveData $data, IReceiveHandler $handler)
+    public function process(IPacketData $data, IPacketHandler $handler)
     {
-        var_dump('test middleware');
+        RequestContext::set('middlewareData', 'imi');
         return $handler->handle($data, $handler);
     }
 }

tests/unit/UDPServer/MainServer/config/config.php

@@ -12,7 +12,7 @@
         'UdpDispatcher'    =>    [
             'middlewares'    =>    [
                 \Imi\Server\UdpServer\Middleware\RouteMiddleware::class,
-                \Imi\Server\UdpServer\Middleware\ActionMiddleware::class,
+                \Imi\Test\UDPServer\MainServer\Middleware\Test::class,
             ],
         ],
         'ConnectContextStore'   =>  [