eee

src/Base/AbstractHandler.php

@@ -12,33 +12,40 @@ abstract class AbstractHandler
 {
 
 
-    public int $offset = 0;
+	public int $offset = 0;
 
 
-    /**
-     * @param array $middlewares
-     * @param Handler $handler
-     * @throws
-     */
-    public function __construct(public array $middlewares, public Handler $handler)
-    {
-    }
+	/**
+	 * @param array   $middlewares
+	 * @param Handler $handler
+	 *
+	 * @throws
+	 */
+	public function __construct(public array $middlewares, public Handler $handler)
+	{
+	}
 
-    /**
-     * @param ServerRequestInterface $request
-     * @return ResponseInterface
-     * @throws
-     */
-    public function execute(ServerRequestInterface $request): ResponseInterface
-    {
-        if (!isset($this->middlewares[$this->offset])) {
-            return $this->handler->handle($request);
-        }
-        
-        $middleware   = $this->middlewares[$this->offset];
-        $this->offset += 1;
 
-        return ($middleware instanceof MiddlewareInterface ? $middleware : di($middleware))->process($request, $this);
-    }
+	/**
+	 * @param ServerRequestInterface $request
+	 *
+	 * @return ResponseInterface
+	 * @throws
+	 */
+	public function execute(ServerRequestInterface $request): ResponseInterface
+	{
+		if (!isset($this->middlewares[$this->offset])) {
+			return $this->handler->handle($request);
+		}
+
+		$middleware   = $this->middlewares[$this->offset];
+		$this->offset += 1;
+
+		if (!($middleware instanceof MiddlewareInterface)) {
+			$middleware = \Kiri::getDi()->get($middleware);
+		}
+
+		return $middleware->process($request, $this);
+	}
 
 }

src/Format/ArrayFormat.php

@@ -9,14 +9,24 @@ use Psr\Http\Message\ResponseInterface;
 class ArrayFormat implements IFormat
 {
 
-    /**
-     * @param $result
-     * @return ResponseInterface
-     */
-    public function call($result): ResponseInterface
-    {
-        return di(ResponseInterface::class)->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
-    }
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function __construct(public ResponseInterface $response)
+	{
+	}
+
+
+	/**
+	 * @param $result
+	 *
+	 * @return ResponseInterface
+	 */
+	public function call($result): ResponseInterface
+	{
+		return $this->response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
+	}
 
 
 }

src/Format/MixedFormat.php

@@ -9,7 +9,16 @@ use Psr\Http\Message\ResponseInterface;
 class MixedFormat implements IFormat
 {
 
-    /**
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function __construct(public ResponseInterface $response)
+	{
+	}
+
+
+	/**
      * @param mixed $result
      * @return ResponseInterface
      */
@@ -18,14 +27,13 @@ class MixedFormat implements IFormat
         if ($result instanceof ResponseInterface) {
             return $result;
         }
-        $response = Kiri::getDi()->get(ResponseInterface::class);
         if (is_object($result)) {
-            return $response->withBody(new Stream('[object]'));
+            return $this->response->withBody(new Stream('[object]'));
         }
         if (is_array($result)) {
-            return $response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
+            return $this->response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
         } else {
-            return $response->withBody(new Stream((string)$result));
+            return $this->response->withBody(new Stream((string)$result));
         }
     }
 

src/Format/NoBody.php

