as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-07-18 01:01:29 +08:00
parent 51c3637ed2
commit a5b2445ec2
3 changed files with 250 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ex/BASEServerListener.php
+250 -267
View File
@@ -25,9 +25,9 @@ require_once 'Worker/ServerWorker.php';
*/ */
function loop(Closure $closure, int $sleep = 1) function loop(Closure $closure, int $sleep = 1)
{ {
call_user_func($closure); call_user_func($closure);
loop($closure, $sleep); loop($closure, $sleep);
} }
/** /**
@@ -37,310 +37,293 @@ function loop(Closure $closure, int $sleep = 1)
class BASEServerListener class BASEServerListener
{ {
public string $host = ''; public string $host = '';
public int $port = 0; public int $port = 0;
public int $mode = SWOOLE_TCP; public int $mode = SWOOLE_TCP;
private Server|WServer|HServer|null $server = null; private Server|WServer|HServer|null $server = null;
private static ?BASEServerListener $BASEServerListener = null; private static ?BASEServerListener $BASEServerListener = null;
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 SERVER_ON_START = 'Start'; const SERVER_ON_START = 'Start';
const SERVER_ON_SHUTDOWN = 'Shutdown'; const SERVER_ON_SHUTDOWN = 'Shutdown';
const SERVER_ON_WORKER_START = 'WorkerStart'; const SERVER_ON_WORKER_START = 'WorkerStart';
const SERVER_ON_WORKER_STOP = 'WorkerStop'; const SERVER_ON_WORKER_STOP = 'WorkerStop';
const SERVER_ON_WORKER_EXIT = 'WorkerExit'; const SERVER_ON_WORKER_EXIT = 'WorkerExit';
const SERVER_ON_CONNECT = 'Connect'; const SERVER_ON_CONNECT = 'Connect';
const SERVER_ON_HANDSHAKE = 'handshake'; const SERVER_ON_HANDSHAKE = 'handshake';
const SERVER_ON_MESSAGE = 'message'; const SERVER_ON_MESSAGE = 'message';
const SERVER_ON_RECEIVE = 'Receive'; const SERVER_ON_RECEIVE = 'Receive';
const SERVER_ON_PACKET = 'Packet'; const SERVER_ON_PACKET = 'Packet';
const SERVER_ON_REQUEST = 'request'; const SERVER_ON_REQUEST = 'request';
const SERVER_ON_CLOSE = 'Close'; const SERVER_ON_CLOSE = 'Close';
const SERVER_ON_TASK = 'Task'; const SERVER_ON_TASK = 'Task';
const SERVER_ON_FINISH = 'Finish'; const SERVER_ON_FINISH = 'Finish';
const SERVER_ON_PIPE_MESSAGE = 'PipeMessage'; const SERVER_ON_PIPE_MESSAGE = 'PipeMessage';
const SERVER_ON_WORKER_ERROR = 'WorkerError'; const SERVER_ON_WORKER_ERROR = 'WorkerError';
const SERVER_ON_MANAGER_START = 'ManagerStart'; const SERVER_ON_MANAGER_START = 'ManagerStart';
const SERVER_ON_MANAGER_STOP = 'ManagerStop'; const SERVER_ON_MANAGER_STOP = 'ManagerStop';
const SERVER_ON_BEFORE_RELOAD = 'BeforeReload'; const SERVER_ON_BEFORE_RELOAD = 'BeforeReload';
const SERVER_ON_AFTER_RELOAD = 'AfterReload'; const SERVER_ON_AFTER_RELOAD = 'AfterReload';
/** /**
* @return static * @return static
*/ */
public static function getContext(): static public static function getContext(): static
{ {
if (!(static::$BASEServerListener)) { if (!(static::$BASEServerListener)) {
static::$BASEServerListener = new BASEServerListener(); static::$BASEServerListener = new BASEServerListener();
} }
return static::$BASEServerListener; return static::$BASEServerListener;
} }
/** /**
* @return Server|WServer|HServer|null * @return Server|WServer|HServer|null
*/ */
public function getServer(): Server|WServer|HServer|null public function getServer(): Server|WServer|HServer|null
{ {
return $this->server; return $this->server;
} }
/** /**
* @param string $type * @param string $type
* @param string $host * @param string $host
* @param int $port * @param int $port
* @param int $mode * @param int $mode
* @param array $settings * @param array $settings
*/ */
public function addListener(string $type, string $host, int $port, int $mode, array $settings = []) public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
{ {
if (!$this->server) { if (!$this->server) {
$this->createBaseServer($type, $host, $port, $mode, $settings); $this->createBaseServer($type, $host, $port, $mode, $settings);
} else { } else {
if (!isset($settings['settings'])) { if (!isset($settings['settings'])) {
$settings['settings'] = []; $settings['settings'] = [];
} }
$this->addNewListener($type, $host, $port, $mode, $settings); $this->addNewListener($type, $host, $port, $mode, $settings);
} }
} }
/** /**
* startRun * startRun
*/ */
public function start(): void public function start(): void
{ {
$context = BASEServerListener::getContext(); $context = BASEServerListener::getContext();
$configs = require_once 'server.php'; $configs = require_once 'server.php';
foreach ($this->sortService($configs['server']['ports']) as $config) { foreach ($this->sortService($configs['server']['ports']) as $config) {
$this->startListenerHandler($context, $config); $this->startListenerHandler($context, $config);
} }
$this->addProcess(RelationshipSystemProcess::class); $this->addProcess(RelationshipSystemProcess::class);
$this->addServerEventCallback($this->getSystemEvents($configs)); $this->addServerEventCallback($this->getSystemEvents($configs));
$context->server->start(); $context->server->start();
} }
/** /**
* @param string|CustomProcess $customProcess * @param string|CustomProcess $customProcess
* @param null $redirect_stdin_and_stdout * @param null $redirect_stdin_and_stdout
* @param int|null $pipe_type * @param int|null $pipe_type
* @param bool $enable_coroutine * @param bool $enable_coroutine
*/ */
public function addProcess(string|CustomProcess $customProcess, $redirect_stdin_and_stdout = null, ?int $pipe_type = SOCK_DGRAM, bool $enable_coroutine = true) public function addProcess(string|CustomProcess $customProcess, $redirect_stdin_and_stdout = null, ?int $pipe_type = SOCK_DGRAM, bool $enable_coroutine = true)
{ {
if (is_string($customProcess)) { if (is_string($customProcess)) {
$implements = class_implements($customProcess); $implements = class_implements($customProcess);
if (!in_array(CustomProcess::class, $implements)) { if (!in_array(CustomProcess::class, $implements)) {
trigger_error('custom process must implement ' . CustomProcess::class); trigger_error('custom process must implement ' . CustomProcess::class);
} }
$customProcess = new $customProcess($this->server); $customProcess = new $customProcess($this->server);
} }
/** @var Process $process */ /** @var Process $process */
$process = $this->server->addProcess( $this->server->addProcess(new Process(function (Process $soloProcess) use ($customProcess) {
new Process( $soloProcess->name($customProcess->getProcessName($soloProcess));
function (Process $soloProcess) use ($customProcess) { $customProcess->onHandler($soloProcess);
$soloProcess->name($customProcess->getProcessName($soloProcess)); },
/** @var \Swoole\Coroutine\Socket $export */ $redirect_stdin_and_stdout, $pipe_type, $enable_coroutine));
$export = $soloProcess->exportSocket(); }
loop(function () use ($export, $customProcess) {
$read = $export->recv();
if (!empty($read)) {
$customProcess->receive($read);
}
});
$customProcess->onHandler($soloProcess);
},
$redirect_stdin_and_stdout,
$pipe_type,
$enable_coroutine
)
);
/** @var \Swoole\Coroutine\Socket $socket */
$socket = $process->exportSocket();
$socket->send("");
}
/** /**
* @param array $ports * @param array $ports
* @return array * @return array
*/ */
private function sortService(array $ports): array private function sortService(array $ports): array
{ {
$array = []; $array = [];
foreach ($ports as $port) { foreach ($ports as $port) {
if ($port['type'] == static::SERVER_TYPE_WEBSOCKET) { if ($port['type'] == static::SERVER_TYPE_WEBSOCKET) {
array_unshift($array, $port); array_unshift($array, $port);
} else if ($port['type'] == static::SERVER_TYPE_HTTP) { } else if ($port['type'] == static::SERVER_TYPE_HTTP) {
if (!empty($array) && $array[0]['type'] == self::SERVER_TYPE_WEBSOCKET) { if (!empty($array) && $array[0]['type'] == self::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;
} }
/** /**
* @param array $configs * @param array $configs
* @return array * @return array
*/ */
private function getSystemEvents(array $configs): array private function getSystemEvents(array $configs): array
{ {
return array_intersect_key($configs['server']['events'] ?? [], [ return array_intersect_key($configs['server']['events'] ?? [], [
BASEServerListener::SERVER_ON_PIPE_MESSAGE => '', BASEServerListener::SERVER_ON_PIPE_MESSAGE => '',
BASEServerListener::SERVER_ON_SHUTDOWN => '', BASEServerListener::SERVER_ON_SHUTDOWN => '',
BASEServerListener::SERVER_ON_WORKER_START => '', BASEServerListener::SERVER_ON_WORKER_START => '',
BASEServerListener::SERVER_ON_WORKER_ERROR => '', BASEServerListener::SERVER_ON_WORKER_ERROR => '',
BASEServerListener::SERVER_ON_WORKER_EXIT => '', BASEServerListener::SERVER_ON_WORKER_EXIT => '',
BASEServerListener::SERVER_ON_WORKER_STOP => '', BASEServerListener::SERVER_ON_WORKER_STOP => '',
BASEServerListener::SERVER_ON_MANAGER_START => '', BASEServerListener::SERVER_ON_MANAGER_START => '',
BASEServerListener::SERVER_ON_MANAGER_STOP => '', BASEServerListener::SERVER_ON_MANAGER_STOP => '',
BASEServerListener::SERVER_ON_BEFORE_RELOAD => '', BASEServerListener::SERVER_ON_BEFORE_RELOAD => '',
BASEServerListener::SERVER_ON_AFTER_RELOAD => '', BASEServerListener::SERVER_ON_AFTER_RELOAD => '',
BASEServerListener::SERVER_ON_START => '', BASEServerListener::SERVER_ON_START => '',
]); ]);
} }
/** /**
* @param BASEServerListener $context * @param BASEServerListener $context
* @param array $config * @param array $config
*/ */
private function startListenerHandler(BASEServerListener $context, array $config) private function startListenerHandler(BASEServerListener $context, array $config)
{ {
if ($this->server) { if ($this->server) {
$context->addNewListener($config['type'], $config['host'], $config['port'], $config['mode'], $config); $context->addNewListener($config['type'], $config['host'], $config['port'], $config['mode'], $config);
} else { } else {
$config['settings'] = array_merge($configs['settings'] ?? [], $config['settings'] ?? []); $config['settings'] = array_merge($configs['settings'] ?? [], $config['settings'] ?? []);
$config['events'] = array_merge($configs['events'] ?? [], $config['events'] ?? []); $config['events'] = array_merge($configs['events'] ?? [], $config['events'] ?? []);
$context->createBaseServer($config['type'], $config['host'], $config['port'], $config['mode'], $config); $context->createBaseServer($config['type'], $config['host'], $config['port'], $config['mode'], $config);
} }
} }
/** /**
* @param string $type * @param string $type
* @param string $host * @param string $host
* @param int $port * @param int $port
* @param int $mode * @param int $mode
* @param array $settings * @param array $settings
*/ */
private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = []) private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = [])
{ {
switch ($type) { switch ($type) {
case self::SERVER_TYPE_TCP: case self::SERVER_TYPE_TCP:
TCPServerListener::instance($this->server, $host, $port, $mode, $settings); TCPServerListener::instance($this->server, $host, $port, $mode, $settings);
break; break;
case self::SERVER_TYPE_UDP: case self::SERVER_TYPE_UDP:
UDPServerListener::instance($this->server, $host, $port, $mode, $settings); UDPServerListener::instance($this->server, $host, $port, $mode, $settings);
break; break;
case self::SERVER_TYPE_HTTP: case self::SERVER_TYPE_HTTP:
HTTPServerListener::instance($this->server, $host, $port, $mode, $settings); HTTPServerListener::instance($this->server, $host, $port, $mode, $settings);
break; break;
case self::SERVER_TYPE_WEBSOCKET: case self::SERVER_TYPE_WEBSOCKET:
WebSocketServerListener::instance($this->server, $host, $port, $mode, $settings); WebSocketServerListener::instance($this->server, $host, $port, $mode, $settings);
break; break;
} }
} }
/** /**
* @param string $type * @param string $type
* @param string $host * @param string $host
* @param int $port * @param int $port
* @param int $mode * @param int $mode
* @param array $settings * @param array $settings
*/ */
private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = []) private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
{ {
$match = match ($type) { $match = match ($type) {
self::SERVER_TYPE_BASE, self::SERVER_TYPE_TCP, self::SERVER_TYPE_UDP => Server::class, self::SERVER_TYPE_BASE, self::SERVER_TYPE_TCP, self::SERVER_TYPE_UDP => Server::class,
self::SERVER_TYPE_HTTP => HServer::class, self::SERVER_TYPE_HTTP => HServer::class,
self::SERVER_TYPE_WEBSOCKET => WServer::class self::SERVER_TYPE_WEBSOCKET => WServer::class
}; };
$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode); $this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
$this->server->set($settings['settings']); $this->server->set($settings['settings']);
$this->addDefaultListener($type, $settings); $this->addDefaultListener($type, $settings);
} }
/** /**
* @param string $type * @param string $type
* @param array $settings * @param array $settings
* @return void * @return void
*/ */
private function addDefaultListener(string $type, array $settings): void private function addDefaultListener(string $type, array $settings): void
{ {
if (($this->server->setting['task_worker_num'] ?? 0) > 0) $this->addTaskListener($settings['events']); if (($this->server->setting['task_worker_num'] ?? 0) > 0) $this->addTaskListener($settings['events']);
if ($type === BASEServerListener::SERVER_TYPE_WEBSOCKET) { if ($type === BASEServerListener::SERVER_TYPE_WEBSOCKET) {
$this->server->on('handshake', $settings['events'][static::SERVER_ON_HANDSHAKE] ?? [WebSocketServerListener::class, 'onHandshake']); $this->server->on('handshake', $settings['events'][static::SERVER_ON_HANDSHAKE] ?? [WebSocketServerListener::class, 'onHandshake']);
$this->server->on('message', $settings['events'][static::SERVER_ON_MESSAGE] ?? [WebSocketServerListener::class, 'onMessage']); $this->server->on('message', $settings['events'][static::SERVER_ON_MESSAGE] ?? [WebSocketServerListener::class, 'onMessage']);
$this->server->on('close', $settings['events'][static::SERVER_ON_CLOSE] ?? [WebSocketServerListener::class, 'onClose']); $this->server->on('close', $settings['events'][static::SERVER_ON_CLOSE] ?? [WebSocketServerListener::class, 'onClose']);
} else if ($type === BASEServerListener::SERVER_TYPE_UDP) { } else if ($type === BASEServerListener::SERVER_TYPE_UDP) {
$this->server->on('packet', $settings['events'][static::SERVER_ON_PACKET] ?? [UDPServerListener::class, 'onPacket']); $this->server->on('packet', $settings['events'][static::SERVER_ON_PACKET] ?? [UDPServerListener::class, 'onPacket']);
} else if ($type === BASEServerListener::SERVER_TYPE_HTTP) { } else if ($type === BASEServerListener::SERVER_TYPE_HTTP) {
$this->server->on('request', $settings['events'][static::SERVER_ON_REQUEST] ?? [HTTPServerListener::class, 'onRequest']); $this->server->on('request', $settings['events'][static::SERVER_ON_REQUEST] ?? [HTTPServerListener::class, 'onRequest']);
} else { } else {
$this->server->on('receive', $settings['events'][static::SERVER_ON_RECEIVE] ?? [TCPServerListener::class, 'onReceive']); $this->server->on('receive', $settings['events'][static::SERVER_ON_RECEIVE] ?? [TCPServerListener::class, 'onReceive']);
} }
$this->addServerEventCallback($settings['events']); $this->addServerEventCallback($settings['events']);
} }
/** /**
* @param array $events * @param array $events
*/ */
private function addServerEventCallback(array $events) private function addServerEventCallback(array $events)
{ {
if (count($events) < 1) { if (count($events) < 1) {
return; return;
} }
foreach ($events as $event_type => $callback) { foreach ($events as $event_type => $callback) {
if ($this->server->getCallback($event_type) !== null) { if ($this->server->getCallback($event_type) !== null) {
continue; continue;
} }
$this->server->on($event_type, $callback); $this->server->on($event_type, $callback);
} }
} }
/** /**
* @param array $events * @param array $events
*/ */
private function addTaskListener(array $events = []): void private function addTaskListener(array $events = []): void
{ {
$task_use_object = $this->server->setting['task_object'] ?? $this->server->setting['task_use_object'] ?? false; $task_use_object = $this->server->setting['task_object'] ?? $this->server->setting['task_use_object'] ?? false;
if ($task_use_object || $this->server->setting['task_enable_coroutine']) { if ($task_use_object || $this->server->setting['task_enable_coroutine']) {
$this->server->on('task', $events[static::SERVER_ON_TASK] ?? [ServerTask::class, 'onCoroutineTask']); $this->server->on('task', $events[static::SERVER_ON_TASK] ?? [ServerTask::class, 'onCoroutineTask']);
} else { } else {
$this->server->on('task', $events[static::SERVER_ON_TASK] ?? [ServerTask::class, 'onTask']); $this->server->on('task', $events[static::SERVER_ON_TASK] ?? [ServerTask::class, 'onTask']);
} }
$this->server->on('finish', $events[static::SERVER_ON_FINISH] ?? [ServerTask::class, 'onFinish']); $this->server->on('finish', $events[static::SERVER_ON_FINISH] ?? [ServerTask::class, 'onFinish']);
} }
} }
ex/SInterface/CustomProcess.php
-5
View File
@@ -28,10 +28,5 @@ interface CustomProcess
public function onHandler(Process $process): void; public function onHandler(Process $process): void;
/**
* @param mixed $data
*/
public function receive(mixed $data): void;
} }
ex/test/RelationshipSystemProcess.php
-9
View File
@@ -31,15 +31,6 @@ class RelationshipSystemProcess implements CustomProcess
} }
/**
* @param mixed $data
*/
public function receive(mixed $data): void
{
}
/** /**
* *
*/ */