Revert "改名"

This reverts commit fdf58326

Abstracts/BaseProcess.php

@@ -1,111 +1,116 @@
-<?php
+<?php
-
+
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
-
+
-
+
-use Kiri\Context;
+use Kiri\Context;
-use Server\Contract\OnProcessInterface;
+use Kiri\Server\Broadcast\OnBroadcastInterface;
-use Swoole\Coroutine;
+use Kiri\Server\Contract\OnProcessInterface;
-use Swoole\Process;
+use Swoole\Coroutine;
-
+use Swoole\Process;
-/**
+
- *
+/**
- */
+ *
-abstract class BaseProcess implements OnProcessInterface
+ */
-{
+abstract class BaseProcess implements OnProcessInterface
-
+{
-	protected bool $isStop = false;
+
-
+	protected bool $isStop = false;
-
+
-	protected bool $redirect_stdin_and_stdout = FALSE;
+
-
+	protected bool $redirect_stdin_and_stdout = FALSE;
-
+
-	protected int $pipe_type = SOCK_DGRAM;
+
-
+	protected int $pipe_type = SOCK_DGRAM;
-
+
-	protected bool $enable_coroutine = true;
+
-
+	protected bool $enable_coroutine = true;
-
+
-	public string $name = 'swoole process.';
+
-
+	public string $name = 'swoole process.';
-
+
-	/**
+
-	 * @return string
+	/**
-	 */
+	 * @return string
-	public function getName(): string
+	 */
-	{
+	public function getName(): string
-		return $this->name;
+	{
-	}
+		return $this->name;
-
+	}
-
+
-	/**
+
-	 * @return bool
+	/**
-	 */
+	 * @return bool
-	public function isStop(): bool
+	 */
-	{
+	public function isStop(): bool
-		return $this->isStop;
+	{
-	}
+		return $this->isStop;
-
+	}
-	/**
+
-	 * @return bool
+	/**
-     */
+	 * @return bool
-	public function getRedirectStdinAndStdout(): bool
+	 */
-    {
+	public function getRedirectStdinAndStdout(): bool
-		return $this->redirect_stdin_and_stdout;
+	{
-	}
+		return $this->redirect_stdin_and_stdout;
-
+	}
-	/**
+
-	 * @return int
+	/**
-	 */
+	 * @return int
-	public function getPipeType(): int
+	 */
-	{
+	public function getPipeType(): int
-		return $this->pipe_type;
+	{
-	}
+		return $this->pipe_type;
-
+	}
-	/**
+
-	 * @return bool
+	/**
-	 */
+	 * @return bool
-	public function isEnableCoroutine(): bool
+	 */
-	{
+	public function isEnableCoroutine(): bool
-		return $this->enable_coroutine;
+	{
-	}
+		return $this->enable_coroutine;
-
+	}
-
+
-	/**
+
-	 *
+	/**
-	 */
+	 *
-	public function onProcessStop(): void
+	 */
-	{
+	public function onProcessStop(): void
-		$this->isStop = true;
+	{
-	}
+		$this->isStop = true;
-
+	}
-
+
-	/**
+
-	 *
+	/**
-	 */
+	 *
-	public function onSigterm(): static
+	 */
-	{
+	public function onSigterm(): static
-		if (!Context::inCoroutine()) {
+	{
-			Process::signal(SIGTERM, fn($data) => $this->onShutdown($data));
+		if (!Context::inCoroutine()) {
-		} else {
+			Process::signal(SIGTERM, fn($data) => $this->onShutdown($data));
-			Coroutine::create(function () {
+		} else {
-				$data = Coroutine::waitSignal(SIGTERM, -1);
+			Coroutine::create(function () {
-				if ($data) {
+				$data = Coroutine::waitSignal(SIGTERM, -1);
-					$this->onShutdown($data);
+				if ($data) {
-				}
+					$this->onShutdown($data);
-			});
+				}
-		}
+			});
-		return $this;
+		}
-	}
+		return $this;
-
+	}
-
+
-	/**
+
-	 * @param $data
+	/**
-	 */
+	 * @param $data
-	protected function onShutdown($data): void
+	 */
-	{
+	protected function onShutdown($data): void
-		$this->isStop = true;
+	{
-	}
+		$this->isStop = true;
-
+		$value = Context::getContext('waite:process:message');
-
+		if (Coroutine::exists($value)) {
-}
+			Coroutine::cancel($value);
+		}
+	}
+
+
+}

Abstracts/Server.php

@@ -1,55 +1,55 @@
-<?php
+<?php
-
+
-
+
-namespace Server\Abstracts;
+namespace Kiri\Server\Abstracts;
-
+
-
+
-use Note\Inject;
+use Kiri\Annotation\Inject;
-use Exception;
+use Exception;
-use Kiri\Abstracts\Config;
+use Kiri\Abstracts\Config;
-use Kiri\Exception\ConfigException;
+use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
-use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
-
+
-
+
-/**
+/**
- * Class Server
+ * Class Server
- * @package Server\Abstracts
+ * @package Server\Abstracts
- */
+ */
-abstract class Server
+abstract class Server
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @var LoggerInterface 
+	 * @var LoggerInterface 
-	 */
+	 */
-	#[Inject(LoggerInterface::class)]
+	#[Inject(LoggerInterface::class)]
-	public LoggerInterface $logger;
+	public LoggerInterface $logger;
-
+
-
+
-	/**
+	/**
-	 * @param $prefix
+	 * @param $prefix
-	 * @throws ConfigException
+	 * @throws ConfigException
-	 */
+	 */
-	protected function setProcessName($prefix)
+	protected function setProcessName($prefix)
-	{
+	{
-		if (Kiri::getPlatform()->isMac()) {
+		if (Kiri::getPlatform()->isMac()) {
-			return;
+			return;
-		}
+		}
-		$name = '[' . Config::get('id', 'system-service') . ']';
+		$name = '[' . Config::get('id', 'system-service') . ']';
-		if (!empty($prefix)) {
+		if (!empty($prefix)) {
-			$name .= '.' . $prefix;
+			$name .= '.' . $prefix;
-		}
+		}
-		swoole_set_process_name($name);
+		swoole_set_process_name($name);
-	}
+	}
-
+
-
+
-	/**
+	/**
-	 * Server constructor.
+	 * Server constructor.
-	 * @throws Exception
+	 * @throws Exception
-	 */
+	 */
-	public function __construct()
+	public function __construct()
-	{
+	{
-	}
+	}
-
+
-}
+}

Broadcast/Broadcast.php

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

Broadcast/Message.php

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

Broadcast/OnBroadcastInterface.php

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

Constant.php

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

Contract/OnBeforeShutdown.php

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

Contract/OnCloseInterface.php

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

Contract/OnConnectInterface.php

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

Contract/OnDisconnectInterface.php

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

Contract/OnHandshakeInterface.php

@@ -1,22 +1,22 @@
-<?php
+<?php
-
+
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
-
+
-use Swoole\Http\Request;
+use Swoole\Http\Request;
-use Swoole\Http\Response;
+use Swoole\Http\Response;
-
+
-
+
-/**
+/**
- *
+ *
- */
+ */
-interface OnHandshakeInterface
+interface OnHandshakeInterface
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param Request $request
+	 * @param Request $request
-	 * @param Response $response
+	 * @param Response $response
-	 */
+	 */
-	public function onHandshake(Request $request, Response $response): void;
+	public function onHandshake(Request $request, Response $response): void;
-
+
-}
+}

Contract/OnMessageInterface.php

@@ -1,19 +1,18 @@
-<?php
+<?php
-
+
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
-
+
-use Swoole\Server;
+use Kiri\Websocket\WebSocketInterface;
-use Swoole\WebSocket\Frame;
+use Swoole\WebSocket\Frame;
-
+
-interface OnMessageInterface
+interface OnMessageInterface
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param Server $server
+	 * @param Frame $frame
-	 * @param Frame $frame
+	 * @return void
-	 * @return void
+	 */
-	 */
+	public function onMessage(Frame $frame): void;
-	public function onMessage(Server $server, Frame $frame): void;
+
-
+}
-}

