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
2020-09-03 11:39:20 +08:00
parent 274332207b
commit efbb049824
42 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-server/Abstracts/Callback.php
+2 -2
View File
@@ -28,7 +28,7 @@ abstract class Callback extends Application
protected function clear($server, $worker_id, $message)
{
Timer::clearAll();
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->offName(Event::EVENT_AFTER_REQUEST);
$event->offName(Event::EVENT_BEFORE_REQUEST);
@@ -36,7 +36,7 @@ abstract class Callback extends Application
Snowflake::clearProcessId($server->worker_pid);
$logger = Snowflake::get()->getLogger();
$logger = Snowflake::app()->getLogger();
$logger->write($this->_MESSAGE[$message] . $worker_id);
$logger->clear();
}
http-server/Application.php
+1 -1
View File
@@ -22,7 +22,7 @@ class Application extends HttpService
*/
protected function write($message, $category = 'app')
{
$logger = Snowflake::get()->logger;
$logger = Snowflake::app()->logger;
$logger->write($message, $category);
$logger->insert();
}
http-server/Command.php
+1 -1
View File
@@ -35,7 +35,7 @@ class Command extends \Console\Command
$action = $dtl->get('action', 3);
/** @var Server $server */
$server = Snowflake::get()->get('server');
$server = Snowflake::app()->get('server');
$server->start();
}
http-server/Controller.php
+1 -1
View File
@@ -83,7 +83,7 @@ class Controller extends Application
public function getRequest(): Request
{
if (!$this->request) {
$this->request = Snowflake::get()->request;
$this->request = Snowflake::app()->request;
}
return $this->request;
}
http-server/Events/OnAfterReload.php
+1 -1
View File
@@ -26,7 +26,7 @@ class OnAfterReload extends Callback
*/
public function onHandler(Server $server)
{
$event = Snowflake::get()->getEvent();
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_AFTER_RELOAD)) {
return;
}
http-server/Events/OnBeforeReload.php
+1 -1
View File
@@ -23,7 +23,7 @@ class OnBeforeReload extends Callback
*/
public function onHandler(Server $server)
{
$event = Snowflake::get()->getEvent();
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_BEFORE_RELOAD)) {
return;
}
http-server/Events/OnClose.php
+5 -5
View File
@@ -38,10 +38,10 @@ class OnClose extends Callback
} catch (\Throwable $exception) {
$this->addError($exception->getMessage());
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::RELEASE_ALL);
$logger = Snowflake::get()->getLogger();
$logger = Snowflake::app()->getLogger();
$logger->insert();
}
}
@@ -59,13 +59,13 @@ class OnClose extends Callback
if (!$server->isEstablished($fd)) {
return [null, null];
}
$manager = Snowflake::get()->annotation->get('websocket');
$manager = Snowflake::app()->annotation->get('websocket');
$name = $manager->getName(AWebsocket::CLOSE);
} else if ($server instanceof HServer) {
$manager = Snowflake::get()->annotation->get('http');
$manager = Snowflake::app()->annotation->get('http');
$name = $manager->getName(Annotation::CLOSE);
} else {
$manager = Snowflake::get()->annotation->get('tcp');
$manager = Snowflake::app()->annotation->get('tcp');
$name = $manager->getName(Tcp::CLOSE);
}
return [$manager, $name];
http-server/Events/OnConnect.php
+1 -1
View File
@@ -27,7 +27,7 @@ class OnConnect extends Callback
*/
public function onHandler(\Swoole\Server $server, int $fd, int $reactorId)
{
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if (!$event->exists(Event::RECEIVE_CONNECTION)) {
return;
}
http-server/Events/OnHandshake.php
+1 -1
View File
@@ -53,7 +53,7 @@ class OnHandshake extends Callback
}
/** @var AWebsocket $manager */
$manager = Snowflake::get()->annotation->get('websocket');
$manager = Snowflake::app()->annotation->get('websocket');
if ($manager->has($manager->getName(AWebsocket::HANDSHAKE))) {
$manager->runWith($manager->getName(AWebsocket::HANDSHAKE), [$request, $response]);
} else {
http-server/Events/OnManagerStart.php
+1 -1
View File
@@ -21,7 +21,7 @@ class OnManagerStart extends Callback
$this->debug('manager start.');
Snowflake::setProcessId($server->manager_pid);
$events = Snowflake::get()->event;
$events = Snowflake::app()->event;
if ($events->exists(Event::SERVER_MANAGER_START)) {
$events->trigger(Event::SERVER_MANAGER_START, null, $server);
}
http-server/Events/OnManagerStop.php
+1 -1
View File
@@ -24,7 +24,7 @@ class OnManagerStop extends Callback
{
$this->warning('manager stop.');
$events = Snowflake::get()->event;
$events = Snowflake::app()->event;
if ($events->exists(Event::SERVER_MANAGER_STOP)) {
$events->trigger(Event::SERVER_MANAGER_STOP, [$server]);
}
http-server/Events/OnMessage.php
+4 -4
View File
@@ -29,7 +29,7 @@ class OnMessage extends Callback
if ($frame->opcode == 0x08) {
return;
}
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if ($event->exists(Event::SERVER_MESSAGE)) {
$event->trigger(Event::SERVER_MESSAGE, [$server, $frame]);
} else {
@@ -37,7 +37,7 @@ class OnMessage extends Callback
}
/** @var AWebsocket $manager */
$manager = Snowflake::get()->annotation->get('websocket');
$manager = Snowflake::app()->annotation->get('websocket');
if (!isset($frame->data['route'])) {
throw new \Exception('Fromat errr.');
}
@@ -47,9 +47,9 @@ class OnMessage extends Callback
$this->addError($exception->getMessage(), 'websocket');
$server->send($frame->fd, $exception->getMessage());
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::EVENT_AFTER_REQUEST);
Snowflake::get()->logger->insert();
Snowflake::app()->logger->insert();
}
}
http-server/Events/OnPacket.php
+1 -1
View File
@@ -78,7 +78,7 @@ class OnPacket extends Callback
$client[] = $this->pack(['message' => $exception->getMessage()]);
return $server->sendto(...$client);
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::SERVER_WORKER_STOP);
}
}
http-server/Events/OnPipeMessage.php
+1 -1
View File
@@ -28,7 +28,7 @@ class OnPipeMessage extends Callback
public function onHandler(Server $server, int $src_worker_id, $message)
{
// TODO: Implement onHandler() method.
$events = Snowflake::get()->getEvent();
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::PIPE_MESSAGE)) {
return;
}
http-server/Events/OnReceive.php
+1 -1
View File
@@ -78,7 +78,7 @@ class OnReceive extends Callback
$client[] = $this->pack(['message' => $exception->getMessage()]);
return $server->send(...$client);
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::SERVER_WORKER_STOP);
}
}
http-server/Events/OnRequest.php
+3 -3
View File
@@ -39,11 +39,11 @@ class OnRequest extends Callback
if ($sRequest->is('favicon.ico')) {
return $sResponse->send($sRequest->isNotFound(), 200);
}
$sResponse->send(Snowflake::get()->router->dispatch(), 200);
$sResponse->send(Snowflake::app()->router->dispatch(), 200);
} catch (Error | \Throwable $exception) {
$this->sendErrorMessage($sResponse ?? null, $exception, $response);
} finally {
$events = Snowflake::get()->getEvent();
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::EVENT_AFTER_REQUEST)) {
return;
}
@@ -85,7 +85,7 @@ class OnRequest extends Callback
$code = $exception->getCode() ?? 500;
$trance = array_slice($exception->getTrace(), 0, 10);
Snowflake::get()->logger->write(print_r($trance, true), 'exception');
Snowflake::app()->logger->write(print_r($trance, true), 'exception');
return JSON::to($code, $errorInfo['message']);
}
http-server/Events/OnShutdown.php
+1 -1
View File
@@ -33,7 +33,7 @@ class OnShutdown extends Callback
public function onHandler(Server $server)
{
$this->system_mail('server shutdown~');
$event = Snowflake::get()->getEvent();
$event = Snowflake::app()->getEvent();
if (!$event->exists(Event::SERVER_SHUTDOWN)) {
return;
}
http-server/Events/OnStart.php
+1 -1
View File
@@ -21,7 +21,7 @@ class OnStart extends Callback
$time = storage('socket.sock');
Snowflake::writeFile($time, $server->master_pid);
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if ($event->exists(Event::SERVER_EVENT_START)) {
$event->trigger(Event::SERVER_EVENT_START, null, $server);
}
http-server/Events/OnTask.php
+1 -1
View File
@@ -108,7 +108,7 @@ class OnTask extends Callback
$finish['info'] = $this->format($exception);
$this->error($exception, 'Task');
} finally {
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger(Event::RELEASE_ALL);
Timer::clearAll();
}
http-server/Events/OnWorkerStart.php
+2 -2
View File
@@ -52,13 +52,13 @@ class OnWorkerStart extends Callback
{
try {
$this->debug(sprintf('Worker #%d is start.....', $worker_id));
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if (!$event->exists(Event::SERVER_WORKER_START)) {
return;
}
$event->trigger(Event::SERVER_WORKER_START);
} catch (\Throwable $exception) {
Snowflake::get()->getLogger()->write($exception->getMessage(), 'worker');
Snowflake::app()->getLogger()->write($exception->getMessage(), 'worker');
}
}
http-server/Http/Response.php
+2 -2
View File
@@ -153,7 +153,7 @@ class Response extends Application
$string .= 'Command Success!' . PHP_EOL;
echo $string;
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
$event->trigger('CONSOLE_END');
return 'ok';
@@ -198,7 +198,7 @@ class Response extends Application
*/
public static function create($response = null)
{
$ciResponse = Snowflake::get()->clone('response');
$ciResponse = Snowflake::app()->clone('response');
$ciResponse->response = $response;
$ciResponse->startTime = microtime(true);
$ciResponse->format = self::JSON;
http-server/Route/Handler.php
+1 -1
View File
@@ -24,7 +24,7 @@ class Handler extends Application
*/
public function __construct()
{
$this->router = Snowflake::get()->router;
$this->router = Snowflake::app()->router;
parent::__construct([]);
}
http-server/Route/Node.php
+2 -2
View File
@@ -150,7 +150,7 @@ class Node extends Application
}
/** @var Annotation $annotation */
$annotation = Snowflake::get()->annotation->get('http');
$annotation = Snowflake::app()->annotation->get('http');
if (!empty($annotations = $annotation->getAnnotation(Annotation::class))) {
$this->_interceptors = $annotation->read($reflect, $action, $annotations);
}
@@ -273,7 +273,7 @@ class Node extends Application
*/
public function limits(int $limit, int $duration = 60, bool $isBindConsumer = false)
{
$limits = Snowflake::get()->getLimits();
$limits = Snowflake::app()->getLimits();
$limits->addLimits($this->path, $limit, $duration, $isBindConsumer);
return $this;
}
http-server/Route/Router.php
+1 -1
View File
@@ -472,7 +472,7 @@ class Router extends Application implements RouterInterface
$prefix = APP_PATH . 'app/Http/';
/** @var Annotation $annotation */
$annotation = Snowflake::get()->annotation;
$annotation = Snowflake::app()->annotation;
$annotation->register('http', Annotation::class);
$annotation = $annotation->get('http');
http-server/Server.php
+7 -7
View File
@@ -68,7 +68,7 @@ class Server extends Application
*/
public function initCore(array $configs)
{
$annotation = Snowflake::get()->annotation;
$annotation = Snowflake::app()->annotation;
$annotation->register('tcp', Tcp::class);
$annotation->register('http', Annotation::class);
$annotation->register('websocket', AWebsocket::class);
@@ -132,7 +132,7 @@ class Server extends Application
return;
}
$application = Snowflake::get();
$application = Snowflake::app();
foreach ($processes as $name => $process) {
$class = Snowflake::createObject($process);
if (!method_exists($class, 'onHandler')) {
@@ -190,7 +190,7 @@ class Server extends Application
if (!is_array($config['events'])) {
return;
}
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
foreach ($config['events'] as $name => $_event) {
$event->on($name, $_event);
}
@@ -284,8 +284,8 @@ class Server extends Application
*/
public function onLoadHttpHandler()
{
$event = Snowflake::get()->getEvent();
$router = Snowflake::get()->getRouter();
$event = Snowflake::app()->getEvent();
$router = Snowflake::app()->getRouter();
if ($event->exists(Event::SERVER_WORKER_START, [$router, 'loadRouterSetting'])) {
return;
}
@@ -299,11 +299,11 @@ class Server extends Application
public function onLoadWebsocketHandler()
{
/** @var AWebsocket $websocket */
$websocket = Snowflake::get()->annotation->register('websocket', AWebsocket::class);
$websocket = Snowflake::app()->annotation->register('websocket', AWebsocket::class);
$websocket->namespace = 'App\\Websocket';
$websocket->path = APP_PATH . 'app/Websocket';
$event = Snowflake::get()->event;
$event = Snowflake::app()->event;
if ($event->exists(Event::SERVER_WORKER_START, [$websocket, 'registration_notes'])) {
return;
}
http-server/Service/Abstracts/Server.php
+2 -2
View File
@@ -26,7 +26,7 @@ trait Server
*/
public function __construct($host, $port = null, $mode = null, $sock_type = null)
{
$this->application = Snowflake::get();
$this->application = Snowflake::app();
parent::__construct($host, $port, $mode, $sock_type);
}
@@ -89,7 +89,7 @@ trait Server
if (!class_exists($classPrefix)) {
throw new Exception('class not found.');
}
$class = Snowflake::createObject($classPrefix, [Snowflake::get()]);
$class = Snowflake::createObject($classPrefix, [Snowflake::app()]);
return [$class, 'onHandler'];
}
http-server/config.php
+3 -3
View File
@@ -21,7 +21,7 @@ return [
],
'events' => [
Event::SERVER_WORKER_START => function () {
$router = Snowflake::get()->router;
$router = Snowflake::app()->router;
$router->loadRouterSetting();
},
]
@@ -81,7 +81,7 @@ return [
'events' => [
Event::SERVER_WORKER_START => function () {
$path = APP_PATH . 'app/Websocket';
$websocket = Snowflake::get()->annotation->websocket;
$websocket = Snowflake::app()->annotation->websocket;
$websocket->registration_notes($path, 'App\\Sockets\\');
},
Event::SERVER_HANDSHAKE => function (Request $request, Response $response) {
@@ -94,7 +94,7 @@ return [
if (is_null($json = json_decode($frame->data, true))) {
return $server->push($frame->fd, 'format error~');
}
$websocket = Snowflake::get()->annotation->websocket;
$websocket = Snowflake::app()->annotation->websocket;
if ($websocket->has($json['path'])) {
return $websocket->runWith($json['path'], [$frame->fd, $json]);
} else {