Compare commits

...

51 Commits

Author SHA1 Message Date
as2252258 2939d58585 1 2022-01-09 15:44:54 +08:00
as2252258 146da1d00c 1 2022-01-09 15:41:37 +08:00
as2252258 51babeddc1 1 2022-01-09 03:55:58 +08:00
as2252258 550197de96 e 2022-01-09 03:49:02 +08:00
as2252258 b5ad99332d 1 2022-01-09 03:46:41 +08:00
as2252258 e9b51ffb1e 1 2022-01-09 02:44:05 +08:00
as2252258 8c9de79027 Revert "改名"
This reverts commit fdf58326
2022-01-08 18:49:06 +08:00
as2252258 85c973469f Revert "改名"
This reverts commit fdf58326
2022-01-08 10:07:19 +08:00
as2252258 db8d9a8376 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:58:56 +08:00
as2252258 18b4e79f5f Revert "改名"
This reverts commit fdf58326
2022-01-07 18:58:16 +08:00
as2252258 0b7f380298 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:56:58 +08:00
as2252258 ea400c4ea5 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:54:46 +08:00
as2252258 07cfb62bb8 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:54:18 +08:00
as2252258 a5efa0813f Revert "改名"
This reverts commit fdf58326
2022-01-07 18:51:46 +08:00
as2252258 d1f2912324 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:51:12 +08:00
as2252258 ba0acf8f00 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:50:24 +08:00
as2252258 2788008fa1 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:45:44 +08:00
as2252258 5beee8352d Revert "改名"
This reverts commit fdf58326
2022-01-07 18:41:28 +08:00
as2252258 35859fead1 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:40:45 +08:00
as2252258 0031d73eff Revert "改名"
This reverts commit fdf58326
2022-01-07 18:40:05 +08:00
as2252258 89807fe548 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:38:45 +08:00
as2252258 9c28ce91ae Revert "改名"
This reverts commit fdf58326
2022-01-07 18:35:35 +08:00
as2252258 7ed01ba893 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:33:31 +08:00
as2252258 926a8c0719 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:29:08 +08:00
as2252258 688a30531a Revert "改名"
This reverts commit fdf58326
2022-01-07 18:27:01 +08:00
as2252258 1ff9d7f210 Revert "改名"
This reverts commit fdf58326
2022-01-07 18:16:29 +08:00
as2252258 da038f4fd8 Revert "改名"
This reverts commit fdf58326
2022-01-07 14:38:36 +08:00
as2252258 de20fa9582 Revert "改名"
This reverts commit fdf58326
2022-01-06 19:05:15 +08:00
as2252258 80cf72adc9 Revert "改名"
This reverts commit fdf58326
2022-01-04 16:06:29 +08:00
as2252258 dabcea452a 改名 2021-12-23 18:25:31 +08:00
as2252258 2feda943af 改名 2021-12-23 18:22:26 +08:00
as2252258 bffe375230 1 2021-12-17 04:20:20 +08:00
as2252258 efb69d02f3 改名 2021-12-08 11:46:08 +08:00
as2252258 79e5fa0b08 改名 2021-12-08 11:45:19 +08:00
as2252258 de7e005b46 改名 2021-12-08 11:32:31 +08:00
as2252258 a64fa8f493 改名 2021-12-08 11:16:35 +08:00
as2252258 c19e141f68 改名 2021-12-06 17:58:11 +08:00
as2252258 94a522588d 改名 2021-12-06 13:51:54 +08:00
as2252258 308c992fd3 改名 2021-12-06 11:47:12 +08:00
as2252258 458c6cbd22 改名 2021-12-03 16:05:49 +08:00
as2252258 b717a7e9f7 改名 2021-12-03 15:42:04 +08:00
as2252258 6786b313b5 改名 2021-12-03 14:46:38 +08:00
as2252258 14db451313 改名 2021-12-02 18:24:23 +08:00
as2252258 ced92a10e1 改名 2021-12-02 14:16:57 +08:00
as2252258 0d12baf49f 改名 2021-12-01 19:04:59 +08:00
as2252258 b798270bb7 改名 2021-12-01 17:21:15 +08:00
as2252258 955f358577 改名 2021-12-01 16:09:49 +08:00
as2252258 97a5deda23 改名 2021-12-01 15:28:59 +08:00
as2252258 8ae395e9cd 改名 2021-12-01 15:18:34 +08:00
as2252258 44a9a507f6 改名 2021-12-01 15:16:08 +08:00
as2252258 903ee0d6ce 改名 2021-11-30 16:00:39 +08:00
45 changed files with 2114 additions and 2062 deletions
+111 -83
View File
@@ -1,83 +1,111 @@
<?php <?php
namespace Server\Abstracts; namespace Server\Abstracts;
use JetBrains\PhpStorm\Pure; use Kiri\Context;
use Server\Contract\OnProcessInterface; use Server\Contract\OnProcessInterface;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Process; use Swoole\Process;
/** /**
* *
*/ */
abstract class BaseProcess implements OnProcessInterface abstract class BaseProcess implements OnProcessInterface
{ {
protected bool $isStop = false; protected bool $isStop = false;
protected mixed $redirect_stdin_and_stdout = null; 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 mixed * @return bool
*/ */
public function getRedirectStdinAndStdout(): mixed 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
{
if (!Context::inCoroutine()) {
Process::signal(SIGTERM, fn($data) => $this->onShutdown($data));
} else {
Coroutine::create(function () {
$data = Coroutine::waitSignal(SIGTERM, -1);
if ($data) {
$this->onShutdown($data);
}
});
}
return $this;
}
/**
* @param $data
*/
protected function onShutdown($data): void
{
$this->isStop = true;
}
}
+55 -55
View File
@@ -1,55 +1,55 @@
<?php <?php
namespace Server\Abstracts; namespace 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\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()
{ {
} }
} }
+133 -133
View File
@@ -1,133 +1,133 @@
<?php <?php
namespace Server; namespace 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';
} }
+8 -8
View File
@@ -1,8 +1,8 @@
<?php <?php
namespace Server\Contract; namespace Server\Contract;
interface OnBeforeShutdown interface OnBeforeShutdown
{ {
} }
+21 -22
View File
@@ -1,22 +1,21 @@
<?php <?php
namespace Server\Contract; namespace 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;
}
}
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Contract; namespace 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;
} }
+18 -19
View File
@@ -1,19 +1,18 @@
<?php <?php
namespace Server\Contract; namespace 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;
}
}
+22 -22
View File
@@ -1,22 +1,22 @@
<?php <?php
namespace Server\Contract; namespace 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;
} }
+18 -19
View File
@@ -1,19 +1,18 @@
<?php <?php
namespace Server\Contract; namespace 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;
}
}
+16 -18
View File
@@ -1,18 +1,16 @@
<?php <?php
namespace Server\Contract; namespace 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; }
}
+19 -19
View File
@@ -1,19 +1,19 @@
<?php <?php
namespace Server\Contract; namespace Server\Contract;
use Server\Abstracts\Server; use 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;
} }
+21 -21
View File
@@ -1,21 +1,21 @@
<?php <?php
namespace Server\Contract; namespace Server\Contract;
/** /**
* Interface OnPipeMessageInterface * Interface OnPipeMessageInterface
* @package Server\Contract * @package Server\Contract
*/ */
interface OnPipeMessageInterface interface OnPipeMessageInterface
{ {
/** /**
* *
*/ */
public function process(): void; public function process(): void;
} }
+25 -25
View File
@@ -1,25 +1,25 @@
<?php <?php
namespace Server\Contract; namespace 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;
} }
+25 -25
View File
@@ -1,25 +1,25 @@
<?php <?php
namespace Server\Contract; namespace 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;
} }
+17 -17
View File
@@ -1,17 +1,17 @@
<?php <?php
namespace Server\Contract; namespace Server\Contract;
use Swoole\Server; use Swoole\Server;
interface OnTaskInterface interface OnTaskInterface
{ {
public function execute(); public function execute();
public function finish(Server $server, int $task_id); public function finish(Server $server, int $task_id);
} }
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+8 -8
View File
@@ -1,8 +1,8 @@
<?php <?php
namespace Server\Events; namespace Server\Events;
class OnAfterWorkerStart class OnAfterWorkerStart
{ {
} }
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+12 -12
View File
@@ -1,12 +1,12 @@
<?php <?php
namespace Server\Events; namespace Server\Events;
class OnBeforeWorkerStart class OnBeforeWorkerStart
{ {
public function __construct(public int $workerId) public function __construct(public int $workerId)
{ {
} }
} }
+16 -16
View File
@@ -1,16 +1,16 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+8 -8
View File
@@ -1,8 +1,8 @@
<?php <?php
namespace Server\Events; namespace Server\Events;
class OnServerBeforeStart class OnServerBeforeStart
{ {
} }
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+18 -18
View File
@@ -1,18 +1,18 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+23 -23
View File
@@ -1,23 +1,23 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+26 -26
View File
@@ -1,26 +1,26 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+23 -23
View File
@@ -1,23 +1,23 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+23 -23
View File
@@ -1,23 +1,23 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+23 -23
View File
@@ -1,23 +1,23 @@
<?php <?php
namespace Server\Events; namespace 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)
{ {
} }
} }
+38 -38
View File
@@ -1,38 +1,38 @@
<?php <?php
namespace Server\Handler; namespace Server\Handler;
use Note\Inject; use Kiri\Annotation\Inject;
use Server\Abstracts\Server; use Server\Abstracts\Server;
use Exception; use Exception;
use Server\Contract\OnPipeMessageInterface; use Server\Contract\OnPipeMessageInterface;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
/** /**
* *
*/ */
class OnPipeMessage extends Server class OnPipeMessage extends Server
{ {
/** @var EventDispatch */ /** @var EventDispatch */
#[Inject(EventDispatch::class)] #[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch; public EventDispatch $eventDispatch;
/** /**
* @param \Swoole\Server $server * @param \Swoole\Server $server
* @param int $src_worker_id * @param int $src_worker_id
* @param mixed $message * @param mixed $message
* @throws Exception * @throws Exception
*/ */
public function onPipeMessage(\Swoole\Server $server, int $src_worker_id, mixed $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);
} }
} }
+62 -58
View File
@@ -1,58 +1,62 @@
<?php <?php
namespace Server\Handler; namespace 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 Server\Abstracts\Server; use ReflectionException;
use Server\Events\OnBeforeShutdown; use Server\Abstracts\Server;
use Server\Events\OnShutdown; use Server\Events\OnBeforeShutdown;
use Server\Events\OnStart; use Server\Events\OnShutdown;
use Server\Events\OnStart;
/**
* Class OnServerDefault /**
* @package Server\Manager * Class OnServerDefault
*/ * @package Server\Manager
class OnServer extends Server */
{ class OnServer extends Server
{
/**
* @var EventDispatch /**
*/ * @var EventDispatch
#[Inject(EventDispatch::class)] */
public EventDispatch $eventDispatch; #[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/**
* @param \Swoole\Server $server /**
* @throws ConfigException * @param \Swoole\Server $server
*/ * @throws ConfigException
public function onStart(\Swoole\Server $server) * @throws ReflectionException
{ */
$this->setProcessName(sprintf('start[%d].server', $server->master_pid)); public function onStart(\Swoole\Server $server)
{
$this->eventDispatch->dispatch(new OnStart($server)); $this->setProcessName(sprintf('start[%d].server', $server->master_pid));
}
$this->eventDispatch->dispatch(new OnStart($server));
}
/**
* @param \Swoole\Server $server
*/ /**
public function onBeforeShutdown(\Swoole\Server $server) * @param \Swoole\Server $server
{ * @throws ReflectionException
$this->eventDispatch->dispatch(new OnBeforeShutdown($server)); */
} public function onBeforeShutdown(\Swoole\Server $server)
{
$this->eventDispatch->dispatch(new OnBeforeShutdown($server));
/** }
* @param \Swoole\Server $server
*/
public function onShutdown(\Swoole\Server $server) /**
{ * @param \Swoole\Server $server
$this->eventDispatch->dispatch(new OnShutdown($server)); * @throws ReflectionException
} */
public function onShutdown(\Swoole\Server $server)
{
} $this->eventDispatch->dispatch(new OnShutdown($server));
}
}
+50 -48
View File
@@ -1,48 +1,50 @@
<?php <?php
namespace Server\Handler; namespace Server\Handler;
use Note\Inject; use Kiri\Annotation\Inject;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Server\Abstracts\Server; use ReflectionException;
use Kiri\Exception\ConfigException; use Server\Abstracts\Server;
use Server\Events\OnManagerStart; use Kiri\Exception\ConfigException;
use Server\Events\OnManagerStop; use Server\Events\OnManagerStart;
use Server\Events\OnManagerStop;
/**
* Class OnServerManager /**
* @package Server\Manager * Class OnServerManager
*/ * @package Server\Manager
class OnServerManager extends Server */
{ class OnServerManager extends Server
{
/**
* @var EventDispatch /**
*/ * @var EventDispatch
#[Inject(EventDispatch::class)] */
public EventDispatch $eventDispatch; #[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/**
* @param \Swoole\Server $server /**
* @throws ConfigException * @param \Swoole\Server $server
*/ * @throws ConfigException|ReflectionException
public function onManagerStart(\Swoole\Server $server) */
{ public function onManagerStart(\Swoole\Server $server)
$this->setProcessName(sprintf('manger[%d].0', $server->manager_pid)); {
$this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
$this->eventDispatch->dispatch(new OnManagerStart($server));
} $this->eventDispatch->dispatch(new OnManagerStart($server));
}
/**
* @param \Swoole\Server $server /**
*/ * @param \Swoole\Server $server
public function onManagerStop(\Swoole\Server $server) * @throws ReflectionException
{ */
$this->eventDispatch->dispatch(new OnManagerStop($server)); public function onManagerStop(\Swoole\Server $server)
} {
$this->eventDispatch->dispatch(new OnManagerStop($server));
}
}
}
+45 -43
View File
@@ -1,43 +1,45 @@
<?php <?php
namespace Server\Handler; namespace Server\Handler;
use Note\Inject; use Kiri\Annotation\Inject;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Server\Events\OnAfterReload; use Server\Events\OnAfterReload;
use Server\Events\OnBeforeReload; use Server\Events\OnBeforeReload;
use Swoole\Server; use Swoole\Server;
/** /**
* *
*/ */
class OnServerReload class OnServerReload
{ {
/** /**
* @var EventDispatch * @var EventDispatch
*/ */
#[Inject(EventDispatch::class)] #[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch; public EventDispatch $eventDispatch;
/** /**
* @param Server $server * @param Server $server
*/ * @throws \ReflectionException
public function onBeforeReload(Server $server) */
{ public function onBeforeReload(Server $server)
$this->eventDispatch->dispatch(new OnBeforeReload($server)); {
} $this->eventDispatch->dispatch(new OnBeforeReload($server));
}
/**
* @param Server $server /**
*/ * @param Server $server
public function onAfterReload(Server $server) * @throws \ReflectionException
{ */
$this->eventDispatch->dispatch(new OnAfterReload($server)); public function onAfterReload(Server $server)
} {
$this->eventDispatch->dispatch(new OnAfterReload($server));
} }
}
+121 -121
View File
@@ -1,121 +1,121 @@
<?php <?php
namespace Server\Handler; namespace Server\Handler;
use Note\Inject; use Exception;
use Exception; use Kiri\Abstracts\Config;
use Kiri\Abstracts\Config; use Kiri\Core\Help;
use Kiri\Core\Help; use Kiri\Events\EventDispatch;
use Kiri\Events\EventDispatch; use Kiri\Kiri;
use Kiri\Kiri; use Kiri\Annotation\Inject;
use Server\Events\OnAfterWorkerStart; use Server\Events\OnAfterWorkerStart;
use Server\Events\OnBeforeWorkerStart; use Server\Events\OnBeforeWorkerStart;
use Server\Events\OnTaskerStart as OnTaskStart; use Server\Events\OnTaskerStart as OnTaskStart;
use Server\Events\OnWorkerError; use Server\Events\OnWorkerError;
use Server\Events\OnWorkerExit; use Server\Events\OnWorkerExit;
use Server\Events\OnWorkerStart; use Server\Events\OnWorkerStart;
use Server\Events\OnWorkerStop; use Server\Events\OnWorkerStop;
use Swoole\Server; use Swoole\Server;
use Swoole\Timer; use Swoole\Timer;
/** /**
* Class OnServerWorker * Class OnServerWorker
* @package Server\Worker * @package Server\Worker
*/ */
class OnServerWorker extends \Server\Abstracts\Server class OnServerWorker extends \Server\Abstracts\Server
{ {
/** /**
* @var EventDispatch * @var EventDispatch
*/ */
#[Inject(EventDispatch::class)] #[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch; public EventDispatch $eventDispatch;
/** /**
* @param Server $server * @param Server $server
* @param int $workerId * @param int $workerId
* @throws Exception * @throws Exception
*/ */
public function onWorkerStart(Server $server, int $workerId) public function onWorkerStart(Server $server, int $workerId)
{ {
$this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId)); $this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId));
if ($workerId < $server->setting['worker_num']) { if ($workerId < $server->setting['worker_num']) {
$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId)); $this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId)); $this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
set_env('environmental', Kiri::WORKER); set_env('environmental', Kiri::WORKER);
} else { } else {
$this->eventDispatch->dispatch(new OnTaskStart($server, $workerId)); $this->eventDispatch->dispatch(new OnTaskStart($server, $workerId));
$this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId)); $this->setProcessName(sprintf('Tasker[%d].%d', $server->worker_pid, $workerId));
set_env('environmental', Kiri::TASK); set_env('environmental', Kiri::TASK);
} }
$this->eventDispatch->dispatch(new OnAfterWorkerStart()); $this->eventDispatch->dispatch(new OnAfterWorkerStart());
} }
/** /**
* @param Server $server * @param Server $server
* @param int $workerId * @param int $workerId
* @throws Exception * @throws Exception
*/ */
public function onWorkerStop(Server $server, int $workerId) public function onWorkerStop(Server $server, int $workerId)
{ {
Timer::clearAll(); Timer::clearAll();
$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId)); $this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
} }
/** /**
* @param Server $server * @param Server $server
* @param int $workerId * @param int $workerId
* @throws Exception * @throws Exception
*/ */
public function onWorkerExit(Server $server, int $workerId) public function onWorkerExit(Server $server, int $workerId)
{ {
set_env('state', 'exit'); set_env('state', 'exit');
$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId)); $this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
} }
/** /**
* @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
* @throws Exception * @throws Exception
*/ */
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)
{ {
$this->eventDispatch->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal)); $this->eventDispatch->dispatch(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s', $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) $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), 9)
); );
$this->logger->error($message); $this->logger->error($message);
// $this->system_mail($message); $this->system_mail($message);
} }
/** /**
* @param $messageContent * @param $messageContent
* @throws Exception * @throws Exception
*/ */
protected function system_mail($messageContent) protected function system_mail($messageContent)
{ {
try { try {
$email = Config::get('email'); $email = Config::get('email', ['enable' => false]);
if (!empty($email) && ($email['enable'] ?? false) == true) { if (!empty($email) && ($email['enable'] ?? false) == true) {
Help::sendEmail($email, 'Service Error', $messageContent); Help::sendEmail($email, 'Service Error', $messageContent);
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
error($e, 'email'); error($e, 'email');
} }
} }
} }
+146 -135
View File
@@ -1,135 +1,146 @@
<?php <?php
namespace Server; namespace Server;
use Note\Inject; use Exception;
use Exception; use Http\Handler\Abstracts\HttpService;
use Http\Handler\Abstracts\HttpService; use Kiri\Abstracts\Config;
use JetBrains\PhpStorm\Pure; use Kiri\Events\EventDispatch;
use Kiri\Abstracts\Config; use Kiri\Exception\ConfigException;
use Kiri\Events\EventDispatch; use Kiri\Kiri;
use Kiri\Exception\ConfigException; use Kiri\Annotation\Inject;
use Server\Events\OnShutdown; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Server\Events\OnShutdown;
defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
/** defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
* Class Server
* @package Http /**
*/ * Class Server
class Server extends HttpService * @package Http
{ */
class Server extends HttpService
private array $process = [ {
];
private array $process = [
];
/**
* @Inject ServerManager
* @var null|ServerManager private mixed $daemon = 0;
*/
#[Inject(ServerManager::class)]
public ?ServerManager $manager = null; /**
* @var State
private mixed $daemon = 0; */
#[Inject(State::class)]
public State $state;
/** @var EventDispatch */
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch; /**
*
*/
/** public function init()
* {
*/ }
public function init()
{
} /**
* @param $process
*/
/** public function addProcess($process)
* @param $process {
*/ $this->process[] = $process;
public function addProcess($process) }
{
$this->process[] = $process;
} /**
* @return string
* @throws ConfigException
/** * @throws ContainerExceptionInterface
* @return string start server * @throws NotFoundExceptionInterface
* * @throws \ReflectionException
* start server * @throws Exception
* @throws ConfigException */
* @throws Exception public function start(): string
*/ {
public function start(): string $this->manager()->initBaseServer(Config::get('server', [], true), $this->daemon);
{
$this->manager->initBaseServer(Config::get('server', [], true), $this->daemon); $rpcService = Config::get('rpc', []);
if (!empty($rpcService)) {
$rpcService = Config::get('rpc', []); $this->manager()->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'],
if (!empty($rpcService)) { $rpcService['mode'], $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) {
$processes = array_merge($this->process, Config::get('processes', [])); $this->manager()->addProcess($process);
foreach ($processes as $process) { }
$this->manager->addProcess($process);
} return $this->manager()->getServer()->start();
}
return $this->manager->getServer()->start();
}
/**
* @return void
/** * @throws ConfigException
* @return void * @throws ContainerExceptionInterface
* * @throws NotFoundExceptionInterface
* start server * @throws \ReflectionException
* @throws Exception * @throws Exception
*/ */
public function shutdown() public function shutdown()
{ {
$configs = Config::get('server', [], true); $configs = Config::get('server', [], true);
foreach ($this->manager->sortService($configs['ports'] ?? []) as $config) { foreach ($this->manager()->sortService($configs['ports'] ?? []) as $config) {
$this->manager->stopServer($config['port']); $this->state->exit($config['port']);
} }
$this->eventDispatch->dispatch(new OnShutdown()); $this->container->get(EventDispatch::class)->dispatch(new OnShutdown());
} }
/** /**
* @return bool * @return bool
* @throws ConfigException * @throws ConfigException
*/ * @throws Exception
public function isRunner(): bool */
{ public function isRunner(): bool
return $this->manager->isRunner(); {
} return $this->state->isRunner();
}
/**
* @param $daemon /**
* @return Server * @param $daemon
*/ * @return Server
public function setDaemon($daemon): static */
{ public function setDaemon($daemon): static
if (!in_array($daemon, [0, 1])) { {
return $this; if (!in_array($daemon, [0, 1])) {
} return $this;
$this->daemon = $daemon; }
return $this; $this->daemon = $daemon;
} return $this;
}
/**
* @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null /**
*/ * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
#[Pure] public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null * @throws \ReflectionException
{ */
return $this->manager->getServer(); public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
} {
return $this->manager()->getServer();
} }
/**
* @return ServerManager
*/
private function manager(): ServerManager
{
return Kiri::getDi()->get(ServerManager::class);
}
}
+120 -116
View File
@@ -1,116 +1,120 @@
<?php <?php
declare(strict_types=1); declare(strict_types=1);
namespace Server; namespace 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\Kiri;
use Kiri\Kiri; use Kiri\Annotation\Inject;
use Server\Events\OnServerBeforeStart; use Psr\Container\ContainerExceptionInterface;
use Swoole\Coroutine; use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\Console\Command\Command; use Swoole\Coroutine;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
/**
* Class Command /**
* @package Http * Class Command
*/ * @package Http
class ServerCommand extends Command */
{ class ServerCommand extends Command
{
const ACTIONS = ['start', 'stop', 'restart'];
const ACTIONS = ['start', 'stop', 'restart'];
/**
* @var EventDispatch /**
*/ * @var EventDispatch
#[Inject(EventDispatch::class)] */
public EventDispatch $eventProvider; #[Inject(EventDispatch::class)]
public EventDispatch $eventProvider;
/**
* /**
*/ *
protected function configure() */
{ protected function configure()
$this->setName('sw:server') {
->setDescription('server start|stop|reload|restart') $this->setName('sw:server')
->addArgument('action', InputArgument::OPTIONAL, 'run action', 'start') ->setDescription('server start|stop|reload|restart')
->addOption('daemon', 'd', InputOption::VALUE_OPTIONAL, 'is run daemonize'); ->addArgument('action', InputArgument::OPTIONAL, 'run action', 'start')
} ->addOption('daemon', 'd', InputOption::VALUE_OPTIONAL, 'is run daemonize');
}
/**
* @param InputInterface $input /**
* @param OutputInterface $output * @param InputInterface $input
* @return int * @param OutputInterface $output
* @throws Exception * @return int
*/ * @throws ConfigException
public function execute(InputInterface $input, OutputInterface $output): int * @throws ContainerExceptionInterface
{ * @throws NotFoundExceptionInterface
$manager = Kiri::app()->getServer(); * @throws \ReflectionException
$manager->setDaemon((int)!is_null($input->getOption('daemon'))); * @throws Exception
if (is_null($input->getArgument('action'))) { */
$input->setArgument('action', 'restart'); public function execute(InputInterface $input, OutputInterface $output): int
} {
if (!in_array($input->getArgument('action'), self::ACTIONS)) { $manager = Kiri::app()->getServer();
throw new Exception('I don\'t know what I want to do.'); $manager->setDaemon((int)!is_null($input->getOption('daemon')));
} if (is_null($input->getArgument('action'))) {
if ($manager->isRunner() && $input->getArgument('action') == 'start') { throw new Exception('I don\'t know what I want to do.');
throw new Exception('Service is running. Please use restart.'); }
} if (!in_array($input->getArgument('action'), self::ACTIONS)) {
$manager->shutdown(); throw new Exception('I don\'t know what I want to do.');
if ($input->getArgument('action') == 'stop') { }
return 0; if ($input->getArgument('action') == 'restart') {
} $manager->shutdown();
return $this->generate_runtime_builder($manager); }
} if ($input->getArgument('action') != 'stop') {
return $this->generate_runtime_builder($manager);
}
/** $manager->shutdown();
* @throws ConfigException return 0;
*/ }
private function configure_set()
{
$enable_coroutine = Config::get('servers.settings.enable_coroutine', false); /**
if ($enable_coroutine != true) { * @throws ConfigException
return; */
} private function configure_set()
Coroutine::set([ {
'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION, $enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
'enable_deadlock_check' => FALSE, Config::set('servers.settings.enable_coroutine', true);
'exit_condition' => function () { if ($enable_coroutine != true) {
return Coroutine::stats()['coroutine_num'] === 0; 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 /**
{ * @param $manager
$this->configure_set(); * @return int
* @throws ConfigException
Kiri::app()->getRouter()->read_files(); * @throws Exception
*/
$this->eventProvider->dispatch(new OnServerBeforeStart()); private function generate_runtime_builder($manager): int
{
$manager->start(); $this->configure_set();
return 1; Kiri::app()->getRouter()->read_files();
}
$manager->start();
}
return 1;
}
}
+412 -456
View File
@@ -1,456 +1,412 @@
<?php <?php
namespace Server; namespace Server;
use Note\Inject; use Exception;
use Exception; use Kiri\Abstracts\Component;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Di\Container; use Kiri\Error\Logger;
use Psr\Container\ContainerInterface; use Kiri\Events\EventDispatch;
use Kiri\Error\Logger; use Kiri\Exception\ConfigException;
use Kiri\Exception\ConfigException; use Kiri\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 ReflectionException; use ReflectionException;
use Server\Abstracts\BaseProcess; use Server\Abstracts\BaseProcess;
use Server\Contract\OnCloseInterface; use Server\Contract\OnCloseInterface;
use Server\Contract\OnConnectInterface; use Server\Contract\OnConnectInterface;
use Server\Contract\OnDisconnectInterface; use Server\Contract\OnDisconnectInterface;
use Server\Contract\OnHandshakeInterface; use Server\Contract\OnHandshakeInterface;
use Server\Contract\OnMessageInterface; use Server\Contract\OnMessageInterface;
use Server\Contract\OnPacketInterface; use Server\Contract\OnPacketInterface;
use Server\Contract\OnProcessInterface; use Server\Contract\OnProcessInterface;
use Server\Contract\OnReceiveInterface; use Server\Contract\OnReceiveInterface;
use Server\Contract\OnTaskInterface; use Server\Events\OnServerBeforeStart;
use Server\Handler\OnPipeMessage; use Server\Handler\OnPipeMessage;
use Server\Handler\OnServer; use Server\Handler\OnServer;
use Server\Handler\OnServerManager; use Server\Handler\OnServerManager;
use Server\Handler\OnServerReload; use Server\Handler\OnServerReload;
use Server\Tasker\OnServerTask; use Server\Handler\OnServerWorker;
use Server\Handler\OnServerWorker; use Server\Tasker\OnServerTask;
use Swoole\Http\Server as HServer; use Swoole\Http\Server as HServer;
use Swoole\Process; use Swoole\Process;
use Swoole\Server; use Swoole\Server;
use Swoole\Server\Port; use Swoole\Server\Port;
use Swoole\WebSocket\Server as WServer; use Swoole\WebSocket\Server as WServer;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Helper\TableSeparator;
/** use Symfony\Component\Console\Output\ConsoleOutput;
* Class OnServerManager use Symfony\Component\Console\Output\OutputInterface;
* @package Http\Service
*/
class ServerManager /**
{ * Class OnServerManager
* @package Http\Service
*/
use TraitServer; class ServerManager extends Component
{
/** @var string */
public string $host = '';
use TraitServer;
public int $port = 0;
/** @var string */
public string $host = '';
#[Inject(Logger::class)]
public Logger $logger; public int $port = 0;
/** @var array<string,Port> */ /**
public array $ports = []; * @var Logger
*/
public int $mode = SWOOLE_TCP; #[Inject(Logger::class)]
public Logger $logger;
private Server|null $server = null; /** @var array<string,Port> */
public array $ports = [];
/** public int $mode = SWOOLE_TCP;
* @var Container
*/
#[Inject(ContainerInterface::class)] private Server|null $server = null;
public ContainerInterface $container;
protected array $initProcesses = [];
const DEFAULT_EVENT = [
Constant::WORKER_START => [OnServerWorker::class, 'onWorkerStart'],
Constant::WORKER_EXIT => [OnServerWorker::class, 'onWorkerExit'], const DEFAULT_EVENT = [
Constant::WORKER_STOP => [OnServerWorker::class, 'onWorkerStop'], Constant::WORKER_START => [OnServerWorker::class, 'onWorkerStart'],
Constant::WORKER_ERROR => [OnServerWorker::class, 'onWorkerError'], Constant::WORKER_EXIT => [OnServerWorker::class, 'onWorkerExit'],
Constant::MANAGER_START => [OnServerManager::class, 'onManagerStart'], Constant::WORKER_STOP => [OnServerWorker::class, 'onWorkerStop'],
Constant::MANAGER_STOP => [OnServerManager::class, 'onManagerStop'], Constant::WORKER_ERROR => [OnServerWorker::class, 'onWorkerError'],
Constant::BEFORE_RELOAD => [OnServerReload::class, 'onBeforeReload'], Constant::MANAGER_START => [OnServerManager::class, 'onManagerStart'],
Constant::AFTER_RELOAD => [OnServerReload::class, 'onAfterReload'], Constant::MANAGER_STOP => [OnServerManager::class, 'onManagerStop'],
Constant::START => [OnServer::class, 'onStart'], Constant::BEFORE_RELOAD => [OnServerReload::class, 'onBeforeReload'],
Constant::BEFORE_SHUTDOWN => [OnServer::class, 'onBeforeShutdown'], Constant::AFTER_RELOAD => [OnServerReload::class, 'onAfterReload'],
Constant::SHUTDOWN => [OnServer::class, 'onShutdown'], 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', private array $eventInterface = [
OnHandshakeInterface::class => 'handshake', OnReceiveInterface::class => 'receive',
OnMessageInterface::class => 'message', OnPacketInterface::class => 'packet',
OnConnectInterface::class => 'connect', OnHandshakeInterface::class => 'handshake',
OnCloseInterface::class => 'close', OnMessageInterface::class => 'message',
OnDisconnectInterface::class => 'disconnect' OnConnectInterface::class => 'connect',
]; OnCloseInterface::class => 'close',
OnDisconnectInterface::class => 'disconnect'
];
/**
* @return Server|WServer|HServer|null
*/ /**
public function getServer(): Server|WServer|HServer|null * @return Server|WServer|HServer|null
{ * @throws ReflectionException
return $this->server; */
} public function getServer(): Server|WServer|HServer|null
{
di(EventDispatch::class)->dispatch(new OnServerBeforeStart());
/** return $this->server;
* @param string $type }
* @param string $host
* @param int $port
* @param int $mode /**
* @param array $settings * @param string $type
* @throws ReflectionException * @param string $host
* @throws ConfigException * @param int $port
* @throws Exception * @param int $mode
*/ * @param array $settings
public function addListener(string $type, string $host, int $port, int $mode, array $settings = []) * @throws ConfigException
{ * @throws ContainerExceptionInterface
if (!$this->server) { * @throws NotFoundExceptionInterface
$this->createBaseServer($type, $host, $port, $mode, $settings); */
} else { public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
if (!isset($settings['settings'])) { {
$settings['settings'] = []; if (!$this->server) {
} $this->createBaseServer($type, $host, $port, $mode, $settings);
$this->addNewListener($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 /**
{ * @param $configs
$context = di(ServerManager::class); * @param int $daemon
foreach ($this->sortService($configs['ports']) as $config) { * @throws ConfigException
$this->startListenerHandler($context, $config, $daemon); * @throws ContainerExceptionInterface
} * @throws NotFoundExceptionInterface
$this->bindCallback([Constant::PIPE_MESSAGE => [OnPipeMessage::class, 'onPipeMessage']]); */
} public function initBaseServer($configs, int $daemon = 0): void
{
$context = di(ServerManager::class);
/** foreach ($this->sortService($configs['ports']) as $config) {
* @return bool $this->startListenerHandler($context, $config, $daemon);
* @throws ConfigException }
* @throws Exception $this->bindCallback([Constant::PIPE_MESSAGE => [OnPipeMessage::class, 'onPipeMessage']]);
*/ }
public function isRunner(): bool
{
$configs = Config::get('server', [], true); /**
foreach ($this->sortService($configs['ports']) as $config) { * @param string|OnProcessInterface|BaseProcess $customProcess
if (checkPortIsAlready($config['port'])) { * @throws Exception
return true; */
} public function addProcess(string|OnProcessInterface|BaseProcess $customProcess)
} {
return false; 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 string|OnProcessInterface|BaseProcess $customProcess $this->server->addProcess(new Process(function (Process $process) use ($customProcess, $system) {
* @throws Exception if (Kiri::getPlatform()->isLinux()) {
*/ $process->name($system . '(' . $customProcess->getName() . ')');
public function addProcess(string|OnProcessInterface|BaseProcess $customProcess) }
{ $customProcess->onSigterm()->process($process);
if (is_string($customProcess)) { },
$customProcess = Kiri::getDi()->get($customProcess); $customProcess->getRedirectStdinAndStdout(),
} $customProcess->getPipeType(),
$system = sprintf('[%s].process', Config::get('id', 'system-service')); $customProcess->isEnableCoroutine()
$process = new Process(function (Process $process) use ($customProcess, $system) { ));
if (Kiri::getPlatform()->isLinux()) { }
$process->name($system . '(' . $customProcess->getName() . ')');
}
$customProcess->process($process); /**
}, $customProcess->getRedirectStdinAndStdout(), $customProcess->getPipeType(), $customProcess->isEnableCoroutine()); * @return array<string,Process>
$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.'); */
$this->container->setBindings($customProcess->getName(), $process); public function getProcesses(): array
$this->server->addProcess($process); {
} return $this->initProcesses;
}
/**
* @return array /**
*/ * @return array
public function getSetting(): array */
{ public function getSetting(): array
return $this->server->setting; {
} return $this->server->setting;
}
/**
* @param string $key /**
* @param string|int $value * @param ServerManager $context
*/ * @param array $config
public static function setEnv(string $key, string|int $value): void * @param int $daemon
{ * @throws ConfigException
putenv(sprintf('%s=%s', $key, (string)$value)); * @throws ContainerExceptionInterface
} * @throws NotFoundExceptionInterface
* @throws Exception
*/
/** private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
* @param ServerManager $context {
* @param array $config if (!$this->server) {
* @param int $daemon $config = $this->mergeConfig($config, $daemon);
* @throws ConfigException }
* @throws ReflectionException $context->addListener(
* @throws Exception $config['type'], $config['host'], $config['port'], $config['mode'],
*/ $config);
private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0) }
{
if (!$this->server) {
$config = $this->mergeConfig($config, $daemon); /**
} * @param $config
$context->addListener( * @param $daemon
$config['type'], $config['host'], $config['port'], $config['mode'], * @return array
$config); * @throws Exception
} */
private function mergeConfig($config, $daemon): array
{
/** $config['settings'] = $config['settings'] ?? [];
* @param $config $config['settings']['daemonize'] = $daemon;
* @param $daemon if (!isset($config['settings']['log_file'])) {
* @return array $config['settings']['log_file'] = storage('system.log');
* @throws Exception }
*/ $config['settings']['pid_file'] = storage('.swoole.pid');
private function mergeConfig($config, $daemon): array $config['settings'][Constant::OPTION_ENABLE_REUSE_PORT] = true;
{ $config['events'] = $config['events'] ?? [];
$config['settings'] = $config['settings'] ?? []; return $config;
$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 string $type
$config['settings'][Constant::OPTION_ENABLE_REUSE_PORT] = true; * @param string $host
$config['events'] = $config['events'] ?? []; * @param int $port
return $config; * @param int $mode
} * @param array $settings
* @throws ConfigException
* @throws ContainerExceptionInterface
/** * @throws NotFoundExceptionInterface
* @param string $type * @throws Exception
* @param string $host */
* @param int $port private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = [])
* @param int $mode {
* @param array $settings $id = Config::get('id', 'system-service');
* @throws ConfigException
* @throws ContainerExceptionInterface $this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
* @throws NotFoundExceptionInterface
* @throws Exception /** @var Server\Port $service */
*/ $this->ports[$port] = $this->server->addlistener($host, $port, $mode);
private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = []) if ($this->ports[$port] === false) {
{ throw new Exception("The port is already in use[$host::$port]");
$id = Config::get('id', 'system-service'); }
if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['settings']['open_http_protocol'])) {
$this->logger->debug(sprintf('[%s]' . $type . ' service %s::%d start', $id, $host, $port)); $settings['settings']['open_http_protocol'] = true;
if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
/** @var Server\Port $service */ $settings['settings']['open_http2_protocol'] = true;
$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_WEBSOCKET && !isset($settings['settings']['open_websocket_protocol'])) {
} $settings['settings']['open_websocket_protocol'] = true;
if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['settings']['open_http_protocol'])) { }
$settings['settings']['open_http_protocol'] = true; $this->ports[$port]->set($settings['settings'] ?? []);
if (in_array($this->server->setting['dispatch_mode'], [2, 4])) { $this->addServiceEvents($settings['events'] ?? [], $this->ports[$port]);
$settings['settings']['open_http2_protocol'] = true; }
}
}
if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['settings']['open_websocket_protocol'])) { /**
$settings['settings']['open_websocket_protocol'] = true; * @param string $type
} * @param string $host
$this->ports[$port]->set($settings['settings'] ?? []); * @param int $port
$this->addServiceEvents($settings['events'] ?? [], $this->ports[$port]); * @param int $mode
} * @param array $settings
* @throws ConfigException
* @throws ContainerExceptionInterface
/** * @throws NotFoundExceptionInterface
* @param string $type * @throws Exception
* @param string $host */
* @param int $port private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
* @param int $mode {
* @param array $settings $match = match ($type) {
* @throws ConfigException Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
* @throws ContainerExceptionInterface Constant::SERVER_TYPE_UDP => Server::class,
* @throws NotFoundExceptionInterface Constant::SERVER_TYPE_HTTP => HServer::class,
* @throws ReflectionException Constant::SERVER_TYPE_WEBSOCKET => WServer::class
* @throws Exception };
*/ $this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = []) $this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
{
$match = match ($type) { $data = new Table($this->container->get(OutputInterface::class));
Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP, $data->setHeaders(['key', 'value']);
Constant::SERVER_TYPE_UDP => Server::class,
Constant::SERVER_TYPE_HTTP => HServer::class, $array = [];
Constant::SERVER_TYPE_WEBSOCKET => WServer::class foreach ($this->server->setting as $key => $value) {
}; $array[] = [$key, $value];
$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode); $array[] = new TableSeparator();
$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings'])); }
$id = Config::get('id', 'system-service'); array_pop($array);
$this->logger->debug(sprintf('[%s]' . $type . ' service %s::%d start', $id, $host, $port)); $data->setStyle('box-double');
$data->setRows($array);
$this->addDefaultListener($settings); $data->render();
}
$id = Config::get('id', 'system-service');
/** $this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
* @param int $port
* @throws Exception $this->addDefaultListener($settings);
*/ }
public function stopServer(int $port)
{
if (!($pid = checkPortIsAlready($port))) { /**
return; * @param array $settings
} * @throws ContainerExceptionInterface
while (checkPortIsAlready($port)) { * @throws NotFoundExceptionInterface
Process::kill($pid, SIGTERM); */
usleep(300); 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);
* @param array $settings $this->addServiceEvents(ServerManager::DEFAULT_EVENT, $this->server);
* @throws ContainerExceptionInterface if (!empty($settings['events']) && is_array($settings['events'])) {
* @throws NotFoundExceptionInterface $this->addServiceEvents($settings['events'], $this->server);
* @throws ReflectionException }
*/ }
private function addDefaultListener(array $settings): void
{
if (($this->server->setting['task_worker_num'] ?? 0) > 0) { /**
$this->addTaskListener($settings['events']); * @param array $events
} * @param Server|Port $server
$this->container->setBindings(SwooleServerInterface::class, $this->server); * @throws ContainerExceptionInterface
$this->addServiceEvents(ServerManager::DEFAULT_EVENT, $this->server); * @throws NotFoundExceptionInterface
if (!empty($settings['events']) && is_array($settings['events'])) { */
$this->addServiceEvents($settings['events'], $this->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]);
/** }
* @param array $events $server->on($name, $event);
* @param Server|Port $server }
* @throws ContainerExceptionInterface }
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ /**
private function addServiceEvents(array $events, Server|Port $server) *
{ */
foreach ($events as $name => $event) { public function start()
if (is_array($event) && is_string($event[0])) { {
$event[0] = $this->container->get($event[0]); $this->server->start();
} }
$server->on($name, $event);
}
} /**
* @param mixed $message
* @param int $workerId
/** * @return mixed
* */
*/ public function sendMessage(mixed $message, int $workerId): mixed
public function start() {
{ return $this->server?->sendMessage($message, $workerId);
$this->server->start(); }
}
/**
/** * @param array $events
* @param string $class * @return void
* @return object * @throws ContainerExceptionInterface
*/ * @throws NotFoundExceptionInterface
private function getNewInstance(string $class): object */
{ private function addTaskListener(array $events = []): void
return $this->container->create($class); {
} $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']) {
* @param OnTaskInterface|string $handler $this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onCoroutineTask']);
* @param array $params } else {
* @param int|null $workerId $this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onTask']);
* @throws ReflectionException }
* @throws Exception }
*/
public function task(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
{ /**
if ($workerId === null || $workerId <= $this->server->setting['worker_num']) { * @param array|null $settings
$workerId = random_int($this->server->setting['worker_num'] + 1, * @return void
$this->server->setting['worker_num'] + 1 + $this->server->setting['task_worker_num']); * @throws ContainerExceptionInterface
} * @throws NotFoundExceptionInterface
if (is_string($handler)) { */
$implements = $this->container->getReflect($handler); public function bindCallback(?array $settings = [])
if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) { {
throw new Exception('Task must instance ' . OnTaskInterface::class); if (count($settings) < 1) {
} return;
$handler = $implements->newInstanceArgs($params); }
} foreach ($settings as $event_type => $callback) {
$this->server->task(serialize($handler), $workerId); if ($this->server->getCallback($event_type) !== null) {
} continue;
}
if (is_array($callback) && !is_object($callback[0])) {
/** $callback[0] = $this->container->get($callback[0]);
* @param mixed $message }
* @param int $workerId $this->server->on($event_type, $callback);
* @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();
$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
* @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);
}
}
}
+34 -34
View File
@@ -1,34 +1,34 @@
<?php <?php
declare(strict_types=1); declare(strict_types=1);
namespace Server; namespace Server;
use Exception; use Exception;
use Kiri\Abstracts\Providers; use Kiri\Abstracts\Providers;
use Kiri\Application; use Kiri\Application;
use Kiri\Kiri; use Kiri\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]); $application->set('server', ['class' => Server::class]);
$container = Kiri::getDi(); $container = Kiri::getDi();
$console = $container->get(\Symfony\Component\Console\Application::class); $console = $container->get(\Symfony\Component\Console\Application::class);
$console->add($container->get(ServerCommand::class)); $console->add($container->get(ServerCommand::class));
} }
} }
+56
View File
@@ -0,0 +1,56 @@
<?php
namespace Server;
use Exception;
use Kiri\Abstracts\Component;
use Kiri\Abstracts\Config;
use Swoole\Process;
class State extends Component
{
use TraitServer;
public array $servers = [];
public function init()
{
$this->servers = Config::get('server.ports');
}
/**
* @return bool
* @throws Exception
*/
public function isRunner(): bool
{
$ports = $this->sortService($this->servers);
foreach ($ports as $config) {
if (checkPortIsAlready($config['port'])) {
return true;
}
}
return false;
}
/**
* @param $port
* @throws Exception
*/
public function exit($port)
{
if (!($pid = checkPortIsAlready($port))) {
return;
}
while (checkPortIsAlready($port)) {
Process::kill($pid, SIGTERM);
usleep(300);
}
}
}
+14 -14
View File
@@ -1,14 +1,14 @@
<?php <?php
namespace Server; namespace Server;
use Swoole\Server; use Swoole\Server;
/** /**
* @mixin Server * @mixin Server
*/ */
interface SwooleServerInterface interface SwooleServerInterface
{ {
} }
+92 -97
View File
@@ -1,97 +1,92 @@
<?php <?php
namespace Server\Tasker; namespace Server\Tasker;
use Note\Inject; use Exception;
use Exception; use Kiri\Abstracts\Component;
use Kiri\Abstracts\BaseObject; use Kiri\Core\HashMap;
use Kiri\Core\HashMap; use Kiri\Kiri;
use Kiri\Di\Container; use ReflectionException;
use Psr\Container\ContainerInterface; use Server\Contract\OnTaskInterface;
use ReflectionException; use Server\SwooleServerInterface;
use Server\Contract\OnTaskInterface;
use Server\SwooleServerInterface;
/**
*
/** */
* class AsyncTaskExecute extends Component
*/ {
class AsyncTaskExecute extends BaseObject
{
/**
* @var SwooleServerInterface|null
/** */
* @var SwooleServerInterface public ?SwooleServerInterface $server = null;
*/
#[Inject(SwooleServerInterface::class)]
public SwooleServerInterface $server; private HashMap $hashMap;
/** /**
* @var Container *
*/ */
#[Inject(ContainerInterface::class)] public function init()
public ContainerInterface $container; {
$this->hashMap = new HashMap();
}
private HashMap $hashMap;
/**
/** * @param string $key
* * @param $handler
*/ */
public function init() public function reg(string $key, $handler)
{ {
$this->hashMap = new HashMap(); $this->hashMap->put($key, $handler);
} }
/** /**
* @param string $key * @param OnTaskInterface|string $handler
* @param $handler * @param array $params
*/ * @param int|null $workerId
public function reg(string $key, $handler) * @throws Exception
{ */
$this->hashMap->put($key, $handler); public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
} {
if (!$this->server) {
$this->server = Kiri::getDi()->get(SwooleServerInterface::class);
/** }
* @param OnTaskInterface|string $handler if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
* @param array $params $workerNum = $this->server->setting['worker_num'];
* @param int|null $workerId $taskerNum = $workerNum + $this->server->setting['task_worker_num'];
* @throws Exception $workerId = random_int($workerNum, $taskerNum - 1);
*/ }
public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = null) if (is_string($handler)) {
{ $handler = $this->handle($handler, $params);
if ($workerId === null || $workerId <= $this->server->setting['worker_num']) { }
$workerId = random_int($this->server->setting['worker_num'] + 1, $this->server->setting['task_worker_num']); $this->server->task(serialize($handler), $workerId);
} }
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
* @param $handler */
* @param $params private function handle($handler, $params): object
* @return object {
* @throws ReflectionException if (!class_exists($handler) && $this->hashMap->has($handler)) {
* @throws Exception $handler = $this->hashMap->get($handler);
*/ }
private function handle($handler, $params): object $implements = $this->container->getReflect($handler);
{ if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
if (!class_exists($handler) && $this->hashMap->has($handler)) { throw new Exception('Task must instance ' . OnTaskInterface::class);
$handler = $this->hashMap->get($handler); }
} return $implements->newInstanceArgs($params);
$implements = $this->container->getReflect($handler); }
if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
throw new Exception('Task must instance ' . OnTaskInterface::class);
} }
return $implements->newInstanceArgs($params);
}
}
+94 -95
View File
@@ -1,95 +1,94 @@
<?php <?php
namespace Server\Tasker; namespace Server\Tasker;
use Note\Inject; use Kiri\Annotation\Inject;
use Kiri\Abstracts\Logger; use Kiri\Abstracts\Logger;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use ReflectionException; use Server\Contract\OnTaskInterface;
use Server\Contract\OnTaskInterface; use Swoole\Server;
use Swoole\Server;
/**
/** * Class OnServerTask
* Class OnServerTask * @package Server\Task
* @package Server\Task */
*/ class OnServerTask
class OnServerTask {
{
#[Inject(Logger::class)]
#[Inject(Logger::class)] public Logger $logger;
public Logger $logger;
/**
/** * @param Server $server
* @param Server $server * @param int $task_id
* @param int $task_id * @param int $src_worker_id
* @param int $src_worker_id * @param mixed $data
* @param mixed $data * @throws ConfigException
* @throws ConfigException */
*/ public function onTask(Server $server, int $task_id, int $src_worker_id, mixed $data)
public function onTask(Server $server, int $task_id, int $src_worker_id, mixed $data) {
{ try {
try { $data = $this->resolve($data);
$data = $this->resolve($data); } catch (\Throwable $exception) {
} catch (\Throwable $exception) { $data = jTraceEx($exception);
$data = jTraceEx($exception);
$this->logger->error('task', [$data]);
$this->logger->error('task', [$data]); } finally {
} finally { $server->finish($data);
$server->finish($data); }
} }
}
/**
/** * @param Server $server
* @param Server $server * @param Server\Task $task
* @param Server\Task $task * @throws ConfigException
* @throws ConfigException */
*/ public function onCoroutineTask(Server $server, Server\Task $task)
public function onCoroutineTask(Server $server, Server\Task $task) {
{ try {
try { $data = $this->resolve($task->data);
$data = $this->resolve($task->data); } catch (\Throwable $exception) {
} catch (\Throwable $exception) { $data = jTraceEx($exception);
$data = jTraceEx($exception);
$this->logger->error('task', [$data]);
$this->logger->error('task', [$data]); } finally {
} finally { $server->finish($data);
$server->finish($data); }
} }
}
/**
/** * @param $data
* @param $data * @return null
* @return null */
*/ private function resolve($data)
private function resolve($data) {
{ $execute = unserialize($data);
$execute = unserialize($data); if ($execute instanceof OnTaskInterface) {
if ($execute instanceof OnTaskInterface) { return $execute->execute();
return $execute->execute(); }
} return null;
return null; }
}
/**
/** * @param Server $server
* @param Server $server * @param int $task_id
* @param int $task_id * @param mixed $data
* @param mixed $data */
*/ public function onFinish(Server $server, int $task_id, mixed $data)
public function onFinish(Server $server, int $task_id, mixed $data) {
{ if (!($data instanceof OnTaskInterface)) {
if (!($data instanceof OnTaskInterface)) { return;
return; }
} $data->finish($server, $task_id);
$data->finish($server, $task_id); }
}
}
}
+32 -32
View File
@@ -1,32 +1,32 @@
<?php <?php
namespace Server; namespace 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;
} }
} }
+1 -1
View File
@@ -15,7 +15,7 @@
"psr/http-server-middleware": "^1.0", "psr/http-server-middleware": "^1.0",
"psr/http-message": "^1.0", "psr/http-message": "^1.0",
"psr/event-dispatcher": "^1.0", "psr/event-dispatcher": "^1.0",
"game-worker/kiri-http-message": "^v1.2" "game-worker/kiri-http-message": "~v2.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {