Extract shared HTTP server middleware behavior

packages/http/src/Server/HttpServerTrait.php

@@ -16,20 +16,19 @@
 use Windwalker\Http\Middleware\RequestRunner;
 use Windwalker\Http\Output\OutputInterface;
 
-use function Windwalker\DI\create;
-
 /**
  * Trait HttpServerTrait
  */
 trait HttpServerTrait
 {
-    protected ?Closure $middlewareResolver = null;
+    use MiddlewareAwareTrait;
 
     public function __construct(
-        protected array $middlewares = [],
+        array $middlewares = [],
         protected ?HttpFactory $httpFactory = null,
         protected ?Closure $outputBuilder = null,
     ) {
+        $this->middlewares = $middlewares;
         $this->adaptLegacyEvents();
     }
 
@@ -186,59 +185,6 @@ public function setHttpFactory(?HttpFactory $httpFactory): static
         return $this;
     }
 
-    public function middleware(mixed $middleware, mixed ...$args): static
-    {
-        if (is_string($middleware)) {
-            $middleware = create($middleware, ...$args);
-        }
-
-        $this->middlewares[] = $middleware;
-
-        return $this;
-    }
-
-    /**
-     * @return  array
-     */
-    public function getMiddlewares(): array
-    {
-        return $this->middlewares;
-    }
-
-    /**
-     * @param  array  $middlewares
-     *
-     * @return  static  Return self to support chaining.
-     *
-     * @codeCoverageIgnore
-     */
-    public function setMiddlewares(array $middlewares): static
-    {
-        $this->middlewares = $middlewares;
-
-        return $this;
-    }
-
-    /**
-     * @return  Closure
-     */
-    public function getMiddlewareResolver(): Closure
-    {
-        return $this->middlewareResolver ?? static fn($entry) => $entry;
-    }
-
-    /**
-     * @param  Closure|null  $middlewareResolver
-     *
-     * @return  static  Return self to support chaining.
-     */
-    public function setMiddlewareResolver(?Closure $middlewareResolver): static
-    {
-        $this->middlewareResolver = $middlewareResolver;
-
-        return $this;
-    }
-
     /**
      * @return  Closure|null
      */

packages/http/src/Server/MiddlewareAwareTrait.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Windwalker\Http\Server;
+
+use Closure;
+
+use function Windwalker\DI\create;
+
+trait MiddlewareAwareTrait
+{
+    protected array $middlewares = [];
+
+    protected ?Closure $middlewareResolver = null;
+
+    public function middleware(mixed $middleware, mixed ...$args): static
+    {
+        if (is_string($middleware)) {
+            $middleware = create($middleware, ...$args);
+        }
+
+        $this->middlewares[] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * @return  array
+     */
+    public function getMiddlewares(): array
+    {
+        return $this->middlewares;
+    }
+
+    /**
+     * @param  array  $middlewares
+     *
+     * @return  static  Return self to support chaining.
+     *
+     * @codeCoverageIgnore
+     */
+    public function setMiddlewares(array $middlewares): static
+    {
+        $this->middlewares = $middlewares;
+
+        return $this;
+    }
+
+    /**
+     * @return  Closure
+     */
+    public function getMiddlewareResolver(): Closure
+    {
+        return $this->middlewareResolver ?? static fn($entry) => $entry;
+    }
+
+    /**
+     * @param  Closure|null  $middlewareResolver
+     *
+     * @return  static  Return self to support chaining.
+     */
+    public function setMiddlewareResolver(?Closure $middlewareResolver): static
+    {
+        $this->middlewareResolver = $middlewareResolver;
+
+        return $this;
+    }
+}

packages/http/src/Server/ReactServer.php

@@ -4,7 +4,6 @@
 
 namespace Windwalker\Http\Server;
 
-use Closure;
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
@@ -22,18 +21,13 @@
 use Windwalker\Http\Output\Output;
 use Windwalker\Http\Request\ServerRequest;
 
-use function Windwalker\DI\create;
-
 /**
  * The ReactServerAdapter class.
  */
 class ReactServer implements ServerInterface
 {
     use EventAwareTrait;
-
-    protected array $middlewares = [];
-
-    protected ?Closure $middlewareResolver = null;
+    use MiddlewareAwareTrait;
 
     protected ?HttpFactory $httpFactory = null;
 
@@ -206,41 +200,6 @@ function (Throwable $e) use ($output) {
         return $server;
     }
 
-    public function middleware(mixed $middleware, mixed ...$args): static
-    {
-        if (is_string($middleware)) {
-            $middleware = create($middleware, ...$args);
-        }
-
-        $this->middlewares[] = $middleware;
-
-        return $this;
-    }
-
-    public function getMiddlewares(): array
-    {
-        return $this->middlewares;
-    }
-
-    public function setMiddlewares(array $middlewares): static
-    {
-        $this->middlewares = $middlewares;
-
-        return $this;
-    }
-
-    public function getMiddlewareResolver(): Closure
-    {
-        return $this->middlewareResolver ?? static fn($entry) => $entry;
-    }
-
-    public function setMiddlewareResolver(?Closure $middlewareResolver): static
-    {
-        $this->middlewareResolver = $middlewareResolver;
-
-        return $this;
-    }
-
     public function getHttpFactory(): HttpFactory
     {
         return $this->httpFactory ??= new HttpFactory();

packages/http/test/Server/ReactServerTest.php

@@ -189,10 +189,10 @@ function (RequestEvent $event) use (&$names) {
     #[Test]
     public function handleRunsMiddlewaresBeforeRequestEvent(): void
     {
-        $this->instance->middleware(
-            function (ServerRequestInterface $request, RequestHandlerInterface $handler) {
-                return $handler->handle($request->withAttribute('middleware', 'ran'));
-            },
+        $this->instance->middleware('ran');
+        $this->instance->setMiddlewareResolver(
+            fn(string $name) => fn(ServerRequestInterface $request, RequestHandlerInterface $handler)
+                => $handler->handle($request->withAttribute('middleware', $name)),
         );
         $this->instance->on(
             'request',