1

This reverts commit fdf58326

Abstracts/BaseProcess.php

@@ -3,8 +3,8 @@
 namespace Server\Abstracts;
 
 
-use JetBrains\PhpStorm\Pure;
+use Kiri\Context;
-use Server\SInterface\OnProcessInterface;
+use Server\Contract\OnProcessInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 
@@ -17,7 +17,7 @@ abstract class BaseProcess implements OnProcessInterface
 	protected bool $isStop = false;
 
 
-	protected mixed $redirect_stdin_and_stdout = null;
+	protected bool $redirect_stdin_and_stdout = FALSE;
 
 
 	protected int $pipe_type = SOCK_DGRAM;
@@ -47,10 +47,10 @@ abstract class BaseProcess implements OnProcessInterface
 	}
 
 	/**
-	 * @return mixed
+	 * @return bool
-	 */
+     */
-	public function getRedirectStdinAndStdout(): mixed
+	public function getRedirectStdinAndStdout(): bool
-	{
+    {
 		return $this->redirect_stdin_and_stdout;
 	}
 
@@ -80,64 +80,32 @@ abstract class BaseProcess implements OnProcessInterface
 	}
 
 
-	/**
-	 * @return bool
-	 */
-	public function checkProcessIsStop(): bool
-	{
-		return $this->isStop === true;
-	}
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function signListen(Process $process): void
-	{
-	}
-
-
 	/**
 	 *
 	 */
-	protected function exit(): void
+	public function onSigterm(): static
 	{
-		putenv('process.status=idle');
+		if (!Context::inCoroutine()) {
-	}
+			Process::signal(SIGTERM, fn($data) => $this->onShutdown($data));
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public function isWorking(): bool
-	{
-		return env('process.status', 'working') == 'working';
-	}
-
-
-	/**
-	 *
-	 */
-	private function waiteExit(Process $process): void
-	{
-		$this->onProcessStop();
-		while ($this->isWorking()) {
-			$this->sleep();
-		}
-		$process->exit(0);
-	}
-
-
-	/**
-	 *
-	 */
-	private function sleep(): void
-	{
-		if ($this->enable_coroutine) {
-			Coroutine::sleep(0.1);
 		} else {
-			usleep(100);
+			Coroutine::create(function () {
+				$data = Coroutine::waitSignal(SIGTERM, -1);
+				if ($data) {
+					$this->onShutdown($data);
+				}
+			});
 		}
+		return $this;
 	}
 
+
+	/**
+	 * @param $data
+	 */
+	protected function onShutdown($data): void
+	{
+		$this->isStop = true;
+	}
+
+
 }

Abstracts/OnTaskerStart.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Server\Abstracts;
-
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use ReflectionException;
-use Server\ServerManager;
-
-
-/**
- *
- */
-class OnTaskerStart extends WorkerStart implements EventDispatcherInterface
-{
-
-
-    /**
-     */
-    public function dispatch(object $event)
-    {
-        ServerManager::setEnv('environmental', Kiri::TASK);
-    }
-
-
-}

Abstracts/OnWorkerStart.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Server\Abstracts;
-
-use Annotation\Annotation;
-use Annotation\Inject;
-use Exception;
-use Http\Handler\Router;
-use Kiri\Abstracts\Config;
-use Kiri\Di\NoteManager;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use ReflectionException;
-use Server\ServerManager;
-
-class OnWorkerStart extends WorkerStart implements EventDispatcherInterface
-{
-
-
-    /**
-     * @param object $event
-     * @return void
-     * @throws Exception
-     */
-    public function dispatch(object $event)
-    {
-        ServerManager::setEnv('environmental', Kiri::WORKER);
-    }
-
-}

Abstracts/Server.php

@@ -4,7 +4,7 @@
 namespace Server\Abstracts;
 
 
-use Annotation\Inject;
+use Kiri\Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;

Abstracts/WorkerStart.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace Server\Abstracts;
-
-use Annotation\Annotation;
-use Annotation\Inject;
-use Http\Handler\Router;
-use Kiri\Abstracts\Config;
-use Kiri\Di\NoteManager;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-
-class WorkerStart
-{
-
-
-    /**
-     * @var Annotation
-     */
-    #[Inject(Annotation::class)]
-    public Annotation $annotation;
-
-
-    /**
-     * @var Router
-     */
-    #[Inject(Router::class)]
-    public Router $router;
-
-
-    /**
-     * @param $prefix
-     * @throws ConfigException
-     */
-    protected function setProcessName($prefix)
-    {
-        if (Kiri::getPlatform()->isMac()) {
-            return;
-        }
-        $name = Config::get('id', 'system-service');
-        if (!empty($prefix)) {
-            $name .= '.' . $prefix;
-        }
-        swoole_set_process_name($name);
-    }
-
-}

Constant.php

@@ -19,6 +19,7 @@ class Constant
 	const WORKER_EXIT = 'WorkerExit';
 	const CONNECT = 'Connect';
 	const HANDSHAKE = 'handshake';
