add RouteHandlerBuilder to pipe the action filters with the endpoint handler

Author: Machometec

lib/Endpoint/EndpointRouteBuilder.php

@@ -11,13 +11,13 @@
 use DevNet\System\MethodTrait;
 use DevNet\System\Runtime\LauncherProperties;
 use DevNet\Web\Endpoint\Route;
+use DevNet\Web\Middleware\RequestDelegate;
 use DevNet\Web\Routing\IRouteBuilder;
-use DevNet\Web\Routing\IRouteHandler;
 use DevNet\Web\Routing\IRouter;
-use DevNet\Web\Routing\RouteHandler;
 use DirectoryIterator;
 use ReflectionClass;
 use Closure;
+use DevNet\Web\Middleware\IRequestHandler;
 
 class EndpointRouteBuilder
 {
@@ -45,41 +45,47 @@ public function mapGroup(string $prefix, callable $callback): void
     /**
      * Adds a route that matches HTTP requests for the specified path and HTTP method, or any HTTP method if it's not specified.
      */
-    public function mapRoute(string $path, callable $handler, ?string $method = null): IRouteHandler
+    public function mapRoute(string $path, callable $handler, ?string $method = null): RouteHandlerBuilder
     {
         $path = $this->prefix . '/' . trim($path, '/');
-        $routeHandler = new RouteHandler($handler);
-        return $this->builder->map($path, $routeHandler, $method);
+
+        if (!$handler instanceof IRequestHandler and !$handler instanceof RequestDelegate) {
+            $handler = new RequestDelegate($handler);
+        }
+
+        $builder = new RouteHandlerBuilder($handler);
+        $this->builder->map($path, $builder->build(), $method);
+        return $builder;
     }
 
     /**
      * Adds a route that matches HTTP GET requests for the specified path.
      */
-    public function mapGet(string $path, callable $handler): IRouteHandler
+    public function mapGet(string $path, callable $handler): RouteHandlerBuilder
     {
         return $this->mapRoute($path, $handler, 'GET');
     }
 
     /**
      * Adds a route that matches HTTP POST requests for the specified path.
      */
-    public function mapPost(string $path, callable $handler): IRouteHandler
+    public function mapPost(string $path, callable $handler): RouteHandlerBuilder
     {
         return $this->mapRoute($path, $handler, 'POST');
     }
 
     /**
      * Adds a route that matches HTTP PUT requests for the specified path.
      */
-    public function mapPut(string $path, callable $handler): IRouteHandler
+    public function mapPut(string $path, callable $handler): RouteHandlerBuilder
     {
         return $this->mapRoute($path, $handler, 'PUT');
     }
 
     /**
      * Adds a route that matches HTTP DELETE requests for the specified path.
      */
-    public function mapDelete(string $path, callable $handler): IRouteHandler
+    public function mapDelete(string $path, callable $handler): RouteHandlerBuilder
     {
         $path = $this->prefix . '/' . trim($path, '/');
         return $this->mapRoute($path, $handler, 'DELETE');
@@ -88,7 +94,7 @@ public function mapDelete(string $path, callable $handler): IRouteHandler
     /**
      * Adds a route that matches HTTP PATCH requests for the specified path.
      */
-    public function mapPatch(string $path, callable $handler): IRouteHandler
+    public function mapPatch(string $path, callable $handler): RouteHandlerBuilder
     {
         return $this->mapRoute($path, $handler, 'PATCH');
     }

lib/Endpoint/RouteHandlerBuilder.php

@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @author      Mohammed Moussaoui
+ * @license     MIT license. For more license information, see the LICENSE file in the root directory.
+ * @link        https://github.com/DevNet-Framework
+ */
+
+namespace DevNet\Web\Endpoint;
+
+use DevNet\System\Exceptions\ClassException;
+use DevNet\Web\Middleware\IRequestHandler;
+use DevNet\Web\Middleware\RequestDelegate;
+use DevNet\Web\Routing\IRouteHandler;
+use DevNet\Web\Routing\RouteHandler;
+use ReflectionClass;
+
+class RouteHandlerBuilder
+{
+    private ActionDelegate $action;
+    private array $filters = [];
+
+    public function __construct(IRequestHandler|RequestDelegate $target)
+    {
+        $this->action = new ActionDelegate(function ($context) use ($target) {
+            return $target($context->HttpContext);
+        });
+    }
+
+    public function addFilter(callable|string $filter, ...$args): static
+    {
+        if (is_string($filter)) {
+            if (!class_exists($filter)) {
+                throw new ClassException("Could not find the class {$filter}", 0, 1);
+            }
+
+            $reflection = new ReflectionClass($filter);
+            $filter = $reflection->newInstanceArgs($args);
+        }
+
+        if (is_object($filter instanceof IActionFilter)) {
+            $this->filters[] = $filter;
+            return $this;
+        }
+
+        $this->filters[] = new ActionFilterDelegate($filter);
+        return $this;
+    }
+
+    public function build(): IRouteHandler
+    {
+        $action = $this->action;
+        $handler = new RequestDelegate(function ($context) use ($action) {
+            foreach (array_reverse($this->filters) as $filter) {
+                $action = new ActionDelegate(function ($context) use ($filter, $action) {
+                    return $filter($context, $action);
+                });
+            }
+            $actionDescriptor = new ActionDescriptor($action, 'invoke');
+            $actionContext = new ActionContext($actionDescriptor, $context);
+            return $action($actionContext);
+        });
+
+        return new RouteHandler($handler);
+    }
+}

lib/Routing/RouteBuilder.php

@@ -8,7 +8,10 @@
 
 namespace DevNet\Web\Routing;
 
+use DevNet\System\Exceptions\TypeException;
 use DevNet\System\MethodTrait;
+use DevNet\Web\Middleware\IRequestHandler;
+use DevNet\Web\Middleware\RequestDelegate;
 
 class RouteBuilder implements IRouteBuilder
 {
@@ -30,6 +33,10 @@ public function map(string $pattern, IRouteHandler $handler, ?string $verb = nul
      */
     public function mapRoute(string $pattern, callable $handler, ?string $verb = null): IRouteHandler
     {
+        if (!$handler instanceof IRequestHandler and !$handler instanceof RequestDelegate) {
+            $handler = new RequestDelegate($handler);
+        }
+
         $routeHandler = new RouteHandler($handler);
         return $this->map($pattern, $routeHandler, $verb);
     }

lib/Routing/RouteHandler.php

@@ -10,19 +10,20 @@
 
 use DevNet\System\Async\Task;
 use DevNet\System\PropertyTrait;
+use DevNet\Web\Middleware\IRequestHandler;
 use DevNet\Web\Middleware\RequestDelegate;
 
 
 class RouteHandler implements IRouteHandler
 {
     use PropertyTrait;
 
-    private RequestDelegate $target;
+    private IRequestHandler|RequestDelegate $target;
     private array $filters = [];
 
-    public function __construct(callable $target)
+    public function __construct(IRequestHandler|RequestDelegate $target)
     {
-        $this->target = new RequestDelegate($target);
+        $this->target = $target;
     }
 
     public function get_Target()
@@ -38,7 +39,7 @@ public function set_Target($value)
     public function handle(RouteContext $routeContext): Task
     {
         $handler = $this->target;
-        $handler = function ($context) use ($handler) {
+        $handler = new RequestDelegate(function ($context) use ($handler) {
             $result = $handler($context);
             if ($result instanceof Task) {
                 return $result->then(function ($previous) use ($context) {
@@ -62,7 +63,7 @@ public function handle(RouteContext $routeContext): Task
             }
 
             return Task::completedTask();
-        };
+        });
 
         $routeContext->Handler = $handler;