Revert "改名"

This reverts commit fdf58326

Abstracts/BaseProcess.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
 use Kiri\Context;
-use Server\Contract\OnProcessInterface;
+use Kiri\Server\Broadcast\OnBroadcastInterface;
+use Kiri\Server\Contract\OnProcessInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 
@@ -48,9 +49,9 @@ abstract class BaseProcess implements OnProcessInterface
 
 	/**
 	 * @return bool
-     */
+	 */
 	public function getRedirectStdinAndStdout(): bool
-    {
+	{
 		return $this->redirect_stdin_and_stdout;
 	}
 
@@ -105,6 +106,10 @@ abstract class BaseProcess implements OnProcessInterface
 	protected function onShutdown($data): void
 	{
 		$this->isStop = true;
+		$value = Context::getContext('waite:process:message');
+		if (Coroutine::exists($value)) {
+			Coroutine::cancel($value);
+		}
 	}
 
 

Abstracts/Server.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
 use Kiri\Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Psr\Log\LoggerInterface;
 
 

Broadcast/Broadcast.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Kiri\Server\Broadcast;
+
+use Kiri;
+use Kiri\Server\ProcessManager;
+use Kiri\Server\SwooleServerInterface;
+
+class Broadcast
+{
+
+
+	/**
+	 * @param $message
+	 * @return void
+	 */
+	public function broadcast($message)
+	{
+		$di = Kiri::getDi();
+		$di->get(ProcessManager::class)->push($message);
+
+		$server = $di->get(SwooleServerInterface::class);
+
+		$total = $server->setting['worker_num'] + $server->setting['task_worker_num'];
+		for ($i = 0; $i < $total; $i++) {
+			if ($i == env('environmental_workerId')) {
+				continue;
+			}
+			$server->sendMessage(serialize(new Message($message)), $i);
+		}
+	}
+
+
+}

Broadcast/Message.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Kiri\Server\Broadcast;
+
+
+use Kiri;
+use Kiri\Server\Contract\OnPipeMessageInterface;
+use Psr\Log\LoggerInterface;
+
+
+/**
+ *
+ */
+class Message implements OnPipeMessageInterface, OnBroadcastInterface
+{
+
+	/**
+	 * @param mixed $data
+	 */
+	public function __construct(public mixed $data)
+	{
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function process(): void
+	{
+		$logger = Kiri::getDi()->get(LoggerInterface::class);
+		$logger->debug(env('environmental') . '::' . env('environmental_workerId', 0) . '::' . $this->data);
+	}
+
+}

Broadcast/OnBroadcastInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Server\Broadcast;
+
+interface OnBroadcastInterface
+{
+
+
+	/**
+	 * @return void
+	 */
+	public function process(): void;
+
+}

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;
 

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;
 

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,6 +1,6 @@
 <?php
 
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
 
 use Kiri\Websocket\WebSocketInterface;
 use Swoole\WebSocket\Frame;

Contract/OnOpenInterface.php

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

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,12 +1,12 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Kiri\Annotation\Inject;
-use Server\Abstracts\Server;
 use Exception;
-use Server\Contract\OnPipeMessageInterface;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
+use Kiri\Server\Abstracts\Server;
+use Kiri\Server\Contract\OnPipeMessageInterface;
 
 /**
  *
@@ -15,7 +15,7 @@ class OnPipeMessage extends Server
 {
 
 
-	/** @var EventDispatch  */
+	/** @var EventDispatch */
 	#[Inject(EventDispatch::class)]
 	public EventDispatch $eventDispatch;
 
@@ -28,6 +28,9 @@ class OnPipeMessage extends Server
 	 */
 	public function onPipeMessage(\Swoole\Server $server, int $src_worker_id, mixed $message)
 	{
+		if (is_string($message)) {
+			$message = unserialize($message);
+		}
 		if (!is_object($message) || !($message instanceof OnPipeMessageInterface)) {
 			return;
 		}

Handler/OnServer.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use ReflectionException;
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
-use Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnBeforeShutdown;
-use Server\Events\OnShutdown;
+use Kiri\Server\Events\OnShutdown;
-use Server\Events\OnStart;
+use Kiri\Server\Events\OnStart;
 
 
 /**

Handler/OnServerManager.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 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 Kiri\Server\Events\OnManagerStart;
-use Server\Events\OnManagerStop;
+use Kiri\Server\Events\OnManagerStop;
 
 
 /**

Handler/OnServerReload.php

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

Handler/OnServerWorker.php

@@ -1,20 +1,21 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
-use Kiri\Kiri;
+use Kiri\Message\Handler\Router;
-use Kiri\Annotation\Inject;
+use Kiri\Server\Events\OnAfterWorkerStart;
-use Server\Events\OnAfterWorkerStart;
+use Kiri\Server\Events\OnBeforeWorkerStart;
-use Server\Events\OnBeforeWorkerStart;
+use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
-use Server\Events\OnTaskerStart as OnTaskStart;
+use Kiri\Server\Events\OnWorkerError;
-use Server\Events\OnWorkerError;
+use Kiri\Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStart;
-use Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnWorkerStop;
-use Server\Events\OnWorkerStop;
 use Swoole\Server;
 use Swoole\Timer;
 
@@ -23,7 +24,7 @@ use Swoole\Timer;
  * Class OnServerWorker
  * @package Server\Worker
  */
-class OnServerWorker extends \Server\Abstracts\Server
+class OnServerWorker extends \Kiri\Server\Abstracts\Server
 {
 
 
@@ -34,6 +35,18 @@ class OnServerWorker extends \Server\Abstracts\Server
 	public EventDispatch $eventDispatch;
 
 
+	public Router $collector;
+
+
+	/**
+	 * @return void
+	 */
+	public function init()
+	{
+		$this->collector = Kiri::getDi()->get(Router::class);
+	}
+
+
 	/**
 	 * @param Server $server
 	 * @param int $workerId
@@ -42,9 +55,11 @@ class OnServerWorker extends \Server\Abstracts\Server
 	public function onWorkerStart(Server $server, int $workerId)
 	{
 		$this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId));
+		set_env('environmental_workerId', $workerId);
 		if ($workerId < $server->setting['worker_num']) {
-			$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
 			$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
+			$this->collector->scan_build_route();
+			$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
 			set_env('environmental', Kiri::WORKER);
 		} else {
 			$this->eventDispatch->dispatch(new OnTaskStart($server, $workerId));
@@ -74,8 +89,6 @@ class OnServerWorker extends \Server\Abstracts\Server
 	 */
 	public function onWorkerExit(Server $server, int $workerId)
 	{
-		set_env('state', 'exit');
-
 		$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
 	}
 

ProcessManager.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Kiri\Server;
+
+use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
+use Kiri\Context;
+use Kiri\Exception\ConfigException;
+use Kiri;
+use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Broadcast\Message;
+use Kiri\Server\Contract\OnProcessInterface;
+use Psr\Log\LoggerInterface;
+use Swoole\Coroutine;
+use Swoole\Process;
+
+class ProcessManager
+{
+
+
+	/** @var array<string, Process> */
+	private array $_process = [];
+
+
+	#[Inject(LoggerInterface::class)]
+	public LoggerInterface $logger;
+
+	/**
+	 * @param string|OnProcessInterface|BaseProcess $customProcess
+	 * @return void
+	 * @throws ConfigException
+	 */
+	public function add(string|OnProcessInterface|BaseProcess $customProcess)
+	{
+		$server = Kiri::getDi()->get(SwooleServerInterface::class);
+		if (is_string($customProcess)) {
+			$customProcess = Kiri::getDi()->get($customProcess);
+		}
+
+		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
+
+		$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
+
+		$server->addProcess($process = $this->parse($customProcess, $system));
+		$this->_process[$customProcess->getName()] = $process;
+	}
+
+
+	/**
+	 * @param $customProcess
+	 * @param $system
+	 * @return Process
+	 */
+	private function parse($customProcess, $system): Process
+	{
+		return new Process(function (Process $process) use ($customProcess, $system) {
+			if (Kiri::getPlatform()->isLinux()) {
+				$process->name($system . '(' . $customProcess->getName() . ')');
+			}
+			set_env('environmental', Kiri::PROCESS);
+			$channel = Coroutine::create(function () use ($process, $customProcess) {
+				while (!$customProcess->isStop()) {
+					$message = $process->read();
+					if (!empty($message)) {
+						$message = unserialize($message);
+					}
+					if (is_null($message)) {
+						continue;
+					}
+					$customProcess->onBroadcast($message);
+				}
+			});
+			Context::setContext('waite:process:message', $channel);
+
+			$customProcess->onSigterm()->process($process);
+		},
+			$customProcess->getRedirectStdinAndStdout(),
+			$customProcess->getPipeType(),
+			$customProcess->isEnableCoroutine()
+		);
+	}
+
+
+	/**
+	 * @param array $processes
+	 * @return void
+	 * @throws ConfigException
+	 */
+	public function batch(array $processes)
+	{
+		foreach ($processes as $process) {
+			$this->add($process);
+		}
+	}
+
+
+	/**
+	 * @param string $message
+	 * @param string $name
+	 * @return void
+	 */
+	public function push(string $message, string $name = '')
+	{
+		$processes = $this->_process;
+		if (!empty($this->_process[$name])) {
+			$processes = [$this->_process[$name]];
+		}
+		foreach ($processes as $process) {
+			$process->write(serialize(new Message($message)));
+		}
+	}
+
+
+}

Server.php

@@ -1,18 +1,22 @@
 <?php
 
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
-use Http\Handler\Abstracts\HttpService;
+use JetBrains\PhpStorm\Pure;
+use Kiri;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri\Message\Handler\Abstracts\HttpService;
-use Kiri\Annotation\Inject;
+use Kiri\Message\Handler\Router;
+use Kiri\Server\Events\OnShutdown;
 use Psr\Container\ContainerExceptionInterface;
+use Kiri\Server\Events\OnServerBeforeStart;
 use Psr\Container\NotFoundExceptionInterface;
-use Server\Events\OnShutdown;
+use Swoole\Coroutine;
 
 
 defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
@@ -38,11 +42,27 @@ class Server extends HttpService
 	public State $state;
 
 
+	public ServerManager $manager;
+
+
 	/**
 	 *
 	 */
 	public function init()
 	{
+		$this->manager = Kiri::getContainer()->get(ServerManager::class);
+		$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;
+			}
+		]);
 	}
 
 
@@ -63,22 +83,23 @@ class Server extends HttpService
 	 * @throws \ReflectionException
 	 * @throws Exception
 	 */
-	public function start(): string
+	public function start(): mixed
 	{
-		$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);
-		}
 
