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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-08-11 01:04:57 +08:00
parent 63d8eaa4a5
commit 682246df28
219 changed files with 790 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/Abstracts/Server.php
+7 -7
View File
@@ -6,10 +6,10 @@ namespace Server\Abstracts;
use Closure;
use Exception;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Exception\ConfigException;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Event;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Swoole\Server\Port;
@@ -34,7 +34,7 @@ abstract class Server
*/
protected function setProcessName($prefix)
{
if (Snowflake::getPlatform()->isMac()) {
if (Kiri::getPlatform()->isMac()) {
return;
}
$name = Config::get('id', 'system-service');
@@ -51,7 +51,7 @@ abstract class Server
*/
public function __construct()
{
$this->_event = Snowflake::getApp('event');
$this->_event = Kiri::getApp('event');
}
@@ -63,7 +63,7 @@ abstract class Server
public function setEvents(string $name, ?array $events): void
{
if (is_array($events) && is_string($events[0])) {
$events[0] = Snowflake::getDi()->get($events[0]);
$events[0] = Kiri::getDi()->get($events[0]);
}
if (!is_callable($events)) {
return;
Server/Constrict/Request.php
+4 -4
View File
@@ -9,9 +9,9 @@ use HttpServer\Http\Request as HttpResponse;
use HttpServer\Http\Response;
use ReflectionException;
use Server\RequestInterface;
use Snowflake\Abstracts\BaseObject;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Abstracts\BaseObject;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
/**
@@ -72,6 +72,6 @@ class Request implements RequestInterface
Context::setContext(HttpResponse::class, $sRequest);
return Snowflake::getDi()->get(Request::class);
return Kiri::getDi()->get(Request::class);
}
}
Server/Constrict/ResponseEmitter.php
+1 -1
View File
@@ -6,7 +6,7 @@ use Exception;
use HttpServer\Http\Formatter\FileFormatter;
use ReflectionException;
use Server\ResponseInterface;
use Snowflake\Exception\NotFindClassException;
use Kiri\Exception\NotFindClassException;
/**
Server/HTTPServerListener.php
+6 -6
View File
@@ -12,11 +12,11 @@ use ReflectionException;
use Server\Constrict\Response as CResponse;
use Server\Constrict\ResponseEmitter;
use Server\Events\OnAfterRequest;
use Snowflake\Abstracts\Config;
use Snowflake\Events\EventDispatch;
use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
use Swoole\Error;
use Swoole\Http\Request;
use Swoole\Http\Response;
@@ -73,7 +73,7 @@ class HTTPServerListener extends Abstracts\Server
if (!in_array(ExceptionHandlerInterface::class, class_implements($exceptionHandler))) {
$exceptionHandler = ExceptionHandlerDispatcher::class;
}
$this->exceptionHandler = Snowflake::getDi()->get($exceptionHandler);
$this->exceptionHandler = Kiri::getDi()->get($exceptionHandler);
}
Server/ListenerHelper.php
+3 -3
View File
@@ -5,8 +5,8 @@ namespace Server;
use Closure;
use ReflectionException;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
/**
@@ -35,7 +35,7 @@ trait ListenerHelper
if ($callback instanceof Closure) {
return $callback;
}
$object = Snowflake::getDi()->getReflect($callback[0]);
$object = Kiri::getDi()->getReflect($callback[0]);
if ($object->getMethod($callback[1])->isStatic()) {
return $callback;
}
Server/Manager/OnPipeMessage.php
+1 -1
View File
@@ -9,7 +9,7 @@ use Server\Constant;
use Exception;
use Server\Events\OnAfterRequest;
use Server\SInterface\PipeMessage;
use Snowflake\Events\EventDispatch;
use Kiri\Events\EventDispatch;
/**
*
Server/Manager/OnServerDefault.php
+3 -3
View File
@@ -8,9 +8,9 @@ use Server\Abstracts\Server;
use Server\Constant;
use Server\Events\OnAfterRequest;
use Server\SInterface\PipeMessage;
use Snowflake\Event;
use Snowflake\Events\EventDispatch;
use Snowflake\Exception\ConfigException;
use Kiri\Event;
use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException;
/**
Server/Manager/OnServerManager.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace Server\Manager;
use Server\Abstracts\Server;
use Server\Constant;
use Snowflake\Exception\ConfigException;
use Kiri\Exception\ConfigException;
/**
Server/ServerManager.php
+14 -14
View File
@@ -9,10 +9,10 @@ use Server\Manager\OnPipeMessage;
use Server\SInterface\CustomProcess;
use Server\SInterface\TaskExecute;
use Server\Task\OnServerTask;
use Snowflake\Abstracts\Config;
use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Exception\ConfigException;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
use Swoole\Http\Server as HServer;
use Swoole\Process;
use Swoole\Server;
@@ -113,7 +113,7 @@ class ServerManager extends Abstracts\Server
*/
private function checkPort($port): bool
{
if (Snowflake::getPlatform()->isLinux()) {
if (Kiri::getPlatform()->isLinux()) {
exec('netstat -tunlp | grep ' . $port, $output);
} else {
exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
@@ -141,7 +141,7 @@ class ServerManager extends Abstracts\Server
/** @var Process $process */
$this->server->addProcess(new Process(function (Process $soloProcess) use ($customProcess) {
$system = sprintf('%s.process[%d]', Config::get('id', 'system-service'), $soloProcess->pid);
if (Snowflake::getPlatform()->isLinux()) {
if (Kiri::getPlatform()->isLinux()) {
$soloProcess->name($system . '.' . $customProcess->getProcessName($soloProcess) . ' start.');
}
@@ -241,10 +241,10 @@ class ServerManager extends Abstracts\Server
}
$this->ports[$port]->set($settings['settings'] ?? []);
$reflect = match ($type) {
Constant::SERVER_TYPE_TCP => Snowflake::getDi()->newObject(TCPServerListener::class),
Constant::SERVER_TYPE_UDP => Snowflake::getDi()->newObject(UDPServerListener::class),
Constant::SERVER_TYPE_HTTP => Snowflake::getDi()->newObject(HTTPServerListener::class),
Constant::SERVER_TYPE_WEBSOCKET => Snowflake::getDi()->newObject(WebSocketServerListener::class),
Constant::SERVER_TYPE_TCP => Kiri::getDi()->newObject(TCPServerListener::class),
Constant::SERVER_TYPE_UDP => Kiri::getDi()->newObject(UDPServerListener::class),
Constant::SERVER_TYPE_HTTP => Kiri::getDi()->newObject(HTTPServerListener::class),
Constant::SERVER_TYPE_WEBSOCKET => Kiri::getDi()->newObject(WebSocketServerListener::class),
default => throw new Exception(''),
};
$reflect->bindCallback($this->ports[$port], $settings['events'] ?? []);
@@ -372,7 +372,7 @@ class ServerManager extends Abstracts\Server
*/
private function getNewInstance(string $class): object
{
return Snowflake::getDi()->newObject($class);
return Kiri::getDi()->newObject($class);
}
@@ -389,7 +389,7 @@ class ServerManager extends Abstracts\Server
$this->server->setting['worker_num'] + 1 + $this->server->setting['task_worker_num']);
}
if (is_string($handler)) {
$implements = Snowflake::getDi()->getReflect($handler);
$implements = Kiri::getDi()->getReflect($handler);
if (!in_array(TaskExecute::class, $implements->getInterfaceNames())) {
throw new Exception('Task must instance ' . TaskExecute::class);
}
@@ -406,7 +406,7 @@ class ServerManager extends Abstracts\Server
private function addTaskListener(array $events = []): void
{
$task_use_object = $this->server->setting['task_object'] ?? $this->server->setting['task_use_object'] ?? false;
$reflect = Snowflake::getDi()->getReflect(OnServerTask::class)?->newInstance();
$reflect = Kiri::getDi()->getReflect(OnServerTask::class)?->newInstance();
if ($task_use_object || $this->server->setting['task_enable_coroutine']) {
$this->server->on('task', $events[Constant::TASK] ?? [$reflect, 'onCoroutineTask']);
} else {
@@ -433,7 +433,7 @@ class ServerManager extends Abstracts\Server
continue;
}
if (is_array($callback) && !is_object($callback[0])) {
$callback[0] = Snowflake::getDi()->get($callback[0]);
$callback[0] = Kiri::getDi()->get($callback[0]);
}
$this->server->on($event_type, $callback);
}
Server/TCPServerListener.php
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Server;
use Annotation\Inject;
use Exception;
use Server\Events\OnAfterRequest;
use Snowflake\Event;
use Snowflake\Events\EventDispatch;
use Kiri\Event;
use Kiri\Events\EventDispatch;
use Swoole\Server;
use Swoole\Server\Port;
Server/Task/OnServerTask.php
+3 -3
View File
@@ -6,8 +6,8 @@ namespace Server\Task;
use ReflectionException;
use Server\SInterface\TaskExecute;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
use Swoole\Server;
@@ -63,7 +63,7 @@ class OnServerTask
{
[$class, $params] = json_encode($data, true);
$reflect = Snowflake::getDi()->getReflect($class);
$reflect = Kiri::getDi()->getReflect($class);
if (!$reflect->isInstantiable()) {
return null;
Server/UDPServerListener.php
+3 -3
View File
@@ -6,9 +6,9 @@ use Annotation\Inject;
use Exception;
use ReflectionException;
use Server\Events\OnAfterRequest;
use Snowflake\Event;
use Snowflake\Events\EventDispatch;
use Snowflake\Exception\NotFindClassException;
use Kiri\Event;
use Kiri\Events\EventDispatch;
use Kiri\Exception\NotFindClassException;
use Swoole\Server;
use Swoole\Server\Port;
Server/WebSocketServerListener.php
+4 -4
View File
@@ -6,9 +6,9 @@ use Annotation\Inject;
use Exception;
use ReflectionException;
use Server\Events\OnAfterRequest;
use Snowflake\Events\EventDispatch;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
use Kiri\Events\EventDispatch;
use Kiri\Exception\NotFindClassException;
use Kiri\Kiri;
use Swoole\Http\Request;
use Swoole\Http\Response;
use Swoole\Server;
@@ -60,7 +60,7 @@ class WebSocketServerListener extends Abstracts\Server
$events = $settings['events'][Constant::REQUEST] ?? [];
if (!empty($events) && is_array($events)) {
$events[0] = Snowflake::getDi()->get($events[0]);
$events[0] = Kiri::getDi()->get($events[0]);
$server->on('request', $events);
}
return $server;
Server/Worker/OnServerWorker.php
+13 -13
View File
@@ -12,13 +12,13 @@ use Server\Events\OnWorkerError;
use Server\Events\OnWorkerExit;
use Server\Events\OnWorkerStart;
use Server\Events\OnWorkerStop;
use Snowflake\Abstracts\Config;
use Snowflake\Core\Help;
use Snowflake\Events\EventDispatch;
use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Runtime;
use Snowflake\Snowflake;
use Kiri\Abstracts\Config;
use Kiri\Core\Help;
use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException;
use Kiri\Exception\NotFindClassException;
use Kiri\Runtime;
use Kiri\Kiri;
use Swoole\Server;
use Swoole\Timer;
@@ -46,7 +46,7 @@ class OnServerWorker extends \Server\Abstracts\Server
public function onWorkerStart(Server $server, int $workerId)
{
$this->_setConfigCache($workerId);
$annotation = Snowflake::app()->getAnnotation();
$annotation = Kiri::app()->getAnnotation();
$annotation->read(APP_PATH . 'app', 'App',
$workerId < $server->setting['worker_num'] ? [] : [CONTROLLER_PATH]
);
@@ -71,7 +71,7 @@ class OnServerWorker extends \Server\Abstracts\Server
private function interpretDirectory(Annotation $annotation)
{
$fileLists = $annotation->runtime(APP_PATH . 'app');
$di = Snowflake::getDi();
$di = Kiri::getDi();
foreach ($fileLists as $class) {
$instance = $di->get($class);
foreach ($di->getTargetNote($class) as $value) {
@@ -100,15 +100,15 @@ class OnServerWorker extends \Server\Abstracts\Server
private function workerInitExecutor(Server $server, Annotation $annotation, int $workerId)
{
if ($workerId < $server->setting['worker_num']) {
$loader = Snowflake::app()->getRouter();
$loader = Kiri::app()->getRouter();
$loader->_loader();
putenv('environmental=' . Snowflake::WORKER);
putenv('environmental=' . Kiri::WORKER);
echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Worker[%d].%d start.", $server->worker_pid, $workerId) . PHP_EOL;
$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));
} else {
putenv('environmental=' . Snowflake::TASK);
putenv('environmental=' . Kiri::TASK);
echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Tasker[%d].%d start.", $server->worker_pid, $workerId) . PHP_EOL;
@@ -162,7 +162,7 @@ class OnServerWorker extends \Server\Abstracts\Server
$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
Snowflake::getApp('logger')->insert();
Kiri::getApp('logger')->insert();
}