eee

This reverts commit fdf58326

Abstracts/AsyncServer.php

@@ -0,0 +1,193 @@
+<?php
+
+namespace Kiri\Server\Abstracts;
+
+use Exception;
+use Kiri\Abstracts\Component;
+use Kiri\Error\StdoutLogger;
+use Kiri\Exception\NotFindClassException;
+use Kiri\Server\Config as SConfig;
+use Kiri\Server\Constant;
+use Kiri\Server\Events\OnServerBeforeStart;
+use Kiri\Server\Handler\OnServer;
+use Kiri\Server\Processes\TraitProcess;
+use Kiri\Server\ServerInterface;
+use Kiri\Server\Task\Task;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Swoole\Server;
+
+/**
+ */
+class AsyncServer extends Component implements ServerInterface
+{
+
+	use TraitServer;
+	use TraitProcess;
+
+
+	/**
+	 * @var Server|null
+	 */
+	private ?Server $server = null;
+
+	private bool $shuttingDown = false;
+
+
+	/**
+	 * @param array $service
+	 * @param int   $daemon
+	 * @return void
+	 * @throws
+	 */
+	public function initCoreServers(array $service, int $daemon = 0): void
+	{
+		$service = $this->createBaseServer($this->genConfigService($service), $daemon);
+		if (isset($this->server->setting[Constant::OPTION_TASK_WORKER_NUM])) {
+			$this->container->get(Task::class)->initTaskWorker($this->server);
+		}
+
+		foreach ($this->_process as $process)
+			$this->server->addProcess($process);
+		foreach ($service as $value)
+			$this->addListener($value);
+
+		$this->provider->on(OnServerBeforeStart::class, [$this, 'onSignal']);
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws
+	 */
+	public function shutdown(): bool
+	{
+		if ($this->shuttingDown) {
+			return true;
+		}
+		$this->shuttingDown = true;
+
+		if ($this->server !== null) {
+			$this->server->shutdown();
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array $service
+	 * @param int   $daemon
+	 * @return array
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFindClassException
+	 * @throws NotFoundExceptionInterface
+	 */
+	private function createBaseServer(array $service, int $daemon = 0): array
+	{
+		$config = array_pop($service);
+
+		$match = $this->getServerClass($config->type);
+		if (is_null($match)) {
+			throw new NotFindClassException('Unknown server type ' . $config->type);
+		}
+
+		$this->container->get(StdoutLogger::class)->println('Listen address ' . $config->type . ' ' . $config->host . '::' . $config->port);
+
+		$this->server = new $match($config->host, $config->port, $config->mode, $config->socket);
+		$this->server->set($this->systemConfig($config, $daemon));
+		if (!isset($config->events[Constant::SHUTDOWN])) {
+			$config->events[Constant::SHUTDOWN] = [OnServer::class, 'onShutdown'];
+		}
+
+		$this->event($this->server, array_merge(\config('servers.server.events', []), $config->events));
+		$this->container->bind(ServerInterface::class, $this->server);
+		return $service;
+	}
+
+
+	/**
+	 * @param SConfig $config
+	 * @param int     $daemon
+	 * @return array
+	 * @throws
+	 */
+	protected function systemConfig(SConfig $config, int $daemon): array
+	{
+		$settings                                     = array_merge(\config('servers.server.settings', []), $config->settings);
+		$settings[Constant::OPTION_DAEMONIZE]         = (bool)$daemon;
+		$settings[Constant::OPTION_ENABLE_REUSE_PORT] = true;
+		$settings[Constant::OPTION_PID_FILE]          = storage('.swoole.pid');
+		if (!isset($settings[Constant::OPTION_LOG_FILE])) {
+			$settings[Constant::OPTION_LOG_FILE] = storage('system.log');
+		}
+		return $settings;
+	}
+
+
+	/**
+	 * @param SConfig $config
+	 * @return void
+	 * @throws
+	 */
+	public function addListener(SConfig $config): void
+	{
+		$port = $this->server->addlistener($config->host, $config->port, $config->socket);
+		if ($port === false) {
+			throw new Exception('Listen port fail.' . swoole_last_error());
+		}
+		$port->set($this->resetSettings($config->type, $config->settings));
+		$this->event($port, $config->getEvents());
+
+		$this->container->get(StdoutLogger::class)->println('Listen address ' . $config->type . ' ' . $config->host . '::' . $config->port);
+	}
+
+
+	/**
+	 * @param string $type
+	 * @param array  $settings
+	 * @return array
+	 * @throws
+	 */
+	private function resetSettings(string $type, array $settings): array
+	{
+		if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['open_http_protocol'])) {
+			$settings['open_http_protocol'] = true;
+			if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
+				$settings['open_http2_protocol'] = true;
+			}
+		}
+		if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['open_websocket_protocol'])) {
+			$settings['open_websocket_protocol'] = true;
+		}
+		return $settings;
+	}
+
+
+	/**
+	 * @param Server\Port|Server $base
+	 * @param array              $events
+	 * @return void
+	 * @throws
+	 */
+	private function event(Server\Port|Server $base, array $events): void
+	{
+		$container = $this->container;
+		foreach ($events as $name => $event) {
+			if (is_array($event) && is_string($event[0])) {
+				$event[0] = $container->get($event[0]);
+			}
+			$base->on($name, $event);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 * @throws
+	 */
+	public function start(): void
+	{
+		$this->dispatch->dispatch(new OnServerBeforeStart);
+		$this->server->start();
+	}
+}

Abstracts/BaseProcess.php

@@ -1,126 +0,0 @@
-<?php
-
-namespace Server\Abstracts;
-
-
-use JetBrains\PhpStorm\Pure;
-use Kiri\Kiri;
-use Server\SInterface\OnProcessInterface;
-use Swoole\Coroutine;
-use Swoole\Process;
-
-/**
- *
- */
-abstract class BaseProcess implements OnProcessInterface
-{
-
-	/** @var bool */
-	protected bool $enableSwooleCoroutine = true;
-
-
-	protected bool $isStop = false;
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void
-	{
-		$this->isStop = true;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function checkProcessIsStop(): bool
-	{
-		return $this->isStop === true;
-	}
-
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function signListen(Process $process): void
-	{
-//		if (Coroutine::getCid() === -1) {
-//			Process::signal(SIGTERM | SIGKILL, function ($signo) use ($process) {
-//				if ($signo) {
-//					$lists = Kiri::app()->getProcess();
-//					foreach ($lists as $process) {
-//						$process->exit(0);
-//					}
-//				}
-//			});
-//		} else {
-//			Coroutine::create(function () use ($process) {
-//				/** @var Coroutine\Socket $message */
-//				$message = $process->exportSocket();
-//				if ($message->recv() == 0x03455343213212) {
-//					$this->waiteExit($process);
-//				}
-//			});
-//			Coroutine::create(function () use ($process) {
-//				$data = Coroutine::waitSignal(SIGTERM | SIGKILL, -1);
-//				if ($data) {
-//					$lists = Kiri::app()->getProcess();
-//					foreach ($lists as $name => $process) {
-//						foreach ($process as $item) {
-//							/** @var Coroutine\Socket $export */
-//							$export = $item->exportSocket();
-//							$export->send(0x03455343213212);
-//						}
-//					}
-//				}
-//			});
-//		}
-	}
-
-
-	/**
-	 *
-	 */
-	protected function exit(): void
-	{
-		putenv('process.status=idle');
-	}
-
-
-	/**
-	 * @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->enableSwooleCoroutine) {
-			Coroutine::sleep(0.1);
-		} else {
-			usleep(100);
-		}
-	}
-
-}

Abstracts/FileWatcher.php

@@ -0,0 +1,559 @@
+<?php
+
+namespace Kiri\Server\Abstracts;
+
+use Kiri\Di\HotReloadState;
+use Kiri\Di\Inject\Container;
+use Kiri\Error\StdoutLogger;
+use Kiri\Events\EventProvider;
+use Kiri\Router\Router;
+use Kiri\Server\Events\OnWorkerStart;
+use Kiri\Server\Processes\AbstractProcess;
+use Kiri\Server\Processes\OnProcessInterface;
+use Psr\Log\LoggerInterface;
+use Swoole\Event;
+use Swoole\Process;
+use const SIGUSR1;
+
+class FileWatcher extends AbstractProcess implements OnProcessInterface
+{
+	protected mixed $pipe;
+
+	#[Container(LoggerInterface::class)]
+	public StdoutLogger|LoggerInterface $logger;
+
+	protected bool $enable_coroutine = false;
+
+	protected array $watches = [];
+
+	protected bool $enable_queue = false;
+
+	protected bool $reloading = false;
+
+	private array $watchPaths      = [];
+	private array $excludePatterns = [];
+	private array $extensions      = ['php'];
+	private string $strategy;
+	private bool $running = false;
+
+	private $inotifyFd = null;
+	private array $inotifyWatchMap = [];
+	private $fswatchProcess = null;
+	private array $fswatchPipes = [];
+	private int $pollInterval = 2;
+	private array $fileSnapshot = [];
+	private $pollTimer = null;
+	private $debounceTimer = null;
+	private int $debounceMs = 200;
+	private int $minReloadIntervalMs = 1000;
+	private int $lastReloadAtMs = 0;
+
+	private const STRATEGY_INOTIFY = 'inotify';
+	private const STRATEGY_FSWATCH = 'fswatch';
+	private const STRATEGY_POLL = 'poll';
+
+	public function __construct()
+	{
+		$this->watchPaths = config('servers.reload.listen', []);
+		$this->excludePatterns = config('servers.reload.scan.skip_patterns', []);
+		$this->extensions = config('servers.reload.scan.extensions', ['php']);
+
+		di(EventProvider::class)->on(OnWorkerStart::class, [di(Router::class), 'scan_build_route']);
+
+		$this->debounceMs = (int)config('servers.reload.debounce_ms', $this->debounceMs);
+		$this->minReloadIntervalMs = (int)config('servers.reload.min_interval_ms', $this->minReloadIntervalMs);
+		$this->strategy = $this->detectBestStrategy();
+	}
+
+	public function getName(): string
+	{
+		return 'hotReload';
+	}
+
+	public function onSigterm(): void
+	{
+		$this->stop();
+	}
+
+	private function detectBestStrategy(): string
+	{
+		$forced = config('servers.reload.scan.strategy', 'auto');
+		if (in_array($forced, [self::STRATEGY_INOTIFY, self::STRATEGY_FSWATCH, self::STRATEGY_POLL], true)) {
+			return $forced;
+		}
+
+		if ($this->isMountedWindowsPath()) {
+			return $this->isFswatchAvailable() ? self::STRATEGY_FSWATCH : self::STRATEGY_POLL;
+		}
+
+		if (extension_loaded('inotify')) {
+			return self::STRATEGY_INOTIFY;
+		}
+
+		if ($this->isFswatchAvailable()) {
+			return self::STRATEGY_FSWATCH;
+		}
+
+		return self::STRATEGY_POLL;
+	}
+
+	private function isMountedWindowsPath(): bool
+	{
+		foreach ($this->watchPaths as $path) {
+			$real = realpath($path) ?: (string)$path;
+			$real = str_replace('\\', '/', $real);
+			if (str_starts_with($real, '/mnt/')) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private function isFswatchAvailable(): bool
+	{
+		$output = [];
+		$returnVar = 0;
+		exec('which fswatch 2>/dev/null', $output, $returnVar);
+		return $returnVar === 0 && !empty($output[0]);
+	}
+
+	public function setDebounce(int $milliseconds): self
+	{
+		$this->debounceMs = $milliseconds;
+		return $this;
+	}
+
+	public function setPollInterval(int $seconds): self
+	{
+		$this->pollInterval = $seconds;
+		return $this;
+	}
+
+	public function process(Process|null $process): void
+	{
+		if ($this->running) {
+			return;
+		}
+
+		$this->running = true;
+
+		switch ($this->strategy) {
+			case self::STRATEGY_INOTIFY:
+				$this->startInotify();
+				break;
+			case self::STRATEGY_FSWATCH:
+				$this->startFswatch();
+				break;
+			case self::STRATEGY_POLL:
+				$this->startPolling();
+				break;
+		}
+
+		Event::wait();
+	}
+
+	public function stop(): void
+	{
+		$this->running = false;
+
+		if ($this->inotifyFd && is_resource($this->inotifyFd)) {
+			@Event::del($this->inotifyFd);
+			@fclose($this->inotifyFd);
+			$this->inotifyFd = null;
+		}
+
+		if (isset($this->fswatchPipes[1]) && is_resource($this->fswatchPipes[1])) {
+			@Event::del($this->fswatchPipes[1]);
+			@fclose($this->fswatchPipes[1]);
+		}
+
+		if (isset($this->fswatchPipes[2]) && is_resource($this->fswatchPipes[2])) {
+			@fclose($this->fswatchPipes[2]);
+		}
+
+		if ($this->fswatchProcess && is_resource($this->fswatchProcess)) {
+			@proc_terminate($this->fswatchProcess);
+			@proc_close($this->fswatchProcess);
+			$this->fswatchProcess = null;
+		}
+
+		if ($this->pollTimer) {
+			\Swoole\Timer::clear($this->pollTimer);
+			$this->pollTimer = null;
+		}
+
+		if ($this->debounceTimer) {
+			\Swoole\Timer::clear($this->debounceTimer);
+			$this->debounceTimer = null;
+		}
+
+		@Event::exit();
+	}
+
+	private function isExcluded(string $path): bool
+	{
+		foreach ($this->excludePatterns as $pattern) {
+			if (strpos($path, $pattern) !== false) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private function hasValidExtension(string $path): bool
+	{
+		if (empty($this->extensions)) {
+			return true;
+		}
+
+		$ext = pathinfo($path, PATHINFO_EXTENSION);
+		return in_array($ext, $this->extensions, true);
+	}
+
+	private function triggerCallback(array $changedFiles): void
+	{
+		$changedFiles = array_values(array_unique(array_filter($changedFiles, function ($file) {
+			return !$this->isExcluded($file) && $this->hasValidExtension($file);
+		})));
+
+		if (empty($changedFiles)) {
+			return;
+		}
+
+		if ($this->debounceTimer) {
+			\Swoole\Timer::clear($this->debounceTimer);
+		}
+
+		$now = intdiv(hrtime(true), 1000000);
+		$elapsed = $this->lastReloadAtMs > 0 ? $now - $this->lastReloadAtMs : $this->minReloadIntervalMs;
+		$delay = max($this->debounceMs, $this->minReloadIntervalMs - $elapsed);
+
+		$this->debounceTimer = \Swoole\Timer::after($delay, function () use ($changedFiles) {
+			$this->debounceTimer = null;
+			$this->reload($changedFiles);
+		});
+	}
+
+	private function reload(array $changedFiles): void
+	{
+		if ($this->reloading) {
+			return;
+		}
+
+		$this->reloading = true;
+
+		try {
+			$this->lastReloadAtMs = intdiv(hrtime(true), 1000000);
+			$preview = implode(', ', array_slice($changedFiles, 0, 3));
+			if (count($changedFiles) > 3) {
+				$preview .= ' ...';
+			}
+
+			di(HotReloadState::class)->store($changedFiles);
+			di(StdoutLogger::class)->println('detected file changes, reloading server: ' . $preview);
+
+			if (!$this->reloadWorkers()) {
+				di(StdoutLogger::class)->println('reload server failed: master pid not found or signal failed');
+			}
+		} finally {
+			$this->reloading = false;
+		}
+	}
+
+	private function reloadWorkers(): bool
+	{
+		$pid = $this->getMasterPid();
+		if ($pid === null) {
+			return false;
+		}
+
+		return Process::kill($pid, SIGUSR1);
+	}
+
+	private function getMasterPid(): ?int
+	{
+		$processes = $this->listProcesses();
+		$candidates = [];
+
+		$pidFile = function_exists('storage') ? storage('.swoole.pid') : '';
+		if (is_file($pidFile)) {
+			$candidates[] = (int)trim((string)file_get_contents($pidFile));
+		}
+
+		foreach ($processes as $process) {
+			if ($this->isMasterProcessCommand($process['command'])) {
+				$candidates[] = (int)$process['pid'];
+			}
+		}
+
+		foreach (array_values(array_unique(array_filter($candidates))) as $pid) {
+			if ($this->isProcessAlive($pid) && $this->isMasterPid($pid, $processes)) {
+				return $pid;
+			}
+		}
+
+		return null;
+	}
+
+
+	/**
+	 * @param int   $pid
+	 * @param array $processes
+	 * @return bool
+	 */
+	private function isMasterPid(int $pid, array $processes): bool
+	{
+		foreach ($processes as $process) {
+			if ((int)$process['pid'] === $pid) {
+				return $this->isMasterProcessCommand($process['command']) && $this->isSameAppProcess($pid);
+			}
+		}
+
+		return false;
+	}
+
+	private function isMasterProcessCommand(string $command): bool
+	{
+		$prefix = '[' . config('site.id', 'system-service') . '].Master[';
+		return str_contains($command, $prefix);
+	}
+
+	private function isSameAppProcess(int $pid): bool
+	{
+		$cwd = @readlink('/proc/' . $pid . '/cwd');
+		if ($cwd === false || $cwd === '') {
+			return false;
+		}
+
+		return $this->normalizePath($cwd) === $this->normalizePath(APP_PATH);
+	}
+
+	private function normalizePath(string $path): string
+	{
+		$real = realpath($path) ?: $path;
+		return rtrim(str_replace('\\', '/', $real), '/');
+	}
+
+	private function listProcesses(): array
+	{
+		$lines = [];
+		exec('ps -eo pid=,ppid=,args=', $lines);
+
+		$processes = [];
+		foreach ($lines as $line) {
+			$line = trim($line);
+			if ($line === '') {
+				continue;
+			}
+
+			$parts = preg_split('/\s+/', $line, 3);
+			if (count($parts) < 3) {
+				continue;
+			}
+
+			$processes[] = [
+				'pid' => (int)$parts[0],
+				'ppid' => (int)$parts[1],
+				'command' => $parts[2],
+			];
+		}
+
+		return $processes;
+	}
+
+	private function isProcessAlive(int $pid): bool
+	{
+		return $pid > 1 && @Process::kill($pid, 0);
+	}
+	private function startInotify(): void
+	{
+		$this->inotifyFd = inotify_init();
+		stream_set_blocking($this->inotifyFd, false);
+
+		foreach ($this->watchPaths as $path) {
+			$this->addInotifyWatchRecursive($path);
+		}
+
+		Event::add($this->inotifyFd, function ($fd) {
+			$events = inotify_read($fd);
+			if ($events === false) {
+				return;
+			}
+
+			$changedFiles = [];
+			foreach ($events as $event) {
+				$wd = $event['wd'];
+				$dir = $this->inotifyWatchMap[$wd] ?? '';
+				$name = $event['name'] ?? '';
+				$filePath = $name === '' ? $dir : $dir . '/' . $name;
+
+				if (($event['mask'] & IN_CREATE) && $filePath !== '' && is_dir($filePath) && !$this->isExcluded($filePath)) {
+					$this->addInotifyWatchRecursive($filePath);
+				}
+
+				if ($filePath !== '') {
+					$changedFiles[] = $filePath;
+				}
+			}
+
+			$this->triggerCallback($changedFiles);
+		});
+	}
+
+	private function addInotifyWatchRecursive(string $path): void
+	{
+		if ($this->isExcluded($path)) {
+			return;
+		}
+
+		if (is_file($path)) {
+			if ($this->hasValidExtension($path)) {
+				$wd = inotify_add_watch($this->inotifyFd, $path, IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+				$this->inotifyWatchMap[$wd] = dirname($path);
+			}
+			return;
+		}
+
+		if (!is_dir($path)) {
+			return;
+		}
+
+		$wd = inotify_add_watch($this->inotifyFd, $path, IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+		$this->inotifyWatchMap[$wd] = $path;
+
+		$items = scandir($path);
+		foreach ($items as $item) {
+			if ($item === '.' || $item === '..') {
+				continue;
+			}
+
+			$full = $path . '/' . $item;
+			if (is_dir($full)) {
+				$this->addInotifyWatchRecursive($full);
+			}
+		}
+	}
+
+	private function startFswatch(): void
+	{
+		$descriptorspec = [
+			0 => ['pipe', 'r'],
+			1 => ['pipe', 'w'],
+			2 => ['pipe', 'w'],
+		];
+
+		$excludeArgs = [];
+		foreach ($this->excludePatterns as $pattern) {
+			$excludeArgs[] = '--exclude';
+			$excludeArgs[] = '.*' . preg_quote($pattern, '/') . '.*';
+		}
+
+		$filterArgs = [];
+		foreach ($this->extensions as $ext) {
+			$filterArgs[] = '--include';
+			$filterArgs[] = '\.' . $ext . '$';
+		}
+
+		$cmd = 'fswatch -0 -r ' . implode(' ', array_merge($excludeArgs, $filterArgs)) . ' ' . implode(' ', array_map('escapeshellarg', $this->watchPaths));
+
+		$this->fswatchProcess = proc_open($cmd, $descriptorspec, $this->fswatchPipes);
+		if (!is_resource($this->fswatchProcess)) {
+			throw new \RuntimeException('Failed to start fswatch process');
+		}
+
+		stream_set_blocking($this->fswatchPipes[1], false);
+
+		Event::add($this->fswatchPipes[1], function ($pipe) {
+			$data = fread($pipe, 8192);
+			if ($data === false || $data === '') {
+				return;
+			}
+
+			$files = explode("\0", trim($data, "\0"));
+			$changedFiles = array_values(array_filter($files, function ($file) {
+				return $file !== '';
+			}));
+
+			$this->triggerCallback($changedFiles);
+		});
+	}
+
+	private function startPolling(): void
+	{
+		$this->buildFileSnapshot();
+
+		$intervalMs = $this->pollInterval * 1000;
+		$this->pollTimer = \Swoole\Timer::tick($intervalMs, function () {
+			$newSnapshot = [];
+			$changedFiles = $this->compareSnapshots($newSnapshot);
+			if (!empty($changedFiles)) {
+				$this->triggerCallback($changedFiles);
+			}
+
+			$this->fileSnapshot = $newSnapshot;
+		});
+	}
+
+	private function buildFileSnapshot(): void
+	{
+		$this->fileSnapshot = [];
+		foreach ($this->watchPaths as $path) {
+			$this->scanDirectory($path, $this->fileSnapshot);
+		}
+	}
+
+	private function scanDirectory(string $path, array &$snapshot): void
+	{
+		if ($this->isExcluded($path)) {
+			return;
+		}
+
+		if (is_file($path)) {
+			if ($this->hasValidExtension($path)) {
+				$snapshot[$path] = filemtime($path);
+			}
+			return;
+		}
+
+		if (!is_dir($path)) {
+			return;
+		}
+
+		$items = scandir($path);
+		foreach ($items as $item) {
+			if ($item === '.' || $item === '..') {
+				continue;
+			}
+
+			$full = $path . '/' . $item;
+			$this->scanDirectory($full, $snapshot);
+		}
+	}
+
+	private function compareSnapshots(array &$newSnapshot): array
+	{
+		$changed = [];
+
+		foreach ($this->watchPaths as $path) {
+			$this->scanDirectory($path, $newSnapshot);
+		}
+
+		foreach ($newSnapshot as $file => $mtime) {
+			if (!isset($this->fileSnapshot[$file])) {
+				$changed[] = $file;
+			} elseif ($this->fileSnapshot[$file] !== $mtime) {
+				$changed[] = $file;
+			}
+		}
+
+		foreach ($this->fileSnapshot as $file => $mtime) {
+			if (!isset($newSnapshot[$file])) {
+				$changed[] = $file;
+			}
+		}
+
+		return $changed;
+	}
+}

Abstracts/HotReload.php

@@ -0,0 +1,271 @@
+<?php
+
+namespace Kiri\Server\Abstracts;
+
+use Kiri\Di\Inject\Container;
+use Kiri\Error\StdoutLogger;
+use Kiri\Events\EventProvider;
+use Kiri\Router\Router;
+use Kiri\Server\Events\OnWorkerStart;
+use Psr\Log\LoggerInterface;
+use Swoole\Event;
+use Swoole\Process;
+use Kiri\Server\Processes\AbstractProcess;
+
+class HotReload extends AbstractProcess
+{
+
+
+    /**
+     * @var mixed
+     */
+    protected mixed $pipe;
+
+
+    /**
+     * @var LoggerInterface|StdoutLogger
+     */
+    #[Container(LoggerInterface::class)]
+    public StdoutLogger|LoggerInterface $logger;
+
+
+    /**
+     * @var bool
+     */
+    protected bool $enable_coroutine = false;
+
+
+    /**
+     * @var array
+     */
+    protected array $watches = [];
+
+
+    /**
+     * @var bool
+     */
+    protected bool $enable_queue = false;
+
+
+    /**
+     * @var bool
+     */
+    protected bool $reloading = false;
+
+
+    /**
+     * @throws \Exception
+     */
+    public function __construct()
+    {
+        di(EventProvider::class)->on(OnWorkerStart::class, [di(Router::class), 'scan_build_route']);
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'hotReload';
+    }
+
+
+    /**
+     * @return void
+     */
+    public function onSigterm(): void
+    {
+        // TODO: Implement onSigterm() method.
+        $this->stop();
+    }
+
+    /**
+     * @param ?Process $process
+     */
+    public function process(Process|null $process): void
+    {
+        $this->pipe = inotify_init();
+        $this->addListen();
+        Event::add($this->pipe, function () use ($process) {
+            $read = inotify_read($this->pipe);
+            if (count($read) > 0) {
+                $this->reload();
+            }
+        });
+        Event::cycle(function (): void {
+            if ($this->isStop()) {
+                Event::exit();
+            }
+        });
+        Event::wait();
+    }
+
+
+    /**
+     * @return void
+     */
+    public function reload(): void
+    {
+        if ($this->reloading) {
+            return;
+        }
+        $this->reloading = true;
+
+        di(StdoutLogger::class)->println('reloading server[' . \config('site.id', 'system-service') . '], please waite.');
+
+        $this->clear();
+        if (!$this->reloadWorkers()) {
+            di(StdoutLogger::class)->println('reload server failed: master pid not found or signal failed');
+        }
+        $this->addListen();
+
+        $this->reloading = false;
+    }
+
+
+    /**
+     * @return void
+     */
+    private function reloadWorkers(): bool
+    {
+        $pid = $this->getMasterPid();
+        if ($pid === null) {
+            return false;
+        }
+
+        return Process::kill($pid, SIGUSR1);
+    }
+
+    private function getMasterPid(): ?int
+    {
+        $processes = $this->listProcesses();
+        $candidates = [];
+
+        $pidFile = function_exists('storage') ? storage('.swoole.pid') : '';
+        if (is_file($pidFile)) {
+            $candidates[] = (int)trim((string)file_get_contents($pidFile));
+        }
+
+        foreach ($processes as $process) {
+            if ($this->isMasterProcessCommand($process['command'])) {
+                $candidates[] = (int)$process['pid'];
+            }
+        }
+
+        foreach (array_values(array_unique(array_filter($candidates))) as $pid) {
+            if ($this->isProcessAlive($pid) && $this->isMasterPid($pid, $processes)) {
+                return $pid;
+            }
+        }
+
+        return null;
+    }
+
+    private function isMasterPid(int $pid, array $processes): bool
+    {
+        foreach ($processes as $process) {
+            if ((int)$process['pid'] === $pid) {
+                return $this->isMasterProcessCommand($process['command']) && $this->isSameAppProcess($pid);
+            }
+        }
+
+        return false;
+    }
+
+    private function isMasterProcessCommand(string $command): bool
+    {
+        $prefix = '[' . config('site.id', 'system-service') . '].Master[';
+        return str_contains($command, $prefix);
+    }
+
+    private function isSameAppProcess(int $pid): bool
+    {
+        $cwd = @readlink('/proc/' . $pid . '/cwd');
+        if ($cwd === false || $cwd === '') {
+            return false;
+        }
+
+        return $this->normalizePath($cwd) === $this->normalizePath(APP_PATH);
+    }
+
+    private function normalizePath(string $path): string
+    {
+        $real = realpath($path) ?: $path;
+        return rtrim(str_replace('\\', '/', $real), '/');
+    }
+
+    private function listProcesses(): array
+    {
+        $lines = [];
+        exec('ps -eo pid=,ppid=,args=', $lines);
+
+        $processes = [];
+        foreach ($lines as $line) {
+            $line = trim($line);
+            if ($line === '') {
+                continue;
+            }
+
+            $parts = preg_split('/\s+/', $line, 3);
+            if (count($parts) < 3) {
+                continue;
+            }
+
+            $processes[] = [
+                'pid' => (int)$parts[0],
+                'ppid' => (int)$parts[1],
+                'command' => $parts[2],
+            ];
+        }
+
+        return $processes;
+    }
+
+    private function isProcessAlive(int $pid): bool
+    {
+        return $pid > 1 && @Process::kill($pid, 0);
+    }
+    protected function addListen(): void
+    {
+        foreach (config('servers.reload.listen') as $value) {
+            $this->readDirectory($value);
+        }
+    }
+
+
+    /**
+     * @return void
+     */
+    protected function clear(): void
+    {
+        $this->watches = [];
+    }
+
+    /**
+     * @param string $directory
+     * @return void
+     */
+    public function readFile(string $directory): void
+    {
+        if (str_ends_with($directory, '.php') === true) {
+            inotify_add_watch($this->pipe, $directory, IN_MODIFY | IN_MOVE | IN_CREATE | IN_DELETE);
+        }
+    }
+
+
+    /**
+     * @param string $directory
+     * @return void
+     */
+    public function readDirectory(string $directory): void
+    {
+        foreach (glob($directory . '/*') as $data) {
+            if (is_dir($data)) {
+                $this->readDirectory($data);
+            } else {
+                $this->readFile($data);
+            }
+        }
+    }
+}

Abstracts/OnTaskerStart.php

@@ -1,36 +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
-{
-
-
-    /**
-     * @throws ConfigException
-     * @throws ReflectionException
-     */
-    public function dispatch(object $event)
-    {
-        $time = microtime(true);
-
-        ServerManager::setEnv('environmental', Kiri::TASK);
-//        if (!is_enable_file_modification_listening()) {
-//            $this->interpretDirectory();
-//        }
-
-        $this->mixed($event, false, $time);
-    }
-
-
-}

Abstracts/OnWorkerStart.php

@@ -1,39 +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 ConfigException
-     * @throws Exception
-     */
-    public function dispatch(object $event)
-    {
-        $time = microtime(true);
-
-        ServerManager::setEnv('environmental', Kiri::WORKER);
-//        if (is_enable_file_modification_listening()) {
-//            $this->router->read_files();
-//            $this->interpretDirectory();
-//        }
-        $this->mixed($event, true, $time);
-    }
-
-}

Abstracts/Server.php

@@ -1,16 +1,10 @@
 <?php
 
 
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
 
 
-use Annotation\Inject;
-use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Psr\Log\LoggerInterface;
-
+use Kiri\Error\StdoutLogger;
 
 /**
  * Class Server
@@ -19,37 +13,22 @@ use Psr\Log\LoggerInterface;
 abstract class Server
 {
 
-
-	/**
-	 * @var LoggerInterface 
-	 */
-	#[Inject(LoggerInterface::class)]
-	public LoggerInterface $logger;
-
-
-	/**
-	 * @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);
-	}
-
-
 	/**
 	 * Server constructor.
-	 * @throws Exception
+	 * @throws
 	 */
 	public function __construct()
 	{
 	}
 
+
+
+	/**
+	 * @return StdoutLogger
+	 */
+	protected function getLogger(): StdoutLogger
+	{
+		return \Kiri::getLogger();
+	}
+
 }

Abstracts/TraitServer.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace Kiri\Server\Abstracts;
+
+use Exception;
+use Kiri;
+use Swoole\Http\Server as HServer;
+use Swoole\Server;
+use Kiri\Server\Processes\AbstractProcess;
+use Kiri\Server\Constant;
+use Kiri\Server\Config;
+use Swoole\WebSocket\Server as WServer;
+use Swoole\Process;
+
+trait TraitServer
+{
+
+    /**
+     * @return void
+     * @throws
+     */
+    public function onSignal(): void
+    {
+        $signal = \config('servers.signal', []);
+        $this->onPcntlSignal(SIGINT, [$this, 'onSigint']);
+        foreach ($signal as $sig => $value) {
+            if (is_array($value) && is_string($value[0])) {
+                $value[0] = \Kiri::getDi()->get($value[0]);
+            }
+            if (!is_callable($value, true)) {
+                throw new Exception('Register signal callback must can exec.');
+            }
+            $this->onPcntlSignal($sig, $value);
+        }
+    }
+
+
+    /**
+     * @param $no
+     * @param array $signInfo
+     * @return void
+     */
+    public function onSigint($no, array $signInfo): void
+    {
+        static $handling = false;
+        if ($handling) {
+            return;
+        }
+        $handling = true;
+
+        try {
+            $pidFile = function_exists('storage') ? storage('.swoole.pid') : '';
+            $masterPid = is_file($pidFile) ? (int)trim((string)file_get_contents($pidFile)) : 0;
+            if ($masterPid > 1 && $masterPid !== getmypid()) {
+                return;
+            }
+
+            Kiri::getLogger()->alert('Pid ' . getmypid() . ' get signo ' . $no);
+            $this->shutdown();
+        } catch (\Throwable $exception) {
+            \Kiri::getLogger()->json_log($exception);
+        }
+    }
+
+    /**
+     * @param $signal
+     * @param $callback
+     * @return void
+     */
+    private function onPcntlSignal($signal, $callback): void
+    {
+        \pcntl_signal($signal, $callback);
+    }
+
+
+    /**
+     * @param array $ports
+     * @return array
+     */
+    public function sortService(array $ports): array
+    {
+        $array = [];
+        foreach ($ports as $port) {
+            $array = $this->sort($array, $port);
+        }
+        return $array;
+    }
+
+
+    /**
+     * @param array $ports
+     * @return array<Config>
+     */
+    public function genConfigService(array $ports): array
+    {
+        $array = [];
+        $ports = $ports['ports'] ?? [];
+        foreach ($ports as $port) {
+            $array = $this->sort($array, $port);
+        }
+        return $array;
+    }
+
+
+    /**
+     * @param array $array
+     * @param $port
+     * @return array
+     */
+    private function sort(array $array, $port): array
+    {
+        $config = instance(Config::class, [], $port);
+        if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
+            array_unshift($array, $config);
+        } else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
+            if (!empty($array) && $array[0]->type == Constant::SERVER_TYPE_WEBSOCKET) {
+                $array[] = $config;
+            } else {
+                array_unshift($array, $config);
+            }
+        } else {
+            $array[] = $config;
+        }
+        return $array;
+    }
+
+
+    /**
+     * @param $type
+     * @return string|null
+     */
+    public function getServerClass($type): ?string
+    {
+        return match ($type) {
+            Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
+            Constant::SERVER_TYPE_UDP => Server::class,
+            Constant::SERVER_TYPE_HTTP => HServer::class,
+            Constant::SERVER_TYPE_WEBSOCKET => WServer::class,
+            default => null
+        };
+    }
+
+}