+	const OPEN = 'open';
 	const DISCONNECT = 'disconnect';
 	const MESSAGE = 'message';
 	const RECEIVE = 'Receive';

Contract/OnBeforeShutdown.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 interface OnBeforeShutdown
 {

Contract/OnCloseInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Server\Contract;
+
+use Swoole\Server;
+
+
+/**
+ *
+ */
+interface OnCloseInterface
+{
+
+
+	/**
+	 * @param int $fd
+	 */
+	public function onClose(int $fd): void;
+
+
+}

Contract/OnConnectInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 use Swoole\Server;
 

Contract/OnDisconnectInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Server\Contract;
+
+use Swoole\Server;
+
+interface OnDisconnectInterface
+{
+
+
+
+    /**
+     * @param int $fd
+     */
+    public function onDisconnect(int $fd): void;
+
+
+}

Contract/OnHandshakeInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 use Swoole\Http\Request;
 use Swoole\Http\Response;

Contract/OnMessageInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Server\Contract;
+
+use Kiri\Websocket\WebSocketInterface;
+use Swoole\WebSocket\Frame;
+
+interface OnMessageInterface
+{
+
+
+	/**
+	 * @param Frame $frame
+	 * @return void
+	 */
+	public function onMessage(Frame $frame): void;
+
+}

Contract/OnOpenInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Server\Contract;
+
+use Swoole\Http\Request;
+
+interface OnOpenInterface
+{
+
+
+	/**
+	 * @param Request $request
+	 */
+    public function onOpen(Request $request): void;
+
+}

Contract/OnPacketInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 use Server\Abstracts\Server;
 

Contract/OnPipeMessageInterface.php

@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 
 /**
  * Interface OnPipeMessageInterface
- * @package Server\SInterface
+ * @package Server\Contract
  */
 interface OnPipeMessageInterface
 {

Contract/OnProcessInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+
+namespace Server\Contract;
+
+
+use Swoole\Process;
+
+
+/**
+ * Interface BaseProcess
+ * @package Contract
+ */
+interface OnProcessInterface
+{
+
+
+	/**
+	 * @param Process $process
+	 */
+	public function process(Process $process): void;
+
+
+
+}

Contract/OnReceiveInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 use Swoole\Server;
 

Contract/OnTaskInterface.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server\SInterface;
+namespace Server\Contract;
 
 
 use Swoole\Server;

Events/OnServerBeforeStart.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Server\Events;
+
+class OnServerBeforeStart
+{
+
+}

Handler/OnPipeMessage.php

@@ -2,10 +2,10 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Kiri\Annotation\Inject;
 use Server\Abstracts\Server;
 use Exception;
-use Server\SInterface\OnPipeMessageInterface;
+use Server\Contract\OnPipeMessageInterface;
 use Kiri\Events\EventDispatch;
 
 /**

Handler/OnServer.php

@@ -2,9 +2,10 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
+use ReflectionException;
 use Server\Abstracts\Server;
 use Server\Events\OnBeforeShutdown;
 use Server\Events\OnShutdown;
@@ -28,6 +29,7 @@ class OnServer extends Server
 	/**
 	 * @param \Swoole\Server $server
 	 * @throws ConfigException
+	 * @throws ReflectionException
 	 */
 	public function onStart(\Swoole\Server $server)
 	{
@@ -39,6 +41,7 @@ class OnServer extends Server
 
 	/**
 	 * @param \Swoole\Server $server
+	 * @throws ReflectionException
 	 */
 	public function onBeforeShutdown(\Swoole\Server $server)
 	{
@@ -48,6 +51,7 @@ class OnServer extends Server
 
 	/**
 	 * @param \Swoole\Server $server
+	 * @throws ReflectionException
 	 */
 	public function onShutdown(\Swoole\Server $server)
 	{

Handler/OnServerManager.php

@@ -2,8 +2,9 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
+use ReflectionException;
 use Server\Abstracts\Server;
 use Kiri\Exception\ConfigException;
 use Server\Events\OnManagerStart;
@@ -26,8 +27,8 @@ class OnServerManager extends Server
 
 	/**
      * @param \Swoole\Server $server
-     * @throws ConfigException
+     * @throws ConfigException|ReflectionException
-     */
+	 */
 	public function onManagerStart(\Swoole\Server $server)
 	{
         $this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
@@ -38,6 +39,7 @@ class OnServerManager extends Server
 
 	/**
 	 * @param \Swoole\Server $server
+	 * @throws ReflectionException
 	 */
 	public function onManagerStop(\Swoole\Server $server)
 	{

Handler/OnServerReload.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Server\Events\OnAfterReload;
 use Server\Events\OnBeforeReload;
@@ -25,6 +25,7 @@ class OnServerReload
 
 	/**
 	 * @param Server $server
+	 * @throws \ReflectionException
 	 */
 	public function onBeforeReload(Server $server)
 	{
@@ -34,6 +35,7 @@ class OnServerReload
 
 	/**
 	 * @param Server $server
+	 * @throws \ReflectionException
 	 */
 	public function onAfterReload(Server $server)
 	{

Handler/OnServerWorker.php

@@ -2,12 +2,12 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
-use Kiri\Runtime;
+use Kiri\Kiri;
+use Kiri\Annotation\Inject;
 use Server\Events\OnAfterWorkerStart;
 use Server\Events\OnBeforeWorkerStart;
 use Server\Events\OnTaskerStart as OnTaskStart;
@@ -15,7 +15,6 @@ use Server\Events\OnWorkerError;
 use Server\Events\OnWorkerExit;
 use Server\Events\OnWorkerStart;
 use Server\Events\OnWorkerStop;
-use Server\ServerManager;
 use Swoole\Server;
 use Swoole\Timer;
 
@@ -46,28 +45,16 @@ class OnServerWorker extends \Server\Abstracts\Server
 		if ($workerId < $server->setting['worker_num']) {
 			$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
 			$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
+			set_env('environmental', Kiri::WORKER);
 		} else {
 			$this->eventDispatch->dispatch(new OnTaskStart($server, $workerId));
 			$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));
+			set_env('environmental', Kiri::TASK);
 		}
 		$this->eventDispatch->dispatch(new OnAfterWorkerStart());
 	}
 
 
-	/**
-	 * @param OnBeforeWorkerStart $worker
-	 * @throws Exception
-	 */
-	public function setConfigure(OnBeforeWorkerStart $worker)
-	{
-		ServerManager::setEnv('worker', $worker->workerId);
-		$serialize = file_get_contents(storage(Runtime::CONFIG_NAME));
-		if (!empty($serialize)) {
-			Config::sets(unserialize($serialize));
-		}
-	}
-
-
 	/**
 	 * @param Server $server
 	 * @param int $workerId
@@ -75,8 +62,8 @@ class OnServerWorker extends \Server\Abstracts\Server
 	 */
 	public function onWorkerStop(Server $server, int $workerId)
 	{
-        Timer::clearAll();
+		Timer::clearAll();
-        $this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
+		$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
 	}
 
 
@@ -87,10 +74,10 @@ class OnServerWorker extends \Server\Abstracts\Server
 	 */
 	public function onWorkerExit(Server $server, int $workerId)
 	{
-		ServerManager::setEnv('state', 'exit');
+		set_env('state', 'exit');
 
-        $this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
+		$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
-    }
+	}
 
 
 	/**
@@ -111,7 +98,7 @@ class OnServerWorker extends \Server\Abstracts\Server
 
 		$this->logger->error($message);
 
-//		$this->system_mail($message);
+		$this->system_mail($message);
 	}
 
 
@@ -122,7 +109,7 @@ class OnServerWorker extends \Server\Abstracts\Server
 	protected function system_mail($messageContent)
 	{
 		try {
-			$email = Config::get('email');
+			$email = Config::get('email', ['enable' => false]);
 			if (!empty($email) && ($email['enable'] ?? false) == true) {
 				Help::sendEmail($email, 'Service Error', $messageContent);
 			}

SInterface/OnCloseInterface.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Server;
-
-
-/**
- *
- */
-interface OnCloseInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 */
-	public function onClose(Server $server, int $fd): void;
-
-
-}

SInterface/OnDisconnectInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Server;
-
-interface OnDisconnectInterface
-{
-
-
-
-    /**
-     * @param Server $server
-     * @param int $fd
-     */
-    public function onDisconnect(Server $server, int $fd): void;
-
-
-}

SInterface/OnDownloadInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Http\Response;
-
-interface OnDownloadInterface
-{
-
-	public function dispatch(Response $response);
-
-}

SInterface/OnMessageInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Server;
-use Swoole\WebSocket\Frame;
-
-interface OnMessageInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param Frame $frame
-	 * @return void
-	 */
-	public function onMessage(Server $server, Frame $frame): void;
-
-}

SInterface/OnOpenInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Http\Request;
-use Swoole\WebSocket\Server;
-
-interface OnOpenInterface
-{
-
-
-    /**
-     * @param Server $server
-     * @param Request $request
-     */
-    public function onOpen(Server $server, Request $request): void;
-
-}

SInterface/OnProcessInterface.php

@@ -1,43 +0,0 @@
-<?php
-
-
-namespace Server\SInterface;
-
-
-use Swoole\Process;
-
-
-/**
- * Interface BaseProcess
- * @package SInterface
- */
-interface OnProcessInterface
-{
-
-
-	/**
-	 * @param Process $process
-	 * @return string
-	 */
-	public function getProcessName(Process $process): string;
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function signListen(Process $process): void;
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function onHandler(Process $process): void;
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void;
-
-
-}

Server.php

@@ -3,14 +3,15 @@
 
 namespace Server;
 
-use Annotation\Inject;
 use Exception;
 use Http\Handler\Abstracts\HttpService;
-use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
-use Kiri\Error\LoggerProcess;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
+use Kiri\Kiri;
+use Kiri\Annotation\Inject;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Server\Events\OnShutdown;
 
 
@@ -27,19 +28,14 @@ class Server extends HttpService
 	];
 
 
-	/**
-	 * @Inject ServerManager
-	 * @var null|ServerManager
-	 */
-	#[Inject(ServerManager::class)]
-	public ?ServerManager $manager = null;
-
 	private mixed $daemon = 0;
 
 
-	/** @var EventDispatch */
+	/**
-	#[Inject(EventDispatch::class)]
+	 * @var State
-	public EventDispatch $eventDispatch;
+	 */
+	#[Inject(State::class)]
+	public State $state;
 
 
 	/**
@@ -60,54 +56,58 @@ class Server extends HttpService
 
 
 	/**
-	 * @return string start server
+	 * @return string
-	 *
-	 * start server
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws \ReflectionException
 	 * @throws Exception
 	 */
 	public function start(): string
 	{
-		$this->manager->initBaseServer(Config::get('server', [], true), $this->daemon);
+		$this->manager()->initBaseServer(Config::get('server', [], true), $this->daemon);
 
 		$rpcService = Config::get('rpc', []);
 		if (!empty($rpcService)) {
-			$this->manager->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'],
+			$this->manager()->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'],
 				$rpcService['mode'], $rpcService);
 		}
 
 		$processes = array_merge($this->process, Config::get('processes', []));
 		foreach ($processes as $process) {
-			$this->manager->addProcess($process);
+			$this->manager()->addProcess($process);
 		}
 
-		return $this->manager->getServer()->start();
+		return $this->manager()->getServer()->start();
 	}
 
 
 	/**
 	 * @return void
-	 *
+	 * @throws ConfigException
-	 * start server
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws \ReflectionException
 	 * @throws Exception
 	 */
 	public function shutdown()
 	{
 		$configs = Config::get('server', [], true);
-		foreach ($this->manager->sortService($configs['ports'] ?? []) as $config) {
+		foreach ($this->manager()->sortService($configs['ports'] ?? []) as $config) {
-			$this->manager->stopServer($config['port']);
+			$this->state->exit($config['port']);
 		}
-		$this->eventDispatch->dispatch(new OnShutdown());
+		$this->container->get(EventDispatch::class)->dispatch(new OnShutdown());
 	}
 
 
 	/**
 	 * @return bool
 	 * @throws ConfigException
+	 * @throws Exception
 	 */
 	public function isRunner(): bool
 	{
-		return $this->manager->isRunner();
+		return $this->state->isRunner();
 	}
 
 
@@ -127,10 +127,20 @@ class Server extends HttpService
 
 	/**
 	 * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
+	 * @throws \ReflectionException
 	 */
-	#[Pure] public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
+	public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
 	{
-		return $this->manager->getServer();
+		return $this->manager()->getServer();
+	}
+
+
+	/**
+	 * @return ServerManager
+	 */
+	private function manager(): ServerManager
+	{
+		return Kiri::getDi()->get(ServerManager::class);
 	}
 
 }

ServerCommand.php

@@ -4,18 +4,14 @@ declare(strict_types=1);
 namespace Server;
 
 
-use Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
-use Kiri\Events\EventProvider;
+use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Server\Abstracts\OnTaskerStart as TaskerDispatch;
+use Kiri\Annotation\Inject;
-use Server\Abstracts\OnWorkerStart as WorkerDispatch;
+use Psr\Container\ContainerExceptionInterface;
-use Server\Events\OnBeforeWorkerStart;
+use Psr\Container\NotFoundExceptionInterface;
-use Server\Events\OnTaskerStart;
-use Server\Events\OnWorkerStart;
-use Server\Handler\OnServerWorker;
 use Swoole\Coroutine;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -35,10 +31,10 @@ class ServerCommand extends Command
 
 
 	/**
-	 * @var EventProvider
+	 * @var EventDispatch
 	 */
-	#[Inject(EventProvider::class)]
+	#[Inject(EventDispatch::class)]
-	public EventProvider $eventProvider;
+	public EventDispatch $eventProvider;
 
 
 	/**
@@ -57,32 +53,30 @@ class ServerCommand extends Command
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 * @return int
+	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws \ReflectionException
 	 * @throws Exception
 	 */
 	public function execute(InputInterface $input, OutputInterface $output): int
 	{
-		try {
+		$manager = Kiri::app()->getServer();
-			$manager = Kiri::app()->getServer();
+		$manager->setDaemon((int)!is_null($input->getOption('daemon')));
-			$manager->setDaemon((int)!is_null($input->getOption('daemon')));
+		if (is_null($input->getArgument('action'))) {
-			if (is_null($input->getArgument('action'))) {
+			throw new Exception('I don\'t know what I want to do.');
-				$input->setArgument('action', 'restart');
-			}
-			if (!in_array($input->getArgument('action'), self::ACTIONS)) {
-				throw new Exception('I don\'t know what I want to do.');
-			}
-			if ($manager->isRunner() && $input->getArgument('action') == 'start') {
-				throw new Exception('Service is running. Please use restart.');
-			}
-			$manager->shutdown();
-			if ($input->getArgument('action') == 'stop') {
-				throw new Exception('shutdown success');
-			}
-			$this->generate_runtime_builder($manager);
-		} catch (\Throwable $throwable) {
-			$output->write(jTraceEx($throwable));
-		} finally {
-			return 1;
 		}
+		if (!in_array($input->getArgument('action'), self::ACTIONS)) {
+			throw new Exception('I don\'t know what I want to do.');
+		}
+		if ($input->getArgument('action') == 'restart') {
+			$manager->shutdown();
+		}
+		if ($input->getArgument('action') != 'stop') {
+			return $this->generate_runtime_builder($manager);
+		}
+		$manager->shutdown();
+		return 0;
 	}
 
 
@@ -92,6 +86,7 @@ class ServerCommand extends Command
 	private function configure_set()
 	{
 		$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
+		Config::set('servers.settings.enable_coroutine', true);
 		if ($enable_coroutine != true) {
 			return;
 		}
@@ -107,19 +102,19 @@ class ServerCommand extends Command
 
 	/**
 	 * @param $manager
+	 * @return int
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	private function generate_runtime_builder($manager): void
+	private function generate_runtime_builder($manager): int
 	{
 		$this->configure_set();
 
 		Kiri::app()->getRouter()->read_files();
 
-		$this->eventProvider->on(OnBeforeWorkerStart::class, [di(OnServerWorker::class), 'setConfigure']);
-		$this->eventProvider->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']);
-		$this->eventProvider->on(OnTaskerStart::class, [di(TaskerDispatch::class), 'dispatch']);
 		$manager->start();
+
+		return 1;
 	}
 
 }

ServerManager.php

@@ -2,50 +2,66 @@
 
 namespace Server;
 
-use Annotation\Inject;
-use Closure;
 use Exception;
+use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Di\ContainerInterface;
+use Kiri\Error\Logger;
+use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Kiri\Annotation\Inject;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
 use Server\Abstracts\BaseProcess;
+use Server\Contract\OnCloseInterface;
+use Server\Contract\OnConnectInterface;
+use Server\Contract\OnDisconnectInterface;
+use Server\Contract\OnHandshakeInterface;
+use Server\Contract\OnMessageInterface;
+use Server\Contract\OnPacketInterface;
+use Server\Contract\OnProcessInterface;
+use Server\Contract\OnReceiveInterface;
+use Server\Events\OnServerBeforeStart;
 use Server\Handler\OnPipeMessage;
 use Server\Handler\OnServer;
 use Server\Handler\OnServerManager;
 use Server\Handler\OnServerReload;
-use Server\Handler\OnServerTask;
 use Server\Handler\OnServerWorker;
-use Server\SInterface\OnCloseInterface;
+use Server\Tasker\OnServerTask;
-use Server\SInterface\OnConnectInterface;
-use Server\SInterface\OnDisconnectInterface;
-use Server\SInterface\OnHandshakeInterface;
-use Server\SInterface\OnMessageInterface;
-use Server\SInterface\OnPacketInterface;
-use Server\SInterface\OnProcessInterface;
-use Server\SInterface\OnReceiveInterface;
-use Server\SInterface\OnTaskInterface;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
 use Swoole\Server;
 use Swoole\Server\Port;
 use Swoole\WebSocket\Server as WServer;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Helper\TableSeparator;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
 
 
 /**
  * Class OnServerManager
  * @package Http\Service
  */
-class ServerManager
+class ServerManager extends Component
 {
 
+
+	use TraitServer;
+
 	/** @var string */
 	public string $host = '';
 
 	public int $port = 0;
 
 
+	/**
+	 * @var Logger
+	 */
+	#[Inject(Logger::class)]
+	public Logger $logger;
+
 	/** @var array<string,Port> */
 	public array $ports = [];
 
@@ -55,11 +71,7 @@ class ServerManager
 	private Server|null $server = null;
 
 
-	/**
+	protected array $initProcesses = [];
-	 * @var ContainerInterface
-	 */
-	#[Inject(ContainerInterface::class)]
-	public ContainerInterface $container;
 
 
 	const DEFAULT_EVENT = [
@@ -90,9 +102,11 @@ class ServerManager
 
 	/**
 	 * @return Server|WServer|HServer|null
+	 * @throws ReflectionException
 	 */
 	public function getServer(): Server|WServer|HServer|null
 	{
+		di(EventDispatch::class)->dispatch(new OnServerBeforeStart());
 		return $this->server;
 	}
 
@@ -103,13 +117,12 @@ class ServerManager
 	 * @param int $port
 	 * @param int $mode
 	 * @param array $settings
-	 * @throws ReflectionException
 	 * @throws ConfigException
-	 * @throws Exception
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
-		if ($this->checkPortIsAlready($port)) $this->stopServer($port);
 		if (!$this->server) {
 			$this->createBaseServer($type, $host, $port, $mode, $settings);
 		} else {
@@ -122,8 +135,11 @@ class ServerManager
 
 
 	/**
-	 * @throws ReflectionException
+	 * @param $configs
+	 * @param int $daemon
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	public function initBaseServer($configs, int $daemon = 0): void
 	{
@@ -131,25 +147,7 @@ class ServerManager
 		foreach ($this->sortService($configs['ports']) as $config) {
 			$this->startListenerHandler($context, $config, $daemon);
 		}
-		$this->bindCallback($this->server, [Constant::PIPE_MESSAGE => [OnPipeMessage::class, 'onPipeMessage']]);
+		$this->bindCallback([Constant::PIPE_MESSAGE => [OnPipeMessage::class, 'onPipeMessage']]);
-//		$this->bindCallback($this->server, $this->getSystemEvents($configs));
-	}
-
-
-	/**
-	 * @return bool
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function isRunner(): bool
-	{
-		$configs = Config::get('server', [], true);
-		foreach ($this->sortService($configs['ports']) as $config) {
-			if ($this->checkPortIsAlready($config['port'])) {
-				return true;
-			}
-		}
-		return false;
 	}
 
 
@@ -162,21 +160,27 @@ class ServerManager
 		if (is_string($customProcess)) {
 			$customProcess = Kiri::getDi()->get($customProcess);
 		}
-		$process = new Process(function (Process $soloProcess) use ($customProcess) {
+		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-			$system = sprintf('[%s].process[%d]', Config::get('id', 'system-service'), $soloProcess->pid);
+		$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
+		$this->server->addProcess(new Process(function (Process $process) use ($customProcess, $system) {
 			if (Kiri::getPlatform()->isLinux()) {
-				$soloProcess->name($system . '.' . $customProcess->getName() . ' start.');
+				$process->name($system . '(' . $customProcess->getName() . ')');
 			}
-			echo "\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m " . $system . $customProcess->getName() . ' start.' . PHP_EOL;
+			$customProcess->onSigterm()->process($process);
-			$customProcess->signListen($soloProcess);
-			$customProcess->onHandler($soloProcess);
 		},
 			$customProcess->getRedirectStdinAndStdout(),
 			$customProcess->getPipeType(),
 			$customProcess->isEnableCoroutine()
-		);
+		));
-//		$this->container->setBindings($customProcess::class, $process);
+	}
-		$this->server->addProcess($process);
+
+
+	/**
+	 * @return array<string,Process>
+	 */
+	public function getProcesses(): array
+	{
+		return $this->initProcesses;
 	}
 
 
@@ -189,46 +193,13 @@ class ServerManager
 	}
 
 
-	/**
-	 * @param array $ports
-	 * @return array
-	 */
-	public function sortService(array $ports): array
-	{
-		$array = [];
-		foreach ($ports as $port) {
-			if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-				array_unshift($array, $port);
-			} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
-				if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-					$array[] = $port;
-				} else {
-					array_unshift($array, $port);
-				}
-			} else {
-				$array[] = $port;
-			}
-		}
-		return $array;
-	}
-
-
-	/**
-	 * @param string $key
-	 * @param string|int $value
-	 */
-	public static function setEnv(string $key, string|int $value): void
-	{
-		putenv(sprintf('%s=%s', $key, (string)$value));
-	}
-
-
 	/**
 	 * @param ServerManager $context
 	 * @param array $config
 	 * @param int $daemon
 	 * @throws ConfigException
-	 * @throws ReflectionException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws Exception
 	 */
 	private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
@@ -256,6 +227,7 @@ class ServerManager
 			$config['settings']['log_file'] = storage('system.log');
 		}
 		$config['settings']['pid_file'] = storage('.swoole.pid');
+		$config['settings'][Constant::OPTION_ENABLE_REUSE_PORT] = true;
 		$config['events'] = $config['events'] ?? [];
 		return $config;
 	}
