改名

Server.php

@@ -3,13 +3,15 @@
 
 namespace Server;
 
-use Note\Inject;
 use Exception;
 use Http\Handler\Abstracts\HttpService;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
+use Note\Inject;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Server\Events\OnShutdown;
 
 
@@ -41,6 +43,13 @@ class Server extends HttpService
 	public EventDispatch $eventDispatch;
 
 
+	/**
+	 * @var State
+	 */
+	#[Inject(State::class)]
+	public State $state;
+
+
 	/**
 	 *
 	 */
@@ -59,10 +68,11 @@ class Server extends HttpService
 
 
 	/**
-	 * @return string start server
-	 *
-	 * start server
+	 * @return string
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws \ReflectionException
 	 * @throws Exception
 	 */
 	public function start(): string
@@ -94,7 +104,7 @@ class Server extends HttpService
 	{
 		$configs = Config::get('server', [], true);
 		foreach ($this->manager->sortService($configs['ports'] ?? []) as $config) {
-			$this->manager->stopServer($config['port']);
+			$this->state->exit($config['port']);
 		}
 		$this->eventDispatch->dispatch(new OnShutdown());
 	}
@@ -103,10 +113,11 @@ class Server extends HttpService
 	/**
 	 * @return bool
 	 * @throws ConfigException
+	 * @throws Exception
 	 */
 	public function isRunner(): bool
 	{
-		return $this->manager->isRunner();
+		return $this->state->isRunner();
 	}
 
 

ServerCommand.php

@@ -105,9 +105,7 @@ class ServerCommand extends Command
 		$this->configure_set();
 
 		Kiri::app()->getRouter()->read_files();
-
-		$this->eventProvider->dispatch(new OnServerBeforeStart());
-
+		
 		$manager->start();
 
 		return 1;

ServerManager.php

@@ -2,15 +2,16 @@
 
 namespace Server;
 
-use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Di\Container;
-use Psr\Container\ContainerInterface;
 use Kiri\Error\Logger;
+use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Note\Inject;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
 use Server\Abstracts\BaseProcess;
@@ -22,13 +23,13 @@ use Server\Contract\OnMessageInterface;
 use Server\Contract\OnPacketInterface;
 use Server\Contract\OnProcessInterface;
 use Server\Contract\OnReceiveInterface;
-use Server\Contract\OnTaskInterface;
+use Server\Events\OnServerBeforeStart;
 use Server\Handler\OnPipeMessage;
 use Server\Handler\OnServer;
 use Server\Handler\OnServerManager;
 use Server\Handler\OnServerReload;
-use Server\Tasker\OnServerTask;
 use Server\Handler\OnServerWorker;
+use Server\Tasker\OnServerTask;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
 use Swoole\Server;
@@ -52,10 +53,20 @@ class ServerManager
 	public int $port = 0;
 
 
+	/**
+	 * @var Logger
+	 */
 	#[Inject(Logger::class)]
 	public Logger $logger;
 
 
+	/**
+	 * @var State
+	 */
+	#[Inject(State::class)]
+	public State $state;
+
+
 	/** @var array<string,Port> */
 	public array $ports = [];
 
@@ -100,9 +111,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;
 	}
 
@@ -113,9 +126,10 @@ class ServerManager
 	 * @param int $port
 	 * @param int $mode
 	 * @param array $settings
-	 * @throws ReflectionException
 	 * @throws ConfigException
-	 * @throws Exception
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
 	 */
 	public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
@@ -131,8 +145,12 @@ class ServerManager
 
 
 	/**
-	 * @throws ReflectionException
+	 * @param $configs
+	 * @param int $daemon
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
 	 */
 	public function initBaseServer($configs, int $daemon = 0): void
 	{
@@ -144,23 +162,6 @@ class ServerManager
 	}
 
 
-	/**
-	 * @return bool
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function isRunner(): bool
-	{
-		$configs = Config::get('server', [], true);
-		foreach ($this->sortService($configs['ports']) as $config) {
-			if (checkPortIsAlready($config['port'])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
 	/**
 	 * @param string|OnProcessInterface|BaseProcess $customProcess
 	 * @throws Exception
@@ -192,21 +193,13 @@ class ServerManager
 	}
 
 
-	/**
-	 * @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 ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws ReflectionException
 	 * @throws Exception
 	 */
@@ -256,7 +249,7 @@ class ServerManager
 	{
 		$id = Config::get('id', 'system-service');
 
-		$this->logger->debug(sprintf('[%s]' . $type . ' service %s::%d start', $id, $host, $port));
+		$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);
@@ -308,22 +301,6 @@ class ServerManager
 	}
 
 
-	/**
-	 * @param int $port
-	 * @throws Exception
-	 */
-	public function stopServer(int $port)
-	{
-		if (!($pid = checkPortIsAlready($port))) {
-			return;
-		}
-		while (checkPortIsAlready($port)) {
-			Process::kill($pid, SIGTERM);
-			usleep(300);
-		}
-	}
-
-
 	/**
 	 * @param array $settings
 	 * @throws ContainerExceptionInterface
@@ -370,40 +347,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
@@ -417,12 +360,14 @@ class ServerManager
 
 	/**
 	 * @param array $events
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws ReflectionException
 	 */
 	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']);

State.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Server;
+
+use Exception;
+use Kiri\Abstracts\BaseObject;
+use Kiri\Abstracts\Config;
+use Swoole\Process;
+
+class State extends BaseObject
+{
+
+	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

@@ -2,11 +2,12 @@
 
 namespace Server\Tasker;
 
-use Note\Inject;
 use Exception;
 use Kiri\Abstracts\BaseObject;
 use Kiri\Core\HashMap;
 use Kiri\Di\Container;
+use Kiri\Kiri;
+use Note\Inject;
 use Psr\Container\ContainerInterface;
 use ReflectionException;
 use Server\Contract\OnTaskInterface;
@@ -21,10 +22,9 @@ class AsyncTaskExecute extends BaseObject
 
 
 	/**
-	 * @var SwooleServerInterface
+	 * @var SwooleServerInterface|null
 	 */
-	#[Inject(SwooleServerInterface::class)]
-	public SwooleServerInterface $server;
+	public ?SwooleServerInterface $server = null;
 
 
 	/**
@@ -64,8 +64,13 @@ class AsyncTaskExecute extends BaseObject
 	 */
 	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']) {
-			$workerId = random_int($this->server->setting['worker_num'] + 1, $this->server->setting['task_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);