@@ -9,27 +9,36 @@ use Psr\Http\Message\ResponseInterface;
 class NoBody implements IFormat
 {
 
-    /**
-     * @param $result
-     * @return ResponseInterface
-     */
-    public function call($result): ResponseInterface
-    {
-        // TODO: Implement call() method.
-        $response = Kiri::getDi()->get(ResponseInterface::class);
-        if (request()->getMethod() === 'HEAD') {
-            return $response->withBody(new Stream());
-        }
-        if ($result instanceof ResponseInterface) {
-            return $result;
-        }
-        if (is_object($result)) {
-            return $response->withBody(new Stream('[object]'));
-        }
-        if (is_array($result)) {
-            return $response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
-        } else {
-            return $response->withBody(new Stream((string)$result));
-        }
-    }
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function __construct(public ResponseInterface $response)
+	{
+	}
+
+
+	/**
+	 * @param $result
+	 *
+	 * @return ResponseInterface
+	 */
+	public function call($result): ResponseInterface
+	{
+		// TODO: Implement call() method.
+		if (request()->getMethod() === 'HEAD') {
+			return $this->response->withBody(new Stream());
+		}
+		if ($result instanceof ResponseInterface) {
+			return $result;
+		}
+		if (is_object($result)) {
+			return $this->response->withBody(new Stream('[object]'));
+		}
+		if (is_array($result)) {
+			return $this->response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
+		} else {
+			return $this->response->withBody(new Stream((string)$result));
+		}
+	}
 }

src/Format/OtherFormat.php

