1

This reverts commit fdf58326

Abstracts/Server.php

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

Contract/OnCloseInterface.php

@@ -13,10 +13,9 @@ interface OnCloseInterface
 
 
 	/**
-	 * @param Server $server
 	 * @param int $fd
 	 */
-	public function onClose(Server $server, int $fd): void;
+	public function onClose(int $fd): void;
 
 
 }

Contract/OnDisconnectInterface.php

@@ -10,10 +10,9 @@ interface OnDisconnectInterface
 
 
     /**
-     * @param Server $server
      * @param int $fd
      */
-    public function onDisconnect(Server $server, int $fd): void;
+    public function onDisconnect(int $fd): void;
 
 
 }

Contract/OnMessageInterface.php

@@ -2,7 +2,7 @@
 
 namespace Server\Contract;
 
-use Swoole\Server;
+use Kiri\Websocket\WebSocketInterface;
 use Swoole\WebSocket\Frame;
 
 interface OnMessageInterface
@@ -10,10 +10,9 @@ interface OnMessageInterface
 
 
 	/**
-	 * @param Server $server
 	 * @param Frame $frame
 	 * @return void
 	 */
-	public function onMessage(Server $server, Frame $frame): void;
+	public function onMessage(Frame $frame): void;
 
 }

Contract/OnOpenInterface.php

@@ -3,16 +3,14 @@
 namespace Server\Contract;
 
 use Swoole\Http\Request;
-use Swoole\WebSocket\Server;
 
 interface OnOpenInterface
 {
 
 
-    /**
-     * @param Server $server
-     * @param Request $request
-     */
-    public function onOpen(Server $server, Request $request): void;
+	/**
+	 * @param Request $request
+	 */
+    public function onOpen(Request $request): void;
 
 }

Handler/OnPipeMessage.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Server\Abstracts\Server;
 use Exception;
 use Server\Contract\OnPipeMessageInterface;

Handler/OnServer.php

@@ -2,9 +2,10 @@
 
 namespace Server\Handler;
 
-use Note\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 Note\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 Note\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 Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
+use Kiri\Annotation\Inject;
 use Server\Events\OnAfterWorkerStart;
 use Server\Events\OnBeforeWorkerStart;
 use Server\Events\OnTaskerStart as OnTaskStart;
@@ -62,8 +62,8 @@ class OnServerWorker extends \Server\Abstracts\Server
 	 */
 	public function onWorkerStop(Server $server, int $workerId)
 	{
-        Timer::clearAll();
-        $this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
+		Timer::clearAll();
+		$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
 	}
 
 
@@ -76,8 +76,8 @@ class OnServerWorker extends \Server\Abstracts\Server
 	{
 		set_env('state', 'exit');
 
-        $this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
-    }
+		$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
+	}
 
 
 	/**
@@ -98,7 +98,7 @@ class OnServerWorker extends \Server\Abstracts\Server
 
 		$this->logger->error($message);
 
-//		$this->system_mail($message);
+		$this->system_mail($message);
 	}
 
 
@@ -109,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);
 			}

Server.php

@@ -9,7 +9,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Server\Events\OnShutdown;
@@ -137,7 +137,6 @@ class Server extends HttpService
 
 	/**
 	 * @return ServerManager
-	 * @throws \ReflectionException
 	 */
 	private function manager(): ServerManager
 	{

ServerCommand.php

@@ -4,13 +4,14 @@ declare(strict_types=1);
 namespace Server;
 
 
-use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Server\Events\OnServerBeforeStart;
+use Kiri\Annotation\Inject;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Coroutine;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -52,6 +53,10 @@ 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
@@ -59,19 +64,19 @@ class ServerCommand extends Command
 		$manager = Kiri::app()->getServer();
 		$manager->setDaemon((int)!is_null($input->getOption('daemon')));
 		if (is_null($input->getArgument('action'))) {
-			$input->setArgument('action', 'restart');
+			throw new Exception('I don\'t know what I want to do.');
 		}
 		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.');
+		if ($input->getArgument('action') == 'restart') {
+			$manager->shutdown();
+		}
+		if ($input->getArgument('action') != 'stop') {
+			return $this->generate_runtime_builder($manager);
 		}
 		$manager->shutdown();
-		if ($input->getArgument('action') == 'stop') {
-			return 0;
-		}
-		return $this->generate_runtime_builder($manager);
+		return 0;
 	}
 
 
@@ -81,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;
 		}

ServerManager.php

@@ -5,12 +5,11 @@ namespace Server;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Di\NoteManager;
 use Kiri\Error\Logger;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
@@ -35,6 +34,10 @@ 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;
 
 
 /**
@@ -117,7 +120,6 @@ class ServerManager extends Component
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
@@ -138,7 +140,6 @@ class ServerManager extends Component
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	public function initBaseServer($configs, int $daemon = 0): void
 	{
@@ -160,15 +161,17 @@ class ServerManager extends Component
 			$customProcess = Kiri::getDi()->get($customProcess);
 		}
 		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-		$process = new Process(function (Process $process) use ($customProcess, $system) {
+		$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
+		$this->server->addProcess(new Process(function (Process $process) use ($customProcess, $system) {
 			if (Kiri::getPlatform()->isLinux()) {
 				$process->name($system . '(' . $customProcess->getName() . ')');
 			}
 			$customProcess->onSigterm()->process($process);
-		}, $customProcess->getRedirectStdinAndStdout(), $customProcess->getPipeType(), $customProcess->isEnableCoroutine());
-		$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
-		$this->initProcesses[$customProcess->getName()] = $process;
-		$this->server->addProcess($process);
+		},
+			$customProcess->getRedirectStdinAndStdout(),
+			$customProcess->getPipeType(),
+			$customProcess->isEnableCoroutine()
+		));
 	}
 
 
@@ -197,7 +200,6 @@ class ServerManager extends Component
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 * @throws Exception
 	 */
 	private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
@@ -276,7 +278,6 @@ class ServerManager extends Component
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 * @throws Exception
 	 */
 	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
@@ -290,6 +291,21 @@ class ServerManager extends Component
 		$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');
 
 		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
@@ -302,7 +318,6 @@ class ServerManager extends Component
 	 * @param array $settings
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	private function addDefaultListener(array $settings): void
 	{
@@ -322,7 +337,6 @@ class ServerManager extends Component
 	 * @param Server|Port $server
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	private function addServiceEvents(array $events, Server|Port $server)
 	{
@@ -360,7 +374,6 @@ class ServerManager extends Component
 	 * @return void
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	private function addTaskListener(array $events = []): void
 	{
@@ -380,7 +393,6 @@ class ServerManager extends Component
 	 * @return void
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	public function bindCallback(?array $settings = [])
 	{

Tasker/OnServerTask.php

@@ -4,10 +4,9 @@
 namespace Server\Tasker;
 
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
-use ReflectionException;
 use Server\Contract\OnTaskInterface;
 use Swoole\Server;
 

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": {