@@ -267,13 +239,17 @@ class ServerManager
 	 * @param int $port
 	 * @param int $mode
 	 * @param array $settings
+	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws Exception
 	 */
 	private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
 		$id = Config::get('id', 'system-service');
 
-		echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m [%s]$type service %s::%d start.", $id, $host, $port) . PHP_EOL;
+		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
+
 		/** @var Server\Port $service */
 		$this->ports[$port] = $this->server->addlistener($host, $port, $mode);
 		if ($this->ports[$port] === false) {
@@ -293,30 +269,16 @@ class ServerManager
 	}
 
 
-	/**
-	 * @param int $port
-	 * @param string $event
-	 * @return Closure|array|null
-	 */
-	public function getPortCallback(int $port, string $event): Closure|array|null
-	{
-		/** @var Server\Port $_port */
-		$_port = $this->ports[$port] ?? null;
-		if (is_null($_port)) {
-			return null;
-		}
-		return $_port->getCallback($event);
-	}
-
-
 	/**
 	 * @param string $type
 	 * @param string $host
 	 * @param int $port
 	 * @param int $mode
 	 * @param array $settings
-	 * @throws ReflectionException
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws Exception
 	 */
 	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
@@ -329,61 +291,33 @@ class ServerManager
 		$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
 		$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
 