Contract/OnOpenInterface.php

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

Contract/OnPacketInterface.php

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

Contract/OnPipeMessageInterface.php

@@ -1,21 +1,21 @@
-<?php
+<?php
-
+
-
+
-namespace Server\Contract;
+namespace Kiri\Server\Contract;
-
+
-
+
-/**
+/**
- * Interface OnPipeMessageInterface
+ * Interface OnPipeMessageInterface
- * @package Server\Contract
+ * @package Server\Contract
- */
+ */
-interface OnPipeMessageInterface
+interface OnPipeMessageInterface
-{
+{
-
+
-	/**
+	/**
-	 *
+	 *
-	 */
+	 */
-	public function process(): void;
+	public function process(): void;
-
+
-
+
-
+
-}
+}

Contract/OnProcessInterface.php

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

Contract/OnReceiveInterface.php

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

Contract/OnTaskInterface.php

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

Events/OnAfterReload.php

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

Events/OnAfterWorkerStart.php

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

Events/OnBeforeReload.php

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

Events/OnBeforeShutdown.php

@@ -1,18 +1,18 @@
-<?php
+<?php
-
+
-namespace Server\Events;
+namespace Kiri\Server\Events;
-
+
-use Swoole\Server;
+use Swoole\Server;
-
+
-class OnBeforeShutdown
+class OnBeforeShutdown
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param Server|null $server
+	 * @param Server|null $server
-	 */
+	 */
-	public function __construct(public ?Server $server = null)
+	public function __construct(public ?Server $server = null)
-	{
+	{
-	}
+	}
-
+
-}
+}

Events/OnBeforeWorkerStart.php

@@ -1,12 +1,12 @@
-<?php
+<?php
-
+
-namespace Server\Events;
+namespace Kiri\Server\Events;
-
+
-class OnBeforeWorkerStart
+class OnBeforeWorkerStart
-{
+{
-
+
-    public function __construct(public int $workerId)
+    public function __construct(public int $workerId)
-    {
+    {
-    }
+    }
-
+
-}
+}

Events/OnManagerStart.php

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

Events/OnManagerStop.php

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

Events/OnProcessStart.php

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

Events/OnServerBeforeStart.php

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

Events/OnShutdown.php

@@ -1,18 +1,18 @@
-<?php
+<?php
-
+
-namespace Server\Events;
+namespace Kiri\Server\Events;
-
+
-use Swoole\Server;
+use Swoole\Server;
-
+
-class OnShutdown
+class OnShutdown
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param Server|null $server
+	 * @param Server|null $server
-	 */
+	 */
-	public function __construct(public ?Server $server = null)
+	public function __construct(public ?Server $server = null)
-	{
+	{
-	}
+	}
-
+
-}
+}

Events/OnStart.php

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

Events/OnTaskerStart.php

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

Events/OnWorkerError.php

@@ -1,26 +1,26 @@
-<?php
+<?php
-
+
-namespace Server\Events;
+namespace Kiri\Server\Events;
-
+
-use Swoole\Server;
+use Swoole\Server;
-
+
-/**
+/**
- *
+ *
- */
+ */
-class OnWorkerError
+class OnWorkerError
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param Server $server
+	 * @param Server $server
-	 * @param int $worker_id
+	 * @param int $worker_id
-	 * @param int $worker_pid
+	 * @param int $worker_pid
-	 * @param int $exit_code
+	 * @param int $exit_code
-	 * @param int $signal
+	 * @param int $signal
-	 */
+	 */
-	public function __construct(public Server $server, public int $worker_id, public int $worker_pid, public int $exit_code, public int $signal)
+	public function __construct(public Server $server, public int $worker_id, public int $worker_pid, public int $exit_code, public int $signal)
-	{
+	{
-	}
+	}
-
+
-
+
-}
+}

Events/OnWorkerExit.php

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

Events/OnWorkerStop.php

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

Handler/OnPipeMessage.php

@@ -1,38 +1,37 @@
-<?php
+<?php
-
+
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
-
+
-use Note\Inject;
+use Exception;
-use Server\Abstracts\Server;
+use Kiri\Annotation\Inject;
-use Exception;
+use Kiri\Events\EventDispatch;
-use Server\Contract\OnPipeMessageInterface;
+use Kiri\Server\Abstracts\Server;
-use Kiri\Events\EventDispatch;
+use Kiri\Server\Contract\OnPipeMessageInterface;
-
+
-/**
+/**
- *
+ *
- */
+ */
-class OnPipeMessage extends Server
+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
-	 * @param \Swoole\Server $server
+	 */
-	 * @param int $src_worker_id
+	public function onPipeMessage(\Swoole\Server $server, int $src_worker_id, mixed $message)
-	 * @param mixed $message
+	{
-	 * @throws Exception
+		if (is_string($message)) {
-	 */
+			$message = unserialize($message);
-	public function onPipeMessage(\Swoole\Server $server, int $src_worker_id, mixed $message)
+		}
-	{
+		if (!is_object($message) || !($message instanceof OnPipeMessageInterface)) {
-		if (!is_object($message) || !($message instanceof OnPipeMessageInterface)) {
+			return;
-			return;
+		}
-		}
+		call_user_func([$message, 'process'], $server, $src_worker_id);
-		call_user_func([$message, 'process'], $server, $src_worker_id);
+	}
-	}
+
-
+
-
+}
-}

Handler/OnServer.php