-		return $this->manager()->getServer()->start();
+		$this->container->get(ProcessManager::class)->batch($processes);
+
+		$this->eventDispatch->dispatch(new OnServerBeforeStart());
+
+		return $this->manager->getServer()->start();
 	}
 
 
@@ -93,7 +114,7 @@ class Server extends HttpService
 	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->state->exit($config['port']);
 		}
 		$this->container->get(EventDispatch::class)->dispatch(new OnShutdown());
@@ -127,20 +148,10 @@ class Server extends HttpService
 
 	/**
 	 * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
-	 * @throws \ReflectionException
 	 */
-	public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
+	#[Pure] 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

@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -63,58 +63,21 @@ class ServerCommand extends Command
 	{
 		$manager = Kiri::app()->getServer();
 		$manager->setDaemon((int)!is_null($input->getOption('daemon')));
-		if (is_null($input->getArgument('action'))) {
+
+        $action = $input->getArgument('action');
+        if (is_null($action)) {
 			throw new Exception('I don\'t know what I want to do.');
 		}
-		if (!in_array($input->getArgument('action'), self::ACTIONS)) {
+		if (!in_array($action, self::ACTIONS)) {
 			throw new Exception('I don\'t know what I want to do.');
 		}
-		if ($input->getArgument('action') == 'restart') {
+		if ($action == 'restart' || $action == 'stop') {
 			$manager->shutdown();
+            if ($action == 'stop') {
+                return 1;
+            }
 		}
-		if ($input->getArgument('action') != 'stop') {
+        return (int)$manager->start();
-			return $this->generate_runtime_builder($manager);
-		}
-		$manager->shutdown();
-		return 0;
-	}
-
-
-	/**
-	 * @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;
-			}
-		]);
-	}
-
-
-	/**
-	 * @param $manager
-	 * @return int
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	private function generate_runtime_builder($manager): int
-	{
-		$this->configure_set();
-
-		Kiri::app()->getRouter()->read_files();
-
-		$manager->start();
-
-		return 1;
 	}
 
 }

ServerManager.php

@@ -1,43 +1,34 @@
 <?php
 
-namespace Server;
+namespace Kiri\Server;
 
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Error\Logger;
-use Kiri\Events\EventDispatch;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
 use Kiri\Annotation\Inject;
+use Kiri\Error\Logger;
+use Kiri\Exception\ConfigException;
+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\OnReceiveInterface;
+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 Kiri\Websocket\WebSocketInterface;
 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 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;
 
 
 /**
@@ -89,6 +80,9 @@ class ServerManager extends Component
 	];
 
 
+	/**
+	 * @var array|string[]
+	 */
 	private array $eventInterface = [
 		OnReceiveInterface::class    => 'receive',
 		OnPacketInterface::class     => 'packet',
@@ -102,11 +96,9 @@ class ServerManager extends Component
 
 	/**
 	 * @return Server|WServer|HServer|null
-	 * @throws ReflectionException
 	 */
 	public function getServer(): Server|WServer|HServer|null
 	{
-		di(EventDispatch::class)->dispatch(new OnServerBeforeStart());
 		return $this->server;
 	}
 
@@ -151,30 +143,6 @@ class ServerManager extends Component
 	}
 
 
-	/**
-	 * @param string|OnProcessInterface|BaseProcess $customProcess
-	 * @throws Exception
-	 */
-	public function addProcess(string|OnProcessInterface|BaseProcess $customProcess)
-	{
-		if (is_string($customProcess)) {
-			$customProcess = Kiri::getDi()->get($customProcess);
-		}
-		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-		$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()
-		));
-	}
-
-
 	/**
 	 * @return array<string,Process>
 	 */
@@ -279,6 +247,22 @@ class ServerManager extends Component
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
 	 * @throws Exception
+	 *
+	 *
+	 *
+	 * $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);
 	 */
 	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