+		$data = new Table($this->container->get(OutputInterface::class));
+		$data->setHeaders(['key', 'value']);
+
+		$array = [];
+		foreach ($this->server->setting as $key => $value) {
+			$array[] = [$key, $value];
+			$array[] = new TableSeparator();
+		}
+
+		array_pop($array);
+
+		$data->setStyle('box-double');
+		$data->setRows($array);
+		$data->render();
+
 		$id = Config::get('id', 'system-service');
 
-		echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m [%s]$type service %s::%d start.", $id, $host, $port) . PHP_EOL;
+		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
 
 		$this->addDefaultListener($settings);
 	}
 
 
-	/**
-	 * @param int $port
-	 * @throws Exception
-	 */
-	public function stopServer(int $port)
-	{
-		if (!($pid = $this->checkPortIsAlready($port))) {
-			return;
-		}
-		while ($this->checkPortIsAlready($port)) {
-			Process::kill($pid, SIGTERM);
-			usleep(300);
-		}
-	}
-
-
-	/**
-	 * @param $port
-	 * @return bool|string
-	 * @throws Exception
-	 */
-	private function checkPortIsAlready($port): bool|string
-	{
-		if (!Kiri::getPlatform()->isLinux()) {
-			exec("lsof -i :" . $port . " | grep -i 'LISTEN' | awk '{print $2}'", $output);
-			if (empty($output)) return false;
-			$output = explode(PHP_EOL, $output[0]);
-			return $output[0];
-		}
-
-		$serverPid = file_get_contents(storage('.swoole.pid'));
-		if (!empty($serverPid) && shell_exec('ps -ef | grep ' . $serverPid . ' | grep -v grep')) {
-			Process::kill($serverPid, SIGTERM);
-		}
-
-		exec('netstat -lnp | grep ' . $port . ' | grep "LISTEN" | awk \'{print $7}\'', $output);
-		if (empty($output)) {
-			return false;
-		}
-		return explode('/', $output[0])[0];
-	}
-
-
 	/**
 	 * @param array $settings
-	 * @throws ReflectionException
+	 * @throws ContainerExceptionInterface
-	 * @throws Exception
+	 * @throws NotFoundExceptionInterface
 	 */
 	private function addDefaultListener(array $settings): void
 	{
@@ -401,6 +335,8 @@ class ServerManager
 	/**
 	 * @param array $events
 	 * @param Server|Port $server
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	private function addServiceEvents(array $events, Server|Port $server)
 	{
@@ -422,40 +358,6 @@ class ServerManager
 	}
 
 
-	/**
-	 * @param string $class
-	 * @return object
-	 */
-	private function getNewInstance(string $class): object
-	{
-		return $this->container->create($class);
-	}
-
-
-	/**
-	 * @param OnTaskInterface|string $handler
-	 * @param array $params
-	 * @param int|null $workerId
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	public function task(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
-	{
-		if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
-			$workerId = random_int($this->server->setting['worker_num'] + 1,
-				$this->server->setting['worker_num'] + 1 + $this->server->setting['task_worker_num']);
-		}
-		if (is_string($handler)) {
-			$implements = $this->container->getReflect($handler);
-			if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
-				throw new Exception('Task must instance ' . OnTaskInterface::class);
-			}
-			$handler = $implements->newInstanceArgs($params);
-		}
-		$this->server->task(serialize($handler), $workerId);
-	}
-
-
 	/**
 	 * @param mixed $message
 	 * @param int $workerId
@@ -469,28 +371,31 @@ class ServerManager
 
 	/**
 	 * @param array $events
-	 * @throws ReflectionException
+	 * @return void
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	private function addTaskListener(array $events = []): void
 	{
 		$task_use_object = $this->server->setting['task_object'] ?? $this->server->setting['task_use_object'] ?? false;
-		$reflect = $this->container->getReflect(OnServerTask::class)?->newInstance();
+		$reflect = $this->container->get(OnServerTask::class);
+		$this->server->on('finish', $events[Constant::FINISH] ?? [$reflect, 'onFinish']);
 		if ($task_use_object || $this->server->setting['task_enable_coroutine']) {
 			$this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onCoroutineTask']);
 		} else {
 			$this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onTask']);
 		}
-		$this->server->on('finish', $events[Constant::FINISH] ?? [$reflect, 'onFinish']);
 	}
 
 
 	/**
-	 * @param Port|Server $server
 	 * @param array|null $settings
+	 * @return void
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
-	public function bindCallback(Port|Server $server, ?array $settings = [])
+	public function bindCallback(?array $settings = [])
 	{
-		// TODO: Implement bindCallback() method.
 		if (count($settings) < 1) {
 			return;
 		}

State.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Server;
+
+use Exception;
+use Kiri\Abstracts\Component;
+use Kiri\Abstracts\Config;
+use Swoole\Process;
+
+class State extends Component
+{
+
+	use TraitServer;
+
+
+	public array $servers = [];
+
+
+	public function init()
+	{
+		$this->servers = Config::get('server.ports');
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function isRunner(): bool
+	{
+		$ports = $this->sortService($this->servers);
+		foreach ($ports as $config) {
+			if (checkPortIsAlready($config['port'])) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param $port
+	 * @throws Exception
+	 */
+	public function exit($port)
+	{
+		if (!($pid = checkPortIsAlready($port))) {
+			return;
+		}
+		while (checkPortIsAlready($port)) {
+			Process::kill($pid, SIGTERM);
+			usleep(300);
+		}
+	}
+
+}