@@ -1,62 +1,56 @@
-<?php
+<?php
-
+
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
-
+
-use Note\Inject;
+use Kiri\Annotation\Inject;
-use Kiri\Events\EventDispatch;
+use Kiri\Events\EventDispatch;
-use Kiri\Exception\ConfigException;
+use Kiri\Exception\ConfigException;
-use ReflectionException;
+use ReflectionException;
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
-use Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnBeforeShutdown;
-use Server\Events\OnShutdown;
+use Kiri\Server\Events\OnShutdown;
-use Server\Events\OnStart;
+use Kiri\Server\Events\OnStart;
-
+
-
+
-/**
+/**
- * Class OnServerDefault
+ * Class OnServerDefault
- * @package Server\Manager
+ * @package Server\Manager
- */
+ */
-class OnServer extends Server
+class OnServer extends Server
-{
+{
-
+	
-	/**
+
-	 * @var EventDispatch
+	/**
-	 */
+	 * @param \Swoole\Server $server
-	#[Inject(EventDispatch::class)]
+	 * @throws ConfigException
-	public EventDispatch $eventDispatch;
+	 * @throws ReflectionException
-
+	 */
-
+	public function onStart(\Swoole\Server $server)
-	/**
+	{
-	 * @param \Swoole\Server $server
+		$this->setProcessName(sprintf('start[%d].server', $server->master_pid));
-	 * @throws ConfigException
+
-	 * @throws ReflectionException
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnStart($server));
-	 */
+	}
-	public function onStart(\Swoole\Server $server)
+
-	{
+
-		$this->setProcessName(sprintf('start[%d].server', $server->master_pid));
+	/**
-
+	 * @param \Swoole\Server $server
-		$this->eventDispatch->dispatch(new OnStart($server));
+	 * @throws ReflectionException
-	}
+	 */
-
+	public function onBeforeShutdown(\Swoole\Server $server)
-
+	{
-	/**
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnBeforeShutdown($server));
-	 * @param \Swoole\Server $server
+	}
-	 * @throws ReflectionException
+
-	 */
+
-	public function onBeforeShutdown(\Swoole\Server $server)
+	/**
-	{
+	 * @param \Swoole\Server $server
-		$this->eventDispatch->dispatch(new OnBeforeShutdown($server));
+	 * @throws ReflectionException
-	}
+	 */
-
+	public function onShutdown(\Swoole\Server $server)
-
+	{
-	/**
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnShutdown($server));
-	 * @param \Swoole\Server $server
+	}
-	 * @throws ReflectionException
+
-	 */
+
-	public function onShutdown(\Swoole\Server $server)
+}
-	{
-		$this->eventDispatch->dispatch(new OnShutdown($server));
-	}
-
-
-}

Handler/OnServerManager.php

@@ -1,50 +1,44 @@
-<?php
+<?php
-
+
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
-
+
-use Note\Inject;
+use Kiri\Annotation\Inject;
-use Kiri\Events\EventDispatch;
+use Kiri\Events\EventDispatch;
-use ReflectionException;
+use ReflectionException;
-use Server\Abstracts\Server;
+use Kiri\Server\Abstracts\Server;
-use Kiri\Exception\ConfigException;
+use Kiri\Exception\ConfigException;
-use Server\Events\OnManagerStart;
+use Kiri\Server\Events\OnManagerStart;
-use Server\Events\OnManagerStop;
+use Kiri\Server\Events\OnManagerStop;
-
+
-
+
-/**
+/**
- * Class OnServerManager
+ * Class OnServerManager
- * @package Server\Manager
+ * @package Server\Manager
- */
+ */
-class OnServerManager extends Server
+class OnServerManager extends Server
-{
+{
-
+
-	/**
+
-	 * @var EventDispatch
+	/**
-	 */
+     * @param \Swoole\Server $server
-	#[Inject(EventDispatch::class)]
+     * @throws ConfigException|ReflectionException
-	public EventDispatch $eventDispatch;
+	 */
-
+	public function onManagerStart(\Swoole\Server $server)
-
+	{
-	/**
+        $this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
-     * @param \Swoole\Server $server
+
-     * @throws ConfigException|ReflectionException
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnManagerStart($server));
-	 */
+	}
-	public function onManagerStart(\Swoole\Server $server)
+
-	{
+
-        $this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
+	/**
-
+	 * @param \Swoole\Server $server
-		$this->eventDispatch->dispatch(new OnManagerStart($server));
+	 * @throws ReflectionException
-	}
+	 */
-
+	public function onManagerStop(\Swoole\Server $server)
-
+	{
-	/**
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnManagerStop($server));
-	 * @param \Swoole\Server $server
+	}
-	 * @throws ReflectionException
+
-	 */
+
-	public function onManagerStop(\Swoole\Server $server)
+}
-	{
-		$this->eventDispatch->dispatch(new OnManagerStop($server));
-	}
-
-
-}

Handler/OnServerReload.php

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

Handler/OnServerWorker.php

@@ -1,121 +1,128 @@
-<?php
+<?php
-
+
-namespace Server\Handler;
+namespace Kiri\Server\Handler;
-
+
-use Exception;
+use Exception;
-use Kiri\Abstracts\Config;
+use Kiri;
-use Kiri\Core\Help;
+use Kiri\Abstracts\Config;
-use Kiri\Events\EventDispatch;
+use Kiri\Annotation\Inject;
-use Kiri\Kiri;
+use Kiri\Core\Help;
-use Note\Inject;
+use Kiri\Events\EventDispatch;
-use Server\Events\OnAfterWorkerStart;
+use Kiri\Message\Handler\Router;
-use Server\Events\OnBeforeWorkerStart;
+use Kiri\Server\Events\OnAfterWorkerStart;
-use Server\Events\OnTaskerStart as OnTaskStart;
+use Kiri\Server\Events\OnBeforeWorkerStart;
-use Server\Events\OnWorkerError;
+use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
-use Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerError;
-use Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStop;
+use Kiri\Server\Events\OnWorkerStart;
-use Swoole\Server;
+use Kiri\Server\Events\OnWorkerStop;
-use Swoole\Timer;
+use Swoole\Server;
-
+use Swoole\Timer;
-
+
-/**
+
- * Class OnServerWorker
+/**
- * @package Server\Worker
+ * Class OnServerWorker
- */
+ * @package Server\Worker
-class OnServerWorker extends \Server\Abstracts\Server
+ */
-{
+class OnServerWorker extends \Kiri\Server\Abstracts\Server
-
+{
-
+
-	/**
+
-	 * @var EventDispatch
+	public Router $collector;
-	 */
+
-	#[Inject(EventDispatch::class)]
+
-	public EventDispatch $eventDispatch;
+	/**
-
+	 * @return void
-
+	 */
-	/**
+	public function init()
-	 * @param Server $server
+	{
-	 * @param int $workerId
+		$this->collector = Kiri::getDi()->get(Router::class);
-	 * @throws Exception
+	}
-	 */
+
-	public function onWorkerStart(Server $server, int $workerId)
+
-	{
+	/**
-		$this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId));
+	 * @param Server $server
-		if ($workerId < $server->setting['worker_num']) {
+	 * @param int $workerId
-			$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
+	 * @throws Exception
-			$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
+	 */
-			set_env('environmental', Kiri::WORKER);
+	public function onWorkerStart(Server $server, int $workerId)
-		} else {
+	{
-			$this->eventDispatch->dispatch(new OnTaskStart($server, $workerId));
+		$dispatch = \Kiri::getDi()->get(EventDispatch::class);
-			$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));
+		$dispatch->dispatch(new OnBeforeWorkerStart($workerId));
-			set_env('environmental', Kiri::TASK);
+		set_env('environmental_workerId', $workerId);
-		}
+		if ($workerId < $server->setting['worker_num']) {
-		$this->eventDispatch->dispatch(new OnAfterWorkerStart());
+			$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
-	}
+			$this->collector->scan_build_route();
-
+			$dispatch->dispatch(new OnWorkerStart($server, $workerId));
-
+			set_env('environmental', Kiri::WORKER);
-	/**
+		} else {
-	 * @param Server $server
+			$dispatch->dispatch(new OnTaskStart($server, $workerId));
-	 * @param int $workerId
+			$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));
-	 * @throws Exception
+			set_env('environmental', Kiri::TASK);
-	 */
+		}
-	public function onWorkerStop(Server $server, int $workerId)
+		$dispatch->dispatch(new OnAfterWorkerStart());
-	{
+	}
-		Timer::clearAll();
+
-		$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
+
-	}
+	/**
-
+	 * @param Server $server
-
+	 * @param int $workerId
-	/**
+	 * @throws Exception
-	 * @param Server $server
+	 */
-	 * @param int $workerId
+	public function onWorkerStop(Server $server, int $workerId)
-	 * @throws Exception
+	{
-	 */
+		Timer::clearAll();
-	public function onWorkerExit(Server $server, int $workerId)
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnWorkerStop($server, $workerId));
-	{
+	}
-		set_env('state', 'exit');
+
-
+
-		$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
+	/**
-	}
+	 * @param Server $server
-
+	 * @param int $workerId
-
+	 * @throws Exception
-	/**
+	 */
-	 * @param Server $server
+	public function onWorkerExit(Server $server, int $workerId)
-	 * @param int $worker_id
+	{
-	 * @param int $worker_pid
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnWorkerExit($server, $workerId));
-	 * @param int $exit_code
+	}
-	 * @param int $signal
+
-	 * @throws Exception
+
-	 */
+	/**
-	public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal)
+	 * @param Server $server
-	{
+	 * @param int $worker_id
-		$this->eventDispatch->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
+	 * @param int $worker_pid
-
+	 * @param int $exit_code
-		$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s',
+	 * @param int $signal
-			$worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), 9)
+	 * @throws Exception
-		);
+	 */
-
+	public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal)
-		$this->logger->error($message);
+	{
-
+		\Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
-		$this->system_mail($message);
+
-	}
+		$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)
-
+		);
-	/**
+
-	 * @param $messageContent
+		$this->logger->error($message);
-	 * @throws Exception
+
-	 */
+		$this->system_mail($message);
-	protected function system_mail($messageContent)
+	}
-	{
+
-		try {
+
-			$email = Config::get('email', ['enable' => false]);
+	/**
-			if (!empty($email) && ($email['enable'] ?? false) == true) {
+	 * @param $messageContent
-				Help::sendEmail($email, 'Service Error', $messageContent);
+	 * @throws Exception
-			}
+	 */
-		} catch (\Throwable $e) {
+	protected function system_mail($messageContent)
-			error($e, 'email');
+	{
-		}
+		try {
-	}
+			$email = Config::get('email', ['enable' => false]);
-
+			if (!empty($email) && ($email['enable'] ?? false) == true) {
-}
+				Help::sendEmail($email, 'Service Error', $messageContent);
+			}
+		} catch (\Throwable $e) {
+			error($e, 'email');
+		}
+	}
+
+}

