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

改名

Browse Source
This commit is contained in:
Mr·x
2021-09-24 18:53:14 +08:00
parent bfd9f07780
commit fce833ddde
2 changed files with 112 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-handler/Abstracts/MiddlewareManager.php
+21 -10
View File
@@ -26,19 +26,14 @@ class MiddlewareManager extends BaseObject
/** /**
* @param $class * @param $class
* @param $method * @param $method
* @param array|string $middlewares * @param array|string|null $middlewares
* @return bool * @return bool
*/ */
public static function add($class, $method, array|string $middlewares): bool public static function add($class, $method, array|string|null $middlewares): bool
{ {
if (is_object($class)) { [$class, $method] = static::setDefault($class, $method);
$class = $class::class; if (empty($middlewares)) {
} return false;
if (!isset(static::$_middlewares[$class])) {
static::$_middlewares[$class] = [];
}
if (!isset(static::$_middlewares[$class][$method])) {
static::$_middlewares[$class][$method] = new Iterator();
} }
if (is_string($middlewares)) { if (is_string($middlewares)) {
$middlewares = [$middlewares]; $middlewares = [$middlewares];
@@ -54,6 +49,22 @@ class MiddlewareManager extends BaseObject
} }
private static function setDefault($class, $method): array
{
if (is_object($class)) {
$class = $class::class;
}
if (!isset(static::$_middlewares[$class])) {
static::$_middlewares[$class] = [];
}
if (!isset(static::$_middlewares[$class][$method])) {
static::$_middlewares[$class][$method] = new Iterator();
}
return [$class, $method];
}
/** /**
* @param $handler * @param $handler
* @return Iterator|null * @return Iterator|null
http-server/ServerCommand.php
+91 -77
View File
@@ -6,17 +6,21 @@ namespace Server;
use Annotation\Inject; use Annotation\Inject;
use Exception; use Exception;
use Http\Handler\Abstracts\HandlerManager;
use Http\Handler\Abstracts\MiddlewareManager;
use Http\Handler\Handler;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Events\EventProvider; use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Server\Abstracts\OnTaskerStart as TaskerDispatch;
use Server\Abstracts\OnWorkerStart as WorkerDispatch;
use Server\Events\OnAfterWorkerStart;
use Server\Events\OnBeforeWorkerStart; use Server\Events\OnBeforeWorkerStart;
use Server\Events\OnTaskerStart; use Server\Events\OnTaskerStart;
use Server\Events\OnWorkerStart; use Server\Events\OnWorkerStart;
use Server\Worker\OnServerWorker; use Server\Worker\OnServerWorker;
use Server\Abstracts\OnWorkerStart as WorkerDispatch;
use Server\Abstracts\OnTaskerStart as TaskerDispatch;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Runtime;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@@ -30,92 +34,102 @@ class ServerCommand extends Command
{ {
const ACTIONS = ['start', 'stop', 'restart']; const ACTIONS = ['start', 'stop', 'restart'];
/** /**
* @var EventProvider * @var EventProvider
*/ */
#[Inject(EventProvider::class)] #[Inject(EventProvider::class)]
public EventProvider $eventProvider; public EventProvider $eventProvider;
/** /**
* *
*/ */
protected function configure() protected function configure()
{ {
$this->setName('sw:server') $this->setName('sw:server')
->setDescription('server start|stop|reload|restart') ->setDescription('server start|stop|reload|restart')
->addArgument('action', InputArgument::REQUIRED) ->addArgument('action', InputArgument::REQUIRED)
->addArgument('daemon', InputArgument::OPTIONAL, '', 0); ->addArgument('daemon', InputArgument::OPTIONAL, '', 0);
} }
/** /**
* @param InputInterface $input * @param InputInterface $input
* @param OutputInterface $output * @param OutputInterface $output
* @return int * @return int
* @throws Exception * @throws Exception
*/ */
public function execute(InputInterface $input, OutputInterface $output): int public function execute(InputInterface $input, OutputInterface $output): int
{ {
try { try {
$manager = Kiri::app()->getServer(); $manager = Kiri::app()->getServer();
$manager->setDaemon($input->getArgument('daemon')); $manager->setDaemon($input->getArgument('daemon'));
if (!in_array($input->getArgument('action'), self::ACTIONS)) { if (!in_array($input->getArgument('action'), self::ACTIONS)) {
throw new Exception('I don\'t know what I want to do.'); throw new Exception('I don\'t know what I want to do.');
} }
if ($manager->isRunner() && $input->getArgument('action') == 'start') { if ($manager->isRunner() && $input->getArgument('action') == 'start') {
throw new Exception('Service is running. Please use restart.'); throw new Exception('Service is running. Please use restart.');
} }
$manager->shutdown(); $manager->shutdown();
if ($input->getArgument('action') == 'stop') { if ($input->getArgument('action') == 'stop') {
throw new Exception('shutdown success'); throw new Exception('shutdown success');
} }
$this->generate_runtime_builder($manager); $this->generate_runtime_builder($manager);
} catch (\Throwable $throwable) { } catch (\Throwable $throwable) {
$output->write($throwable->getMessage()); $output->write($throwable->getMessage());
} finally { } finally {
return 1; return 1;
} }
} }
/** /**
* @throws \Kiri\Exception\ConfigException * @throws ConfigException
*/ */
private function configure_set() private function configure_set()
{ {
$enable_coroutine = Config::get('servers.settings.enable_coroutine', false); $enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
if ($enable_coroutine != true) { if ($enable_coroutine != true) {
return; return;
} }
Coroutine::set([ Coroutine::set([
'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION, 'hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
'enable_deadlock_check' => FALSE, 'enable_deadlock_check' => FALSE,
'exit_condition' => function () { 'exit_condition' => function () {
return Coroutine::stats()['coroutine_num'] === 0; return Coroutine::stats()['coroutine_num'] === 0;
} }
]); ]);
} }
/** /**
* @param $manager * @param $manager
* @throws \Kiri\Exception\ConfigException * @throws ConfigException
*/ */
private function generate_runtime_builder($manager): void private function generate_runtime_builder($manager): void
{ {
$this->configure_set(); $this->configure_set();
exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder'); exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder');
$this->eventProvider->on(OnBeforeWorkerStart::class, [di(OnServerWorker::class), 'setConfigure']); $this->eventProvider->on(OnBeforeWorkerStart::class, [di(OnServerWorker::class), 'setConfigure']);
$this->eventProvider->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']); $this->eventProvider->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']);
$this->eventProvider->on(OnTaskerStart::class, [di(TaskerDispatch::class), 'dispatch']); $this->eventProvider->on(OnTaskerStart::class, [di(TaskerDispatch::class), 'dispatch']);
$manager->start(); $this->eventProvider->on(OnAfterWorkerStart::class, function () {
} $lists = HandlerManager::dump();
foreach ($lists as $list) {
if ($list instanceof \Closure) {
continue;
}
/** @var Handler|Closure $list */
MiddlewareManager::add($list->callback[0], $list->callback[1], null);
}
});
$manager->start();
}
} }