Revert "改名"

This reverts commit fdf58326

Abstracts/BaseProcess.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
 use Kiri\Context;
-use Server\Contract\OnProcessInterface;
+use Kiri\Server\Contract\OnProcessInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 

Abstracts/Server.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;

Constant.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server;
+namespace Kiri\Server;
 
 
 /**

Contract/OnBeforeShutdown.php

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

Contract/OnCloseInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Server;
 
@@ -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/OnConnectInterface.php

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

Contract/OnDisconnectInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Swoole\Server;
 
@@ -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/OnHandshakeInterface.php

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

Contract/OnMessageInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\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

@@ -1,18 +1,16 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\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;
 
 }

Contract/OnPacketInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
 
 interface OnPacketInterface
 {

Contract/OnPipeMessageInterface.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 
 /**

Contract/OnProcessInterface.php

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

Contract/OnReceiveInterface.php

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

Contract/OnTaskInterface.php

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

Events/OnAfterReload.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnAfterWorkerStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 class OnAfterWorkerStart
 {

Events/OnBeforeReload.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnBeforeShutdown.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnBeforeWorkerStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 class OnBeforeWorkerStart
 {

Events/OnManagerStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnManagerStop.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnServerBeforeStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 class OnServerBeforeStart
 {

Events/OnShutdown.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnTaskerStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnWorkerError.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnWorkerExit.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnWorkerStart.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Events/OnWorkerStop.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
 

Handler/OnPipeMessage.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Note\Inject;
-use Server\Abstracts\Server;
+use Kiri\Annotation\Inject;
+use Kiri\Server\Abstracts\Server;
 use Exception;
-use Server\Contract\OnPipeMessageInterface;
+use Kiri\Server\Contract\OnPipeMessageInterface;
 use Kiri\Events\EventDispatch;
 
 /**

Handler/OnServer.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\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;
-use Server\Events\OnStart;
+use Kiri\Server\Abstracts\Server;
+use Kiri\Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnShutdown;
+use Kiri\Server\Events\OnStart;
 
 
 /**

Handler/OnServerManager.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use ReflectionException;
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
 use Kiri\Exception\ConfigException;
-use Server\Events\OnManagerStart;
-use Server\Events\OnManagerStop;
+use Kiri\Server\Events\OnManagerStart;
+use Kiri\Server\Events\OnManagerStop;
 
 
 /**

Handler/OnServerReload.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
-use Server\Events\OnAfterReload;
-use Server\Events\OnBeforeReload;
+use Kiri\Server\Events\OnAfterReload;
+use Kiri\Server\Events\OnBeforeReload;
 use Swoole\Server;
 
 

Handler/OnServerWorker.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
-use Note\Inject;
-use Server\Events\OnAfterWorkerStart;
-use Server\Events\OnBeforeWorkerStart;
-use Server\Events\OnTaskerStart as OnTaskStart;
-use Server\Events\OnWorkerError;
-use Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStart;
-use Server\Events\OnWorkerStop;
+use Kiri\Annotation\Inject;
+use Kiri\Server\Events\OnAfterWorkerStart;
+use Kiri\Server\Events\OnBeforeWorkerStart;
+use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
+use Kiri\Server\Events\OnWorkerError;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnWorkerStop;
 use Swoole\Server;
 use Swoole\Timer;
 

Server.php

@@ -1,18 +1,20 @@
 <?php
 
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
-use Http\Handler\Abstracts\HttpService;
+use Kiri\Message\Handler\Abstracts\HttpService;
+use Kiri\Message\Handler\Router;
 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;
+use Kiri\Server\Events\OnShutdown;
+use Swoole\Coroutine;
 
 
 defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
@@ -81,8 +83,46 @@ class Server extends HttpService
 		return $this->manager()->getServer()->start();
 	}
 
+    /**
+     * @throws ConfigException
+     */
+    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;
+        }
+        Coroutine::set([
+            'hook_flags'            => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
+            'enable_deadlock_check' => FALSE,
+            'exit_condition'        => function () {
+                return Coroutine::stats()['coroutine_num'] === 0;
+            }
+        ]);
+    }
 
-	/**
+
+    /**
+     * @return void
+     * @throws ConfigException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     * @throws \ReflectionException
+     * @throws \Exception
+     */
+    public function runtime_start(): void
+    {
+        $this->configure_set();
+
+        $this->container->get(Router::class)->read_files();
+
+        $this->start();
+    }
+
+
+
+    /**
 	 * @return void
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
@@ -137,7 +177,6 @@ class Server extends HttpService
 
 	/**
 	 * @return ServerManager
-	 * @throws \ReflectionException
 	 */
 	private function manager(): ServerManager
 	{

ServerCommand.php

@@ -1,18 +1,17 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
-use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 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\OnServerBeforeStart;
 use Swoole\Coroutine;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -64,20 +63,22 @@ 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');
-		}
-		if (!in_array($input->getArgument('action'), self::ACTIONS)) {
+
+        $action = $input->getArgument('action');
+        if (is_null($action)) {
 			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 (!in_array($action, self::ACTIONS)) {
+			throw new Exception('I don\'t know what I want to do.');
 		}
-		$manager->shutdown();
-		if ($input->getArgument('action') == 'stop') {
-			return 0;
+		if ($action == 'restart' || $action == 'stop') {
+			$manager->shutdown();
+            if ($action == 'stop') {
+                return 1;
+            }
 		}
-		return $this->generate_runtime_builder($manager);
+        $manager->runtime_start();
+        return 0;
 	}
 
 
@@ -87,6 +88,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

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
 use Kiri\Abstracts\Component;
@@ -9,31 +9,35 @@ 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;
-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\OnServerWorker;
-use Server\Tasker\OnServerTask;
+use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnConnectInterface;
+use Kiri\Server\Contract\OnDisconnectInterface;
+use Kiri\Server\Contract\OnHandshakeInterface;
+use Kiri\Server\Contract\OnMessageInterface;
+use Kiri\Server\Contract\OnPacketInterface;
+use Kiri\Server\Contract\OnProcessInterface;
+use Kiri\Server\Contract\OnReceiveInterface;
+use Kiri\Server\Events\OnServerBeforeStart;
+use Kiri\Server\Handler\OnPipeMessage;
+use Kiri\Server\Handler\OnServer;
+use Kiri\Server\Handler\OnServerManager;
+use Kiri\Server\Handler\OnServerReload;
+use Kiri\Server\Handler\OnServerWorker;
+use Kiri\Server\Tasker\OnServerTask;
 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;
 
 
 /**
@@ -136,7 +140,6 @@ class ServerManager extends Component
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	public function initBaseServer($configs, int $daemon = 0): void
 	{
@@ -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)
@@ -289,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));

ServerProviders.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
 use Exception;

State.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
 use Kiri\Abstracts\Component;

SwooleServerInterface.php

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

Tasker/AsyncTaskExecute.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Server\Tasker;
+namespace Kiri\Server\Tasker;
 
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\HashMap;
 use Kiri\Kiri;
 use ReflectionException;
-use Server\Contract\OnTaskInterface;
-use Server\SwooleServerInterface;
+use Kiri\Server\Contract\OnTaskInterface;
+use Kiri\Server\SwooleServerInterface;
 
 
 /**

Tasker/OnServerTask.php

@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Server\Tasker;
+namespace Kiri\Server\Tasker;
 
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
-use Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
 use Swoole\Server;
 
 

TraitServer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 trait TraitServer
 {

composer.json

@@ -15,11 +15,11 @@
         "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": {
-            "Server\\": "./"
+            "Kiri\\Server\\": "./"
         }
     }
 }