Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b2728947a3 | |||
| 8ec5b0e8d8 | |||
| 2939d58585 | |||
| 146da1d00c | |||
| 51babeddc1 | |||
| 550197de96 | |||
| b5ad99332d | |||
| e9b51ffb1e | |||
| 8c9de79027 | |||
| 85c973469f | |||
| db8d9a8376 | |||
| 18b4e79f5f | |||
| 0b7f380298 | |||
| ea400c4ea5 | |||
| 07cfb62bb8 | |||
| a5efa0813f | |||
| d1f2912324 | |||
| ba0acf8f00 | |||
| 2788008fa1 | |||
| 5beee8352d | |||
| 35859fead1 | |||
| 0031d73eff | |||
| 89807fe548 | |||
| 9c28ce91ae | |||
| 7ed01ba893 | |||
| 926a8c0719 | |||
| 688a30531a | |||
| 1ff9d7f210 | |||
| da038f4fd8 | |||
| de20fa9582 | |||
| 80cf72adc9 | |||
| dabcea452a | |||
| 2feda943af | |||
| bffe375230 |
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Abstracts;
|
||||
namespace Kiri\Server\Abstracts;
|
||||
|
||||
|
||||
use Kiri\Context;
|
||||
use Server\Contract\OnProcessInterface;
|
||||
use Kiri\Server\Contract\OnProcessInterface;
|
||||
use Swoole\Coroutine;
|
||||
use Swoole\Process;
|
||||
|
||||
@@ -17,7 +17,7 @@ abstract class BaseProcess implements OnProcessInterface
|
||||
protected bool $isStop = false;
|
||||
|
||||
|
||||
protected mixed $redirect_stdin_and_stdout = null;
|
||||
protected bool $redirect_stdin_and_stdout = FALSE;
|
||||
|
||||
|
||||
protected int $pipe_type = SOCK_DGRAM;
|
||||
@@ -47,10 +47,10 @@ abstract class BaseProcess implements OnProcessInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function getRedirectStdinAndStdout(): mixed
|
||||
{
|
||||
* @return bool
|
||||
*/
|
||||
public function getRedirectStdinAndStdout(): bool
|
||||
{
|
||||
return $this->redirect_stdin_and_stdout;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server\Abstracts;
|
||||
namespace Kiri\Server\Abstracts;
|
||||
|
||||
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Exception\ConfigException;
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
interface OnBeforeShutdown
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
@@ -13,10 +13,9 @@ interface OnCloseInterface
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param int $fd
|
||||
*/
|
||||
public function onClose(Server $server, int $fd): void;
|
||||
public function onClose(int $fd): void;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
@@ -10,10 +10,9 @@ interface OnDisconnectInterface
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param int $fd
|
||||
*/
|
||||
public function onDisconnect(Server $server, int $fd): void;
|
||||
public function onDisconnect(int $fd): void;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Http\Request;
|
||||
use Swoole\Http\Response;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
use Kiri\Websocket\WebSocketInterface;
|
||||
use Swoole\WebSocket\Frame;
|
||||
|
||||
interface OnMessageInterface
|
||||
@@ -10,10 +10,9 @@ interface OnMessageInterface
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param Frame $frame
|
||||
* @return void
|
||||
*/
|
||||
public function onMessage(Server $server, Frame $frame): void;
|
||||
public function onMessage(Frame $frame): void;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Http\Request;
|
||||
use Swoole\WebSocket\Server;
|
||||
|
||||
interface OnOpenInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param Request $request
|
||||
*/
|
||||
public function onOpen(Server $server, Request $request): void;
|
||||
/**
|
||||
* @param Request $request
|
||||
*/
|
||||
public function onOpen(Request $request): void;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Server\Abstracts\Server;
|
||||
use Kiri\Server\Abstracts\Server;
|
||||
|
||||
interface OnPacketInterface
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
|
||||
use Swoole\Process;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server\Contract;
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
class OnAfterWorkerStart
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
class OnBeforeWorkerStart
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
class OnServerBeforeStart
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Events;
|
||||
namespace Kiri\Server\Events;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Handler;
|
||||
namespace Kiri\Server\Handler;
|
||||
|
||||
use Note\Inject;
|
||||
use Server\Abstracts\Server;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Kiri\Server\Abstracts\Server;
|
||||
use Exception;
|
||||
use Server\Contract\OnPipeMessageInterface;
|
||||
use Kiri\Server\Contract\OnPipeMessageInterface;
|
||||
use Kiri\Events\EventDispatch;
|
||||
|
||||
/**
|
||||
|
||||
+10
-6
@@ -1,14 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Handler;
|
||||
namespace Kiri\Server\Handler;
|
||||
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Server\Abstracts\Server;
|
||||
use Server\Events\OnBeforeShutdown;
|
||||
use Server\Events\OnShutdown;
|
||||
use Server\Events\OnStart;
|
||||
use ReflectionException;
|
||||
use Kiri\Server\Abstracts\Server;
|
||||
use Kiri\Server\Events\OnBeforeShutdown;
|
||||
use Kiri\Server\Events\OnShutdown;
|
||||
use Kiri\Server\Events\OnStart;
|
||||
|
||||
|
||||
/**
|
||||
@@ -28,6 +29,7 @@ class OnServer extends Server
|
||||
/**
|
||||
* @param \Swoole\Server $server
|
||||
* @throws ConfigException
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function onStart(\Swoole\Server $server)
|
||||
{
|
||||
@@ -39,6 +41,7 @@ class OnServer extends Server
|
||||
|
||||
/**
|
||||
* @param \Swoole\Server $server
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function onBeforeShutdown(\Swoole\Server $server)
|
||||
{
|
||||
@@ -48,6 +51,7 @@ class OnServer extends Server
|
||||
|
||||
/**
|
||||
* @param \Swoole\Server $server
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function onShutdown(\Swoole\Server $server)
|
||||
{
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Handler;
|
||||
namespace Kiri\Server\Handler;
|
||||
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Server\Abstracts\Server;
|
||||
use ReflectionException;
|
||||
use Kiri\Server\Abstracts\Server;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Server\Events\OnManagerStart;
|
||||
use Server\Events\OnManagerStop;
|
||||
use Kiri\Server\Events\OnManagerStart;
|
||||
use Kiri\Server\Events\OnManagerStop;
|
||||
|
||||
|
||||
/**
|
||||
@@ -26,8 +27,8 @@ class OnServerManager extends Server
|
||||
|
||||
/**
|
||||
* @param \Swoole\Server $server
|
||||
* @throws ConfigException
|
||||
*/
|
||||
* @throws ConfigException|ReflectionException
|
||||
*/
|
||||
public function onManagerStart(\Swoole\Server $server)
|
||||
{
|
||||
$this->setProcessName(sprintf('manger[%d].0', $server->manager_pid));
|
||||
@@ -38,6 +39,7 @@ class OnServerManager extends Server
|
||||
|
||||
/**
|
||||
* @param \Swoole\Server $server
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function onManagerStop(\Swoole\Server $server)
|
||||
{
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Handler;
|
||||
namespace Kiri\Server\Handler;
|
||||
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Server\Events\OnAfterReload;
|
||||
use Server\Events\OnBeforeReload;
|
||||
use Kiri\Server\Events\OnAfterReload;
|
||||
use Kiri\Server\Events\OnBeforeReload;
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ class OnServerReload
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function onBeforeReload(Server $server)
|
||||
{
|
||||
@@ -34,6 +35,7 @@ class OnServerReload
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function onAfterReload(Server $server)
|
||||
{
|
||||
|
||||
+15
-15
@@ -1,20 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Handler;
|
||||
namespace Kiri\Server\Handler;
|
||||
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Core\Help;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Kiri\Kiri;
|
||||
use Server\Events\OnAfterWorkerStart;
|
||||
use Server\Events\OnBeforeWorkerStart;
|
||||
use Server\Events\OnTaskerStart as OnTaskStart;
|
||||
use Server\Events\OnWorkerError;
|
||||
use Server\Events\OnWorkerExit;
|
||||
use Server\Events\OnWorkerStart;
|
||||
use Server\Events\OnWorkerStop;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Kiri\Server\Events\OnAfterWorkerStart;
|
||||
use Kiri\Server\Events\OnBeforeWorkerStart;
|
||||
use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
|
||||
use Kiri\Server\Events\OnWorkerError;
|
||||
use Kiri\Server\Events\OnWorkerExit;
|
||||
use Kiri\Server\Events\OnWorkerStart;
|
||||
use Kiri\Server\Events\OnWorkerStop;
|
||||
use Swoole\Server;
|
||||
use Swoole\Timer;
|
||||
|
||||
@@ -62,8 +62,8 @@ class OnServerWorker extends \Server\Abstracts\Server
|
||||
*/
|
||||
public function onWorkerStop(Server $server, int $workerId)
|
||||
{
|
||||
Timer::clearAll();
|
||||
$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
|
||||
Timer::clearAll();
|
||||
$this->eventDispatch->dispatch(new OnWorkerStop($server, $workerId));
|
||||
}
|
||||
|
||||
|
||||
@@ -76,8 +76,8 @@ class OnServerWorker extends \Server\Abstracts\Server
|
||||
{
|
||||
set_env('state', 'exit');
|
||||
|
||||
$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
|
||||
}
|
||||
$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@@ -98,7 +98,7 @@ class OnServerWorker extends \Server\Abstracts\Server
|
||||
|
||||
$this->logger->error($message);
|
||||
|
||||
// $this->system_mail($message);
|
||||
$this->system_mail($message);
|
||||
}
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ class OnServerWorker extends \Server\Abstracts\Server
|
||||
protected function system_mail($messageContent)
|
||||
{
|
||||
try {
|
||||
$email = Config::get('email');
|
||||
$email = Config::get('email', ['enable' => false]);
|
||||
if (!empty($email) && ($email['enable'] ?? false) == true) {
|
||||
Help::sendEmail($email, 'Service Error', $messageContent);
|
||||
}
|
||||
|
||||
+45
-6
@@ -1,18 +1,20 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
use Exception;
|
||||
use Http\Handler\Abstracts\HttpService;
|
||||
use Kiri\Message\Handler\Abstracts\HttpService;
|
||||
use Kiri\Message\Handler\Router;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Kiri;
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
use Server\Events\OnShutdown;
|
||||
use Kiri\Server\Events\OnShutdown;
|
||||
use Swoole\Coroutine;
|
||||
|
||||
|
||||
defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
|
||||
@@ -81,8 +83,46 @@ class Server extends HttpService
|
||||
return $this->manager()->getServer()->start();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws ConfigException
|
||||
*/
|
||||
private function configure_set()
|
||||
{
|
||||
$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
|
||||
Config::set('servers.settings.enable_coroutine', true);
|
||||
if ($enable_coroutine != true) {
|
||||
return;
|
||||
}
|
||||
Coroutine::set([
|
||||
'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
|
||||
'enable_deadlock_check' => FALSE,
|
||||
'exit_condition' => function () {
|
||||
return Coroutine::stats()['coroutine_num'] === 0;
|
||||
}
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
/**
|
||||
* @return void
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws \ReflectionException
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function runtime_start(): void
|
||||
{
|
||||
$this->configure_set();
|
||||
|
||||
$this->container->get(Router::class)->read_files();
|
||||
|
||||
$this->start();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @return void
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
@@ -137,7 +177,6 @@ class Server extends HttpService
|
||||
|
||||
/**
|
||||
* @return ServerManager
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
private function manager(): ServerManager
|
||||
{
|
||||
|
||||
+21
-13
@@ -1,16 +1,17 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Kiri;
|
||||
use Server\Events\OnServerBeforeStart;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
use Swoole\Coroutine;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
@@ -52,26 +53,32 @@ class ServerCommand extends Command
|
||||
* @param InputInterface $input
|
||||
* @param OutputInterface $output
|
||||
* @return int
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws \ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
$manager = Kiri::app()->getServer();
|
||||
$manager->setDaemon((int)!is_null($input->getOption('daemon')));
|
||||
if (is_null($input->getArgument('action'))) {
|
||||
$input->setArgument('action', 'restart');
|
||||
}
|
||||
if (!in_array($input->getArgument('action'), self::ACTIONS)) {
|
||||
|
||||
$action = $input->getArgument('action');
|
||||
if (is_null($action)) {
|
||||
throw new Exception('I don\'t know what I want to do.');
|
||||
}
|
||||
if ($manager->isRunner() && $input->getArgument('action') == 'start') {
|
||||
throw new Exception('Service is running. Please use restart.');
|
||||
if (!in_array($action, self::ACTIONS)) {
|
||||
throw new Exception('I don\'t know what I want to do.');
|
||||
}
|
||||
$manager->shutdown();
|
||||
if ($input->getArgument('action') == 'stop') {
|
||||
return 0;
|
||||
if ($action == 'restart' || $action == 'stop') {
|
||||
$manager->shutdown();
|
||||
if ($action == 'stop') {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return $this->generate_runtime_builder($manager);
|
||||
$manager->runtime_start();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -81,6 +88,7 @@ class ServerCommand extends Command
|
||||
private function configure_set()
|
||||
{
|
||||
$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
|
||||
Config::set('servers.settings.enable_coroutine', true);
|
||||
if ($enable_coroutine != true) {
|
||||
return;
|
||||
}
|
||||
|
||||
+44
-32
@@ -1,40 +1,43 @@
|
||||
<?php
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Component;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Di\NoteManager;
|
||||
use Kiri\Error\Logger;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Kiri;
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
use ReflectionException;
|
||||
use Server\Abstracts\BaseProcess;
|
||||
use Server\Contract\OnCloseInterface;
|
||||
use Server\Contract\OnConnectInterface;
|
||||
use Server\Contract\OnDisconnectInterface;
|
||||
use Server\Contract\OnHandshakeInterface;
|
||||
use Server\Contract\OnMessageInterface;
|
||||
use Server\Contract\OnPacketInterface;
|
||||
use Server\Contract\OnProcessInterface;
|
||||
use Server\Contract\OnReceiveInterface;
|
||||
use Server\Events\OnServerBeforeStart;
|
||||
use Server\Handler\OnPipeMessage;
|
||||
use Server\Handler\OnServer;
|
||||
use Server\Handler\OnServerManager;
|
||||
use Server\Handler\OnServerReload;
|
||||
use Server\Handler\OnServerWorker;
|
||||
use Server\Tasker\OnServerTask;
|
||||
use Kiri\Server\Abstracts\BaseProcess;
|
||||
use Kiri\Server\Contract\OnCloseInterface;
|
||||
use Kiri\Server\Contract\OnConnectInterface;
|
||||
use Kiri\Server\Contract\OnDisconnectInterface;
|
||||
use Kiri\Server\Contract\OnHandshakeInterface;
|
||||
use Kiri\Server\Contract\OnMessageInterface;
|
||||
use Kiri\Server\Contract\OnPacketInterface;
|
||||
use Kiri\Server\Contract\OnProcessInterface;
|
||||
use Kiri\Server\Contract\OnReceiveInterface;
|
||||
use Kiri\Server\Events\OnServerBeforeStart;
|
||||
use Kiri\Server\Handler\OnPipeMessage;
|
||||
use Kiri\Server\Handler\OnServer;
|
||||
use Kiri\Server\Handler\OnServerManager;
|
||||
use Kiri\Server\Handler\OnServerReload;
|
||||
use Kiri\Server\Handler\OnServerWorker;
|
||||
use Kiri\Server\Tasker\OnServerTask;
|
||||
use Swoole\Http\Server as HServer;
|
||||
use Swoole\Process;
|
||||
use Swoole\Server;
|
||||
use Swoole\Server\Port;
|
||||
use Swoole\WebSocket\Server as WServer;
|
||||
use Symfony\Component\Console\Helper\Table;
|
||||
use Symfony\Component\Console\Helper\TableSeparator;
|
||||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
@@ -117,7 +120,6 @@ class ServerManager extends Component
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function addListener(string $type, string $host, int $port, int $mode, array $settings = [])
|
||||
{
|
||||
@@ -138,7 +140,6 @@ class ServerManager extends Component
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function initBaseServer($configs, int $daemon = 0): void
|
||||
{
|
||||
@@ -160,15 +161,17 @@ class ServerManager extends Component
|
||||
$customProcess = Kiri::getDi()->get($customProcess);
|
||||
}
|
||||
$system = sprintf('[%s].process', Config::get('id', 'system-service'));
|
||||
$process = new Process(function (Process $process) use ($customProcess, $system) {
|
||||
$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
|
||||
$this->server->addProcess(new Process(function (Process $process) use ($customProcess, $system) {
|
||||
if (Kiri::getPlatform()->isLinux()) {
|
||||
$process->name($system . '(' . $customProcess->getName() . ')');
|
||||
}
|
||||
$customProcess->onSigterm()->process($process);
|
||||
}, $customProcess->getRedirectStdinAndStdout(), $customProcess->getPipeType(), $customProcess->isEnableCoroutine());
|
||||
$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
|
||||
$this->initProcesses[$customProcess->getName()] = $process;
|
||||
$this->server->addProcess($process);
|
||||
},
|
||||
$customProcess->getRedirectStdinAndStdout(),
|
||||
$customProcess->getPipeType(),
|
||||
$customProcess->isEnableCoroutine()
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
@@ -197,7 +200,6 @@ class ServerManager extends Component
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
private function startListenerHandler(ServerManager $context, array $config, int $daemon = 0)
|
||||
@@ -276,7 +278,6 @@ class ServerManager extends Component
|
||||
* @throws ConfigException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
|
||||
@@ -290,6 +291,21 @@ class ServerManager extends Component
|
||||
$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
|
||||
$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
|
||||
|
||||
$data = new Table($this->container->get(OutputInterface::class));
|
||||
$data->setHeaders(['key', 'value']);
|
||||
|
||||
$array = [];
|
||||
foreach ($this->server->setting as $key => $value) {
|
||||
$array[] = [$key, $value];
|
||||
$array[] = new TableSeparator();
|
||||
}
|
||||
|
||||
array_pop($array);
|
||||
|
||||
$data->setStyle('box-double');
|
||||
$data->setRows($array);
|
||||
$data->render();
|
||||
|
||||
$id = Config::get('id', 'system-service');
|
||||
|
||||
$this->logger->debug(sprintf('[%s].' . $type . ' service %s::%d start', $id, $host, $port));
|
||||
@@ -302,7 +318,6 @@ class ServerManager extends Component
|
||||
* @param array $settings
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
private function addDefaultListener(array $settings): void
|
||||
{
|
||||
@@ -322,7 +337,6 @@ class ServerManager extends Component
|
||||
* @param Server|Port $server
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
private function addServiceEvents(array $events, Server|Port $server)
|
||||
{
|
||||
@@ -360,7 +374,6 @@ class ServerManager extends Component
|
||||
* @return void
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
private function addTaskListener(array $events = []): void
|
||||
{
|
||||
@@ -380,7 +393,6 @@ class ServerManager extends Component
|
||||
* @return void
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function bindCallback(?array $settings = [])
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
|
||||
use Exception;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Component;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Tasker;
|
||||
namespace Kiri\Server\Tasker;
|
||||
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Component;
|
||||
use Kiri\Core\HashMap;
|
||||
use Kiri\Kiri;
|
||||
use ReflectionException;
|
||||
use Server\Contract\OnTaskInterface;
|
||||
use Server\SwooleServerInterface;
|
||||
use Kiri\Server\Contract\OnTaskInterface;
|
||||
use Kiri\Server\SwooleServerInterface;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Server\Tasker;
|
||||
namespace Kiri\Server\Tasker;
|
||||
|
||||
|
||||
use Note\Inject;
|
||||
use Kiri\Annotation\Inject;
|
||||
use Kiri\Abstracts\Logger;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use ReflectionException;
|
||||
use Server\Contract\OnTaskInterface;
|
||||
use Kiri\Server\Contract\OnTaskInterface;
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Server;
|
||||
namespace Kiri\Server;
|
||||
|
||||
trait TraitServer
|
||||
{
|
||||
|
||||
+2
-2
@@ -15,11 +15,11 @@
|
||||
"psr/http-server-middleware": "^1.0",
|
||||
"psr/http-message": "^1.0",
|
||||
"psr/event-dispatcher": "^1.0",
|
||||
"game-worker/kiri-http-message": "^v1.2"
|
||||
"game-worker/kiri-http-message": "~v2.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Server\\": "./"
|
||||
"Kiri\\Server\\": "./"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user