Tasker/AsyncTaskExecute.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Server\Tasker;
+
+use Exception;
+use Kiri\Abstracts\Component;
+use Kiri\Core\HashMap;
+use Kiri\Kiri;
+use ReflectionException;
+use Server\Contract\OnTaskInterface;
+use Server\SwooleServerInterface;
+
+
+/**
+ *
+ */
+class AsyncTaskExecute extends Component
+{
+
+
+	/**
+	 * @var SwooleServerInterface|null
+	 */
+	public ?SwooleServerInterface $server = null;
+
+
+	private HashMap $hashMap;
+
+
+	/**
+	 *
+	 */
+	public function init()
+	{
+		$this->hashMap = new HashMap();
+	}
+
+
+	/**
+	 * @param string $key
+	 * @param $handler
+	 */
+	public function reg(string $key, $handler)
+	{
+		$this->hashMap->put($key, $handler);
+	}
+
+
+	/**
+	 * @param OnTaskInterface|string $handler
+	 * @param array $params
+	 * @param int|null $workerId
+	 * @throws Exception
+	 */
+	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
+	{
+		if (!$this->server) {
+			$this->server = Kiri::getDi()->get(SwooleServerInterface::class);
+		}
+		if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
+			$workerNum = $this->server->setting['worker_num'];
+			$taskerNum = $workerNum + $this->server->setting['task_worker_num'];
+			$workerId = random_int($workerNum, $taskerNum - 1);
+		}
+		if (is_string($handler)) {
+			$handler = $this->handle($handler, $params);
+		}
+		$this->server->task(serialize($handler), $workerId);
+	}
+
+
+	/**
+	 * @param $handler
+	 * @param $params
+	 * @return object
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	private function handle($handler, $params): object
+	{
+		if (!class_exists($handler) && $this->hashMap->has($handler)) {
+			$handler = $this->hashMap->get($handler);
+		}
+		$implements = $this->container->getReflect($handler);
+		if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
+			throw new Exception('Task must instance ' . OnTaskInterface::class);
+		}
+		return $implements->newInstanceArgs($params);
+	}
+
+
+}

Tasker/OnServerTask.php

@@ -1,15 +1,13 @@
 <?php
 
 
-namespace Server\Handler;
+namespace Server\Tasker;
 
 
-use Annotation\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Server\Contract\OnTaskInterface;
-use ReflectionException;
-use Server\SInterface\OnTaskInterface;
 use Swoole\Server;
 
 
@@ -68,19 +66,14 @@ class OnServerTask
 	/**
 	 * @param $data
 	 * @return null
-	 * @throws ReflectionException
 	 */
 	private function resolve($data)
 	{
-		[$class, $params] = json_encode($data, true);
+		$execute = unserialize($data);
-
+		if ($execute instanceof OnTaskInterface) {
-		$reflect = Kiri::getDi()->getReflect($class);
+			return $execute->execute();
-
-		if (!$reflect->isInstantiable()) {
-			return null;
 		}
-		$class = $reflect->newInstanceArgs($params);
+		return null;
-		return $class->execute();
 	}
 
 

TraitServer.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Server;
+
+trait TraitServer
+{
+
+
+	/**
+	 * @param array $ports
+	 * @return array
+	 */
+	public function sortService(array $ports): array
+	{
+		$array = [];
+		foreach ($ports as $port) {
+			if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
+				array_unshift($array, $port);
+			} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
+				if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
+					$array[] = $port;
+				} else {
+					array_unshift($array, $port);
+				}
+			} else {
+				$array[] = $port;
+			}
+		}
+		return $array;
+	}
+
+}

composer.json

@@ -15,7 +15,7 @@
         "psr/http-server-middleware": "^1.0",
         "psr/http-message": "^1.0",
         "psr/event-dispatcher": "^1.0",
-        "game-worker/kiri-http-message": "^v1.2"
+        "game-worker/kiri-http-message": "~v2.0"
     },
     "autoload": {
         "psr-4": {