@@ -291,20 +275,7 @@ 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));
+		$this->container->setBindings(SwooleServerInterface::class, $this->server);
-		$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');
 
@@ -324,7 +295,6 @@ class ServerManager extends Component
 		if (($this->server->setting['task_worker_num'] ?? 0) > 0) {
 			$this->addTaskListener($settings['events']);
 		}
-		$this->container->setBindings(SwooleServerInterface::class, $this->server);
 		$this->addServiceEvents(ServerManager::DEFAULT_EVENT, $this->server);
 		if (!empty($settings['events']) && is_array($settings['events'])) {
 			$this->addServiceEvents($settings['events'], $this->server);

ServerProviders.php

@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
 use Exception;
 use Kiri\Abstracts\Providers;
 use Kiri\Application;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class DatabasesProviders
@@ -23,8 +23,6 @@ class ServerProviders extends Providers
 	 */
 	public function onImport(Application $application)
 	{
-		$application->set('server', ['class' => Server::class]);
-
 		$container = Kiri::getDi();
 
 		$console = $container->get(\Symfony\Component\Console\Application::class);

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,15 @@
 <?php
 
-namespace Server\Tasker;
+namespace Kiri\Server\Tasker;
 
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\HashMap;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
-use Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
-use Server\SwooleServerInterface;
+use Kiri\Server\SwooleServerInterface;
+use Swoole\Server;
 
 
 /**
@@ -19,9 +20,9 @@ class AsyncTaskExecute extends Component
 
 
 	/**
-	 * @var SwooleServerInterface|null
+	 * @var Server|\Swoole\WebSocket\Server|\Swoole\Http\Server
 	 */
-	public ?SwooleServerInterface $server = null;
+	public mixed $server = null;
 
 
 	private HashMap $hashMap;
@@ -49,18 +50,16 @@ class AsyncTaskExecute extends Component
 	/**
 	 * @param OnTaskInterface|string $handler
 	 * @param array $params
-	 * @param int|null $workerId
+	 * @param int $workerId
 	 * @throws Exception
 	 */
-	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
+	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = -1)
 	{
 		if (!$this->server) {
 			$this->server = Kiri::getDi()->get(SwooleServerInterface::class);
 		}
-		if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
+		if ($workerId < 0 || $workerId > $this->server->setting['task_worker_num']) {
-			$workerNum = $this->server->setting['worker_num'];
+			$workerId = random_int(0, $this->server->setting['task_worker_num'] - 1);
-			$taskerNum = $workerNum + $this->server->setting['task_worker_num'];
-			$workerId = random_int($workerNum, $taskerNum - 1);
 		}
 		if (is_string($handler)) {
 			$handler = $this->handle($handler, $params);

Tasker/OnServerTask.php

@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Server\Tasker;
+namespace Kiri\Server\Tasker;
 
 
 use Kiri\Annotation\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
-use Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
 use Swoole\Server;
 
 
@@ -37,7 +37,7 @@ class OnServerTask
 		} catch (\Throwable $exception) {
 			$data = jTraceEx($exception);
 
-			$this->logger->error('task', [$data]);
+			$this->logger->error('task', [error_trigger_format($exception)]);
 		} finally {
 			$server->finish($data);
 		}
@@ -56,9 +56,9 @@ class OnServerTask
 		} catch (\Throwable $exception) {
 			$data = jTraceEx($exception);
 
-			$this->logger->error('task', [$data]);
+			$this->logger->error('task', [error_trigger_format($exception)]);
 		} finally {
-			$server->finish($data);
+			$task->finish($data);
 		}
 	}
 

TraitServer.php

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

composer.json

@@ -19,7 +19,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Server\\": "./"
+            "Kiri\\Server\\": "./"
         }
     }
 }