ProcessManager.php

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

Server.php

@@ -1,147 +1,157 @@
-<?php
+<?php
-
+
-
+
-namespace Server;
+namespace Kiri\Server;
-
+
-use Exception;
+use Exception;
-use Http\Handler\Abstracts\HttpService;
+use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\Config;
+use Kiri;
-use Kiri\Events\EventDispatch;
+use Kiri\Abstracts\Config;
-use Kiri\Exception\ConfigException;
+use Kiri\Annotation\Inject;
-use Kiri\Kiri;
+use Kiri\Events\EventDispatch;
-use Note\Inject;
+use Kiri\Exception\ConfigException;
-use Psr\Container\ContainerExceptionInterface;
+use Kiri\Message\Handler\Abstracts\HttpService;
-use Psr\Container\NotFoundExceptionInterface;
+use Kiri\Server\Events\OnShutdown;
-use Server\Events\OnShutdown;
+use Psr\Container\ContainerExceptionInterface;
-
+use Kiri\Server\Events\OnServerBeforeStart;
-
+use Psr\Container\NotFoundExceptionInterface;
-defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
+use ReflectionException;
-
+use Swoole\Coroutine;
-/**
+
- * Class Server
+
- * @package Http
+defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
- */
+
-class Server extends HttpService
+/**
-{
+ * Class Server
-
+ * @package Http
-	private array $process = [
+ */
-	];
+class Server extends HttpService
-
+{
-
+
-	private mixed $daemon = 0;
+	private array $process = [
-
+	];
-
+
-	/**
+
-	 * @var State
+	private mixed $daemon = 0;
-	 */
+
-	#[Inject(State::class)]
+
-	public State $state;
+	/**
-
+	 * @var State
-
+	 */
-	/**
+	#[Inject(State::class)]
-	 *
+	public State $state;
-	 */
+
-	public function init()
+
-	{
+	public ServerManager $manager;
-	}
+
-
+
-
+	/**
-	/**
+	 *
-	 * @param $process
+	 */
-	 */
+	public function init()
-	public function addProcess($process)
+	{
-	{
+		$this->manager = Kiri::getContainer()->get(ServerManager::class);
-		$this->process[] = $process;
+		$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
-	}
+		Config::set('servers.settings.enable_coroutine', true);
-
+		if ($enable_coroutine != true) {
-
+			return;
-	/**
+		}
-	 * @return string
+		Coroutine::set([
-	 * @throws ConfigException
+			'hook_flags'            => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
-	 * @throws ContainerExceptionInterface
+			'enable_deadlock_check' => FALSE,
-	 * @throws NotFoundExceptionInterface
+			'exit_condition'        => function () {
-	 * @throws \ReflectionException
+				return Coroutine::stats()['coroutine_num'] === 0;
-	 * @throws Exception
+			}
-	 */
+		]);
-	public function start(): string
+	}
-	{
+
-		$this->manager()->initBaseServer(Config::get('server', [], true), $this->daemon);
+
-
+	/**
-		$rpcService = Config::get('rpc', []);
+	 * @param $process
-		if (!empty($rpcService)) {
+	 */
-			$this->manager()->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'],
+	public function addProcess($process)
-				$rpcService['mode'], $rpcService);
+	{
-		}
+		$this->process[] = $process;
-
+	}
-		$processes = array_merge($this->process, Config::get('processes', []));
+
-		foreach ($processes as $process) {
+
-			$this->manager()->addProcess($process);
+	/**
-		}
+	 * @return string
-
+	 * @throws ConfigException
-		return $this->manager()->getServer()->start();
+	 * @throws ContainerExceptionInterface
-	}
+	 * @throws NotFoundExceptionInterface
-
+	 * @throws ReflectionException
-
+	 * @throws Exception
-	/**
+	 */
-	 * @return void
+	public function start(): mixed
-	 * @throws ConfigException
+	{
-	 * @throws ContainerExceptionInterface
+		$this->manager->initBaseServer(Config::get('server', [], true), $this->daemon);
-	 * @throws NotFoundExceptionInterface
+
-	 * @throws \ReflectionException
+		$rpcService = Config::get('rpc', []);
-	 * @throws Exception
+		if (!empty($rpcService)) {
-	 */
+			$this->manager->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'],
-	public function shutdown()
+				$rpcService['mode'], $rpcService);
-	{
+		}
-		$configs = Config::get('server', [], true);
+
-		foreach ($this->manager()->sortService($configs['ports'] ?? []) as $config) {
+		$processes = array_merge($this->process, Config::get('processes', []));
-			$this->state->exit($config['port']);
+
-		}
+		$this->getContainer()->get(ProcessManager::class)->batch($processes);
-		$this->container->get(EventDispatch::class)->dispatch(new OnShutdown());
+
-	}
+		$this->getEventDispatch()->dispatch(new OnServerBeforeStart());
-
+
-
+		return $this->manager->getServer()->start();
-	/**
+	}
-	 * @return bool
+
-	 * @throws ConfigException
+
-	 * @throws Exception
+	/**
-	 */
+	 * @return void
-	public function isRunner(): bool
+	 * @throws ConfigException
-	{
+	 * @throws ContainerExceptionInterface
-		return $this->state->isRunner();
+	 * @throws NotFoundExceptionInterface
-	}
+	 * @throws ReflectionException
-
+	 * @throws Exception
-
+	 */
-	/**
+	public function shutdown()
-	 * @param $daemon
+	{
-	 * @return Server
+		$configs = Config::get('server', [], true);
-	 */
+		foreach ($this->manager->sortService($configs['ports'] ?? []) as $config) {
-	public function setDaemon($daemon): static
+			$this->state->exit($config['port']);
-	{
+		}
-		if (!in_array($daemon, [0, 1])) {
+		$this->getContainer()->get(EventDispatch::class)->dispatch(new OnShutdown());
-			return $this;
+	}
-		}
+
-		$this->daemon = $daemon;
+
-		return $this;
+	/**
-	}
+	 * @return bool
-
+	 * @throws ConfigException
-
+	 * @throws Exception
-	/**
+	 */
-	 * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
+	public function isRunner(): bool
-	 * @throws \ReflectionException
+	{
-	 */
+		return $this->state->isRunner();
-	public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
+	}
-	{
+
-		return $this->manager()->getServer();
+
-	}
+	/**
-
+	 * @param $daemon
-
+	 * @return Server
-	/**
+	 */
-	 * @return ServerManager
+	public function setDaemon($daemon): static
-	 * @throws \ReflectionException
+	{
-	 */
+		if (!in_array($daemon, [0, 1])) {
-	private function manager(): ServerManager
+			return $this;
-	{
+		}
-		return Kiri::getDi()->get(ServerManager::class);
+		$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,120 +1,77 @@
-<?php
+<?php
-declare(strict_types=1);
+declare(strict_types=1);
-
+
-namespace Server;
+namespace Kiri\Server;
-
+
-
+
-use Note\Inject;
+use Exception;
-use Exception;
+use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Config;
+use Kiri\Events\EventDispatch;
-use Kiri\Events\EventDispatch;
+use Kiri\Exception\ConfigException;
-use Kiri\Exception\ConfigException;
+use Kiri;
-use Kiri\Kiri;
+use Kiri\Annotation\Inject;
-use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
-use Server\Events\OnServerBeforeStart;
+use Swoole\Coroutine;
-use Swoole\Coroutine;
+use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+
-
+/**
-/**
+ * Class Command
- * Class Command
+ * @package Http
- * @package Http
+ */
- */
+class ServerCommand extends Command
-class ServerCommand extends Command
+{
-{
+
-
+
-
+	const ACTIONS = ['start', 'stop', 'restart'];
-	const ACTIONS = ['start', 'stop', 'restart'];
+
-
+
-
+
-	/**
+	/**
-	 * @var EventDispatch
+	 *
-	 */
+	 */
-	#[Inject(EventDispatch::class)]
+	protected function configure()
-	public EventDispatch $eventProvider;
+	{
-
+		$this->setName('sw:server')
-
+			->setDescription('server start|stop|reload|restart')
-	/**
+			->addArgument('action', InputArgument::OPTIONAL, 'run action', 'start')
-	 *
+			->addOption('daemon', 'd', InputOption::VALUE_OPTIONAL, 'is run daemonize');
-	 */
+	}
-	protected function configure()
+
-	{
+
-		$this->setName('sw:server')
+	/**
-			->setDescription('server start|stop|reload|restart')
+	 * @param InputInterface $input
-			->addArgument('action', InputArgument::OPTIONAL, 'run action', 'start')
+	 * @param OutputInterface $output
-			->addOption('daemon', 'd', InputOption::VALUE_OPTIONAL, 'is run daemonize');
+	 * @return int
-	}
+	 * @throws ConfigException
-
+	 * @throws ContainerExceptionInterface
-
+	 * @throws NotFoundExceptionInterface
-	/**
+	 * @throws \ReflectionException
-	 * @param InputInterface $input
+	 * @throws Exception
-	 * @param OutputInterface $output
+	 */
-	 * @return int
+	public function execute(InputInterface $input, OutputInterface $output): int
-	 * @throws ConfigException
+	{
-	 * @throws ContainerExceptionInterface
+		$manager = Kiri::app()->getServer();
-	 * @throws NotFoundExceptionInterface
+		$manager->setDaemon((int)!is_null($input->getOption('daemon')));
-	 * @throws \ReflectionException
+
-	 * @throws Exception
+        $action = $input->getArgument('action');
-	 */
+        if (is_null($action)) {
-	public function execute(InputInterface $input, OutputInterface $output): int
+			throw new Exception('I don\'t know what I want to do.');
-	{
+		}
-		$manager = Kiri::app()->getServer();
+		if (!in_array($action, self::ACTIONS)) {
-		$manager->setDaemon((int)!is_null($input->getOption('daemon')));
+			throw new Exception('I don\'t know what I want to do.');
-		if (is_null($input->getArgument('action'))) {
+		}
-			$input->setArgument('action', 'restart');
+		if ($action == 'restart' || $action == 'stop') {
-		}
+			$manager->shutdown();
-		if (!in_array($input->getArgument('action'), self::ACTIONS)) {
+            if ($action == 'stop') {
-			throw new Exception('I don\'t know what I want to do.');
+                return 1;
-		}
+            }
-		if ($manager->isRunner() && $input->getArgument('action') == 'start') {
+		}
-			throw new Exception('Service is running. Please use restart.');
+        return (int)$manager->start();
-		}
+	}
-		$manager->shutdown();
+
-		if ($input->getArgument('action') == 'stop') {
+}
-			return 0;
-		}
-		return $this->generate_runtime_builder($manager);
-	}
-
-
-	/**
-	 * @throws ConfigException
-	 */
-	private function configure_set()
-	{
-		$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
-		if ($enable_coroutine != true) {
-			return;
-		}
-		Coroutine::set([
-			'hook_flags'            => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
-			'enable_deadlock_check' => FALSE,
-			'exit_condition'        => function () {
-				return Coroutine::stats()['coroutine_num'] === 0;
-			}
-		]);
-	}
-
-
-	/**
-	 * @param $manager
-	 * @return int
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	private function generate_runtime_builder($manager): int
-	{
-		$this->configure_set();
-
-		Kiri::app()->getRouter()->read_files();
-
-		$manager->start();
-
-		return 1;
-	}
-
-}

ServerManager.php

@@ -1,401 +1,309 @@
-<?php
+<?php
-
+
-namespace Server;
+namespace Kiri\Server;
-
+
-use Exception;
+use Exception;
-use Kiri\Abstracts\Component;
+use Kiri\Abstracts\Component;
-use Kiri\Abstracts\Config;
+use Kiri\Abstracts\Config;
-use Kiri\Error\Logger;
+use Kiri\Annotation\Inject;
-use Kiri\Events\EventDispatch;
+use Kiri\Error\Logger;
-use Kiri\Exception\ConfigException;
+use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri\Server\Contract\OnCloseInterface;
-use Note\Inject;
+use Kiri\Server\Contract\OnConnectInterface;
-use Psr\Container\ContainerExceptionInterface;
+use Kiri\Server\Contract\OnDisconnectInterface;
-use Psr\Container\NotFoundExceptionInterface;
+use Kiri\Server\Contract\OnHandshakeInterface;
-use ReflectionException;
+use Kiri\Server\Contract\OnMessageInterface;
-use Server\Abstracts\BaseProcess;
+use Kiri\Server\Contract\OnPacketInterface;
-use Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnReceiveInterface;
-use Server\Contract\OnConnectInterface;
+use Kiri\Server\Handler\OnPipeMessage;
-use Server\Contract\OnDisconnectInterface;
+use Kiri\Server\Handler\OnServer;
-use Server\Contract\OnHandshakeInterface;
+use Kiri\Server\Handler\OnServerWorker;
-use Server\Contract\OnMessageInterface;
+use Kiri\Task\TaskManager;
-use Server\Contract\OnPacketInterface;
+use Psr\Container\ContainerExceptionInterface;
-use Server\Contract\OnProcessInterface;
+use Psr\Container\NotFoundExceptionInterface;
-use Server\Contract\OnReceiveInterface;
+use Swoole\Http\Server as HServer;
-use Server\Events\OnServerBeforeStart;
+use Swoole\Server;
-use Server\Handler\OnPipeMessage;
+use Swoole\Server\Port;
-use Server\Handler\OnServer;
+use Swoole\WebSocket\Server as WServer;
-use Server\Handler\OnServerManager;
+
-use Server\Handler\OnServerReload;
+
-use Server\Handler\OnServerWorker;
+/**
-use Server\Tasker\OnServerTask;
+ * Class OnServerManager
-use Swoole\Http\Server as HServer;
+ * @package Http\Service
-use Swoole\Process;
+ */
-use Swoole\Server;
+class ServerManager extends Component
-use Swoole\Server\Port;
+{
-use Swoole\WebSocket\Server as WServer;
+
-
+
-
+	use TraitServer;
-/**
+
- * Class OnServerManager
+	/** @var string */
- * @package Http\Service
+	public string $host = '';
- */
+
-class ServerManager extends Component
+	public int $port = 0;
-{
+
-
+
-
+	/**
-	use TraitServer;
+	 * @var Logger
-
+	 */
-	/** @var string */
+	#[Inject(Logger::class)]
-	public string $host = '';
+	public Logger $logger;
-
+
-	public int $port = 0;
+	/** @var array<string,Port> */
-
+	public array $ports = [];
-
+
-	/**
+	public int $mode = SWOOLE_TCP;
-	 * @var Logger
+
-	 */
+
-	#[Inject(Logger::class)]
+	private Server|null $server = null;
-	public Logger $logger;
+
-
+
-	/** @var array<string,Port> */
+	const DEFAULT_EVENT = [
-	public array $ports = [];
+		Constant::WORKER_START    => [OnServerWorker::class, 'onWorkerStart'],
-
+		Constant::WORKER_EXIT     => [OnServerWorker::class, 'onWorkerExit'],
-	public int $mode = SWOOLE_TCP;
+		Constant::WORKER_STOP     => [OnServerWorker::class, 'onWorkerStop'],
-
+		Constant::WORKER_ERROR    => [OnServerWorker::class, 'onWorkerError'],
-
+		Constant::START           => [OnServer::class, 'onStart'],
-	private Server|null $server = null;
+		Constant::SHUTDOWN        => [OnServer::class, 'onShutdown'],
-
+	];
-
+
-	protected array $initProcesses = [];
+
-
+	/**
-
+	 * @var array|string[]
-	const DEFAULT_EVENT = [
+	 */
-		Constant::WORKER_START    => [OnServerWorker::class, 'onWorkerStart'],
+	private array $eventInterface = [
-		Constant::WORKER_EXIT     => [OnServerWorker::class, 'onWorkerExit'],
+		OnReceiveInterface::class    => 'receive',
-		Constant::WORKER_STOP     => [OnServerWorker::class, 'onWorkerStop'],
+		OnPacketInterface::class     => 'packet',
-		Constant::WORKER_ERROR    => [OnServerWorker::class, 'onWorkerError'],
+		OnHandshakeInterface::class  => 'handshake',
-		Constant::MANAGER_START   => [OnServerManager::class, 'onManagerStart'],
+		OnMessageInterface::class    => 'message',
-		Constant::MANAGER_STOP    => [OnServerManager::class, 'onManagerStop'],
+		OnConnectInterface::class    => 'connect',
-		Constant::BEFORE_RELOAD   => [OnServerReload::class, 'onBeforeReload'],
+		OnCloseInterface::class      => 'close',
-		Constant::AFTER_RELOAD    => [OnServerReload::class, 'onAfterReload'],
+		OnDisconnectInterface::class => 'disconnect'
-		Constant::START           => [OnServer::class, 'onStart'],
+	];
-		Constant::BEFORE_SHUTDOWN => [OnServer::class, 'onBeforeShutdown'],
+
-		Constant::SHUTDOWN        => [OnServer::class, 'onShutdown'],
+
-	];
+	/**
-
+	 * @return Server|WServer|HServer|null
-
+	 */
-	private array $eventInterface = [
+	public function getServer(): Server|WServer|HServer|null
-		OnReceiveInterface::class    => 'receive',
+	{
-		OnPacketInterface::class     => 'packet',
+		return $this->server;
-		OnHandshakeInterface::class  => 'handshake',
+	}
-		OnMessageInterface::class    => 'message',
+
-		OnConnectInterface::class    => 'connect',
+
-		OnCloseInterface::class      => 'close',
+	/**
-		OnDisconnectInterface::class => 'disconnect'
+	 * @param string $type
-	];
+	 * @param string $host
-
+	 * @param int $port
-
+	 * @param int $mode
-	/**
+	 * @param array $settings
-	 * @return Server|WServer|HServer|null
+	 * @throws ConfigException
-	 * @throws ReflectionException
+	 * @throws ContainerExceptionInterface
-	 */
+	 * @throws NotFoundExceptionInterface
-	public function getServer(): Server|WServer|HServer|null
+	 */
-	{
+	public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
-		di(EventDispatch::class)->dispatch(new OnServerBeforeStart());
+	{
-		return $this->server;
+		if (!$this->server) {
-	}
+			$this->createBaseServer($type, $host, $port, $mode, $settings);
-
+		} else {
-
+			if (!isset($settings['settings'])) {
-	/**
+				$settings['settings'] = [];
-	 * @param string $type
+			}
-	 * @param string $host
+			$this->addNewListener($type, $host, $port, $mode, $settings);
-	 * @param int $port
+		}
-	 * @param int $mode
+	}
-	 * @param array $settings
+
-	 * @throws ConfigException
+
-	 * @throws ContainerExceptionInterface
+	/**
-	 * @throws NotFoundExceptionInterface
+	 * @param $configs
-	 * @throws ReflectionException
+	 * @param int $daemon
-	 */
+	 * @throws ConfigException
-	public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
+	 * @throws ContainerExceptionInterface
-	{
+	 * @throws NotFoundExceptionInterface
-		if (!$this->server) {
+	 */
-			$this->createBaseServer($type, $host, $port, $mode, $settings);
+	public function initBaseServer($configs, int $daemon = 0): void
-		} else {
+	{
-			if (!isset($settings['settings'])) {
+		$context = di(ServerManager::class);
-				$settings['settings'] = [];
+		foreach ($this->sortService($configs['ports']) as $config) {
-			}
+			$this->startListenerHandler($context, $config, $daemon);
-			$this->addNewListener($type, $host, $port, $mode, $settings);
+		}
-		}
+		$this->bindPipeMessage();
-	}
+	}
-
+
-
+
-	/**
+	/**
-	 * @param $configs
+	 * @return void
-	 * @param int $daemon
+	 * @throws ContainerExceptionInterface
-	 * @throws ConfigException
+	 * @throws NotFoundExceptionInterface
-	 * @throws ContainerExceptionInterface
+	 */
-	 * @throws NotFoundExceptionInterface
+	public function bindPipeMessage(): void
-	 * @throws ReflectionException
+	{
-	 */
+		$pipeMessage = $this->getContainer()->get(OnPipeMessage::class);
-	public function initBaseServer($configs, int $daemon = 0): void
+		$this->server->on(Constant::PIPE_MESSAGE, [$pipeMessage, 'onPipeMessage']);
-	{
+
-		$context = di(ServerManager::class);
+		if (!isset($this->server->setting['task_worker_num']) || $this->server->setting['task_worker_num'] < 1) {
-		foreach ($this->sortService($configs['ports']) as $config) {
+			return;
-			$this->startListenerHandler($context, $config, $daemon);
+		}
-		}
+
-		$this->bindCallback([Constant::PIPE_MESSAGE => [OnPipeMessage::class, 'onPipeMessage']]);
+		$this->getContainer()->get(TaskManager::class)->taskListener($this->server);
-	}
+	}
-
+
-
+
-	/**
+	/**
-	 * @param string|OnProcessInterface|BaseProcess $customProcess
+	 * @return array
-	 * @throws Exception
+	 */
-	 */
+	public function getSetting(): array
-	public function addProcess(string|OnProcessInterface|BaseProcess $customProcess)
+	{
-	{
+		return $this->server->setting;
-		if (is_string($customProcess)) {
+	}
-			$customProcess = Kiri::getDi()->get($customProcess);
+
-		}
+
-		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
+	/**
-		$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
+	 * @param ServerManager $context
-		$this->server->addProcess(new Process(function (Process $process) use ($customProcess, $system) {
+	 * @param array $config
-			if (Kiri::getPlatform()->isLinux()) {
+	 * @param int $daemon
-				$process->name($system . '(' . $customProcess->getName() . ')');
+	 * @throws ConfigException
-			}
+	 * @throws ContainerExceptionInterface
-			$customProcess->onSigterm()->process($process);
+	 * @throws NotFoundExceptionInterface
-		},
+	 * @throws Exception
-			$customProcess->getRedirectStdinAndStdout(),
+	 */
-			$customProcess->getPipeType(),
+	private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
-			$customProcess->isEnableCoroutine()
+	{
-		));
+		if (!$this->server) {
-	}
+			$config = $this->mergeConfig($config, $daemon);
-
+		}
-
+		$context->addListener(
-	/**
+			$config['type'], $config['host'], $config['port'], $config['mode'],
-	 * @return array<string,Process>
+			$config);
-	 */
+	}
-	public function getProcesses(): array
+
-	{
+
-		return $this->initProcesses;
+	/**
-	}
+	 * @param $config
-
+	 * @param $daemon
-
+	 * @return array
-	/**
+	 * @throws Exception
-	 * @return array
+	 */
-	 */
+	private function mergeConfig($config, $daemon): array
-	public function getSetting(): array
+	{
-	{
+		$config['settings'] = $config['settings'] ?? [];
-		return $this->server->setting;
+		$config['settings']['daemonize'] = $daemon;
-	}
+		if (!isset($config['settings']['log_file'])) {
-
+			$config['settings']['log_file'] = storage('system.log');
-
+		}
-	/**
+		$config['settings']['pid_file'] = storage('.swoole.pid');
-	 * @param ServerManager $context
+		$config['settings'][Constant::OPTION_ENABLE_REUSE_PORT] = true;
-	 * @param array $config
+		$config['events'] = $config['events'] ?? [];
-	 * @param int $daemon
+		return $config;
-	 * @throws ConfigException
+	}
-	 * @throws ContainerExceptionInterface
+
-	 * @throws NotFoundExceptionInterface
+
-	 * @throws ReflectionException
+	/**
-	 * @throws Exception
+	 * @param string $type
-	 */
+	 * @param string $host
-	private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
+	 * @param int $port
-	{
+	 * @param int $mode
-		if (!$this->server) {
+	 * @param array $settings
-			$config = $this->mergeConfig($config, $daemon);
+	 * @throws ConfigException
-		}
+	 * @throws ContainerExceptionInterface
-		$context->addListener(
+	 * @throws NotFoundExceptionInterface
-			$config['type'], $config['host'], $config['port'], $config['mode'],
+	 * @throws Exception
-			$config);
+	 */
-	}
+	private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = [])
-
+	{
-
+		$id = Config::get('id', 'system-service');
-	/**
+
-	 * @param $config
+		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
-	 * @param $daemon
+
-	 * @return array
+		/** @var Server\Port $service */
-	 * @throws Exception
+		$this->ports[$port] = $this->server->addlistener($host, $port, $mode);
-	 */
+		if ($this->ports[$port] === false) {
-	private function mergeConfig($config, $daemon): array
+			throw new Exception("The port is already in use[$host::$port]");
-	{
+		}
-		$config['settings'] = $config['settings'] ?? [];
+		if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['settings']['open_http_protocol'])) {
-		$config['settings']['daemonize'] = $daemon;
+			$settings['settings']['open_http_protocol'] = true;
-		if (!isset($config['settings']['log_file'])) {
+			if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
-			$config['settings']['log_file'] = storage('system.log');
+				$settings['settings']['open_http2_protocol'] = true;
-		}
+			}
-		$config['settings']['pid_file'] = storage('.swoole.pid');
+		}
-		$config['settings'][Constant::OPTION_ENABLE_REUSE_PORT] = true;
+		if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['settings']['open_websocket_protocol'])) {
-		$config['events'] = $config['events'] ?? [];
+			$settings['settings']['open_websocket_protocol'] = true;
-		return $config;
+		}
-	}
+		$this->ports[$port]->set($settings['settings'] ?? []);
-
+		$this->addServiceEvents($settings['events'] ?? [], $this->ports[$port]);
-
+	}
-	/**
+
-	 * @param string $type
+
-	 * @param string $host
+	/**
-	 * @param int $port
+	 * @param string $type
-	 * @param int $mode
+	 * @param string $host
-	 * @param array $settings
+	 * @param int $port
-	 * @throws ConfigException
+	 * @param int $mode
-	 * @throws ContainerExceptionInterface
+	 * @param array $settings
-	 * @throws NotFoundExceptionInterface
+	 * @throws ConfigException
-	 * @throws Exception
+	 * @throws ContainerExceptionInterface
-	 */
+	 * @throws NotFoundExceptionInterface
-	private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = [])
+	 * @throws Exception
-	{
+	 */
-		$id = Config::get('id', 'system-service');
+	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
-
+	{
-		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
+		$match = match ($type) {
-
+			Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
-		/** @var Server\Port $service */
+			Constant::SERVER_TYPE_UDP => Server::class,
-		$this->ports[$port] = $this->server->addlistener($host, $port, $mode);
+			Constant::SERVER_TYPE_HTTP => HServer::class,
-		if ($this->ports[$port] === false) {
+			Constant::SERVER_TYPE_WEBSOCKET => WServer::class
-			throw new Exception("The port is already in use[$host::$port]");
+		};
-		}
+		$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
-		if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['settings']['open_http_protocol'])) {
+		$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
-			$settings['settings']['open_http_protocol'] = true;
+
-			if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
+		$this->getContainer()->setBindings(SwooleServerInterface::class, $this->server);
-				$settings['settings']['open_http2_protocol'] = true;
+
-			}
+		$id = Config::get('id', 'system-service');
-		}
+
-		if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['settings']['open_websocket_protocol'])) {
+		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
-			$settings['settings']['open_websocket_protocol'] = true;
+
-		}
+		$this->addDefaultListener($settings);
-		$this->ports[$port]->set($settings['settings'] ?? []);
+	}
-		$this->addServiceEvents($settings['events'] ?? [], $this->ports[$port]);
+
-	}
+
-
+	/**
-
+	 * @param array $settings
-	/**
+	 * @throws ContainerExceptionInterface
-	 * @param string $type
+	 * @throws NotFoundExceptionInterface
-	 * @param string $host
+	 */
-	 * @param int $port
+	private function addDefaultListener(array $settings): void
-	 * @param int $mode
+	{
-	 * @param array $settings
+		$this->addServiceEvents(ServerManager::DEFAULT_EVENT, $this->server);
-	 * @throws ConfigException
+		if (!empty($settings['events']) && is_array($settings['events'])) {
-	 * @throws ContainerExceptionInterface
+			$this->addServiceEvents($settings['events'], $this->server);
-	 * @throws NotFoundExceptionInterface
+		}
-	 * @throws ReflectionException
+	}
-	 * @throws Exception
+
-	 */
+
-	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
+	/**
-	{
+	 * @param array $events
-		$match = match ($type) {
+	 * @param Server|Port $server
-			Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
+	 * @throws ContainerExceptionInterface
-			Constant::SERVER_TYPE_UDP => Server::class,
+	 * @throws NotFoundExceptionInterface
-			Constant::SERVER_TYPE_HTTP => HServer::class,
+	 */
-			Constant::SERVER_TYPE_WEBSOCKET => WServer::class
+	private function addServiceEvents(array $events, Server|Port $server)
-		};
+	{
-		$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
+		foreach ($events as $name => $event) {
-		$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
+			if (is_array($event) && is_string($event[0])) {
-
+				$event[0] = $this->getContainer()->get($event[0]);
-		$id = Config::get('id', 'system-service');
+			}
-
+			$server->on($name, $event);
-		$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
+		}
-
+	}
-		$this->addDefaultListener($settings);
+
-	}
+
-
+	/**
-
+	 *
-	/**
+	 */
-	 * @param array $settings
+	public function start()
-	 * @throws ContainerExceptionInterface
+	{
-	 * @throws NotFoundExceptionInterface
+		$this->server->start();
-	 * @throws ReflectionException
+	}
-	 */
+
-	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
-	 * @throws ContainerExceptionInterface
-	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
-	 */
-	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 mixed $message
-	 * @param int $workerId
-	 * @return mixed
-	 */
-	public function sendMessage(mixed $message, int $workerId): mixed
-	{
-		return $this->server?->sendMessage($message, $workerId);
-	}
-
-
-	/**
-	 * @param array $events
-	 * @return void
-	 * @throws ContainerExceptionInterface
-	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
-	 */
-	private function addTaskListener(array $events = []): void
-	{
-		$task_use_object = $this->server->setting['task_object'] ?? $this->server->setting['task_use_object'] ?? false;
-		$reflect = $this->container->get(OnServerTask::class);
-		$this->server->on('finish', $events[Constant::FINISH] ?? [$reflect, 'onFinish']);
-		if ($task_use_object || $this->server->setting['task_enable_coroutine']) {
-			$this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onCoroutineTask']);
-		} else {
-			$this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onTask']);
-		}
-	}
-
-
-	/**
-	 * @param array|null $settings
-	 * @return void
-	 * @throws ContainerExceptionInterface
-	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
-	 */
-	public function bindCallback(?array $settings = [])
-	{
-		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,34 +1,32 @@
-<?php
+<?php
-declare(strict_types=1);
+declare(strict_types=1);
-
+
-namespace Server;
+namespace Kiri\Server;
-
+
-
+
-use Exception;
+use Exception;
-use Kiri\Abstracts\Providers;
+use Kiri\Abstracts\Providers;
-use Kiri\Application;
+use Kiri\Application;
-use Kiri\Kiri;
+use Kiri;
-
+
-/**
+/**
- * Class DatabasesProviders
+ * Class DatabasesProviders
- * @package Database
+ * @package Database
- */
+ */
-class ServerProviders extends Providers
+class ServerProviders extends Providers
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param Application $application
+	 * @param Application $application
-	 * @throws Exception
+	 * @throws Exception
-	 */
+	 */
-	public function onImport(Application $application)
+	public function onImport(Application $application)
-	{
+	{
-		$application->set('server', ['class' => Server::class]);
+		$container = Kiri::getDi();
-
+
-		$container = Kiri::getDi();
+		$console = $container->get(\Symfony\Component\Console\Application::class);
-
+		$console->add($container->get(ServerCommand::class));
-		$console = $container->get(\Symfony\Component\Console\Application::class);
+
-		$console->add($container->get(ServerCommand::class));
+	}
-
+}
-	}
-}

