改名

http-helper/Route/MiddlewareManager.php

@@ -5,7 +5,6 @@ namespace Http\Route;
 
 
 use Closure;
-use Http\IInterface\MiddlewareInterface;
 use Kiri\Abstracts\BaseObject;
 
 
@@ -23,8 +22,9 @@ class MiddlewareManager extends BaseObject
 	 * @param $class
 	 * @param $method
 	 * @param array|string $middlewares
+	 * @return bool
 	 */
-    public static function addMiddlewares($class, $method, array|string $middlewares)
+	public static function add($class, $method, array|string $middlewares): bool
 	{
 		if (is_object($class)) {
 			$class = $class::class;
@@ -32,11 +32,9 @@ class MiddlewareManager extends BaseObject
 		if (!isset(static::$_middlewares[$class . '::' . $method])) {
 			static::$_middlewares[$class . '::' . $method] = [];
 		}
-
 		if (is_string($middlewares) && !in_array($middlewares, static::$_middlewares[$class . '::' . $method])) {
 			static::$_middlewares[$class . '::' . $method][] = $middlewares;
-            return;
+		} else {
-        }
 			foreach ($middlewares as $middleware) {
 				if (in_array($middleware, static::$_middlewares[$class . '::' . $method])) {
 					continue;
@@ -44,13 +42,15 @@ class MiddlewareManager extends BaseObject
 				static::$_middlewares[$class . '::' . $method][] = $middleware;
 			}
 		}
+		return true;
+	}
 
 
 	/**
 	 * @param $handler
-     * @return mixed|null
+	 * @return mixed
 	 */
-    public static function get($handler)
+	public static function get($handler): mixed
 	{
 		if ($handler instanceof Closure) {
 			return null;
@@ -76,52 +76,4 @@ class MiddlewareManager extends BaseObject
 		return isset(static::$_middlewares[$class . '::' . $method]);
 	}
 
-
-    /**
-     * @param $class
-     * @param $method
-     * @param $caller
-     * @return mixed
-     */
-    public static function callerMiddlewares($class, $method, $caller): mixed
-    {
-        if (is_object($class)) {
-            $class = $class::class;
-        }
-        $middlewares = static::$_middlewares[$class . '::' . $method] ?? [];
-        if (empty($middlewares)) {
-            return $caller;
-        }
-        return array_reduce(array_reverse($middlewares), function ($stack, $pipe) {
-            return function ($passable) use ($stack, $pipe) {
-                if ($pipe instanceof MiddlewareInterface) {
-                    $pipe = [$pipe, 'onHandler'];
-                }
-                return call_user_func($pipe, $passable, $stack);
-            };
-        }, $caller);
-    }
-
-
-    /**
-     * @param $middlewares
-     * @param Closure $caller
-     * @return Closure
-     */
-    public static function closureMiddlewares($middlewares, Closure $caller): Closure
-    {
-        if (empty($middlewares)) {
-            return $caller;
-        }
-        return array_reduce(array_reverse($middlewares), function ($stack, $pipe) {
-            return function ($passable) use ($stack, $pipe) {
-                if ($pipe instanceof MiddlewareInterface) {
-                    $pipe = [$pipe, 'onHandler'];
-                }
-                return call_user_func($pipe, $passable, $stack);
-            };
-        }, $caller);
-    }
-
-
 }

http-server/Service/Http.php

@@ -52,6 +52,8 @@ class Http extends \Server\Abstracts\Http implements OnClose, OnConnect
 		} catch (Error | \Throwable $exception) {
 			$psr7Response = $this->exceptionHandler->emit($exception, $this->response);
 		} finally {
+			$request_time_float = $request->server['request_time_float'] - $request->server['request_time'];
+			$psr7Response->withHeader('Run-Time', microtime(true) - $request_time_float);
 			$this->responseEmitter->sender($response, $psr7Response);
 			$this->eventDispatch->dispatch(new OnAfterRequest());
 		}

note/Route/Middleware.php

@@ -46,7 +46,7 @@ use Http\IInterface\MiddlewareInterface;
 	 */
     public function execute(mixed $class, mixed $method = null): mixed
     {
-        MiddlewareManager::addMiddlewares($class, $method, $this->middleware);
+        MiddlewareManager::add($class, $method, $this->middleware);
         return parent::execute($class, $method);
     }