as2252258/kiri-router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Compare commits

base: as2252258/kiri-router:v1.4
Branches Tags
as2252258/kiri-router:main
as2252258/kiri-router:v1.13 as2252258/kiri-router:v1.12 as2252258/kiri-router:v1.11 as2252258/kiri-router:v1.10 as2252258/kiri-router:v1.9 as2252258/kiri-router:v1.8 as2252258/kiri-router:v1.7 as2252258/kiri-router:v1.6 as2252258/kiri-router:v1.5 as2252258/kiri-router:v1.4 as2252258/kiri-router:v1.3 as2252258/kiri-router:v1.2 as2252258/kiri-router:v1.1 as2252258/kiri-router:v1.0
...
compare: as2252258/kiri-router:v1.5
Branches Tags
as2252258/kiri-router:main
as2252258/kiri-router:v1.13 as2252258/kiri-router:v1.12 as2252258/kiri-router:v1.11 as2252258/kiri-router:v1.10 as2252258/kiri-router:v1.9 as2252258/kiri-router:v1.8 as2252258/kiri-router:v1.7 as2252258/kiri-router:v1.6 as2252258/kiri-router:v1.5 as2252258/kiri-router:v1.4 as2252258/kiri-router:v1.3 as2252258/kiri-router:v1.2 as2252258/kiri-router:v1.1 as2252258/kiri-router:v1.0

6 Commits
v1.4 ... v1.5

Author SHA1 Message Date
as2252258 f38942f4f3 eee 2024-12-16 16:36:35 +08:00
as2252258 dc561cec9b eee 2024-12-16 16:29:35 +08:00
as2252258 daa02a6408 eee 2024-12-16 16:05:01 +08:00
as2252258 34ab8f145c eee 2024-12-16 15:55:29 +08:00
as2252258 ae20755bd7 eee 2024-12-16 15:47:00 +08:00
as2252258 011e95a3f2 eee 2024-12-16 15:44:56 +08:00
11 changed files with 961 additions and 900 deletions
Expand all files Collapse all files
src/Base/AbstractHandler.php
+31 -24
View File
@@ -12,33 +12,40 @@ abstract class AbstractHandler
{ {
public int $offset = 0; public int $offset = 0;
/** /**
* @param array $middlewares * @param array $middlewares
* @param Handler $handler * @param Handler $handler
* @throws *
*/ * @throws
public function __construct(public array $middlewares, public Handler $handler) */
{ 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/ContentType.php
+644 -643
View File
File diff suppressed because it is too large Load Diff
src/Format/ArrayFormat.php
+18 -8
View File
@@ -9,14 +9,24 @@ use Psr\Http\Message\ResponseInterface;
class ArrayFormat implements IFormat class ArrayFormat implements IFormat
{ {
/**
* @param $result /**
* @return ResponseInterface * @param ResponseInterface $response
*/ */
public function call($result): ResponseInterface public function __construct(public ResponseInterface $response)
{ {
return di(ResponseInterface::class)->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE))); }
}
/**
* @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
+13 -5
View File
@@ -9,7 +9,16 @@ use Psr\Http\Message\ResponseInterface;
class MixedFormat implements IFormat class MixedFormat implements IFormat
{ {
/**
/**
* @param ResponseInterface $response
*/
public function __construct(public ResponseInterface $response)
{
}
/**
* @param mixed $result * @param mixed $result
* @return ResponseInterface * @return ResponseInterface
*/ */
@@ -18,14 +27,13 @@ class MixedFormat implements IFormat
if ($result instanceof ResponseInterface) { if ($result instanceof ResponseInterface) {
return $result; return $result;
} }
$response = Kiri::getDi()->get(ResponseInterface::class);
if (is_object($result)) { if (is_object($result)) {
return $response->withBody(new Stream('[object]')); return $this->response->withBody(new Stream('[object]'));
} }
if (is_array($result)) { 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 { } else {
return $response->withBody(new Stream((string)$result)); return $this->response->withBody(new Stream((string)$result));
} }
} }
src/Format/NoBody.php
+32 -23
View File
@@ -9,27 +9,36 @@ use Psr\Http\Message\ResponseInterface;
class NoBody implements IFormat class NoBody implements IFormat
{ {
/**
* @param $result /**
* @return ResponseInterface * @param ResponseInterface $response
*/ */
public function call($result): ResponseInterface public function __construct(public ResponseInterface $response)
{ {
// TODO: Implement call() method. }
$response = Kiri::getDi()->get(ResponseInterface::class);
if (request()->getMethod() === 'HEAD') {
return $response->withBody(new Stream()); /**
} * @param $result
if ($result instanceof ResponseInterface) { *
return $result; * @return ResponseInterface
} */
if (is_object($result)) { public function call($result): ResponseInterface
return $response->withBody(new Stream('[object]')); {
} // TODO: Implement call() method.
if (is_array($result)) { if (request()->getMethod() === 'HEAD') {
return $response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE))); return $this->response->withBody(new Stream());
} else { }
return $response->withBody(new Stream((string)$result)); 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
+7 -2
View File
@@ -9,13 +9,18 @@ use Psr\Http\Message\ResponseInterface;
class OtherFormat implements IFormat class OtherFormat implements IFormat
{ {
/**
public function __construct(public ResponseInterface $response)
{
}
/**
* @param mixed $result * @param mixed $result
* @return ResponseInterface * @return ResponseInterface
*/ */
public function call(mixed $result): 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
+18 -9
View File
@@ -8,14 +8,23 @@ use Psr\Http\Message\ResponseInterface;
class VoidFormat implements IFormat class VoidFormat implements IFormat
{ {
/**
* @param $result /**
* @return ResponseInterface * @param ResponseInterface $response
*/ */
public function call($result): ResponseInterface public function __construct(public ResponseInterface $response)
{ {
// TODO: Implement call() method. }
return di(ResponseInterface::class);
} /**
* @param $result
*
* @return ResponseInterface
*/
public function call($result): ResponseInterface
{
// TODO: Implement call() method.
return $this->response;
}
} }
src/Handler.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Handler implements RequestHandlerInterface
*/ */
public function setRequestMethod(string $method): void public function setRequestMethod(string $method): void
{ {
if ($method == 'HEAD') { if ($method == 'HEAD' || $method == 'OPTIONS') {
$this->format = Kiri::getDi()->get(NoBody::class); $this->format = Kiri::getDi()->get(NoBody::class);
} }
} }
src/HttpRequestHandler.php
-1
View File
@@ -7,7 +7,6 @@ use Kiri\Router\Base\AbstractHandler;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface; use Psr\Http\Server\RequestHandlerInterface;
use ReflectionException;
class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterface class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterface
{ {
src/Router.php
+190 -178
View File
@@ -12,6 +12,7 @@ use Kiri\Router\Validator\ValidatorMiddleware;
use Kiri\Router\Base\Middleware as MiddlewareManager; use Kiri\Router\Base\Middleware as MiddlewareManager;
use Kiri\Router\Constrict\RequestMethod; use Kiri\Router\Constrict\RequestMethod;
use Psr\Container\ContainerInterface; 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 * @var string
*/ */
private static string $type = ROUTER_TYPE_HTTP; private static string $type = ROUTER_TYPE_HTTP;
/** /**
* @param string $name * @param string $name
* @param Closure $closure * @param Closure $closure
*/ */
public static function addServer(string $name, Closure $closure): void public static function addServer(string $name, Closure $closure): void
{ {
static::$type = $name; static::$type = $name;
$closure(); $closure();
static::$type = ROUTER_TYPE_HTTP; static::$type = ROUTER_TYPE_HTTP;
} }
/** /**
* @param Closure $handler * @param Closure $handler
*/ */
public static function jsonp(Closure $handler): void public static function jsonp(Closure $handler): void
{ {
static::$type = 'json-rpc'; static::$type = 'json-rpc';
$handler(); $handler();
static::$type = ROUTER_TYPE_HTTP; static::$type = ROUTER_TYPE_HTTP;
} }
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function post(string $route, string $handler): void */
{ 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); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute([RequestMethod::REQUEST_POST], $route, $handler);
}
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function get(string $route, string $handler): void */
{ 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); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute([RequestMethod::REQUEST_GET], $route, $handler);
}
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function options(string $route, string $handler): void */
{ 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); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute([RequestMethod::REQUEST_OPTIONS], $route, $handler);
}
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function any(string $route, string $handler): void */
{ public static function any(string $route, string $handler): void
$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type); {
$router->addRoute(self::METHODS, $route, $handler); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute(self::METHODS, $route, $handler);
}
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function delete(string $route, string $handler): void */
{ 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); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute([RequestMethod::REQUEST_DELETE], $route, $handler);
}
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function head(string $route, string $handler): void */
{ 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); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute([RequestMethod::REQUEST_HEAD], $route, $handler);
}
/** /**
* @param string $route * @param string $route
* @param string $handler * @param string $handler
* @throws *
*/ * @throws
public static function put(string $route, string $handler): void */
{ 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); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
} $router->addRoute([RequestMethod::REQUEST_PUT], $route, $handler);
}
/** /**
* @param array|RequestMethod $methods * @param array|RequestMethod $methods
* @param string $route * @param string $route
* @param string|array $handler * @param string|array $handler
*/ */
public static function addRoute(array|RequestMethod $methods, string $route, string|array $handler): void public static function addRoute(array|RequestMethod $methods, string $route, string|array $handler): void
{ {
$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type); $router = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
if ($methods instanceof RequestMethod) { if ($methods instanceof RequestMethod) {
$methods = [$methods]; $methods = [$methods];
} }
$router->addRoute($methods, $route, $handler); $router->addRoute($methods, $route, $handler);
} }
/** /**
* @param array $config * @param array $config
* @param Closure $closure * @param Closure $closure
* @throws *
*/ * @throws
public static function group(array $config, Closure $closure): void */
{ public static function group(array $config, Closure $closure): void
$router = Kiri::getDi()->get(DataGrip::class)->get(static::$type); {
$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 * @throws
*/ */
public function scan_build_route(): void public function scan_build_route(): void
{ {
$coordinator = CoordinatorManager::utility(Coordinator::WORKER_START); $coordinator = CoordinatorManager::utility(Coordinator::WORKER_START);
$this->read_dir_file(APP_PATH . 'routes'); $this->read_dir_file(APP_PATH . 'routes');
$container = Kiri::getDi(); $container = Kiri::getDi();
$scanner = $container->get(Kiri\Di\Scanner::class); $scanner = $container->get(Kiri\Di\Scanner::class);
$scanner->load_directory(APP_PATH . 'app/Controller'); $scanner->load_directory(APP_PATH . 'app/Controller');
$this->reset($container); $this->reset($container);
$coordinator->done(); $coordinator->done();
} }
/** /**
* @param ContainerInterface $container * @param ContainerInterface $container
* @return void *
* @throws * @return void
*/ * @throws
public function reset(ContainerInterface $container): void */
{ public function reset(ContainerInterface $container): void
$router = $container->get(DataGrip::class)->get(static::$type); {
foreach ($router->getMethods() as $name => $method) { $router = $container->get(DataGrip::class)->get(static::$type);
$middlewares = MiddlewareManager::get($method->getClass(), $method->getMethod()); foreach ($router->getMethods() as $name => $method) {
$validator = MiddlewareManager::getValidator($method->getClass(), $method->getMethod()); $middlewares = MiddlewareManager::get($method->getClass(), $method->getMethod());
if (!is_null($validator)) { $validator = MiddlewareManager::getValidator($method->getClass(), $method->getMethod());
array_unshift($middlewares, new ValidatorMiddleware($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)); }
} $router->setHttpHandler($name, new HttpRequestHandler($middlewares, $method));
} }
}
/** /**
* @param $path * @param $path
* @return void *
* @throws * @return void
*/ * @throws
private function read_dir_file($path): void */
{ private function read_dir_file($path): void
$files = glob($path . '/*'); {
for ($i = 0; $i < count($files); $i++) { $files = glob($path . '/*');
$file = $files[$i]; for ($i = 0; $i < count($files); $i++) {
if (is_dir($file)) { $file = $files[$i];
$this->read_dir_file($file); if (is_dir($file)) {
} else { $this->read_dir_file($file);
$this->resolve_file($file); } else {
} $this->resolve_file($file);
} }
} }
}
/** /**
* @param $files * @param $files
* @throws *
*/ * @throws
private function resolve_file($files): void */
{ private function resolve_file($files): void
try { {
include "$files"; try {
} catch (\Throwable $throwable) { include "$files";
error($throwable); } catch (\Throwable $throwable) {
} error($throwable);
} }
}
} }
src/Validator/ValidatorMiddleware.php
+7 -6
View File
@@ -17,11 +17,12 @@ class ValidatorMiddleware implements MiddlewareInterface
{ {
/** /**
* @param string $class * @param ResponseInterface $response
* @param string $method * @param string $class
*/ * @param string $method
public function __construct(public string $class, public 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)) { if (!$validator->run($request)) {
Kiri::getLogger()->println($request->getUri()->getPath() . ' `' . $validator->error() . '`'); Kiri::getLogger()->println($request->getUri()->getPath() . ' `' . $validator->error() . '`');
return di(ResponseInterface::class)->html($validator->error(), 415); return $this->response->html($validator->error(), 415);
} else { } else {
return $handler->handle($request); return $handler->handle($request);
} }