State.php

@@ -1,56 +1,56 @@
-<?php
+<?php
-
+
-namespace Server;
+namespace Kiri\Server;
-
+
-use Exception;
+use Exception;
-use Kiri\Abstracts\Component;
+use Kiri\Abstracts\Component;
-use Kiri\Abstracts\Config;
+use Kiri\Abstracts\Config;
-use Swoole\Process;
+use Swoole\Process;
-
+
-class State extends Component
+class State extends Component
-{
+{
-
+
-	use TraitServer;
+	use TraitServer;
-
+
-
+
-	public array $servers = [];
+	public array $servers = [];
-
+
-
+
-	public function init()
+	public function init()
-	{
+	{
-		$this->servers = Config::get('server.ports');
+		$this->servers = Config::get('server.ports');
-	}
+	}
-
+
-
+
-	/**
+	/**
-	 * @return bool
+	 * @return bool
-	 * @throws Exception
+	 * @throws Exception
-	 */
+	 */
-	public function isRunner(): bool
+	public function isRunner(): bool
-	{
+	{
-		$ports = $this->sortService($this->servers);
+		$ports = $this->sortService($this->servers);
-		foreach ($ports as $config) {
+		foreach ($ports as $config) {
-			if (checkPortIsAlready($config['port'])) {
+			if (checkPortIsAlready($config['port'])) {
-				return true;
+				return true;
-			}
+			}
-		}
+		}
-		return false;
+		return false;
-	}
+	}
-
+
-
+
-	/**
+	/**
-	 * @param $port
+	 * @param $port
-	 * @throws Exception
+	 * @throws Exception
-	 */
+	 */
-	public function exit($port)
+	public function exit($port)
-	{
+	{
-		if (!($pid = checkPortIsAlready($port))) {
+		if (!($pid = checkPortIsAlready($port))) {
-			return;
+			return;
-		}
+		}
-		while (checkPortIsAlready($port)) {
+		while (checkPortIsAlready($port)) {
-			Process::kill($pid, SIGTERM);
+			Process::kill($pid, SIGTERM);
-			usleep(300);
+			usleep(300);
-		}
+		}
-	}
+	}
-
+
-}
+}

