改名

http-handler/Abstracts/Handler.php

@@ -2,7 +2,6 @@
 
 namespace Http\Handler\Abstracts;
 
-use Annotation\Inject;
 use Http\Handler\Handler as CHl;
 use Http\Message\ServerRequest;
 use Kiri\Core\Help;
@@ -24,9 +23,9 @@ abstract class Handler implements RequestHandlerInterface
 
 	/**
 	 * @param CHl $handler
-     * @param Iterator $middlewares
+	 * @param null|Iterator $middlewares
 	 */
-    public function __construct(public CHl $handler, public Iterator $middlewares)
+	public function __construct(public CHl $handler, public ?Iterator $middlewares)
 	{
 		$this->aspectProxy = Kiri::getDi()->get(AspectProxy::class);
 	}
@@ -39,8 +38,7 @@ abstract class Handler implements RequestHandlerInterface
 	 */
 	protected function execute(ServerRequestInterface $request): ResponseInterface
 	{
-		$middleware = $this->middlewares->current();
-        if (empty($middleware)) {
+		if (empty($this->middlewares) || !($middleware = $this->middlewares->current())) {
 			return $this->dispatcher($request);
 		}
 		if (!($middleware instanceof MiddlewareInterface)) {

http-server/Service/Http.php

@@ -16,7 +16,6 @@ use Http\Message\Stream;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Kiri\Pool\Helper\SplQueue;
 use Psr\Http\Message\ServerRequestInterface;
 use Server\Abstracts\Utility\EventDispatchHelper;
 use Server\Abstracts\Utility\ResponseHelper;
@@ -115,8 +114,7 @@ class Http implements OnCloseInterface, OnConnectInterface, OnRequestInterface
 	{
 		$middlewares = MiddlewareManager::get($handler->callback);
 
-
-		$dispatcher = new Dispatcher($handler, new Iterator($middlewares));
+		$dispatcher = new Dispatcher($handler, empty($middlewares) ? null : new Iterator($middlewares));
 
 		return $dispatcher->handle($PsrRequest);
 	}