改名

http-handler/Abstracts/MiddlewareManager.php

@@ -26,19 +26,14 @@ class MiddlewareManager extends BaseObject
 	/**
 	 * @param $class
 	 * @param $method
-	 * @param array|string $middlewares
+	 * @param array|string|null $middlewares
 	 * @return bool
 	 */
-	public static function add($class, $method, array|string $middlewares): bool
+	public static function add($class, $method, array|string|null $middlewares): bool
 	{
-		if (is_object($class)) {
+		[$class, $method] = static::setDefault($class, $method);
-			$class = $class::class;
+		if (empty($middlewares)) {
-		}
+			return false;
-		if (!isset(static::$_middlewares[$class])) {
-			static::$_middlewares[$class] = [];
-		}
-		if (!isset(static::$_middlewares[$class][$method])) {
-			static::$_middlewares[$class][$method] = new Iterator();
 		}
 		if (is_string($middlewares)) {
 			$middlewares = [$middlewares];
@@ -54,6 +49,22 @@ class MiddlewareManager extends BaseObject
 	}
 
 
+	private static function setDefault($class, $method): array
+	{
+		if (is_object($class)) {
+			$class = $class::class;
+		}
+
+		if (!isset(static::$_middlewares[$class])) {
+			static::$_middlewares[$class] = [];
+		}
+		if (!isset(static::$_middlewares[$class][$method])) {
+			static::$_middlewares[$class][$method] = new Iterator();
+		}
+		return [$class, $method];
+	}
+
+
 	/**
 	 * @param $handler
 	 * @return Iterator|null

http-server/ServerCommand.php

@@ -6,17 +6,21 @@ namespace Server;
 
 use Annotation\Inject;
 use Exception;
+use Http\Handler\Abstracts\HandlerManager;
+use Http\Handler\Abstracts\MiddlewareManager;
+use Http\Handler\Handler;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventProvider;
+use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Server\Abstracts\OnTaskerStart as TaskerDispatch;
+use Server\Abstracts\OnWorkerStart as WorkerDispatch;
+use Server\Events\OnAfterWorkerStart;
 use Server\Events\OnBeforeWorkerStart;
 use Server\Events\OnTaskerStart;
 use Server\Events\OnWorkerStart;
 use Server\Worker\OnServerWorker;
-use Server\Abstracts\OnWorkerStart as WorkerDispatch;
-use Server\Abstracts\OnTaskerStart as TaskerDispatch;
 use Swoole\Coroutine;
-use Swoole\Runtime;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -83,7 +87,7 @@ class ServerCommand extends Command
 
 
 	/**
-     * @throws \Kiri\Exception\ConfigException
+	 * @throws ConfigException
 	 */
 	private function configure_set()
 	{
@@ -103,7 +107,7 @@ class ServerCommand extends Command
 
 	/**
 	 * @param $manager
-     * @throws \Kiri\Exception\ConfigException
+	 * @throws ConfigException
 	 */
 	private function generate_runtime_builder($manager): void
 	{
@@ -115,6 +119,16 @@ class ServerCommand extends Command
 		$this->eventProvider->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']);
 		$this->eventProvider->on(OnTaskerStart::class, [di(TaskerDispatch::class), 'dispatch']);
 
+		$this->eventProvider->on(OnAfterWorkerStart::class, function () {
+			$lists = HandlerManager::dump();
+			foreach ($lists as $list) {
+				if ($list instanceof \Closure) {
+					continue;
+				}
+				/** @var Handler|Closure $list */
+				MiddlewareManager::add($list->callback[0], $list->callback[1], null);
+			}
+		});
 		$manager->start();
 	}