Abstracts/WorkerStart.php

@@ -1,88 +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;
-
-
-    /**
-     * @throws \ReflectionException
-     * @throws \Exception
-     */
-    protected function interpretDirectory()
-    {
-        $di = Kiri::getDi();
-
-        $this->annotation->read(APP_PATH . 'app', 'App');
-
-        $fileLists = $this->annotation->read(APP_PATH . 'app');
-        foreach ($fileLists->runtime(APP_PATH . 'app') as $class) {
-            foreach (NoteManager::getTargetNote($class) as $value) {
-                $value->execute($class);
-            }
-            $methods = $di->getMethodAttribute($class);
-            foreach ($methods as $method => $attribute) {
-                if (empty($attribute)) {
-                    continue;
-                }
-                foreach ($attribute as $item) {
-                    $item->execute($class, $method);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param $event
-     * @param $isWorker
-     * @param $time
-     * @throws \Kiri\Exception\ConfigException
-     */
-    protected function mixed($event, $isWorker, $time)
-    {
-        $name = Config::get('id', 'system-service');
-        echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m [%s]Builder %s[%d].%d use time %s.", $name, $isWorker ? 'Worker' : 'Taker',
-                $event->server->worker_pid, $event->workerId, round(microtime(true) - $time, 6) . 's') . PHP_EOL;
-    }
-
-    /**
-     * @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);
-    }
-
-}

Config.php

@@ -0,0 +1,163 @@
+<?php
+
+namespace Kiri\Server;
+
+
+/**
+ *
+ */
+class Config
+{
+
+	public string $type;
+
+
+	public string $host = '';
+
+
+	public int $port = 0;
+
+
+	public string $name = '';
+
+
+
+	public int $mode = SWOOLE_PROCESS;
+
+	public int $socket = SWOOLE_SOCK_TCP;
+
+
+	public array $settings = [];
+
+
+	public array $events = [];
+
+	/**
+	 * @return string
+	 */
+	public function getType(): string
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @param string $type
+	 */
+	public function setType(string $type): void
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHost(): string
+	{
+		return $this->host;
+	}
+
+	/**
+	 * @param string $host
+	 */
+	public function setHost(string $host): void
+	{
+		$this->host = $host;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getPort(): int
+	{
+		return $this->port;
+	}
+
+	/**
+	 * @param int $port
+	 */
+	public function setPort(int $port): void
+	{
+		$this->port = $port;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function setName(string $name): void
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getMode(): int
+	{
+		return $this->mode;
+	}
+
+	/**
+	 * @param int $mode
+	 */
+	public function setMode(int $mode): void
+	{
+		$this->mode = $mode;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSettings(): array
+	{
+		return $this->settings;
+	}
+
+	/**
+	 * @param array $settings
+	 */
+	public function setSettings(array $settings): void
+	{
+		$this->settings = $settings;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getEvents(): array
+	{
+		return $this->events;
+	}
+
+	/**
+	 * @param array $events
+	 */
+	public function setEvents(array $events): void
+	{
+		$this->events = $events;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSocket(): int
+	{
+		return $this->socket;
+	}
+
+	/**
+	 * @param int $socket
+	 */
+	public function setSocket(int $socket): void
+	{
+		$this->socket = $socket;
+	}
+
+}

Constant.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Server;
+namespace Kiri\Server;
 
 
 /**
@@ -11,122 +11,123 @@ namespace Server;
 class Constant
 {
 
-	const START = 'Start';
-	const SHUTDOWN = 'Shutdown';
-	const BEFORE_SHUTDOWN = 'beforeShutdown';
-	const WORKER_START = 'WorkerStart';
-	const WORKER_STOP = 'WorkerStop';
-	const WORKER_EXIT = 'WorkerExit';
-	const CONNECT = 'Connect';
-	const HANDSHAKE = 'handshake';
-	const DISCONNECT = 'disconnect';
-	const MESSAGE = 'message';
-	const RECEIVE = 'Receive';
-	const PACKET = 'Packet';
-	const REQUEST = 'request';
-	const CLOSE = 'Close';
-	const TASK = 'Task';
-	const FINISH = 'Finish';
-	const PIPE_MESSAGE = 'PipeMessage';
-	const WORKER_ERROR = 'WorkerError';
-	const MANAGER_START = 'ManagerStart';
-	const MANAGER_STOP = 'ManagerStop';
-	const BEFORE_RELOAD = 'BeforeReload';
-	const AFTER_RELOAD = 'AfterReload';
+	const string START = 'Start';
+	const string SHUTDOWN = 'Shutdown';
+	const string BEFORE_SHUTDOWN = 'beforeShutdown';
+	const string WORKER_START = 'WorkerStart';
+	const string WORKER_STOP = 'WorkerStop';
+	const string WORKER_EXIT = 'WorkerExit';
+	const string CONNECT = 'Connect';
+	const string HANDSHAKE = 'handshake';
+	const string OPEN = 'open';
+	const string DISCONNECT = 'disconnect';
+	const string MESSAGE = 'message';
+	const string RECEIVE = 'Receive';
+	const string PACKET = 'Packet';
+	const string REQUEST = 'request';
+	const string CLOSE = 'Close';
+	const string TASK = 'Task';
+	const string FINISH = 'Finish';
+	const string PIPE_MESSAGE = 'PipeMessage';
+	const string WORKER_ERROR = 'WorkerError';
+	const string MANAGER_START = 'ManagerStart';
+	const string MANAGER_STOP = 'ManagerStop';
+	const string BEFORE_RELOAD = 'BeforeReload';
+	const string AFTER_RELOAD = 'AfterReload';
 
 
-	const SERVER_TYPE_HTTP = 'http';
-	const SERVER_TYPE_WEBSOCKET = 'ws';
-	const SERVER_TYPE_TCP = 'tcp';
-	const SERVER_TYPE_UDP = 'udp';
-	const SERVER_TYPE_BASE = 'base';
+	const string SERVER_TYPE_HTTP = 'http';
+	const string SERVER_TYPE_WEBSOCKET = 'ws';
+	const string SERVER_TYPE_TCP = 'tcp';
+	const string SERVER_TYPE_UDP = 'udp';
+	const string SERVER_TYPE_BASE = 'base';
 
 
-	const STATUS_404_MESSAGE = '<h2>HTTP 404 Not Found</h2><hr><i>Powered by Swoole</i>';
-	const STATUS_405_MESSAGE = '<h2>HTTP 405 Method allow</h2><hr><i>Powered by Swoole</i>';
+	const string STATUS_404_MESSAGE = '<h2>HTTP 404 Not Found</h2><hr><i>Powered by Swoole</i>';
+	const string STATUS_405_MESSAGE = '<h2>HTTP 405 Method allow</h2><hr><i>Powered by Swoole</i>';
 
 
-    const OPTION_REACTOR_NUM = 'reactor_num';
-    const OPTION_WORKER_NUM = 'worker_num';
-    const OPTION_MAX_REQUEST = 'max_request';
-    const OPTION_MAX_CONN = 'max_connection';
-    const OPTION_TASK_WORKER_NUM = 'task_worker_num';
-    const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
-    const OPTION_TASK_MAX_REQUEST = 'task_max_request';
-    const OPTION_TASK_TMPDIR = 'task_tmpdir';
-    const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
-    const OPTION_TASK_USE_OBJECT = 'task_use_object';
-    const OPTION_DISPATCH_MODE = 'dispatch_mode';
-    const OPTION_DISPATCH_FUNC = 'dispatch_func';
-    const OPTION_MESSAGE_QUEUE_KEY = 'message_queue_key';
-    const OPTION_DAEMONIZE = 'daemonize';
-    const OPTION_BACKLOG = 'backlog';
-    const OPTION_LOG_FILE = 'log_file';
-    const OPTION_LOG_LEVEL = 'log_level';
-    const OPTION_LOG_DATE_WITH_MICROSECONDS = 'log_date_with_microseconds';
-    const OPTION_LOG_ROTATION = 'log_rotation';
-    const OPTION_LOG_DATE_FORMAT = 'log_date_format';
-    const OPTION_OPEN_TCP_KEEPALIVE = 'open_tcp_keepalive';
-    const OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';
-    const OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';
-    const OPTION_OPEN_EOF_CHECK = 'open_eof_check';
-    const OPTION_OPEN_EOF_SPLIT = 'open_eof_split';
-    const OPTION_PACKAGE_EOF = 'package_eof';
-    const OPTION_OPEN_LENGTH_CHECK = 'open_length_check';
-    const OPTION_PACKAGE_LENGTH_TYPE = 'package_length_type';
-    const OPTION_PACKAGE_LENGTH_FUNC = 'package_length_func';
-    const OPTION_PACKAGE_MAX_LENGTH = 'package_max_length';
-    const OPTION_OPEN_HTTP_PROTOCOL = 'open_http_protocol';
-    const OPTION_OPEN_MQTT_PROTOCOL = 'open_mqtt_protocol';
-    const OPTION_OPEN_REDIS_PROTOCOL = 'open_redis_protocol';
-    const OPTION_OPEN_WEBSOCKET_PROTOCOL = 'open_websocket_protocol';
-    const OPTION_OPEN_WEBSOCKET_CLOSE_FRAME = 'open_websocket_close_frame';
-    const OPTION_OPEN_TCP_NODELAY = 'open_tcp_nodelay';
-    const OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';
-    const OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';
-    const OPTION_TCP_DEFER_ACCEPT = 'tcp_defer_accept';
-    const OPTION_SSL_CERT_FILE = 'ssl_cert_file';
-    const OPTION_SSL_KEY_FILE = 'ssl_key_file';
-    const OPTION_SSL_METHOD = 'ssl_method';
-    const OPTION_SSL_PROTOCOLS = 'ssl_protocols';
-    const OPTION_SSL_SNI_CERTS = 'ssl_sni_certs';
-    const OPTION_SSL_CIPHERS = 'ssl_ciphers';
-    const OPTION_SSL_VERIFY_PEER = 'ssl_verify_peer';
-    const OPTION_SSL_ALLOW_SELF_SIGNED = 'ssl_allow_self_signed';
-    const OPTION_SSL_CLIENT_CERT_FILE = 'ssl_client_cert_file';
-    const OPTION_SSL_COMPRESS = 'ssl_compress';
-    const OPTION_SSL_VERIFY_DEPTH = 'ssl_verify_depth';
-    const OPTION_SSL_PREFER_SERVER_CIPHERS = 'ssl_prefer_server_ciphers';
-    const OPTION_SSL_DHPARAM = 'ssl_dhparam';
-    const OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';
-    const OPTION_USER = 'user';
-    const OPTION_GROUP = 'group';
-    const OPTION_CHROOT = 'chroot';
-    const OPTION_PID_FILE = 'pid_file';
-    const OPTION_BUFFER_INPUT_SIZE = 'buffer_input_size';
-    const OPTION_BUFFER_OUTPUT_SIZE = 'buffer_output_size';
-    const OPTION_SOCKET_BUFFER_SIZE = 'socket_buffer_size';
-    const OPTION_ENABLE_UNSAFE_EVENT = 'enable_unsafe_event';
-    const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
-    const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
-    const OPTION_ENABLE_DELAY_RECEIVE = 'enable_delay_receive';
-    const OPTION_RELOAD_ASYNC = 'reload_async';
-    const OPTION_MAX_WAIT_TIME = 'max_wait_time';
-    const OPTION_TCP_FASTOPEN = 'tcp_fastopen';
-    const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
-    const OPTION_ENABLE_COROUTINE = 'enable_coroutine';
-    const OPTION_MAX_COROUTINE = 'max_coroutine';
-    const OPTION_SEND_YIELD = 'send_yield';
-    const OPTION_SEND_TIMEOUT = 'send_timeout';
-    const OPTION_HOOK_FLAGS = 'hook_flags';
-    const OPTION_BUFFER_HIGH_WATERMARK = 'buffer_high_watermark';
-    const OPTION_BUFFER_LOW_WATERMARK = 'buffer_low_watermark';
-    const OPTION_TCP_USER_TIMEOUT = 'tcp_user_timeout';
-    const OPTION_STATS_FILE = 'stats_file';
-    const OPTION_EVENT_OBJECT = 'event_object';
-    const OPTION_START_SESSION_ID = 'start_session_id';
-    const OPTION_SINGLE_THREAD = 'single_thread';
-    const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';
+    const string OPTION_REACTOR_NUM = 'reactor_num';
+    const string OPTION_WORKER_NUM = 'worker_num';
+    const string OPTION_MAX_REQUEST = 'max_request';
+    const string OPTION_MAX_CONN = 'max_connection';
+    const string OPTION_TASK_WORKER_NUM = 'task_worker_num';
+    const string OPTION_TASK_IPC_MODE = 'task_ipc_mode';
+    const string OPTION_TASK_MAX_REQUEST = 'task_max_request';
+    const string OPTION_TASK_TMPDIR = 'task_tmpdir';
+    const string OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
+    const string OPTION_TASK_USE_OBJECT = 'task_use_object';
+    const string OPTION_DISPATCH_MODE = 'dispatch_mode';
+    const string OPTION_DISPATCH_FUNC = 'dispatch_func';
+    const string OPTION_MESSAGE_QUEUE_KEY = 'message_queue_key';
+    const string OPTION_DAEMONIZE = 'daemonize';
+    const string OPTION_BACKLOG = 'backlog';
+    const string OPTION_LOG_FILE = 'log_file';
+    const string OPTION_LOG_LEVEL = 'log_level';
+    const string OPTION_LOG_DATE_WITH_MICROSECONDS = 'log_date_with_microseconds';
+    const string OPTION_LOG_ROTATION = 'log_rotation';
+    const string OPTION_LOG_DATE_FORMAT = 'log_date_format';
+    const string OPTION_OPEN_TCP_KEEPALIVE = 'open_tcp_keepalive';
+    const string OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';
+    const string OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';
+    const string OPTION_OPEN_EOF_CHECK = 'open_eof_check';
+    const string OPTION_OPEN_EOF_SPLIT = 'open_eof_split';
+    const string OPTION_PACKAGE_EOF = 'package_eof';
+    const string OPTION_OPEN_LENGTH_CHECK = 'open_length_check';
+    const string OPTION_PACKAGE_LENGTH_TYPE = 'package_length_type';
+    const string OPTION_PACKAGE_LENGTH_FUNC = 'package_length_func';
+    const string OPTION_PACKAGE_MAX_LENGTH = 'package_max_length';
+    const string OPTION_OPEN_HTTP_PROTOCOL = 'open_http_protocol';
+    const string OPTION_OPEN_MQTT_PROTOCOL = 'open_mqtt_protocol';
+    const string OPTION_OPEN_REDIS_PROTOCOL = 'open_redis_protocol';
+    const string OPTION_OPEN_WEBSOCKET_PROTOCOL = 'open_websocket_protocol';
+    const string OPTION_OPEN_WEBSOCKET_CLOSE_FRAME = 'open_websocket_close_frame';
+    const string OPTION_OPEN_TCP_NODELAY = 'open_tcp_nodelay';
+    const string OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';
+    const string OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';
+    const string OPTION_TCP_DEFER_ACCEPT = 'tcp_defer_accept';
+    const string OPTION_SSL_CERT_FILE = 'ssl_cert_file';
+    const string OPTION_SSL_KEY_FILE = 'ssl_key_file';
+    const string OPTION_SSL_METHOD = 'ssl_method';
+    const string OPTION_SSL_PROTOCOLS = 'ssl_protocols';
+    const string OPTION_SSL_SNI_CERTS = 'ssl_sni_certs';
+    const string OPTION_SSL_CIPHERS = 'ssl_ciphers';
+    const string OPTION_SSL_VERIFY_PEER = 'ssl_verify_peer';
+    const string OPTION_SSL_ALLOW_SELF_SIGNED = 'ssl_allow_self_signed';
+    const string OPTION_SSL_CLIENT_CERT_FILE = 'ssl_client_cert_file';
+    const string OPTION_SSL_COMPRESS = 'ssl_compress';
+    const string OPTION_SSL_VERIFY_DEPTH = 'ssl_verify_depth';
+    const string OPTION_SSL_PREFER_SERVER_CIPHERS = 'ssl_prefer_server_ciphers';
+    const string OPTION_SSL_DHPARAM = 'ssl_dhparam';
+    const string OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';
+    const string OPTION_USER = 'user';
+    const string OPTION_GROUP = 'group';
+    const string OPTION_CHROOT = 'chroot';
+    const string OPTION_PID_FILE = 'pid_file';
+    const string OPTION_BUFFER_INPUT_SIZE = 'buffer_input_size';
+    const string OPTION_BUFFER_OUTPUT_SIZE = 'buffer_output_size';
+    const string OPTION_SOCKET_BUFFER_SIZE = 'socket_buffer_size';
+    const string OPTION_ENABLE_UNSAFE_EVENT = 'enable_unsafe_event';
+    const string OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
+    const string OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
+    const string OPTION_ENABLE_DELAY_RECEIVE = 'enable_delay_receive';
+    const string OPTION_RELOAD_ASYNC = 'reload_async';
+    const string OPTION_MAX_WAIT_TIME = 'max_wait_time';
+    const string OPTION_TCP_FASTOPEN = 'tcp_fastopen';
+    const string OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
+    const string OPTION_ENABLE_COROUTINE = 'enable_coroutine';
+    const string OPTION_MAX_COROUTINE = 'max_coroutine';
+    const string OPTION_SEND_YIELD = 'send_yield';
+    const string OPTION_SEND_TIMEOUT = 'send_timeout';
+    const string OPTION_HOOK_FLAGS = 'hook_flags';
+    const string OPTION_BUFFER_HIGH_WATERMARK = 'buffer_high_watermark';
+    const string OPTION_BUFFER_LOW_WATERMARK = 'buffer_low_watermark';
+    const string OPTION_TCP_USER_TIMEOUT = 'tcp_user_timeout';
+    const string OPTION_STATS_FILE = 'stats_file';
+    const string OPTION_EVENT_OBJECT = 'event_object';
+    const string OPTION_START_SESSION_ID = 'start_session_id';
+    const string OPTION_SINGLE_THREAD = 'single_thread';
+    const string OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';
 
 
 }

Contract/OnBeforeShutdown.php

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

Contract/OnCloseInterface.php

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

Contract/OnConnectInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Kiri\Server\Contract;
+
+use Swoole\Server;
+
+interface OnConnectInterface
+{
+
+
+	/**
+	 * @param Server $server
+	 * @param int    $fd
+	 * @param int    $reactorId
+	 * @return void
+	 */
+	public function onConnect(Server $server, int $fd, int $reactorId): void;
+
+}

Contract/OnDisconnectInterface.php

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

Contract/OnHandshakeInterface.php

@@ -1,14 +1,10 @@
 <?php
 
-namespace Server\SInterface;
+namespace Kiri\Server\Contract;
 
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 
-
-/**
- *
- */
 interface OnHandshakeInterface
 {
 
@@ -16,6 +12,7 @@ interface OnHandshakeInterface
 	/**
 	 * @param Request $request
 	 * @param Response $response
+	 * @return void
 	 */
 	public function onHandshake(Request $request, Response $response): void;
 

Contract/OnMessageInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Server\SInterface;
+namespace Kiri\Server\Contract;
 
-use Swoole\Server;
+use Swoole\WebSocket\Server;
 use Swoole\WebSocket\Frame;
 
 interface OnMessageInterface

Contract/OnOpenInterface.php

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

Contract/OnPacketInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Server\SInterface;
+namespace Kiri\Server\Contract;
 
-use Server\Abstracts\Server;
+use Swoole\Server;
 
 interface OnPacketInterface
 {
@@ -12,7 +12,7 @@ interface OnPacketInterface
 	 * @param Server $server
 	 * @param string $data
 	 * @param array $clientInfo
-	 * @return mixed
+	 * @return void
 	 */
 	public function onPacket(Server $server, string $data, array $clientInfo): void;
 

Contract/OnPipeMessageInterface.php

@@ -0,0 +1,26 @@
+<?php
+
+
+namespace Kiri\Server\Contract;
+
+
+use Swoole\Server;
+
+/**
+ * Interface OnPipeMessageInterface
+ * @package Server\Contract
+ */
+interface OnPipeMessageInterface
+{
+
+	/**
+	 * @param Server $server
+	 * @param int    $src_worker_id
+	 * @param mixed  $message
+	 * @return void
+	 */
+	public function onPipeMessage(Server $server, int $src_worker_id, mixed $message): void;
+
+
+
+}

Contract/OnReceiveInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Kiri\Server\Contract;
+
+use Swoole\Server;
+
+
+/**
+ *
+ */
+interface OnReceiveInterface
+{
+
+
+    /**
+     * @param Server $server
+     * @param int $fd
+     * @param int $reactor_id
+     * @param string $data
+     * @return bool
+     */
+	public function onReceive(Server $server, int $fd, int $reactor_id, string $data): bool;
+
+
+}

Events/OnAfterCommandExecute.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace Server\Events;
-
-class OnAfterCommandExecute
-{
-
-
-	/**
-	 * @param mixed $data
-	 */
-	public function __construct(public mixed $data)
-	{
-	}
-
-}

Events/OnAfterReload.php

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

Events/OnAfterRequest.php

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

Events/OnAfterWorkerStart.php

@@ -1,8 +1,19 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
+
+use Swoole\Server;
 
 class OnAfterWorkerStart
 {
 
+
+    /**
+     * @param Server $server
+     * @param int $workerId
+     */
+    public function __construct(public Server $server, public int $workerId)
+    {
+    }
+
 }

Events/OnBeforeCommandExecute.php

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

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,11 +1,17 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
+
+use Swoole\Server;
 
 class OnBeforeWorkerStart
 {
 
-    public function __construct(public int $workerId)
+    /**
+     * @param Server $server
+     * @param int $workerId
+     */
+    public function __construct(public Server $server,public int $workerId)
     {
     }
 

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/OnProcessStart.php

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

Events/OnProcessStop.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Kiri\Server\Events;
+
+use Swoole\Process;
+
+class OnProcessStop
+{
+
+	/**
+	 * @param Process $process
+	 */
+	public function __construct(Process $process)
+	{
+	}
+
+}

Events/OnServerBeforeStart.php

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

Events/OnShutdown.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
+use Swoole\Coroutine\Http\Server as CHServer;
+use Swoole\Coroutine\Server as CServer;
 use Swoole\Server;
 
 class OnShutdown
@@ -9,9 +11,9 @@ class OnShutdown
 
 
 	/**
-	 * @param Server|null $server
+	 * @param Server|CHServer|CServer|null $server
 	 */
-	public function __construct(public ?Server $server = null)
+	public function __construct(public Server|null|CHServer|CServer $server = null)
 	{
 	}
 

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;
 
@@ -12,10 +12,10 @@ class OnWorkerExit
 
 
     /**
-	 * @param Server $server
+     * @param Server|null $server
      * @param int $workerId
      */
-	public function __construct(public Server $server, public int $workerId)
+	public function __construct(public ?Server $server, public int $workerId)
 	{
 	}
 

Events/OnWorkerStart.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
 use Swoole\Server;
+use Swoole\Coroutine\Server as CServer;
+use Swoole\Coroutine\Http\Server as CHServer;
 
 /**
  *
@@ -12,10 +14,10 @@ class OnWorkerStart
 
 
 	/**
-     * @param Server $server
+	 * @param Server|CHServer|CServer|null $server
 	 * @param int $workerId
 	 */
-    public function __construct(public Server $server, public int $workerId)
+	public function __construct(public Server|null|CHServer|CServer $server, public int $workerId)
 	{
 	}
 

Events/OnWorkerStop.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Server\Events;
+namespace Kiri\Server\Events;
 
+use Swoole\Coroutine\Http\Server as CHServer;
+use Swoole\Coroutine\Server as CServer;
 use Swoole\Server;
 
 /**
@@ -12,10 +14,10 @@ class OnWorkerStop
 
 
 	/**
-	 * @param Server $server
+	 * @param Server|CHServer|CServer|null $server
 	 * @param int $workerId
 	 */
-	public function __construct(public Server $server, public int $workerId)
+	public function __construct(public Server|null|CHServer|CServer $server, public int $workerId)
 	{
 	}
 

Handler/OnPipeMessage.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace Server\Handler;
-
-use Annotation\Inject;
-use Server\Abstracts\Server;
-use Exception;
-use Server\SInterface\OnPipeMessageInterface;
-use Kiri\Events\EventDispatch;
-
-/**
- *
- */
-class OnPipeMessage extends Server
-{
-
-
-	/** @var EventDispatch  */
-	#[Inject(EventDispatch::class)]
-	public EventDispatch $eventDispatch;
-
-
-	/**
-	 * @param \Swoole\Server $server
-	 * @param int $src_worker_id
-	 * @param mixed $message
-	 * @throws Exception
-	 */
-	public function onPipeMessage(\Swoole\Server $server, int $src_worker_id, mixed $message)
-	{
-		if (!is_object($message) || !($message instanceof OnPipeMessageInterface)) {
-			return;
-		}
-		call_user_func([$message, 'process'], $server, $src_worker_id);
-	}
-
-
-}

Handler/OnServer.php

@@ -1,14 +1,16 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Annotation\Inject;
-use Kiri\Events\EventDispatch;
-use Kiri\Exception\ConfigException;
-use Server\Abstracts\Server;
-use Server\Events\OnBeforeShutdown;
-use Server\Events\OnShutdown;
-use Server\Events\OnStart;
+use Kiri;
+use Kiri\Di\Inject\Container;
+use Kiri\Error\StdoutLogger;
+use Psr\Log\LoggerInterface;
+use Kiri\Server\Abstracts\Server;
+use Kiri\Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnShutdown;
+use Kiri\Server\Events\OnStart;
+use Swoole\Server as SServer;
 
 
 /**
@@ -18,41 +20,44 @@ use Server\Events\OnStart;
 class OnServer extends Server
 {
 
+
     /**
-	 * @var EventDispatch
+     * @var StdoutLogger
      */
-	#[Inject(EventDispatch::class)]
-	public EventDispatch $eventDispatch;
+    #[Container(LoggerInterface::class)]
+    public StdoutLogger $logger;
 
 
     /**
-	 * @param \Swoole\Server $server
-	 * @throws ConfigException
+     * @param SServer $server
+     * @throws
      */
-	public function onStart(\Swoole\Server $server)
+    public function onStart(SServer $server): void
     {
-		$this->setProcessName(sprintf('start[%d].server', $server->master_pid));
+        Kiri::setProcessName(sprintf('Master[%d]', $server->master_pid));
 
-		$this->eventDispatch->dispatch(new OnStart($server));
+        event(new OnStart($server));
     }
 
 
     /**
-	 * @param \Swoole\Server $server
+     * @param SServer $server
+     * @throws
      */
-	public function onBeforeShutdown(\Swoole\Server $server)
+    public function onBeforeShutdown(SServer $server): void
     {
-		$this->eventDispatch->dispatch(new OnBeforeShutdown($server));
+        event(new OnBeforeShutdown($server));
     }
 
 
     /**
-	 * @param \Swoole\Server $server
+     * @param SServer $server
+     * @throws
      */
-	public function onShutdown(\Swoole\Server $server)
+    public function onShutdown(SServer $server): void
     {
-		$this->eventDispatch->dispatch(new OnShutdown($server));
+        @unlink(storage('.swoole.pid'));
+        event(new OnShutdown($server));
     }
 
-
 }

Handler/OnServerManager.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Annotation\Inject;
-use Kiri\Events\EventDispatch;
-use Server\Abstracts\Server;
-use Kiri\Exception\ConfigException;
-use Server\Events\OnManagerStart;
-use Server\Events\OnManagerStop;
+use Kiri;
+use Kiri\Server\Abstracts\Server;
+use Kiri\Server\Events\OnManagerStart;
+use Kiri\Server\Events\OnManagerStop;
 
 
 /**
@@ -17,31 +15,27 @@ use Server\Events\OnManagerStop;
 class OnServerManager extends Server
 {
 
-	/**
-	 * @var EventDispatch
-	 */
-	#[Inject(EventDispatch::class)]
-	public EventDispatch $eventDispatch;
-
 
     /**
      * @param \Swoole\Server $server
-     * @throws ConfigException
+     * @throws
      */
-	public function onManagerStart(\Swoole\Server $server)
+    public function onManagerStart(\Swoole\Server $server): void
     {
-        $this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
+        Kiri::setProcessName(sprintf('Manger[%d]', $server->manager_pid));
 
-		$this->eventDispatch->dispatch(new OnManagerStart($server));
+        event(new OnManagerStart($server));
     }
 
 
     /**
      * @param \Swoole\Server $server
+     * @return void
+     * @throws
      */
-	public function onManagerStop(\Swoole\Server $server)
+    public function onManagerStop(\Swoole\Server $server): void
     {
-		$this->eventDispatch->dispatch(new OnManagerStop($server));
+        event(new OnManagerStop($server));
     }
 
 

Handler/OnServerReload.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace Server\Handler;
-
-use Annotation\Inject;
-use Kiri\Events\EventDispatch;
-use Server\Events\OnAfterReload;
-use Server\Events\OnBeforeReload;
-use Swoole\Server;
-
-
-/**
- *
- */
-class OnServerReload
-{
-
-
-	/**
-	 * @var EventDispatch
-	 */
-	#[Inject(EventDispatch::class)]
-	public EventDispatch $eventDispatch;
-
-
-	/**
-	 * @param Server $server
-	 */
-	public function onBeforeReload(Server $server)
-	{
-		$this->eventDispatch->dispatch(new OnBeforeReload($server));
-	}
-
-
-	/**
-	 * @param Server $server
-	 */
-	public function onAfterReload(Server $server)
-	{
-		$this->eventDispatch->dispatch(new OnAfterReload($server));
-	}
-
-}

Handler/OnServerTask.php

@@ -1,101 +0,0 @@
-<?php
-
-
-namespace Server\Handler;
-
-
-use Annotation\Inject;
-use Kiri\Abstracts\Logger;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use ReflectionException;
-use Server\SInterface\OnTaskInterface;
-use Swoole\Server;
-
-
-/**
- * Class OnServerTask
- * @package Server\Task
- */
-class OnServerTask
-{
-
-
-	#[Inject(Logger::class)]
-	public Logger $logger;
-
-
-	/**
-	 * @param Server $server
-	 * @param int $task_id
-	 * @param int $src_worker_id
-	 * @param mixed $data
-	 * @throws ConfigException
-	 */
-	public function onTask(Server $server, int $task_id, int $src_worker_id, mixed $data)
-	{
-		try {
-			$data = $this->resolve($data);
-		} catch (\Throwable $exception) {
-			$data = jTraceEx($exception);
-
-			$this->logger->error('task', [$data]);
-		} finally {
-			$server->finish($data);
-		}
-	}
-
-
-	/**
-	 * @param Server $server
-	 * @param Server\Task $task
-	 * @throws ConfigException
-	 */
-	public function onCoroutineTask(Server $server, Server\Task $task)
-	{
-		try {
-			$data = $this->resolve($task->data);
-		} catch (\Throwable $exception) {
-			$data = jTraceEx($exception);
-
-			$this->logger->error('task', [$data]);
-		} finally {
-			$server->finish($data);
-		}
-	}
-
-
-	/**
-	 * @param $data
-	 * @return null
-	 * @throws ReflectionException
-	 */
-	private function resolve($data)
-	{
-		[$class, $params] = json_encode($data, true);
-
-		$reflect = Kiri::getDi()->getReflect($class);
-
-		if (!$reflect->isInstantiable()) {
-			return null;
-		}
-		$class = $reflect->newInstanceArgs($params);
-		return $class->execute();
-	}
-
-
-	/**
-	 * @param Server $server
-	 * @param int $task_id
-	 * @param mixed $data
-	 */
-	public function onFinish(Server $server, int $task_id, mixed $data)
-	{
-		if (!($data instanceof OnTaskInterface)) {
-			return;
-		}
-		$data->finish($server, $task_id);
-	}
-
-
-}

Handler/OnServerWorker.php

@@ -1,82 +1,112 @@
 <?php
 
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
 
-use Annotation\Inject;
-use Exception;
-use Kiri\Abstracts\Config;
+use Kiri;
+use Kiri\Abstracts\CoordinatorManager;
+use Kiri\Coordinator;
 use Kiri\Core\Help;
+use Kiri\Di\Inject\Container;
 use Kiri\Events\EventDispatch;
-use Kiri\Runtime;
-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 Server\ServerManager;
+use Kiri\Server\Events\OnAfterWorkerStart;
+use Kiri\Server\Events\OnBeforeWorkerStart;
+use Kiri\Server\Events\OnTaskerStart as OnTaskerStart;
+use Kiri\Server\Events\OnWorkerError;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnWorkerStop;
+use Psr\Http\Message\RequestInterface;
 use Swoole\Server;
 use Swoole\Timer;
+use Throwable;
+use function config;
 
 
 /**
  * Class OnServerWorker
  * @package Server\Worker
  */
-class OnServerWorker extends \Server\Abstracts\Server
+class OnServerWorker extends Kiri\Server\Abstracts\Server
 {
 
 
 	/**
 	 * @var EventDispatch
 	 */
-	#[Inject(EventDispatch::class)]
-	public EventDispatch $eventDispatch;
+	#[Container(EventDispatch::class)]
+	public EventDispatch $dispatch;
 
 
 	/**
-	 * @param Server $server
-	 * @param int $workerId
-	 * @throws Exception
+	 * @return void
 	 */
-	public function onWorkerStart(Server $server, int $workerId)
+	public function init(): void
 	{
-		$this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId));
-		if ($workerId < $server->setting['worker_num']) {
-			$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
-			$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
+		on(OnBeforeWorkerStart::class, [$this, 'onWorkerNameAlias']);
+	}
+
+
+	/**
+	 * @param OnBeforeWorkerStart $workerStart
+	 * @return void
+	 */
+	public function onWorkerNameAlias(OnBeforeWorkerStart $workerStart): void
+	{
+		if ($workerStart->workerId < $workerStart->server->setting['worker_num']) {
+			$this->processName($workerStart->server, 'Worker');
+			set_env('environmental', Kiri::WORKER);
 		} else {
-			$this->eventDispatch->dispatch(new OnTaskStart($server, $workerId));
-			$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));
-		}
-		$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));
+			$this->processName($workerStart->server, 'Tasker');
+			set_env('environmental', Kiri::TASK);
 		}
+		set_env('environmental_worker_id', $workerStart->workerId);
 	}
 
 
 	/**
 	 * @param Server $server
 	 * @param int $workerId
-	 * @throws Exception
+	 * @return void
+	 * @throws
 	 */
-	public function onWorkerStop(Server $server, int $workerId)
+	public function onWorkerStart(Server $server, int $workerId): void
 	{
-		$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
+		try {
+			$this->dispatch->dispatch(new OnBeforeWorkerStart($server, $workerId));
+			if ($workerId < $server->setting['worker_num']) {
+				CoordinatorManager::utility(Coordinator::WORKER_START)->wait();
 
+				$this->dispatch->dispatch(new OnWorkerStart($server, $workerId));
+			} else {
+				$this->dispatch->dispatch(new OnTaskerStart($server, $workerId));
+			}
+		} catch (Throwable $exception) {
+			\Kiri::getLogger()->json_log($exception);
+		} finally {
+			$this->dispatch->dispatch(new OnAfterWorkerStart($server, $workerId));
+		}
+	}
+
+
+	/**
+	 * @param Server $server
+	 * @param string $prefix
+	 * @return void
+	 */
+	protected function processName(Server $server, string $prefix): void
+	{
+		Kiri::setProcessName(sprintf($prefix . '[%d]', $server->worker_pid));
+	}
+
+
+	/**
+	 * @param Server $server
+	 * @param int $workerId
+	 * @throws
+	 */
+	public function onWorkerStop(Server $server, int $workerId): void
+	{
+		event(new OnWorkerStop($server, $workerId));
 		Timer::clearAll();
 	}
 
@@ -84,13 +114,11 @@ class OnServerWorker extends \Server\Abstracts\Server
 	/**
 	 * @param Server $server
 	 * @param int $workerId
-	 * @throws Exception
+	 * @throws
 	 */
-	public function onWorkerExit(Server $server, int $workerId)
+	public function onWorkerExit(Server $server, int $workerId): void
 	{
-		$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
-
-		ServerManager::setEnv('state', 'exit');
+		event(new OnWorkerExit($server, $workerId));
 	}
 
 
@@ -100,35 +128,40 @@ class OnServerWorker extends \Server\Abstracts\Server
 	 * @param int $worker_pid
 	 * @param int $exit_code
 	 * @param int $signal
-	 * @throws Exception
+	 * @throws
 	 */
-	public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal)
+	public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal): void
 	{
-		$this->eventDispatch->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
+		event(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
 
-		$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s',
-			$worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), 9)
-		);
-
-		$this->logger->error($message);
+		debug_print_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
 
+		/** @var RequestInterface $context */
+		$context = Kiri\Di\Context::get(RequestInterface::class);
+		if (is_null($context)) {
+			$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s', $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), $signal));
+		} else {
+			$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s, method: %s, path: %s, query: %s', $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), $signal),
+							   $context->getMethod(), $context->getUri()->getPath(), $context->getUri()->getQuery());
+		}
+		$this->getLogger()->println($message);
 		$this->system_mail($message);
 	}
 
 
 	/**
 	 * @param $messageContent
-	 * @throws Exception
+	 * @throws
 	 */