@@ -9,13 +9,18 @@ use Psr\Http\Message\ResponseInterface;
 class OtherFormat implements IFormat
 {
 
-    /**
+
+	public function __construct(public ResponseInterface $response)
+	{
+	}
+
+	/**
      * @param mixed $result
      * @return ResponseInterface
      */
     public function call(mixed $result): ResponseInterface
     {
-        return di(ResponseInterface::class)->withBody(new Stream($result));
+        return $this->response->withBody(new Stream($result));
     }
 
 

src/Format/VoidFormat.php

@@ -8,14 +8,23 @@ use Psr\Http\Message\ResponseInterface;
 class VoidFormat implements IFormat
 {
 
-    /**
-     * @param $result
-     * @return ResponseInterface
-     */
-    public function call($result): ResponseInterface
-    {
-        // TODO: Implement call() method.
-        return di(ResponseInterface::class);
-    }
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function __construct(public ResponseInterface $response)
+	{
+	}
+
+	/**
+	 * @param $result
+	 *
+	 * @return ResponseInterface
+	 */
+	public function call($result): ResponseInterface
+	{
+		// TODO: Implement call() method.
+		return $this->response;
+	}
 
 }

src/Handler.php

@@ -49,7 +49,7 @@ class Handler implements RequestHandlerInterface
      */
     public function setRequestMethod(string $method): void
     {
-        if ($method == 'HEAD') {
+        if ($method == 'HEAD' || $method == 'OPTIONS') {
             $this->format = Kiri::getDi()->get(NoBody::class);
         }
     }

src/HttpRequestHandler.php

@@ -7,7 +7,6 @@ use Kiri\Router\Base\AbstractHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use ReflectionException;
 
 class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterface
 {

src/Router.php

@@ -12,6 +12,7 @@ use Kiri\Router\Validator\ValidatorMiddleware;
 use Kiri\Router\Base\Middleware as MiddlewareManager;
 use Kiri\Router\Constrict\RequestMethod;
 use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  *
@@ -26,219 +27,230 @@ class Router
 {
 
 
-    const array METHODS = [RequestMethod::REQUEST_POST, RequestMethod::REQUEST_GET, RequestMethod::REQUEST_OPTIONS, RequestMethod::REQUEST_DELETE, RequestMethod::REQUEST_PUT, RequestMethod::REQUEST_HEAD];
+	const array METHODS = [RequestMethod::REQUEST_POST, RequestMethod::REQUEST_GET, RequestMethod::REQUEST_OPTIONS, RequestMethod::REQUEST_DELETE, RequestMethod::REQUEST_PUT, RequestMethod::REQUEST_HEAD];
 
 
-    /**
-     * @var string
-     */
-    private static string $type = ROUTER_TYPE_HTTP;
+	/**
+	 * @var string
+	 */
+	private static string $type = ROUTER_TYPE_HTTP;
 
 
-    /**
-     * @param string $name
-     * @param Closure $closure
-     */
-    public static function addServer(string $name, Closure $closure): void
-    {
-        static::$type = $name;
-        $closure();
-        static::$type = ROUTER_TYPE_HTTP;
-    }
+	/**
+	 * @param string  $name
+	 * @param Closure $closure
+	 */
+	public static function addServer(string $name, Closure $closure): void
+	{
+		static::$type = $name;
+		$closure();
+		static::$type = ROUTER_TYPE_HTTP;
+	}
 
 
-    /**
-     * @param Closure $handler
-     */
-    public static function jsonp(Closure $handler): void
-    {
-        static::$type = 'json-rpc';
-        $handler();
-        static::$type = ROUTER_TYPE_HTTP;
-    }
+	/**
+	 * @param Closure $handler
+	 */
+	public static function jsonp(Closure $handler): void
+	{
+		static::$type = 'json-rpc';
+		$handler();
+		static::$type = ROUTER_TYPE_HTTP;
+	}
 
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function post(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute([RequestMethod::REQUEST_POST], $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function post(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute([RequestMethod::REQUEST_POST], $route, $handler);
+	}
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function get(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute([RequestMethod::REQUEST_GET], $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function get(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute([RequestMethod::REQUEST_GET], $route, $handler);
+	}
 
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function options(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute([RequestMethod::REQUEST_OPTIONS], $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function options(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute([RequestMethod::REQUEST_OPTIONS], $route, $handler);
+	}
 
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function any(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute(self::METHODS, $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function any(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute(self::METHODS, $route, $handler);
+	}
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function delete(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute([RequestMethod::REQUEST_DELETE], $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function delete(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute([RequestMethod::REQUEST_DELETE], $route, $handler);
+	}
 
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function head(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute([RequestMethod::REQUEST_HEAD], $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function head(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute([RequestMethod::REQUEST_HEAD], $route, $handler);
+	}
 
 
-    /**
-     * @param string $route
-     * @param string $handler
-     * @throws
-     */
-    public static function put(string $route, string $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        $router->addRoute([RequestMethod::REQUEST_PUT], $route, $handler);
-    }
+	/**
+	 * @param string $route
+	 * @param string $handler
+	 *
+	 * @throws
+	 */
+	public static function put(string $route, string $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		$router->addRoute([RequestMethod::REQUEST_PUT], $route, $handler);
+	}
 
 
-    /**
-     * @param array|RequestMethod $methods
-     * @param string $route
-     * @param string|array $handler
-     */
-    public static function addRoute(array|RequestMethod $methods, string $route, string|array $handler): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
-        if ($methods instanceof RequestMethod) {
-            $methods = [$methods];
-        }
-        $router->addRoute($methods, $route, $handler);
-    }
+	/**
+	 * @param array|RequestMethod $methods
+	 * @param string              $route
+	 * @param string|array        $handler
+	 */
+	public static function addRoute(array|RequestMethod $methods, string $route, string|array $handler): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+		if ($methods instanceof RequestMethod) {
+			$methods = [$methods];
+		}
+		$router->addRoute($methods, $route, $handler);
+	}
 
 
-    /**
-     * @param array $config
-     * @param Closure $closure
-     * @throws
-     */
-    public static function group(array $config, Closure $closure): void
-    {
-        $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
+	/**
+	 * @param array   $config
+	 * @param Closure $closure
+	 *
+	 * @throws
+	 */
+	public static function group(array $config, Closure $closure): void
+	{
+		$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
 
-        $router->groupTack[] = $config;
+		$router->groupTack[] = $config;
 
-        call_user_func($closure);
+		call_user_func($closure);
 
-        array_pop($router->groupTack);
-    }
+		array_pop($router->groupTack);
+	}
 
 
-    /**
-     * @throws
-     */
-    public function scan_build_route(): void
-    {
-        $coordinator = CoordinatorManager::utility(Coordinator::WORKER_START);
+	/**
+	 * @throws
+	 */
+	public function scan_build_route(): void
+	{
+		$coordinator = CoordinatorManager::utility(Coordinator::WORKER_START);
 
-        $this->read_dir_file(APP_PATH . 'routes');
+		$this->read_dir_file(APP_PATH . 'routes');
 
-        $container = Kiri::getDi();
-        $scanner   = $container->get(Kiri\Di\Scanner::class);
-        $scanner->load_directory(APP_PATH . 'app/Controller');
-        $this->reset($container);
+		$container = Kiri::getDi();
+		$scanner   = $container->get(Kiri\Di\Scanner::class);
+		$scanner->load_directory(APP_PATH . 'app/Controller');
+		$this->reset($container);
 
-        $coordinator->done();
-    }
+		$coordinator->done();
+	}
 
 
-    /**
-     * @param ContainerInterface $container
-     * @return void
-     * @throws
-     */
-    public function reset(ContainerInterface $container): void
-    {
-        $router = $container->get(DataGrip::class)->get(static::$type);
-        foreach ($router->getMethods() as $name => $method) {
-            $middlewares = MiddlewareManager::get($method->getClass(), $method->getMethod());
-            $validator   = MiddlewareManager::getValidator($method->getClass(), $method->getMethod());
-            if (!is_null($validator)) {
-                array_unshift($middlewares, new ValidatorMiddleware($method->getClass(), $method->getMethod()));
-            }
-            $router->setHttpHandler($name, new HttpRequestHandler($middlewares, $method));
-        }
-    }
+	/**
+	 * @param ContainerInterface $container
+	 *
+	 * @return void
+	 * @throws
+	 */
+	public function reset(ContainerInterface $container): void
+	{
+		$router = $container->get(DataGrip::class)->get(static::$type);
+		foreach ($router->getMethods() as $name => $method) {
+			$middlewares = MiddlewareManager::get($method->getClass(), $method->getMethod());
+			$validator   = MiddlewareManager::getValidator($method->getClass(), $method->getMethod());
+			if (!is_null($validator)) {
+				array_unshift($middlewares, new ValidatorMiddleware(di(ResponseInterface::class), $method->getClass(), $method->getMethod()));
+			}
+			$router->setHttpHandler($name, new HttpRequestHandler($middlewares, $method));
+		}
+	}
 
 
-    /**
-     * @param $path
-     * @return void
-     * @throws
-     */
-    private function read_dir_file($path): void
-    {
-        $files = glob($path . '/*');
-        for ($i = 0; $i < count($files); $i++) {
-            $file = $files[$i];
-            if (is_dir($file)) {
-                $this->read_dir_file($file);
-            } else {
-                $this->resolve_file($file);
-            }
-        }
-    }
+	/**
+	 * @param $path
+	 *
+	 * @return void
+	 * @throws
+	 */
+	private function read_dir_file($path): void
+	{
+		$files = glob($path . '/*');
+		for ($i = 0; $i < count($files); $i++) {
+			$file = $files[$i];
+			if (is_dir($file)) {
+				$this->read_dir_file($file);
+			} else {
+				$this->resolve_file($file);
+			}
+		}
+	}
 
 
-    /**
-     * @param $files
-     * @throws
-     */
-    private function resolve_file($files): void
-    {
-        try {
-            include "$files";
-        } catch (\Throwable $throwable) {
-            error($throwable);
-        }
-    }
+	/**
+	 * @param $files
+	 *
+	 * @throws
+	 */
+	private function resolve_file($files): void
+	{
+		try {
+			include "$files";
+		} catch (\Throwable $throwable) {
+			error($throwable);
+		}
+	}
 
 }

src/Validator/ValidatorMiddleware.php

@@ -17,11 +17,12 @@ class ValidatorMiddleware implements MiddlewareInterface
 {
 
 
-    /**
-     * @param string $class
-     * @param string $method
-     */
-    public function __construct(public string $class, public string $method)
+	/**
+	 * @param ResponseInterface $response
+	 * @param string            $class
+	 * @param string            $method
+	 */
+    public function __construct(public ResponseInterface $response ,public string $class, public string $method)
     {
     }
 
@@ -38,7 +39,7 @@ class ValidatorMiddleware implements MiddlewareInterface
         if (!$validator->run($request)) {
             Kiri::getLogger()->println($request->getUri()->getPath() . ' `' . $validator->error() . '`');
 
-            return di(ResponseInterface::class)->html($validator->error(), 415);
+            return $this->response->html($validator->error(), 415);
         } else {
             return $handler->handle($request);
         }