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

改名

Browse Source
This commit is contained in:
向林
2021-12-08 11:32:31 +08:00
parent a64fa8f493
commit de7e005b46
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server.php
+22 -22
View File
@@ -5,10 +5,10 @@ namespace Server;
use Exception; use Exception;
use Http\Handler\Abstracts\HttpService; use Http\Handler\Abstracts\HttpService;
use JetBrains\PhpStorm\Pure;
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 Note\Inject; use Note\Inject;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
@@ -28,21 +28,9 @@ class Server extends HttpService
]; ];
/**
* @Inject ServerManager
* @var null|ServerManager
*/
#[Inject(ServerManager::class)]
public ?ServerManager $manager = null;
private mixed $daemon = 0; private mixed $daemon = 0;
/** @var EventDispatch */
#[Inject(EventDispatch::class)]
public EventDispatch $eventDispatch;
/** /**
* @var State * @var State
*/ */
@@ -77,36 +65,38 @@ class Server extends HttpService
*/ */
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', []); $rpcService = Config::get('rpc', []);
if (!empty($rpcService)) { if (!empty($rpcService)) {
$this->manager->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'], $this->manager()->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'],
$rpcService['mode'], $rpcService); $rpcService['mode'], $rpcService);
} }
$processes = array_merge($this->process, Config::get('processes', [])); $processes = array_merge($this->process, Config::get('processes', []));
foreach ($processes as $process) { foreach ($processes as $process) {
$this->manager->addProcess($process); $this->manager()->addProcess($process);
} }
return $this->manager->getServer()->start(); return $this->manager()->getServer()->start();
} }
/** /**
* @return void * @return void
* * @throws ConfigException
* start server * @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @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->state->exit($config['port']); $this->state->exit($config['port']);
} }
$this->eventDispatch->dispatch(new OnShutdown()); $this->container->get(EventDispatch::class)->dispatch(new OnShutdown());
} }
@@ -141,7 +131,17 @@ class Server extends HttpService
*/ */
public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null public function getServer(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
{ {
return $this->manager->getServer(); return $this->manager()->getServer();
}
/**
* @return ServerManager
* @throws \ReflectionException
*/
private function manager(): ServerManager
{
return Kiri::getDi()->get(ServerManager::class);
} }
} }