SwooleServerInterface.php

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

Tasker/AsyncTaskExecute.php

@@ -1,92 +0,0 @@
-<?php
-
-namespace Server\Tasker;
-
-use Exception;
-use Kiri\Abstracts\Component;
-use Kiri\Core\HashMap;
-use Kiri\Kiri;
-use ReflectionException;
-use Server\Contract\OnTaskInterface;
-use Server\SwooleServerInterface;
-
-
-/**
- *
- */
-class AsyncTaskExecute extends Component
-{
-
-
-	/**
-	 * @var SwooleServerInterface|null
-	 */
-	public ?SwooleServerInterface $server = null;
-
-
-	private HashMap $hashMap;
-
-
-	/**
-	 *
-	 */
-	public function init()
-	{
-		$this->hashMap = new HashMap();
-	}
-
-
-	/**
-	 * @param string $key
-	 * @param $handler
-	 */
-	public function reg(string $key, $handler)
-	{
-		$this->hashMap->put($key, $handler);
-	}
-
-
-	/**
-	 * @param OnTaskInterface|string $handler
-	 * @param array $params
-	 * @param int|null $workerId
-	 * @throws Exception
-	 */
-	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
-	{
-		if (!$this->server) {
-			$this->server = Kiri::getDi()->get(SwooleServerInterface::class);
-		}
-		if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
-			$workerNum = $this->server->setting['worker_num'];
-			$taskerNum = $workerNum + $this->server->setting['task_worker_num'];
-			$workerId = random_int($workerNum, $taskerNum - 1);
-		}
-		if (is_string($handler)) {
-			$handler = $this->handle($handler, $params);
-		}
-		$this->server->task(serialize($handler), $workerId);
-	}
-
-
-	/**
-	 * @param $handler
-	 * @param $params
-	 * @return object
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	private function handle($handler, $params): object
-	{
-		if (!class_exists($handler) && $this->hashMap->has($handler)) {
-			$handler = $this->hashMap->get($handler);
-		}
-		$implements = $this->container->getReflect($handler);
-		if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
-			throw new Exception('Task must instance ' . OnTaskInterface::class);
-		}
-		return $implements->newInstanceArgs($params);
-	}
-
-
-}

Tasker/OnServerTask.php

@@ -1,94 +0,0 @@
-<?php
-
-
-namespace Server\Tasker;
-
-
-use Note\Inject;
-use Kiri\Abstracts\Logger;
-use Kiri\Exception\ConfigException;
-use Server\Contract\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
-	 */
-	private function resolve($data)
-	{
-		$execute = unserialize($data);
-		if ($execute instanceof OnTaskInterface) {
-			return $execute->execute();
-		}
-		return null;
-	}
-
-
-	/**
-	 * @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);
-	}
-
-
-}

TraitServer.php

@@ -1,32 +1,32 @@
-<?php
+<?php
-
+
-namespace Server;
+namespace Kiri\Server;
-
+
-trait TraitServer
+trait TraitServer
-{
+{
-
+
-
+
-	/**
+	/**
-	 * @param array $ports
+	 * @param array $ports
-	 * @return array
+	 * @return array
-	 */
+	 */
-	public function sortService(array $ports): array
+	public function sortService(array $ports): array
-	{
+	{
-		$array = [];
+		$array = [];
-		foreach ($ports as $port) {
+		foreach ($ports as $port) {
-			if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
+			if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-				array_unshift($array, $port);
+				array_unshift($array, $port);
-			} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
+			} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
-				if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
+				if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-					$array[] = $port;
+					$array[] = $port;
-				} else {
+				} else {
-					array_unshift($array, $port);
+					array_unshift($array, $port);
-				}
+				}
-			} else {
+			} else {
-				$array[] = $port;
+				$array[] = $port;
-			}
+			}
-		}
+		}
-		return $array;
+		return $array;
-	}
+	}
-
+
-}
+}

composer.json

@@ -15,11 +15,11 @@
         "psr/http-server-middleware": "^1.0",
         "psr/http-message": "^1.0",
         "psr/event-dispatcher": "^1.0",
-        "game-worker/kiri-http-message": "^v1.2"
+        "game-worker/kiri-http-message": "~v2.0"
     },
     "autoload": {
         "psr-4": {
-            "Server\\": "./"
+            "Kiri\\Server\\": "./"
         }
     }
 }