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

qqq

Browse Source
This commit is contained in:
向林
2023-08-11 00:12:32 +08:00
parent 59419edbdf
commit 8fb3fd699e
3 changed files with 190 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Abstracts/AsyncServer.php
+173 -211
View File
@@ -26,232 +26,194 @@ use Swoole\Server;
class AsyncServer implements ServerInterface
{
use TraitServer;
use TraitServer;
/**
* @var Server|null
*/
private ?Server $server = null;
/**
* @param array $service
* @param int $daemon
* @return void
* @throws Exception
*/
public function initCoreServers(array $service, int $daemon = 0): void
{
$this->listener($service, $daemon);
$this->initProcess();
$this->onSignal();
}
/**
* @param array $service
* @param $daemon
* @return void
* @throws
*/
private function listener(array $service, $daemon): void
{
$service = $this->genConfigService($service);
foreach ($service as $value) {
if (is_null($this->server)) {
$this->createBaseServer($value, $daemon);
} else {
$this->addListener($value);
}
}
}
/**
* @return void
*/
private function initProcess(): void
{
foreach ($this->_process as $process) {
$this->server->addProcess($process);
}
}
/**
* @return bool
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface|ReflectionException
*/
public function shutdown(): bool
{
$this->server->shutdown();
event(new OnShutdown());
return true;
}
/**
* @param SConfig $config
* @param int $daemon
* @return void
* @throws ConfigException
* @throws NotFindClassException
* @throws ReflectionException
*/
private function createBaseServer(SConfig $config, int $daemon = 0): void
{
$match = $this->getServerClass($config->type);
if (is_null($match)) {
throw new NotFindClassException('Unknown server type ' . $config->type);
}
$this->initServer($match, $config, $daemon);
$this->onEventListen($this->server, \config('server.events', []));
$this->onEventListen($this->server, $config->events);
$this->onTaskListen();
}
/**
* @param $match
* @param $config
* @param $daemon
* @return void
* @throws ConfigException
/**
* @var Server|null
*/
private function initServer($match, $config, $daemon): void
{
$this->server = new $match($config->host, $config->port, $config->mode, $config->socket);
$this->server->set($this->systemConfig($config, $daemon));
Logger::_alert('Listen ' . $config->type . ' address ' . $config->host . '::' . $config->port);
if (!isset($config->events[Constant::SHUTDOWN])) {
$config->events[Constant::SHUTDOWN] = [OnServer::class, 'onShutdown'];
}
Kiri::getDi()->bind(ServerInterface::class, $this->server);
}
private ?Server $server = null;
/**
* @return void
* @throws
*/
private function onTaskListen(): void
{
if (!isset($this->server->setting[Constant::OPTION_TASK_WORKER_NUM])) {
return;
}
$container = Kiri::getDi();
$task = $container->get(Task::class);
$container->bind(TaskInterface::class, $task);
$task->initTaskWorker($this->server);
}
/**
* @param array $service
* @param int $daemon
* @return void
* @throws Exception
*/
public function initCoreServers(array $service, int $daemon = 0): void
{
$service = $this->genConfigService($service);
$this->createBaseServer(array_pop($service), $daemon);
foreach ($service as $value) {
$this->addListener($value);
}
foreach ($this->_process as $process) {
$this->server->addProcess($process);
}
on(OnServerBeforeStart::class, [$this, 'onSignal']);
}
/**
* @param SConfig $config
* @param int $daemon
* @return array
* @throws Exception
* @throws ConfigException
*/
protected function systemConfig(SConfig $config, int $daemon): array
{
$settings = array_merge(\config('server.settings', []), $config->settings);
$settings[Constant::OPTION_DAEMONIZE] = (bool)$daemon;
$settings[Constant::OPTION_ENABLE_REUSE_PORT] = true;
$settings[Constant::OPTION_PID_FILE] = storage('.swoole.pid');
if (!isset($settings[Constant::OPTION_PID_FILE])) {
$settings[Constant::OPTION_LOG_FILE] = storage('system.log');
}
return $settings;
}
/**
* @return bool
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface|ReflectionException
*/
public function shutdown(): bool
{
$this->server->shutdown();
event(new OnShutdown());
return true;
}
/**
* @param SConfig $config
* @return void
* @throws Exception
*/
public function addListener(SConfig $config): void
{
$port = $this->server->addlistener($config->host, $config->port, $config->socket);
if ($port === false) {
throw new Exception('Listen port fail.' . swoole_last_error());
}
Logger::_alert('Listen ' . $config->type . ' address ' . $config->host . '::' . $config->port);
$port->set($this->resetSettings($config->type, $config->settings));
$this->onEventListen($port, $config->getEvents());
}
/**
* @param $no
* @param array $signInfo
* @return void
*/
public function onSigint($no, array $signInfo): void
{
try {
Logger::_alert('Pid ' . getmypid() . ' get signo ' . $no);
$this->shutdown();
} catch (\Throwable $exception) {
error($exception);
}
}
/**
* @param SConfig $config
* @param int $daemon
* @return void
* @throws ConfigException
* @throws NotFindClassException
* @throws ReflectionException
*/
private function createBaseServer(SConfig $config, int $daemon = 0): void
{
$match = $this->getServerClass($config->type);
if (is_null($match)) {
throw new NotFindClassException('Unknown server type ' . $config->type);
}
$this->initServer($match, $config, $daemon);
$this->onEventListen($this->server, \config('server.events', []));
$this->onEventListen($this->server, $config->events);
$this->onTaskListen();
}
/**
* @param string $type
* @param array $settings
* @return array
* @throws
*/
private function resetSettings(string $type, array $settings): array
{
if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['open_http_protocol'])) {
$settings['open_http_protocol'] = true;
if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
$settings['open_http2_protocol'] = true;
}
}
if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['open_websocket_protocol'])) {
$settings['open_websocket_protocol'] = true;
}
return $settings;
}
/**
* @param $match
* @param $config
* @param $daemon
* @return void
* @throws ConfigException
*/
private function initServer($match, $config, $daemon): void
{
$this->server = new $match($config->host, $config->port, $config->mode, $config->socket);
$this->server->set($this->systemConfig($config, $daemon));
Logger::_alert('Listen ' . $config->type . ' address ' . $config->host . '::' . $config->port);
if (!isset($config->events[Constant::SHUTDOWN])) {
$config->events[Constant::SHUTDOWN] = [OnServer::class, 'onShutdown'];
}
Kiri::getDi()->bind(ServerInterface::class, $this->server);
}
/**
* @param Server\Port|Server $base
* @param array $events
* @return void
* @throws ReflectionException
*/
private function onEventListen(Server\Port|Server $base, array $events): void
{
foreach ($events as $name => $event) {
if (is_array($event) && is_string($event[0])) {
$event[0] = Kiri::getDi()->get($event[0]);
}
$base->on($name, $event);
}
}
/**
* @return void
* @throws
*/
private function onTaskListen(): void
{
if (!isset($this->server->setting[Constant::OPTION_TASK_WORKER_NUM])) {
return;
}
$container = Kiri::getDi();
$task = $container->get(Task::class);
$container->bind(TaskInterface::class, $task);
$task->initTaskWorker($this->server);
}
/**
* @return void
* @throws
*/
public function start(): void
{
event(new OnServerBeforeStart());
$this->server->start();
}
/**
* @param SConfig $config
* @param int $daemon
* @return array
* @throws Exception
* @throws ConfigException
*/
protected function systemConfig(SConfig $config, int $daemon): array
{
$settings = array_merge(\config('server.settings', []), $config->settings);
$settings[Constant::OPTION_DAEMONIZE] = (bool)$daemon;
$settings[Constant::OPTION_ENABLE_REUSE_PORT] = true;
$settings[Constant::OPTION_PID_FILE] = storage('.swoole.pid');
if (!isset($settings[Constant::OPTION_PID_FILE])) {
$settings[Constant::OPTION_LOG_FILE] = storage('system.log');
}
return $settings;
}
/**
* @param SConfig $config
* @return void
* @throws Exception
*/
public function addListener(SConfig $config): void
{
$port = $this->server->addlistener($config->host, $config->port, $config->socket);
if ($port === false) {
throw new Exception('Listen port fail.' . swoole_last_error());
}
Logger::_alert('Listen ' . $config->type . ' address ' . $config->host . '::' . $config->port);
$port->set($this->resetSettings($config->type, $config->settings));
$this->onEventListen($port, $config->getEvents());
}
/**
* @param string $type
* @param array $settings
* @return array
* @throws
*/
private function resetSettings(string $type, array $settings): array
{
if ($type == Constant::SERVER_TYPE_HTTP && !isset($settings['open_http_protocol'])) {
$settings['open_http_protocol'] = true;
if (in_array($this->server->setting['dispatch_mode'], [2, 4])) {
$settings['open_http2_protocol'] = true;
}
}
if ($type == Constant::SERVER_TYPE_WEBSOCKET && !isset($settings['open_websocket_protocol'])) {
$settings['open_websocket_protocol'] = true;
}
return $settings;
}
/**
* @param Server\Port|Server $base
* @param array $events
* @return void
* @throws ReflectionException
*/
private function onEventListen(Server\Port|Server $base, array $events): void
{
foreach ($events as $name => $event) {
if (is_array($event) && is_string($event[0])) {
$event[0] = Kiri::getDi()->get($event[0]);
}
$base->on($name, $event);
}
}
/**
* @return void
* @throws
*/
public function start(): void
{
event(new OnServerBeforeStart());
$this->server->start();
}
}
Abstracts/TraitServer.php
+17
View File
@@ -4,6 +4,7 @@ namespace Kiri\Server\Abstracts;
use Exception;
use Kiri;
use Kiri\Abstracts\Logger;
use ReflectionException;
use Swoole\Coroutine;
use Swoole\Http\Server as HServer;
@@ -78,6 +79,22 @@ trait TraitServer
}
/**
* @param $no
* @param array $signInfo
* @return void
*/
public function onSigint($no, array $signInfo): void
{
try {
Logger::_alert('Pid ' . getmypid() . ' get signo ' . $no);
$this->shutdown();
} catch (\Throwable $exception) {
error($exception);
}
}
/**
* @param $signal
* @param $callback
Server.php
-1
View File
@@ -68,7 +68,6 @@ class Server
on(OnWorkerStop::class, [Timer::class, 'clearAll'], 9999);
on(OnWorkerStart::class, [$this, 'setWorkerName']);
on(OnTaskerStart::class, [$this, 'setTaskerName']);
if (\config('reload.hot') === false) {
$this->router->scan_build_route();
} else {