-	protected function system_mail($messageContent)
+	protected function system_mail($messageContent): void
 	{
 		try {
-			$email = Config::get('email');
-			if (!empty($email) && ($email['enable'] ?? false) == true) {
+			$email = config('email', ['enable' => false]);
+			if (!empty($email) && ($email['enable'] ?? false)) {
 				Help::sendEmail($email, 'Service Error', $messageContent);
 			}
-		} catch (\Throwable $e) {
-			error($e, 'email');
+		} catch (Throwable $e) {
+			\Kiri::getLogger()->json_log($e);
 		}
 	}
 

Processes/AbstractProcess.php

@@ -0,0 +1,174 @@
+<?php
+
+namespace Kiri\Server\Processes;
+
+
+use Swoole\Coroutine;
+use Swoole\Process;
+use const SIGHUP;
+use const SIGINT;
+use const SIGTERM;
+
+/**
+ *
+ */
+abstract class AbstractProcess implements OnProcessInterface
+{
+
+    private bool $stop = false;
+
+
+    public Process $process;
+
+
+    /**
+     * @var bool
+     */
+    protected bool $redirect_stdin_and_stdout = FALSE;
+
+
+    /**
+     * @var int
+     */
+    protected int $pipe_type = SOCK_DGRAM;
+
+
+    /**
+     * @var bool
+     */
+    protected bool $enable_coroutine = false;
+
+
+    /**
+     * @var bool
+     */
+    protected bool $enable_queue = false;
+
+
+    /**
+     * @var string
+     */
+    public string $name = '';
+
+
+    /**
+     * @return bool
+     */
+    public function isEnableQueue(): bool
+    {
+        return $this->enable_queue;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        if (empty($this->name)) {
+            $this->name = uniqid('p.');
+        }
+        return $this->name;
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function isStop(): bool
+    {
+        return $this->stop;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getRedirectStdinAndStdout(): bool
+    {
+        return $this->redirect_stdin_and_stdout;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPipeType(): int
+    {
+        return $this->pipe_type;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEnableCoroutine(): bool
+    {
+        return $this->enable_coroutine;
+    }
+
+
+    /**
+     *
+     */
+    public function stop(): void
+    {
+        $this->stop = true;
+    }
+
+
+    /**
+     * @return void
+     */
+    abstract public function onSigterm(): void;
+
+
+    /**
+     * @param Process $process
+     * @return AbstractProcess
+     */
+    public function onShutdown(Process $process): static
+    {
+        $this->process = $process;
+        if ($this->enable_coroutine) {
+            $array['enable_deadlock_check']        = false;
+            $array['deadlock_check_disable_trace'] = false;
+            $array['exit_condition']               = [$this, 'exit_condition'];
+            Coroutine::set($array);
+            Coroutine::create(fn() => $this->coroutineWaitSignal());
+        } else {
+            $process::signal(SIGTERM, [$this, 'pointWaitSignal']);
+            $process::signal(SIGINT, [$this, 'pointWaitSignal']);
+        }
+        return $this;
+    }
+
+
+    public function exit_condition(): bool
+    {
+        return Coroutine::stats()['coroutine_num'] === 0;
+    }
+
+
+    /**
+     * @param $signal
+     * @return void
+     */
+    public function pointWaitSignal($signal): void
+    {
+        $this->stop = true;
+
+        $this->onSigterm();
+    }
+
+
+    /**
+     * @return void
+     */
+    public function coroutineWaitSignal(): void
+    {
+        $value = Coroutine::waitSignal(SIGTERM);
+        if ($value) {
+            $this->stop = true;
+        }
+        $this->onSigterm();
+    }
+
+}

Processes/OnProcessInterface.php

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

Processes/TraitProcess.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Kiri\Server\Processes;
+
+use Exception;
+use Kiri;
+use Swoole\Process;
+
+trait TraitProcess
+{
+
+    /**
+     * @var array
+     */
+    private array $_process = [];
+
+
+    /**
+     * @param string|array|AbstractProcess $class
+     * @return void
+     * @throws
+     */
+    public function addProcess(string|array|AbstractProcess $class): void
+    {
+        if (!is_array($class)) $class = [$class];
+        foreach ($class as $name) {
+            if (is_string($name)) $name = Kiri::getDi()->get($name);
+            if (isset($this->_process[$name->getName()])) {
+                throw new Exception('AbstractProcess(' . $name->getName() . ') is exists.');
+            }
+            $this->_process[$name->getName()] = $this->genProcess($name);
+        }
+    }
+
+
+    /**
+     * @param AbstractProcess $name
+     * @return Process
+     */
+    private function genProcess(AbstractProcess $name): Process
+    {
+        return new Process(function (Process $process) use ($name) {
+            $process->name('[' . \config('site.id', 'system-service') . '].' . $name->getName() . '[' . $process->pid . ']');
+            $name->onShutdown($process)->process($process);
+        },
+            $name->getRedirectStdinAndStdout(),
+            $name->getPipeType(),
+            $name->isEnableCoroutine());
+    }
+
+
+    /**
+     * @param string $name
+     * @return AbstractProcess|null
+     */
+    public function getProcess(string $name): ?Process
+    {
+        return $this->_process[$name] ?? null;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getProcesses(): array
+    {
+        return $this->_process;
+    }
+}

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/OnConnectInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Server;
-
-interface OnConnectInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 * @return void
-	 */
-	public function onConnect(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/OnOpenInterface.php

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

SInterface/OnPipeMessageInterface.php

@@ -1,21 +0,0 @@
-<?php
-
-
-namespace Server\SInterface;
-
-
-/**
- * Interface OnPipeMessageInterface
- * @package Server\SInterface
- */
-interface OnPipeMessageInterface
-{
-
-	/**
-	 *
-	 */
-	public function process(): 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;
-
-
-}

SInterface/OnReceiveInterface.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Server\SInterface;
-
-use Swoole\Server;
-
-
-/**
- *
- */
-interface OnReceiveInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 * @param int $reactor_id
-	 * @param string $data
-	 * @return void
-	 */
-	public function onReceive(Server $server, int $fd, int $reactor_id, string $data): void;
-
-
-}

SInterface/OnTaskInterface.php

@@ -1,17 +0,0 @@
-<?php
-
-
-namespace Server\SInterface;
-
-
-use Swoole\Server;
-
-interface OnTaskInterface
-{
-
-	public function execute();
-
-
-	public function finish(Server $server, int $task_id);
-
-}

Server.php

@@ -1,137 +0,0 @@
-<?php
-
-
-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 Server\Events\OnShutdown;
-
-
-defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
-
-/**
- * Class Server
- * @package Http
- */
-class Server extends HttpService
-{
-
-	private array $process = [
-		LoggerProcess::class
-	];
-
-
-	/**
-	 * @Inject ServerManager
-	 * @var null|ServerManager
-	 */
-	#[Inject(ServerManager::class)]
-	public ?ServerManager $manager = null;
-
-	private mixed $daemon = 0;
-
-
-	/** @var EventDispatch */
-	#[Inject(EventDispatch::class)]
-	public EventDispatch $eventDispatch;
-
-
-	/**
-	 *
-	 */
-	public function init()
-	{
-	}
-
-
-	/**
-	 * @param $process
-	 */
-	public function addProcess($process)
-	{
-		$this->process[] = $process;
-	}
-
-
-	/**
-	 * @return string start server
-	 *
-	 * start server
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function start(): string
-	{
-		$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'],
-				$rpcService['mode'], $rpcService);
-		}
-
-		$processes = array_merge($this->process, Config::get('processes', []));
-		foreach ($processes as $process) {
-			$this->manager->addProcess($process);
-		}
-
-		return $this->manager->getServer()->start();
-	}
-
-
-	/**
-	 * @return void
-	 *
-	 * start server
-	 * @throws Exception
-	 */
-	public function shutdown()
-	{
-		$configs = Config::get('server', [], true);
-		foreach ($this->manager->sortService($configs['ports'] ?? []) as $config) {
-			$this->manager->stopServer($config['port']);
-		}
-		$this->eventDispatch->dispatch(new OnShutdown());
-	}
-
-
-	/**
-	 * @return bool
-	 * @throws ConfigException
-	 */
-	public function isRunner(): bool
-	{
-		return $this->manager->isRunner();
-	}
-
-
-	/**
-	 * @param $daemon
-	 * @return Server
-	 */
-	public function setDaemon($daemon): static
-	{
-		if (!in_array($daemon, [0, 1])) {
-			return $this;
-		}
-		$this->daemon = $daemon;
-		return $this;
-	}
-
-
-	/**
-	 * @return \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();
-	}
-
-}

ServerCommand.php

@@ -1,32 +1,30 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
-use Annotation\Inject;
 use Exception;
-use Http\Constrict\Request;
-use Http\Constrict\RequestInterface;
-use Http\Constrict\Response;
-use Http\Constrict\ResponseInterface;
-use Kiri\Abstracts\Config;
-use Kiri\Di\ContainerInterface;
+use Kiri;
+use Kiri\Server\Abstracts\FileWatcher;
+use Kiri\Server\Events\OnWorkerStart;
 use Kiri\Events\EventProvider;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Server\Abstracts\OnTaskerStart as TaskerDispatch;
-use Server\Abstracts\OnWorkerStart as WorkerDispatch;
-use Server\Events\OnBeforeWorkerStart;
-use Server\Events\OnTaskerStart;
-use Server\Events\OnWorkerStart;
-use Server\Handler\OnServerWorker;
-use Swoole\Coroutine;
+use Kiri\Events\EventDispatch;
+use Kiri\Router\Router;
+use Kiri\Server\Abstracts\AsyncServer;
+use Kiri\Server\Events\OnShutdown;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use function config;
+use Kiri\Server\Abstracts\HotReload;
+use Kiri\Di\Inject\Container;
+
+defined('ROUTER_TYPE_HTTP') or define('ROUTER_TYPE_HTTP', 'http');
+defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
 
 /**
  * Class Command
@@ -36,25 +34,47 @@ class ServerCommand extends Command
 {
 
 
-	const ACTIONS = ['start', 'stop', 'restart'];
+    #[Container(State::class)]
+    public State $state;
+
+
+    /**
+     * @var ContainerInterface
+     */
+    #[Container(ContainerInterface::class)]
+    public ContainerInterface $container;
+
+
+    /**
+     * @var AsyncServer
+     */
+    #[Container(AsyncServer::class)]
+    public AsyncServer $asyncServer;
+
+
+    /**
+     * @var EventDispatch
+     */
+    #[Container(EventDispatch::class)]
+    public EventDispatch $eventDispatch;
 
 
     /**
      * @var EventProvider
      */
-	#[Inject(EventProvider::class)]
+    #[Container(EventProvider::class)]
     public EventProvider $eventProvider;
 
 
     /**
-	 *
+     * @return void
      */
-	protected function configure()
+    protected function configure(): void
     {
         $this->setName('sw:server')
              ->setDescription('server start|stop|reload|restart')
-			->addArgument('action', InputArgument::REQUIRED)
-			->addOption('daemon', 'd', InputOption::VALUE_OPTIONAL,'is run daemonize',-1);
+             ->addArgument('action', InputArgument::OPTIONAL, 'run action', 'start')
+             ->addOption('daemon', 'd', InputOption::VALUE_NONE, 'is run daemonize');
     }
 
 
@@ -62,65 +82,69 @@ class ServerCommand extends Command
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return int
-	 * @throws Exception
+     * @throws
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-		try {
-			$manager = Kiri::app()->getServer();
-			$manager->setDaemon((int)is_null($input->getOption('daemon')));
-			if (!in_array($input->getArgument('action'), self::ACTIONS)) {
-				throw new Exception('I don\'t know what I want to do.');
+        return match ($input->getArgument('action')) {
+            'restart' => $this->restart($input),
+            'stop'    => $this->stop(),
+            'start'   => $this->start($input),
+            default   =>
+            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 {
+
+
+    /**
+     * @param InputInterface $input
+     * @return int
+     * @throws
+     */
+    protected function restart(InputInterface $input): int
+    {
+        $this->stop();
+        $this->start($input);
         return 1;
     }
+
+
+    /**
+     * @return int
+     * @throws
+     */
+    protected function stop(): int
+    {
+        $configs   = config('servers.server', []);
+        $instances = $this->asyncServer->sortService($configs['ports'] ?? []);
+        foreach ($instances as $config) {
+            $this->state->exit($config->port);
+        }
+        $this->eventDispatch->dispatch(new OnShutdown());
+        return 1;
     }
 
 
     /**
-	 * @throws ConfigException
+     * @param InputInterface $input
+     * @return int
+     * @throws
      */
-	private function configure_set()
+    protected function start(InputInterface $input): int
     {
-		$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
-		if ($enable_coroutine != true) {
-			return;
+        $this->asyncServer->addProcess(config('process', []));
+        $hotReload = \config('servers.reload.hot', false) === true;
+        if ($hotReload) {
+            $this->asyncServer->addProcess([FileWatcher::class]);
         }
-		Coroutine::set([
-			'hook_flags'            => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
-			'enable_deadlock_check' => FALSE,
-			'exit_condition'        => function () {
-				return Coroutine::stats()['coroutine_num'] === 0;
+        if (!$hotReload) {
+            // 非热更模式可在 Master 进程预扫描，Worker 通过 fork 继承扫描结果。
+            // 热更模式必须让新 Worker 自己加载业务类，避免继承旧类定义后无法重新声明。
+            di(Router::class)->scan_build_route();
         }
-		]);
-	}
-
-
-	/**
-	 * @param $manager
-	 * @throws ConfigException
-	 */
-	private function generate_runtime_builder($manager): void
-	{
-		$this->configure_set();
-
-		exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder');
-
-		$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();
+        $this->asyncServer->initCoreServers(config('servers.server', []), (int)$input->getOption('daemon'));
+        $this->asyncServer->start();
+        return 1;
     }
 
 }

ServerInterface.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Kiri\Server;
+
+
+use Swoole\Server;
+
+/**
+ * @mixin Server
+ */
+interface ServerInterface
+{
+
+	/**
+	 * @param array $service
+	 * @param int $daemon
+	 * @return void
+	 */
+	public function initCoreServers(array $service, int $daemon = 0): void;
+
+
+	/**
+	 * @param Config $config
+	 * @return void
+	 */
+	public function addListener(Config $config): void;
+
+
+	/**
+	 * @return void
+	 */
+	public function start(): void;
+
+}

ServerManager.php

@@ -1,537 +0,0 @@
-<?php
-
-namespace Server;
-
-use Annotation\Inject;
-use Closure;
-use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Di\ContainerInterface;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use ReflectionException;
-
-use Server\Handler\OnPipeMessage;
-use Server\Handler\OnServer;
-use Server\Handler\OnServerManager;
-use Server\Handler\OnServerReload;
-use Server\Handler\OnServerWorker;
-use Server\Handler\OnServerTask;
-
-use Server\SInterface\OnCloseInterface;
-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;
-
-
-/**
- * Class OnServerManager
- * @package Http\Service
- */
-class ServerManager
-{
-
-	/** @var string */
-	public string $host = '';
-
-	public int $port = 0;
-
-
-	/** @var array<string,Port> */
-	public array $ports = [];
-
-	public int $mode = SWOOLE_TCP;
-
-
-	private Server|null $server = null;
-
-
-	/**
-	 * @var ContainerInterface
-	 */
-	#[Inject(ContainerInterface::class)]
-	public ContainerInterface $container;
-
-
-	const DEFAULT_EVENT = [
-		Constant::WORKER_START    => [OnServerWorker::class, 'onWorkerStart'],
-		Constant::WORKER_EXIT     => [OnServerWorker::class, 'onWorkerExit'],
-		Constant::WORKER_STOP     => [OnServerWorker::class, 'onWorkerStop'],
-		Constant::WORKER_ERROR    => [OnServerWorker::class, 'onWorkerError'],
-		Constant::MANAGER_START   => [OnServerManager::class, 'onManagerStart'],
-		Constant::MANAGER_STOP    => [OnServerManager::class, 'onManagerStop'],
-		Constant::BEFORE_RELOAD   => [OnServerReload::class, 'onBeforeReload'],
-		Constant::AFTER_RELOAD    => [OnServerReload::class, 'onAfterReload'],
-		Constant::START           => [OnServer::class, 'onStart'],
-		Constant::BEFORE_SHUTDOWN => [OnServer::class, 'onBeforeShutdown'],
-		Constant::SHUTDOWN        => [OnServer::class, 'onShutdown'],
-	];
-
-
-	private array $eventInterface = [
-		OnReceiveInterface::class    => 'receive',
-		OnPacketInterface::class     => 'packet',
-		OnHandshakeInterface::class  => 'handshake',
-		OnMessageInterface::class    => 'message',
-		OnConnectInterface::class    => 'connect',
-		OnCloseInterface::class      => 'close',
-		OnDisconnectInterface::class => 'disconnect'
-	];
-
-
-	/**
-	 * @return Server|WServer|HServer|null
-	 */
-	public function getServer(): Server|WServer|HServer|null
-	{
-		return $this->server;
-	}
-
-
-	/**
-	 * @param string $type
-	 * @param string $host
-	 * @param int $port
-	 * @param int $mode
-	 * @param array $settings
-	 * @throws ReflectionException
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	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 {
-			if (!isset($settings['settings'])) {
-				$settings['settings'] = [];
-			}
-			$this->addNewListener($type, $host, $port, $mode, $settings);
-		}
-	}
-
-
-	/**
-	 * @throws ReflectionException
-	 * @throws ConfigException
-	 */
-	public function initBaseServer($configs, int $daemon = 0): void
-	{
-		$context = di(ServerManager::class);
-		foreach ($this->sortService($configs['ports']) as $config) {
-			$this->startListenerHandler($context, $config, $daemon);
-		}
-		$this->bindCallback($this->server, [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;
-	}
-
-
-	/**
-	 * @param string|OnProcessInterface $customProcess
-	 * @param null $redirect_stdin_and_stdout
-	 * @param int|null $pipe_type
-	 * @param bool $enable_coroutine
-	 * @throws Exception
-	 */
-	public function addProcess(string|OnProcessInterface $customProcess, $redirect_stdin_and_stdout = null, ?int $pipe_type = SOCK_DGRAM, bool $enable_coroutine = true)
-	{
-		$process = $this->initProcess($customProcess, $redirect_stdin_and_stdout, $pipe_type, $enable_coroutine);
-		$this->server->addProcess($process);
-		if ($customProcess instanceof OnProcessInterface) {
-			Kiri::app()->addProcess($customProcess::class, $process);
-		} else {
-			Kiri::app()->addProcess($customProcess, $process);
-		}
-	}
-
-
-	/**
-	 * @param $customProcess
-	 * @param $redirect_stdin_and_stdout
-	 * @param $pipe_type
-	 * @param $enable_coroutine
-	 * @return Process
-	 */
-	private function initProcess($customProcess, $redirect_stdin_and_stdout, $pipe_type, $enable_coroutine): Process
-	{
-		$server = $this->server;
-		return new Process(function (Process $soloProcess) use ($customProcess, $server) {
-			$time = microtime(true);
-			if (is_string($customProcess)) {
-				$customProcess = Kiri::createObject($customProcess, [$server]);
-			}
-
-			$name = $customProcess->getProcessName($soloProcess);
-
-			$system = sprintf('%s.process[%d]', Config::get('id', 'system-service'), $soloProcess->pid);
-			if (Kiri::getPlatform()->isLinux()) {
-				$soloProcess->name($system . '.' . $name . ' start.');
-			}
-			$name = Config::get('id', 'system-service');
-			echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m [%s]Builder %s[%d].%d use time %s.", $name, 'Process ' . $name,
-					$server->master_pid, $soloProcess->pid, round(microtime(true) - $time, 6) . 's') . PHP_EOL;
-			$customProcess->signListen($soloProcess);
-			$customProcess->onHandler($soloProcess);
-		},
-			$redirect_stdin_and_stdout,
-			$pipe_type,
-			$enable_coroutine
-		);
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getSetting(): array
-	{
-		return $this->server->setting;
-	}
-
-
-	/**
-	 * @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 Exception
-	 */
-	private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
-	{
-		if (!$this->server) {
-			$config = $this->mergeConfig($config, $daemon);
-		}
-		$context->addListener(
-			$config['type'], $config['host'], $config['port'], $config['mode'],
-			$config);
-	}
-
-
-	/**
-	 * @param $config
-	 * @param $daemon
-	 * @return array
-	 * @throws Exception
-	 */
-	private function mergeConfig($config, $daemon): array
-	{
-		$config['settings'] = $config['settings'] ?? [];
-		if (!isset($config['settings']['daemonize']) || !$config['settings']['daemonize'] != $daemon) {
-			$config['settings']['daemonize'] = $daemon;
-		}
-		if (!isset($config['settings']['log_file'])) {
-			$config['settings']['log_file'] = storage('system.log');
-		}
-		$config['settings']['pid_file'] = storage('.swoole.pid');
-		$config['events'] = $config['events'] ?? [];
-		return $config;
-	}
-
-
-	/**
-	 * @param string $type
-	 * @param string $host
-	 * @param int $port
-	 * @param int $mode
-	 * @param array $settings
-	 * @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;
-		/** @var Server\Port $service */
-		$this->ports[$port] = $this->server->addlistener($host, $port, $mode);
-		if ($this->ports[$port] === false) {
-			throw new Exception("The port is already in use[$host::$port]");
-		}
-		if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['settings']['open_http_protocol'])) {
-			$settings['settings']['open_http_protocol'] = true;
-			if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
-				$settings['settings']['open_http2_protocol'] = true;
-			}
-		}
-		if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['settings']['open_websocket_protocol'])) {
-			$settings['settings']['open_websocket_protocol'] = true;
-		}
-		$this->ports[$port]->set($settings['settings'] ?? []);
-		$this->addServiceEvents($settings['events'] ?? [], $this->ports[$port]);
-	}
-
-
-	/**
-	 * @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
-	 */
-	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
-	{
-		$match = match ($type) {
-			Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
-			Constant::SERVER_TYPE_UDP => Server::class,
-			Constant::SERVER_TYPE_HTTP => HServer::class,
-			Constant::SERVER_TYPE_WEBSOCKET => WServer::class
-		};
-		$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
-		$this->server->set(array_merge(Config::get('server.settings', []), $settings['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->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 Exception
-	 */
-	private function addDefaultListener(array $settings): void
-	{
-		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);
-		}
-	}
-
-
-	/**
-	 * @param array $events
-	 * @param Server|Port $server
-	 */
-	private function addServiceEvents(array $events, Server|Port $server)
-	{
-		foreach ($events as $name => $event) {
-			if (is_array($event) && is_string($event[0])) {
-				$event[0] = $this->container->get($event[0]);
-			}
-			$server->on($name, $event);
-		}
-	}
-
-
-	/**
-	 *
-	 */
-	public function start()
-	{
-		$this->server->start();
-	}
-
-
-	/**
-	 * @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
-	 * @return mixed
-	 */
-	public function sendMessage(mixed $message, int $workerId): mixed
-	{
-		return $this->server?->sendMessage($message, $workerId);
-	}
-
-
-	/**
-	 * @param array $events
-	 * @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();
-		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
-	 */
-	public function bindCallback(Port|Server $server, ?array $settings = [])
-	{
-		// TODO: Implement bindCallback() method.
-		if (count($settings) < 1) {
-			return;
-		}
-		foreach ($settings as $event_type => $callback) {
-			if ($this->server->getCallback($event_type) !== null) {
-				continue;
-			}
-			if (is_array($callback) && !is_object($callback[0])) {
-				$callback[0] = $this->container->get($callback[0]);
-			}
-			$this->server->on($event_type, $callback);
-		}
-	}
-}

ServerProviders.php

@@ -1,13 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace Server;
+namespace Kiri\Server;
 
 
-use Exception;
 use Kiri\Abstracts\Providers;
-use Kiri\Application;
-use Kiri\Kiri;
+use Symfony\Component\Console\Application;
 
 /**
  * Class DatabasesProviders
@@ -18,17 +16,13 @@ class ServerProviders extends Providers
 
 
     /**
-	 * @param Application $application
-	 * @throws Exception
+     * @throws
      */
-	public function onImport(Application $application)
+    public function onImport(): void
     {
-		$application->set('server', ['class' => Server::class]);
-
-		$container = Kiri::getDi();
-
-		$console = $container->get(\Symfony\Component\Console\Application::class);
-		$console->add($container->get(ServerCommand::class));
+        $server = $this->container->get(ServerCommand::class);
 
+        $console = $this->container->get(Application::class);
+        $console->addCommand($server);
     }
 }

State.php

@@ -0,0 +1,230 @@
+<?php
+
+namespace Kiri\Server;
+
+use Kiri\Abstracts\Component;
+use Kiri\Server\Abstracts\TraitServer;
+use Swoole\Process;
+use function config;
+
+class State extends Component
+{
+
+    use TraitServer;
+
+
+    public array $servers = [];
+
+
+    /**
+     * @return void
+     */
+    public function init(): void
+    {
+        $this->servers = config('servers.server.ports');
+    }
+
+
+    /**
+     * @return bool
+     * @throws
+     */
+    public function isRunner(): bool
+    {
+        if ($this->getPidFilePid() !== null || $this->getNamedServerPids() !== []) {
+            return true;
+        }
+
+        $ports = $this->sortService($this->servers);
+        foreach ($ports as $config) {
+            if (checkPortIsAlready($config->port)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * @param $port
+     * @throws
+     */
+    public function exit($port): void
+    {
+        $pids = $this->collectStopPids((int)$port);
+        if ($pids === []) {
+            return;
+        }
+
+        $this->terminatePids($pids, SIGTERM, 30);
+
+        $remaining = array_values(array_filter($pids, [$this, 'isProcessAlive']));
+        if ($remaining !== []) {
+            $this->terminatePids($remaining, SIGKILL, 10);
+        }
+
+        if (!checkPortIsAlready((int)$port)) {
+            @unlink(storage('.swoole.pid'));
+        }
+    }
+
+
+    private function collectStopPids(int $port): array
+    {
+        $pids = [];
+
+        $pidFilePid = $this->getPidFilePid();
+        if ($pidFilePid !== null) {
+            $pids[] = $pidFilePid;
+            $pids = array_merge($pids, $this->getDescendantPids($pidFilePid));
+        }
+
+        $pids = array_merge($pids, $this->getNamedServerPids());
+
+        $portPid = checkPortIsAlready($port);
+        if ($portPid !== false) {
+            $pids[] = (int)$portPid;
+            $pids = array_merge($pids, $this->getDescendantPids((int)$portPid));
+        }
+
+        $currentPid = getmypid();
+        $pids = array_values(array_unique(array_filter(array_map('intval', $pids), function (int $pid) use ($currentPid) {
+            return $pid > 1 && $pid !== $currentPid;
+        })));
+        rsort($pids);
+
+        return $pids;
+    }
+
+
+    private function terminatePids(array $pids, int $signal, int $rounds): void
+    {
+        for ($i = 0; $i < $rounds; $i++) {
+            $alive = false;
+            foreach ($pids as $pid) {
+                if (!$this->isProcessAlive($pid)) {
+                    continue;
+                }
+                $alive = true;
+                @Process::kill($pid, $signal);
+            }
+
+            if (!$alive) {
+                return;
+            }
+
+            usleep(100000);
+        }
+    }
+
+
+    private function getPidFilePid(): ?int
+    {
+        $pidFile = storage('.swoole.pid');
+        if (!is_file($pidFile)) {
+            return null;
+        }
+
+        $pid = (int)trim((string)file_get_contents($pidFile));
+        if ($pid <= 1 || !$this->isProcessAlive($pid) || !$this->isSameAppProcess($pid)) {
+            return null;
+        }
+
+        return $pid;
+    }
+
+
+    private function getDescendantPids(int $parentPid): array
+    {
+        $processes = $this->listProcesses();
+        $children = [];
+        foreach ($processes as $process) {
+            $children[(int)$process['ppid']][] = (int)$process['pid'];
+        }
+
+        $result = [];
+        $stack = [$parentPid];
+        while ($stack !== []) {
+            $pid = array_pop($stack);
+            foreach ($children[$pid] ?? [] as $childPid) {
+                $result[] = $childPid;
+                $stack[] = $childPid;
+            }
+        }
+
+        return $result;
+    }
+
+
+    private function getNamedServerPids(): array
+    {
+        $siteId = '[' . config('site.id', 'system-service') . ']';
+        $pids = [];
+        foreach ($this->listProcesses() as $process) {
+            $command = $process['command'];
+            if (!str_contains($command, $siteId)) {
+                continue;
+            }
+            if (!preg_match('/\\]\\..+\\[[0-9]+\\]/', $command)) {
+                continue;
+            }
+            if (!$this->isSameAppProcess((int)$process['pid'])) {
+                continue;
+            }
+            $pids[] = (int)$process['pid'];
+        }
+
+        return $pids;
+    }
+
+
+    private function listProcesses(): array
+    {
+        $lines = [];
+        exec('ps -eo pid=,ppid=,args=', $lines);
+
+        $processes = [];
+        foreach ($lines as $line) {
+            $line = trim($line);
+            if ($line === '') {
+                continue;
+            }
+
+            $parts = preg_split('/\s+/', $line, 3);
+            if (count($parts) < 3) {
+                continue;
+            }
+
+            $processes[] = [
+                'pid' => (int)$parts[0],
+                'ppid' => (int)$parts[1],
+                'command' => $parts[2],
+            ];
+        }
+
+        return $processes;
+    }
+
+
+    private function isSameAppProcess(int $pid): bool
+    {
+        $cwd = @readlink('/proc/' . $pid . '/cwd');
+        if ($cwd === false || $cwd === '') {
+            return false;
+        }
+
+        return $this->normalizePath($cwd) === $this->normalizePath(APP_PATH);
+    }
+
+    private function normalizePath(string $path): string
+    {
+        $real = realpath($path) ?: $path;
+        return rtrim(str_replace('\\', '/', $real), '/');
+    }
+
+    private function isProcessAlive(int $pid): bool
+    {
+        return $pid > 1 && @Process::kill($pid, 0);
+    }
+
+}

SwooleServerInterface.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Server;
-
-
-use Swoole\Server;
-
-/**
- * @mixin Server
- */
-interface SwooleServerInterface
-{
-
-}

Task/OnTaskFinish.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Kiri\Server\Task;
+
+class OnTaskFinish
+{
+
+
+    /**
+     * @param int $task_id
+     * @param mixed $data
+     */
+    public function __construct(public int $task_id, public mixed $data)
+    {
+    }
+
+}

Task/OnTaskInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Kiri\Server\Task;
+
+interface OnTaskInterface
+{
+
+
+    /**
+     * @param int $task_id
+     * @param int $src_worker_id
+     * @return mixed
+     */
+    public function process(int $task_id, int $src_worker_id): mixed;
+
+
+}

Task/Task.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Kiri\Server\Task;
+
+
+use Kiri;
+use Kiri\Router\Base\ExceptionHandlerDispatcher;
+use Kiri\Router\Interface\ExceptionHandlerInterface;
+use Kiri\Server\Constant;
+use Swoole\Server;
+
+/**
+ *
+ */
+class Task
+{
+
+
+    public ExceptionHandlerInterface $exception;
+
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        $exception = \config('servers.task.exception');
+        if (!in_array(ExceptionHandlerInterface::class, class_implements($exception))) {
+            $exception = ExceptionHandlerDispatcher::class;
+        }
+        $this->exception = Kiri::getDi()->get($exception);
+    }
+
+
+    /**
+     * @param Server $server
+     * @return void
+     */
+    public function initTaskWorker(Server $server): void
+    {
+        if (!isset($server->setting[Constant::OPTION_TASK_WORKER_NUM])) {
+            return;
+        }
+        if ($server->setting[Constant::OPTION_TASK_WORKER_NUM] < 1) {
+            return;
+        }
+        $server->on('finish', [$this, 'onFinish']);
+        $server->on('task', [$this, 'onTask']);
+    }
+
+
+    /**
+     * @param Server $server
+     * @param int $task_id
+     * @param mixed $data
+     * @return void
+     * @throws
+     */
+    public function onFinish(Server $server, int $task_id, mixed $data): void
+    {
+        event(new OnTaskFinish($task_id, $data));
+    }
+
+
+    /**
+     * @param Server $server
+     * @param int $task_id
+     * @param int $src_worker_id
+     * @param mixed $data
+     * @return void
+     * @throws
+     */
+    public function onTask(Server $server, int $task_id, int $src_worker_id, mixed $data): void
+    {
+        try {
+            [$handler, $params] = [$data[0], $data[1]];
+
+            $handler = Kiri::getDi()->make($handler, $params);
+            if (!($handler instanceof OnTaskInterface)) {
+                throw new \Exception('Task process must implements ' . OnTaskInterface::class);
+            }
+
+            $response = call_user_func([$handler, 'process'], $task_id, $src_worker_id);
+        } catch (\Throwable $throwable) {
+			\Kiri::getLogger()->json_log($throwable, ['task_id' => $task_id, 'src_worker_id' => $src_worker_id, 'data' => $data]);
+
+			$response = throwable($throwable);
+        } finally {
+            $server->finish($response);
+        }
+    }
+
+
+}

Task/TaskExecute.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Kiri\Server\Task;
+
+use Exception;
+use Kiri\Server\ServerInterface;
+
+class TaskExecute implements TaskInterface
+{
+
+
+    /**
+     * @param string $handler
+     * @param mixed $data
+     * @param int $dstWorkerId
+     * @param callable|null $finishFinishCallback
+     * @return void
+     * @throws
+     */
+    public function task(string $handler, mixed $data, int $dstWorkerId = -1, ?callable $finishFinishCallback = null): void
+    {
+        $array = class_implements($handler, true);
+        if (!in_array(OnTaskInterface::class, $array, true)) {
+            throw new Exception('Task is not implement OnTaskInterface');
+        }
+        $server = \Kiri::getDi()->get(ServerInterface::class);
+
+        $server->task([$handler, $data], $dstWorkerId, $finishFinishCallback);
+    }
+
+
+    /**
+     * @param string $handler
+     * @param mixed $data
+     * @param float $timeout
+     * @param int $dstWorkerId
+     * @return mixed
+     * @throws
+     */
+    public function taskWait(string $handler, mixed $data, float $timeout = 0.5, int $dstWorkerId = -1): mixed
+    {
+        $array = class_implements($handler, true);
+        if (!in_array(OnTaskInterface::class, $array, true)) {
+            throw new Exception('Task is not implement OnTaskInterface');
+        }
+        $server = \Kiri::getDi()->get(ServerInterface::class);
+
+        return $server->taskwait([$handler, $data], $timeout, $dstWorkerId);
+    }
+
+
+    /**
+     * @param array $tasks
+     * @param float $timeout
+     * @return false|array
+     */
+    public function taskCo(array $tasks, float $timeout = 0.5): false|array
+    {
+        $server = \Kiri::getDi()->get(ServerInterface::class);
+
+        return $server->taskCo($tasks, $timeout);
+    }
+
+
+    /**
+     * @param array $tasks
+     * @param float $timeout
+     * @return false|array
+     */
+    public function taskWaitMulti(array $tasks, float $timeout = 0.5): false|array
+    {
+        $server = \Kiri::getDi()->get(ServerInterface::class);
+
+        return $server->taskWaitMulti($tasks, $timeout);
+    }
+}

Task/TaskInterface.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Kiri\Server\Task;
+
+interface TaskInterface
+{
+
+
+    /**
+     * @param string $handler
+     * @param mixed $data
+     * @param int $dstWorkerId
+     * @param callable|null $finishFinishCallback
+     * @return void
+     */
+    public function task(string $handler, mixed $data, int $dstWorkerId = -1, ?callable $finishFinishCallback = null): void;
+
+
+    /**
+     * @param string $handler
+     * @param mixed $data
+     * @param float $timeout
+     * @param int $dstWorkerId
+     * @return mixed
+     */
+    public function taskWait(string $handler, mixed $data, float $timeout = 0.5, int $dstWorkerId = -1): mixed;
+
+
+    /**
+     * @param array $tasks
+     * @param float $timeout
+     * @return false|array
+     */
+    public function taskCo(array $tasks, float $timeout = 0.5): false|array;
+
+
+    /**
+     * @param array $tasks
+     * @param float $timeout
+     * @return false|array
+     */
+    public function taskWaitMulti(array $tasks, float $timeout = 0.5): false|array;
+
+}

Task/TestTask.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Kiri\Server\Task;
+
+class TestTask implements OnTaskInterface
+{
+
+
+    public function __construct($user, $friend)
+    {
+    }
+
+
+    /**
+     * @param int $task_id
+     * @param int $src_worker_id
+     * @return int
+     */
+    public function process(int $task_id, int $src_worker_id): int
+    {
+        return 0;
+    }
+
+}

composer.json

@@ -1,7 +1,6 @@
 {
-    "name": "game-worker/http-server",
+  "name": "game-worker/kiri-http-server",
   "description": "http-server",
-    "type": "composer-plugin",
   "license": "MIT",
   "authors": [
     {
@@ -10,17 +9,19 @@
     }
   ],
   "require": {
-        "php": ">=8.0",
+    "php": ">=8.5",
     "ext-json": "*",
     "composer-runtime-api": "^2.0",
     "psr/http-server-middleware": "^1.0",
     "psr/http-message": "^1.0",
     "psr/event-dispatcher": "^1.0",
-        "game-worker/kiri-http-message": "^v1.0"
+    "ext-inotify": "*",
+    "ext-posix": "*",
+    "ext-pcntl": "*"
   },
   "autoload": {
     "psr-4": {
-            "Server\\": "./"
+      "Kiri\\Server\\": "./"
     }
   }
 }