Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b4ac5c4758 | |||
| d161477957 | |||
| a26b99dd1e | |||
| 86e4a92ab0 | |||
| ea425bb82d | |||
| ad0154d319 | |||
| edb70d2b9b | |||
| 9f3355cab4 | |||
| 4107b5bb07 | |||
| 048960c572 | |||
| b826e1f594 | |||
| e5b57cbcdb | |||
| 2870a64792 | |||
| 4d1587bc8d |
+3
-2
@@ -30,14 +30,15 @@
|
||||
"swiftmailer/swiftmailer": "v6.3.*",
|
||||
"psr/container": "^2.0",
|
||||
"psr/http-server-middleware": "1.0.1",
|
||||
"game-worker/kiri-event": "v1.0",
|
||||
"game-worker/kiri-event": "^v1.0",
|
||||
"ext-inotify": "*"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Kiri\\": "kiri-engine/",
|
||||
"Kiri\\Gateway\\": "kiri-gateway/",
|
||||
"Gii\\": "kiri-gii/",
|
||||
"Annotation\\": "kiri-note/"
|
||||
"Note\\": "kiri-note/"
|
||||
},
|
||||
"files": [
|
||||
"error.php",
|
||||
|
||||
+33
-22
@@ -3,7 +3,8 @@
|
||||
defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
|
||||
|
||||
|
||||
use Annotation\Annotation;
|
||||
use Note\Note;
|
||||
use Note\Route\Route;
|
||||
use Http\Handler\Router;
|
||||
use JetBrains\PhpStorm\Pure;
|
||||
use Kiri\Abstracts\Config;
|
||||
@@ -14,10 +15,8 @@ use Kiri\Error\Logger;
|
||||
use Kiri\Events\EventDispatch;
|
||||
use Kiri\Events\EventProvider;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Exception\NotFindClassException;
|
||||
use Kiri\Kiri;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Server\ServerManager;
|
||||
use Swoole\Process;
|
||||
use Swoole\WebSocket\Server;
|
||||
|
||||
@@ -177,16 +176,16 @@ if (!function_exists('workerName')) {
|
||||
}
|
||||
|
||||
|
||||
if (!function_exists('annotation')) {
|
||||
if (!function_exists('note')) {
|
||||
|
||||
|
||||
/**
|
||||
* @return Annotation
|
||||
* @return Note
|
||||
* @throws Exception
|
||||
*/
|
||||
function annotation(): Annotation
|
||||
function annotation(): Note
|
||||
{
|
||||
return Kiri::getAnnotation();
|
||||
return Kiri::getNote();
|
||||
}
|
||||
|
||||
|
||||
@@ -205,7 +204,7 @@ if (!function_exists('scan_directory')) {
|
||||
*/
|
||||
function scan_directory($dir, $namespace, array $exclude = [])
|
||||
{
|
||||
$annotation = Kiri::app()->getAnnotation();
|
||||
$annotation = Kiri::app()->getNote();
|
||||
$annotation->read($dir, $namespace, $exclude);
|
||||
|
||||
injectRuntime($dir, $exclude);
|
||||
@@ -225,8 +224,10 @@ if (!function_exists('injectRuntime')) {
|
||||
*/
|
||||
function injectRuntime(string $path, array $exclude = [])
|
||||
{
|
||||
$fileLists = Kiri::getAnnotation()->runtime($path, $exclude);
|
||||
$fileLists = Kiri::getNote()->runtime($path, $exclude);
|
||||
$di = Kiri::getDi();
|
||||
|
||||
$router = [];
|
||||
foreach ($fileLists as $class) {
|
||||
foreach (NoteManager::getTargetNote($class) as $value) {
|
||||
$value->execute($class);
|
||||
@@ -237,10 +238,20 @@ if (!function_exists('injectRuntime')) {
|
||||
continue;
|
||||
}
|
||||
foreach ($attribute as $item) {
|
||||
$item->execute($class, $method);
|
||||
if ($item instanceof Route) {
|
||||
$router[] = [$item, $class, $method];
|
||||
} else {
|
||||
$item->execute($class, $method);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!empty($router)) {
|
||||
foreach ($router as $class) {
|
||||
[$item, $class, $method] = $class;
|
||||
$item->execute($class, $method);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -445,7 +456,7 @@ if (!function_exists('fire')) {
|
||||
|
||||
/**
|
||||
* @param object $event
|
||||
*/
|
||||
*/
|
||||
function fire(object $event)
|
||||
{
|
||||
di(EventDispatch::class)->dispatch($event);
|
||||
@@ -540,7 +551,7 @@ if (!function_exists('trim_blank')) {
|
||||
if (!function_exists('get_file_extension')) {
|
||||
|
||||
function get_file_extension($filename): bool|int|string
|
||||
{
|
||||
{
|
||||
$mime_types = [
|
||||
'txt' => 'text/plain',
|
||||
'htm' => 'text/html',
|
||||
@@ -877,11 +888,11 @@ if (!function_exists('env')) {
|
||||
if (!function_exists('di')) {
|
||||
|
||||
|
||||
/**
|
||||
* @param string $className
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
/**
|
||||
* @param string $className
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
function di(string $className): mixed
|
||||
{
|
||||
return Kiri::getDi()->get($className);
|
||||
@@ -892,11 +903,11 @@ if (!function_exists('di')) {
|
||||
if (!function_exists('duplicate')) {
|
||||
|
||||
|
||||
/**
|
||||
* @param string $className
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
/**
|
||||
* @param string $className
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
function duplicate(string $className): mixed
|
||||
{
|
||||
$class = di($className);
|
||||
|
||||
@@ -10,7 +10,7 @@ declare(strict_types=1);
|
||||
namespace Kiri\Abstracts;
|
||||
|
||||
|
||||
use Annotation\Annotation as SAnnotation;
|
||||
use Note\Note as SNote;
|
||||
use Database\Connection;
|
||||
use Exception;
|
||||
use Http\Handler\Router;
|
||||
@@ -392,12 +392,12 @@ abstract class BaseApplication extends Component
|
||||
|
||||
|
||||
/**
|
||||
* @return SAnnotation
|
||||
* @return SNote
|
||||
* @throws
|
||||
*/
|
||||
public function getAnnotation(): SAnnotation
|
||||
public function getNote(): SNote
|
||||
{
|
||||
return $this->get('annotation');
|
||||
return $this->get('note');
|
||||
}
|
||||
|
||||
|
||||
@@ -450,7 +450,7 @@ abstract class BaseApplication extends Component
|
||||
'error' => ['class' => ErrorHandler::class],
|
||||
'config' => ['class' => Config::class],
|
||||
'logger' => ['class' => Logger::class],
|
||||
'annotation' => ['class' => SAnnotation::class],
|
||||
'note' => ['class' => SNote::class],
|
||||
'databases' => ['class' => Connection::class],
|
||||
'jwt' => ['class' => Jwt::class],
|
||||
'async' => ['class' => Async::class],
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace Kiri\Abstracts;
|
||||
|
||||
use Annotation\Inject;
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Kiri\Events\EventProvider;
|
||||
use Kiri\Exception\ConfigException;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
namespace Kiri\Abstracts;
|
||||
|
||||
|
||||
use Annotation\Annotation as SAnnotation;
|
||||
use Note\Note as SNote;
|
||||
use Database\Connection;
|
||||
use Database\DatabasesProviders;
|
||||
use Http\Handler\Client\Client;
|
||||
@@ -25,7 +25,7 @@ use Kiri\Jwt\JWTAuth;
|
||||
* @property Async $async
|
||||
* @property Logger $logger
|
||||
* @property JWTAuth $jwt
|
||||
* @property SAnnotation $annotation
|
||||
* @property SNote $annotation
|
||||
* @property BaseGoto $goto
|
||||
* @property Client $client
|
||||
* @property Connection $databases
|
||||
|
||||
@@ -225,7 +225,6 @@ class Application extends BaseApplication
|
||||
|
||||
|
||||
/**
|
||||
* @throws NotFindClassException
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
|
||||
@@ -9,7 +9,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Cache;
|
||||
|
||||
use Annotation\Inject;
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Server\Events\OnWorkerExit;
|
||||
use Kiri\Abstracts\Component;
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Core;
|
||||
|
||||
use JetBrains\PhpStorm\Pure;
|
||||
|
||||
class HashMap implements \ArrayAccess
|
||||
{
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private array $lists = [];
|
||||
|
||||
|
||||
/**
|
||||
* @param string $key
|
||||
* @param $value
|
||||
*/
|
||||
public function put(string $key, $value)
|
||||
{
|
||||
$this->lists[$key] = $value;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param string $key
|
||||
* @return mixed
|
||||
*/
|
||||
#[Pure] public function get(string $key): mixed
|
||||
{
|
||||
if (!$this->has($key)) {
|
||||
return null;
|
||||
}
|
||||
return $this->lists[$key];
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param string $key
|
||||
*/
|
||||
public function del(string $key)
|
||||
{
|
||||
if (!$this->has($key)) {
|
||||
return;
|
||||
}
|
||||
unset($this->lists[$key]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param string $key
|
||||
* @return bool
|
||||
*/
|
||||
public function has(string $key): bool
|
||||
{
|
||||
return array_key_exists($key, $this->lists);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param mixed $offset
|
||||
* @return bool
|
||||
*/
|
||||
public function offsetExists($offset): bool
|
||||
{
|
||||
return isset($this->lists[$offset]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param mixed $offset
|
||||
* @return mixed
|
||||
*/
|
||||
#[Pure] public function offsetGet($offset): mixed
|
||||
{
|
||||
return $this->get($offset);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param mixed $offset
|
||||
* @param mixed $value
|
||||
*/
|
||||
public function offsetSet($offset, $value)
|
||||
{
|
||||
$this->put($offset, $value);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param mixed $offset
|
||||
*/
|
||||
public function offsetUnset($offset)
|
||||
{
|
||||
unset($this->lists[$offset]);
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Di;
|
||||
|
||||
use Annotation\Inject;
|
||||
use Note\Inject;
|
||||
use Closure;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\BaseObject;
|
||||
|
||||
@@ -236,7 +236,7 @@ class NoteManager
|
||||
* @param string $method
|
||||
* @return mixed
|
||||
*/
|
||||
public static function getPropertyByAnnotation(string $attribute, string $class, string $method): mixed
|
||||
public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
|
||||
{
|
||||
$class = self::getAttributeTrees($attribute, $class);
|
||||
if (empty($class) || !isset($class['property'])) {
|
||||
|
||||
@@ -9,7 +9,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Error;
|
||||
|
||||
use Annotation\Inject;
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Component;
|
||||
use Kiri\Core\Json;
|
||||
|
||||
@@ -2,14 +2,15 @@
|
||||
|
||||
namespace Kiri\FileListen;
|
||||
|
||||
use Annotation\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Error\Logger;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Kiri;
|
||||
use Note\Inject;
|
||||
use Swoole\Coroutine;
|
||||
use Swoole\Process;
|
||||
use Swoole\Timer;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
@@ -81,7 +82,8 @@ class HotReload extends Command
|
||||
}
|
||||
$this->trigger_reload();
|
||||
|
||||
var_dump(getmypid());
|
||||
Timer::tick(1000, fn() => $this->healthCheck());
|
||||
|
||||
Process::signal(SIGTERM, [$this, 'onSignal']);
|
||||
Process::signal(SIGKILL, [$this, 'onSignal']);
|
||||
|
||||
@@ -90,6 +92,22 @@ class HotReload extends Command
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function healthCheck()
|
||||
{
|
||||
$pid = (int)file_get_contents(storage('.swoole.pid'));
|
||||
if (empty($pid)) {
|
||||
$this->logger->warning('service is shutdown you need reload.');
|
||||
$this->trigger_reload();
|
||||
} else if (!Process::kill($pid, 0)) {
|
||||
$this->logger->warning('service is shutdown you need reload.');
|
||||
$this->trigger_reload();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param $data
|
||||
* @throws Exception
|
||||
@@ -138,9 +156,11 @@ class HotReload extends Command
|
||||
public function trigger_reload()
|
||||
{
|
||||
$this->logger->warning('change reload');
|
||||
$pid = $this->process?->pid;
|
||||
$pid = $this->process?->pid;
|
||||
$process = new Process(function (Process $process) {
|
||||
$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
|
||||
|
||||
$this->logger->warning('service stop.');
|
||||
});
|
||||
$process->start();
|
||||
if ($pid && Process::kill($pid, 0)) {
|
||||
|
||||
@@ -5,7 +5,7 @@ declare(strict_types=1);
|
||||
namespace Kiri;
|
||||
|
||||
|
||||
use Annotation\Annotation;
|
||||
use Note\Note;
|
||||
use Database\Collection;
|
||||
use Database\ModelInterface;
|
||||
use Exception;
|
||||
@@ -156,12 +156,12 @@ class Kiri
|
||||
|
||||
|
||||
/**
|
||||
* @return Annotation
|
||||
* @return Note
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getAnnotation(): Annotation
|
||||
public static function getNote(): Note
|
||||
{
|
||||
return static::app()->getAnnotation();
|
||||
return static::app()->getNote();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ class Runtime extends Command
|
||||
public function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
// TODO: Implement onHandler() method.
|
||||
$annotation = Kiri::app()->getAnnotation();
|
||||
$annotation = Kiri::app()->getNote();
|
||||
|
||||
$runtime = storage(static::CACHE_NAME);
|
||||
$config = storage(static::CONFIG_NAME);
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Gateway;
|
||||
|
||||
class Collector
|
||||
{
|
||||
|
||||
|
||||
public function get()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Gateway;
|
||||
|
||||
use Swoole\Http\Request;
|
||||
use Swoole\Http\Response;
|
||||
|
||||
class GatewayServer
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Response $response
|
||||
*/
|
||||
public function onRequest(Request $request, Response $response)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Gateway;
|
||||
|
||||
class HashMap
|
||||
{
|
||||
|
||||
|
||||
const HTTP = 1;
|
||||
const TCP = 2;
|
||||
const UDP = 2;
|
||||
|
||||
|
||||
public string $domain;
|
||||
|
||||
|
||||
public string $path;
|
||||
|
||||
|
||||
public string $scheme;
|
||||
|
||||
|
||||
public string $method;
|
||||
|
||||
|
||||
public string $proxy_host;
|
||||
|
||||
|
||||
public string $proxy_port;
|
||||
|
||||
|
||||
public int $type = self::HTTP;
|
||||
|
||||
|
||||
}
|
||||
@@ -68,9 +68,9 @@ namespace {$namespace};
|
||||
} else {
|
||||
$import = "use Kiri;
|
||||
use Exception;
|
||||
use Annotation\Target;
|
||||
use Annotation\Route\Middleware;
|
||||
use Annotation\Route\Route;
|
||||
use Note\Target;
|
||||
use Note\Route\Middleware;
|
||||
use Note\Route\Route;
|
||||
use Kiri\Core\Str;
|
||||
use Kiri\Core\Json;
|
||||
use Http\Context\Request;
|
||||
|
||||
@@ -51,8 +51,8 @@ interface ' . ucfirst($name) . 'RpcInterface
|
||||
namespace Rpc\Producers;
|
||||
|
||||
|
||||
use Annotation\Target;
|
||||
use Annotation\Mapping;
|
||||
use Note\Target;
|
||||
use Note\Mapping;
|
||||
use Rpc\\' . ucfirst($name) . 'RpcInterface;
|
||||
use Exception;
|
||||
use Kiri\Rpc\JsonRpcConsumers;
|
||||
@@ -86,8 +86,8 @@ class ' . ucfirst($name) . 'RpcService extends JsonRpcConsumers implements ' . u
|
||||
namespace Rpc\Consumers;
|
||||
|
||||
|
||||
use Annotation\Target;
|
||||
use Kiri\Rpc\Annotation\JsonRpc;
|
||||
use Note\Target;
|
||||
use Kiri\Rpc\Note\JsonRpc;
|
||||
use Http\Handler\Controller;
|
||||
use Rpc\\' . ucfirst($name) . 'RpcInterface;
|
||||
|
||||
|
||||
@@ -69,11 +69,11 @@ namespace ' . $namespace . ';
|
||||
$html .= $imports . PHP_EOL;
|
||||
}
|
||||
|
||||
if (!str_contains($imports, 'Database\Annotation\Set')) {
|
||||
$html .= 'use Database\Annotation\Set;' . PHP_EOL;
|
||||
if (!str_contains($imports, 'Database\Note\Set')) {
|
||||
$html .= 'use Database\Note\Set;' . PHP_EOL;
|
||||
}
|
||||
if (!str_contains($imports, 'Database\Annotation\Get')) {
|
||||
$html .= 'use Database\Annotation\Get;' . PHP_EOL;
|
||||
if (!str_contains($imports, 'Database\Note\Get')) {
|
||||
$html .= 'use Database\Note\Get;' . PHP_EOL;
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
logger()->addError($e, 'throwable');
|
||||
@@ -87,11 +87,11 @@ namespace ' . $namespace . ';
|
||||
|
||||
|
||||
use Exception;
|
||||
use Annotation\Target;
|
||||
use Note\Target;
|
||||
use Kiri\Core\Json;
|
||||
use Database\Connection;
|
||||
use Database\Annotation\Get;
|
||||
use Database\Annotation\Set;
|
||||
use Database\Note\Get;
|
||||
use Database\Note\Set;
|
||||
use Database\Relation;
|
||||
use Database\Model;
|
||||
' . PHP_EOL;
|
||||
|
||||
@@ -36,9 +36,9 @@ class GiiRpcClient extends GiiBase
|
||||
|
||||
namespace App\Client\Rpc;
|
||||
|
||||
use Annotation\Rpc\Consumer;
|
||||
use Annotation\Rpc\RpcClient;
|
||||
use Annotation\Target;
|
||||
use Note\Rpc\Consumer;
|
||||
use Note\Rpc\RpcClient;
|
||||
use Note\Target;
|
||||
use Exception;
|
||||
use Rpc\Client;
|
||||
use Kiri\Core\Json;
|
||||
|
||||
@@ -33,8 +33,8 @@ class GiiRpcService extends GiiBase
|
||||
|
||||
namespace App\Rpc;
|
||||
|
||||
use Annotation\Route\RpcProducer;
|
||||
use Annotation\Target;
|
||||
use Note\Route\RpcProducer;
|
||||
use Note\Target;
|
||||
use Exception;
|
||||
use Http\Controller;
|
||||
use Kiri\Core\Json;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
use Exception;
|
||||
@@ -10,7 +10,7 @@ defined('ASPECT_ERROR') or define('ASPECT_ERROR', 'Aspect annotation must implem
|
||||
|
||||
/**
|
||||
* Class Aspect
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_METHOD)] class Aspect extends Attribute
|
||||
{
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
/**
|
||||
* Class Attribute
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
abstract class Attribute implements IAnnotation
|
||||
abstract class Attribute implements INote
|
||||
{
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
use Exception;
|
||||
@@ -11,7 +11,7 @@ use Kiri\Kiri;
|
||||
|
||||
/**
|
||||
* Class Event
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_METHOD)] class Event extends Attribute
|
||||
{
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
|
||||
interface IAnnotation
|
||||
interface INote
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
use Exception;
|
||||
@@ -12,7 +12,7 @@ use ReflectionProperty;
|
||||
|
||||
/**
|
||||
* Class Inject
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_PROPERTY)] class Inject extends Attribute
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
use DirectoryIterator;
|
||||
@@ -15,7 +15,7 @@ use Throwable;
|
||||
|
||||
/**
|
||||
* Class Loader
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
class Loader extends BaseObject
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
use Kiri\Kiri;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
use DirectoryIterator;
|
||||
@@ -10,10 +10,10 @@ use ReflectionException;
|
||||
use Kiri\Abstracts\Component;
|
||||
|
||||
/**
|
||||
* Class Annotation
|
||||
* @package Annotation
|
||||
* Class Note
|
||||
* @package Note
|
||||
*/
|
||||
class Annotation extends Component
|
||||
class Note extends Component
|
||||
{
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation\Route;
|
||||
namespace Note\Route;
|
||||
|
||||
|
||||
use Annotation\Attribute;
|
||||
use Note\Attribute;
|
||||
|
||||
/**
|
||||
* Class Document
|
||||
* @package Annotation\Route
|
||||
* @package Note\Route
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_METHOD)] class Document extends Attribute
|
||||
{
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation\Route;
|
||||
namespace Note\Route;
|
||||
|
||||
|
||||
use Annotation\Attribute;
|
||||
use Note\Attribute;
|
||||
use Http\Handler\Abstracts\MiddlewareManager;
|
||||
use Psr\Http\Server\MiddlewareInterface;
|
||||
|
||||
/**
|
||||
* Class Middleware
|
||||
* @package Annotation\Route
|
||||
* @package Note\Route
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Middleware extends Attribute
|
||||
{
|
||||
@@ -41,6 +41,7 @@ use Psr\Http\Server\MiddlewareInterface;
|
||||
* @param mixed $class
|
||||
* @param mixed|null $method
|
||||
* @return $this
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function execute(mixed $class, mixed $method = null): mixed
|
||||
{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation\Route;
|
||||
namespace Note\Route;
|
||||
|
||||
|
||||
use Annotation\Attribute;
|
||||
use Note\Attribute;
|
||||
use Http\Handler\Router;
|
||||
use Kiri\Kiri;
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation\Route;
|
||||
namespace Note\Route;
|
||||
|
||||
|
||||
use Annotation\Attribute;
|
||||
use Note\Attribute;
|
||||
|
||||
/**
|
||||
* Class Socket
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_METHOD)] class Socket extends Attribute
|
||||
{
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
/**
|
||||
* Class Target
|
||||
* @package Annotation
|
||||
* @package Note
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_CLASS)] class Target extends Attribute
|
||||
{
|
||||
|
||||
@@ -1,24 +1,25 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Annotation;
|
||||
namespace Note;
|
||||
|
||||
|
||||
use Exception;
|
||||
use Kiri\Kiri;
|
||||
use Server\Tasker\AsyncTaskExecute;
|
||||
|
||||
|
||||
/**
|
||||
* Class Asynchronous
|
||||
* @package Annotation
|
||||
* Class Task
|
||||
* @package Note
|
||||
* Task任务
|
||||
*/
|
||||
#[\Attribute(\Attribute::TARGET_CLASS)] class Asynchronous extends Attribute
|
||||
#[\Attribute(\Attribute::TARGET_CLASS)] class Task extends Attribute
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* Asynchronous constructor.
|
||||
* Task constructor.
|
||||
* @param string $name
|
||||
*/
|
||||
public function __construct(public string $name)
|
||||
@@ -35,8 +36,8 @@ use Kiri\Kiri;
|
||||
*/
|
||||
public function execute(mixed $class, mixed $method = null): bool
|
||||
{
|
||||
$async = Kiri::app()->getAsync();
|
||||
$async->addAsync($this->name, $class);
|
||||
$task = Kiri::getDi()->get(AsyncTaskExecute::class);
|
||||
$task->reg($this->name, $class);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Abstracts;
|
||||
|
||||
|
||||
use JetBrains\PhpStorm\Pure;
|
||||
use Kiri\Server\Contract\OnProcessInterface;
|
||||
use Swoole\Coroutine;
|
||||
use Swoole\Process;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
abstract class BaseProcess implements OnProcessInterface
|
||||
{
|
||||
|
||||
protected bool $isStop = false;
|
||||
|
||||
|
||||
protected mixed $redirect_stdin_and_stdout = null;
|
||||
|
||||
|
||||
protected int $pipe_type = SOCK_DGRAM;
|
||||
|
||||
|
||||
protected bool $enable_coroutine = true;
|
||||
|
||||
|
||||
public string $name = 'swoole process.';
|
||||
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getName(): string
|
||||
{
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function isStop(): bool
|
||||
{
|
||||
return $this->isStop;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function getRedirectStdinAndStdout(): mixed
|
||||
{
|
||||
return $this->redirect_stdin_and_stdout;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
*/
|
||||
public function getPipeType(): int
|
||||
{
|
||||
return $this->pipe_type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function isEnableCoroutine(): bool
|
||||
{
|
||||
return $this->enable_coroutine;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function onProcessStop(): void
|
||||
{
|
||||
$this->isStop = true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function checkProcessIsStop(): bool
|
||||
{
|
||||
return $this->isStop === true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param Process $process
|
||||
*/
|
||||
public function signListen(Process $process): void
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
protected function exit(): void
|
||||
{
|
||||
putenv('process.status=idle');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
#[Pure] public function isWorking(): bool
|
||||
{
|
||||
return env('process.status', 'working') == 'working';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private function waiteExit(Process $process): void
|
||||
{
|
||||
$this->onProcessStop();
|
||||
while ($this->isWorking()) {
|
||||
$this->sleep();
|
||||
}
|
||||
$process->exit(0);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private function sleep(): void
|
||||
{
|
||||
if ($this->enable_coroutine) {
|
||||
Coroutine::sleep(0.1);
|
||||
} else {
|
||||
usleep(100);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Kiri\Server;
|
||||
|
||||
|
||||
/**
|
||||
* Class Constant
|
||||
* @package Server
|
||||
*/
|
||||
class Constant
|
||||
{
|
||||
|
||||
const START = 'Start';
|
||||
const SHUTDOWN = 'Shutdown';
|
||||
const BEFORE_SHUTDOWN = 'beforeShutdown';
|
||||
const WORKER_START = 'WorkerStart';
|
||||
const WORKER_STOP = 'WorkerStop';
|
||||
const WORKER_EXIT = 'WorkerExit';
|
||||
const CONNECT = 'Connect';
|
||||
const HANDSHAKE = 'handshake';
|
||||
const OPEN = 'open';
|
||||
const DISCONNECT = 'disconnect';
|
||||
const MESSAGE = 'message';
|
||||
const RECEIVE = 'Receive';
|
||||
const PACKET = 'Packet';
|
||||
const REQUEST = 'request';
|
||||
const CLOSE = 'Close';
|
||||
const TASK = 'Task';
|
||||
const FINISH = 'Finish';
|
||||
const PIPE_MESSAGE = 'PipeMessage';
|
||||
const WORKER_ERROR = 'WorkerError';
|
||||
const MANAGER_START = 'ManagerStart';
|
||||
const MANAGER_STOP = 'ManagerStop';
|
||||
const BEFORE_RELOAD = 'BeforeReload';
|
||||
const AFTER_RELOAD = 'AfterReload';
|
||||
|
||||
|
||||
const SERVER_TYPE_HTTP = 'http';
|
||||
const SERVER_TYPE_WEBSOCKET = 'ws';
|
||||
const SERVER_TYPE_TCP = 'tcp';
|
||||
const SERVER_TYPE_UDP = 'udp';
|
||||
const SERVER_TYPE_BASE = 'base';
|
||||
|
||||
|
||||
const STATUS_404_MESSAGE = '<h2>HTTP 404 Not Found</h2><hr><i>Powered by Swoole</i>';
|
||||
const STATUS_405_MESSAGE = '<h2>HTTP 405 Method allow</h2><hr><i>Powered by Swoole</i>';
|
||||
|
||||
|
||||
const OPTION_REACTOR_NUM = 'reactor_num';
|
||||
const OPTION_WORKER_NUM = 'worker_num';
|
||||
const OPTION_MAX_REQUEST = 'max_request';
|
||||
const OPTION_MAX_CONN = 'max_connection';
|
||||
const OPTION_TASK_WORKER_NUM = 'task_worker_num';
|
||||
const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
|
||||
const OPTION_TASK_MAX_REQUEST = 'task_max_request';
|
||||
const OPTION_TASK_TMPDIR = 'task_tmpdir';
|
||||
const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
|
||||
const OPTION_TASK_USE_OBJECT = 'task_use_object';
|
||||
const OPTION_DISPATCH_MODE = 'dispatch_mode';
|
||||
const OPTION_DISPATCH_FUNC = 'dispatch_func';
|
||||
const OPTION_MESSAGE_QUEUE_KEY = 'message_queue_key';
|
||||
const OPTION_DAEMONIZE = 'daemonize';
|
||||
const OPTION_BACKLOG = 'backlog';
|
||||
const OPTION_LOG_FILE = 'log_file';
|
||||
const OPTION_LOG_LEVEL = 'log_level';
|
||||
const OPTION_LOG_DATE_WITH_MICROSECONDS = 'log_date_with_microseconds';
|
||||
const OPTION_LOG_ROTATION = 'log_rotation';
|
||||
const OPTION_LOG_DATE_FORMAT = 'log_date_format';
|
||||
const OPTION_OPEN_TCP_KEEPALIVE = 'open_tcp_keepalive';
|
||||
const OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';
|
||||
const OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';
|
||||
const OPTION_OPEN_EOF_CHECK = 'open_eof_check';
|
||||
const OPTION_OPEN_EOF_SPLIT = 'open_eof_split';
|
||||
const OPTION_PACKAGE_EOF = 'package_eof';
|
||||
const OPTION_OPEN_LENGTH_CHECK = 'open_length_check';
|
||||
const OPTION_PACKAGE_LENGTH_TYPE = 'package_length_type';
|
||||
const OPTION_PACKAGE_LENGTH_FUNC = 'package_length_func';
|
||||
const OPTION_PACKAGE_MAX_LENGTH = 'package_max_length';
|
||||
const OPTION_OPEN_HTTP_PROTOCOL = 'open_http_protocol';
|
||||
const OPTION_OPEN_MQTT_PROTOCOL = 'open_mqtt_protocol';
|
||||
const OPTION_OPEN_REDIS_PROTOCOL = 'open_redis_protocol';
|
||||
const OPTION_OPEN_WEBSOCKET_PROTOCOL = 'open_websocket_protocol';
|
||||
const OPTION_OPEN_WEBSOCKET_CLOSE_FRAME = 'open_websocket_close_frame';
|
||||
const OPTION_OPEN_TCP_NODELAY = 'open_tcp_nodelay';
|
||||
const OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';
|
||||
const OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';
|
||||
const OPTION_TCP_DEFER_ACCEPT = 'tcp_defer_accept';
|
||||
const OPTION_SSL_CERT_FILE = 'ssl_cert_file';
|
||||
const OPTION_SSL_KEY_FILE = 'ssl_key_file';
|
||||
const OPTION_SSL_METHOD = 'ssl_method';
|
||||
const OPTION_SSL_PROTOCOLS = 'ssl_protocols';
|
||||
const OPTION_SSL_SNI_CERTS = 'ssl_sni_certs';
|
||||
const OPTION_SSL_CIPHERS = 'ssl_ciphers';
|
||||
const OPTION_SSL_VERIFY_PEER = 'ssl_verify_peer';
|
||||
const OPTION_SSL_ALLOW_SELF_SIGNED = 'ssl_allow_self_signed';
|
||||
const OPTION_SSL_CLIENT_CERT_FILE = 'ssl_client_cert_file';
|
||||
const OPTION_SSL_COMPRESS = 'ssl_compress';
|
||||
const OPTION_SSL_VERIFY_DEPTH = 'ssl_verify_depth';
|
||||
const OPTION_SSL_PREFER_SERVER_CIPHERS = 'ssl_prefer_server_ciphers';
|
||||
const OPTION_SSL_DHPARAM = 'ssl_dhparam';
|
||||
const OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';
|
||||
const OPTION_USER = 'user';
|
||||
const OPTION_GROUP = 'group';
|
||||
const OPTION_CHROOT = 'chroot';
|
||||
const OPTION_PID_FILE = 'pid_file';
|
||||
const OPTION_BUFFER_INPUT_SIZE = 'buffer_input_size';
|
||||
const OPTION_BUFFER_OUTPUT_SIZE = 'buffer_output_size';
|
||||
const OPTION_SOCKET_BUFFER_SIZE = 'socket_buffer_size';
|
||||
const OPTION_ENABLE_UNSAFE_EVENT = 'enable_unsafe_event';
|
||||
const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
|
||||
const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
|
||||
const OPTION_ENABLE_DELAY_RECEIVE = 'enable_delay_receive';
|
||||
const OPTION_RELOAD_ASYNC = 'reload_async';
|
||||
const OPTION_MAX_WAIT_TIME = 'max_wait_time';
|
||||
const OPTION_TCP_FASTOPEN = 'tcp_fastopen';
|
||||
const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
|
||||
const OPTION_ENABLE_COROUTINE = 'enable_coroutine';
|
||||
const OPTION_MAX_COROUTINE = 'max_coroutine';
|
||||
const OPTION_SEND_YIELD = 'send_yield';
|
||||
const OPTION_SEND_TIMEOUT = 'send_timeout';
|
||||
const OPTION_HOOK_FLAGS = 'hook_flags';
|
||||
const OPTION_BUFFER_HIGH_WATERMARK = 'buffer_high_watermark';
|
||||
const OPTION_BUFFER_LOW_WATERMARK = 'buffer_low_watermark';
|
||||
const OPTION_TCP_USER_TIMEOUT = 'tcp_user_timeout';
|
||||
const OPTION_STATS_FILE = 'stats_file';
|
||||
const OPTION_EVENT_OBJECT = 'event_object';
|
||||
const OPTION_START_SESSION_ID = 'start_session_id';
|
||||
const OPTION_SINGLE_THREAD = 'single_thread';
|
||||
const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace Server\Contract;
|
||||
|
||||
interface OnBeforeShutdown
|
||||
{
|
||||
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
interface OnCloseInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param int $fd
|
||||
*/
|
||||
public function onClose(Server $server, int $fd): void;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
interface OnConnectInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param int $fd
|
||||
* @return void
|
||||
*/
|
||||
public function onConnect(Server $server, int $fd): void;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
interface OnDisconnectInterface
|
||||
{
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param int $fd
|
||||
*/
|
||||
public function onDisconnect(Server $server, int $fd): void;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Http\Response;
|
||||
|
||||
interface OnDownloadInterface
|
||||
{
|
||||
|
||||
public function dispatch(Response $response);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Http\Request;
|
||||
use Swoole\Http\Response;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
interface OnHandshakeInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Response $response
|
||||
*/
|
||||
public function onHandshake(Request $request, Response $response): void;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
use Swoole\WebSocket\Frame;
|
||||
|
||||
interface OnMessageInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param Frame $frame
|
||||
* @return void
|
||||
*/
|
||||
public function onMessage(Server $server, Frame $frame): void;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
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;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Server\Abstracts\Server;
|
||||
|
||||
interface OnPacketInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param string $data
|
||||
* @param array $clientInfo
|
||||
* @return mixed
|
||||
*/
|
||||
public function onPacket(Server $server, string $data, array $clientInfo): void;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
|
||||
/**
|
||||
* Interface OnPipeMessageInterface
|
||||
* @package Server\Contract
|
||||
*/
|
||||
interface OnPipeMessageInterface
|
||||
{
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function process(): void;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
|
||||
use Swoole\Process;
|
||||
|
||||
|
||||
/**
|
||||
* Interface BaseProcess
|
||||
* @package Contract
|
||||
*/
|
||||
interface OnProcessInterface
|
||||
{
|
||||
|
||||
/**
|
||||
* @param Process $process
|
||||
*/
|
||||
public function onHandler(Process $process): void;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function onProcessStop(): void;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
interface OnReceiveInterface
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param int $fd
|
||||
* @param int $reactor_id
|
||||
* @param string $data
|
||||
* @return void
|
||||
*/
|
||||
public function onReceive(Server $server, int $fd, int $reactor_id, string $data): void;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace Kiri\Server\Contract;
|
||||
|
||||
|
||||
use Swoole\Server;
|
||||
|
||||
interface OnTaskInterface
|
||||
{
|
||||
|
||||
public function execute();
|
||||
|
||||
|
||||
public function finish(Server $server, int $task_id);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,207 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server;
|
||||
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Error\Logger;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Kiri;
|
||||
use Kiri\Server\Abstracts\BaseProcess;
|
||||
use ReflectionException;
|
||||
use Swoole\Coroutine;
|
||||
use Swoole\Coroutine\Http\Server as HServer;
|
||||
use Swoole\Coroutine\Server;
|
||||
use Swoole\Coroutine\Server\Connection;
|
||||
use Swoole\Http\Request;
|
||||
use Swoole\Http\Response;
|
||||
use Swoole\Process;
|
||||
use function Swoole\Coroutine\run;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
class CoroutineServer implements SwooleServerInterface
|
||||
{
|
||||
|
||||
use TraitServer;
|
||||
|
||||
|
||||
/**
|
||||
* @var HServer[]|Server[]
|
||||
*/
|
||||
private array $servers = [];
|
||||
|
||||
|
||||
#[Inject(Logger::class)]
|
||||
public Logger $logger;
|
||||
|
||||
|
||||
const SERVER_CLASS = [
|
||||
Constant::SERVER_TYPE_BASE => Server::class,
|
||||
Constant::SERVER_TYPE_TCP => Server::class,
|
||||
Constant::SERVER_TYPE_UDP => Server::class,
|
||||
Constant::SERVER_TYPE_HTTP => HServer::class,
|
||||
Constant::SERVER_TYPE_WEBSOCKET => HServer::class,
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* @param array $configs
|
||||
* @param bool $daemon
|
||||
* @throws Exception
|
||||
*/
|
||||
public function initBaseServer(array $configs, bool $daemon)
|
||||
{
|
||||
$configs['ports'] = $this->sortService($configs['ports']);
|
||||
foreach ($configs['ports'] as $n => $config) {
|
||||
$this->servers[$config['name'] ?? $n] = $this->addListener($config);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $config
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
private function addListener(array $config): mixed
|
||||
{
|
||||
/** @var HServer|Server $port */
|
||||
$class = self::SERVER_CLASS[$config['type']];
|
||||
$port = new $class($config['host'], $config['port'], $config['isSsl'] ?? false, $config['reuse_port'] ?? true);
|
||||
$port->set($config['settings'] ?? []);
|
||||
if ($config['type'] == Constant::SERVER_TYPE_HTTP) {
|
||||
$port->handle('/', fn($request, $response) => $this->onRequestHandle($request, $response, $config));
|
||||
} else if ($config['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
|
||||
$port->handle('/', fn($request, $response) => $this->onWebsocketHandle($request, $response, $config));
|
||||
} else {
|
||||
$port->handle(fn(Connection $connection) => $this->onConnectionHandle($connection, $config));
|
||||
}
|
||||
return $this->eventListener($port, $config);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Response $response
|
||||
* @param $config
|
||||
*/
|
||||
protected function onRequestHandle(Request $request, Response $response, $config)
|
||||
{
|
||||
if (isset($config[Constant::REQUEST])) {
|
||||
call_user_func($config[Constant::REQUEST], $request, $response);
|
||||
return;
|
||||
}
|
||||
$response->status(505);
|
||||
$response->end();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Response $response
|
||||
* @param $config
|
||||
*/
|
||||
protected function onWebsocketHandle(Request $request, Response $response, $config)
|
||||
{
|
||||
$handshake = $config[Constant::HANDSHAKE] ?? null;
|
||||
if (!is_null($handshake)) {
|
||||
call_user_func($handshake, $request, $response);
|
||||
} else {
|
||||
$response->upgrade();
|
||||
$open = $config[Constant::OPEN] ?? null;
|
||||
if (!is_null($open)) {
|
||||
call_user_func($open, $request);
|
||||
}
|
||||
}
|
||||
$close = $config[Constant::CLOSE] ?? null;
|
||||
$message = $config[Constant::MESSAGE] ?? null;
|
||||
while (true) {
|
||||
$data = $response->recv();
|
||||
if ($data === '' || $data === false) {
|
||||
$response->close();
|
||||
call_user_func($close, $response->fd);
|
||||
} else {
|
||||
call_user_func($message, $data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param Connection $connection
|
||||
* @param $config
|
||||
*/
|
||||
protected function onConnectionHandle(Connection $connection, $config)
|
||||
{
|
||||
call_user_func($config[Constant::RECEIVE] ?? null, $connection);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @throws ConfigException
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function start(): void
|
||||
{
|
||||
$this->startProcess();
|
||||
run(function () {
|
||||
$this->startServers();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return array
|
||||
* @throws ConfigException|ReflectionException
|
||||
*/
|
||||
private function startProcess(): array
|
||||
{
|
||||
$processes = [];
|
||||
$system = sprintf('[%s].process', Config::get('id', 'system-service'));
|
||||
foreach ($this->process as $process) {
|
||||
/** @var BaseProcess $process */
|
||||
if (is_string($process)) {
|
||||
$process = Kiri::getDi()->get($process);
|
||||
}
|
||||
$swowProcess = new Process([$process, 'onHandler'], $process->getRedirectStdinAndStdout(),
|
||||
$process->getPipeType(), $process->isEnableCoroutine());
|
||||
if (Kiri::getPlatform()->isLinux()) {
|
||||
$swowProcess->name($system . '(' . $process->getName() . ')');
|
||||
}
|
||||
$swowProcess->start();
|
||||
array_push($processes, $swowProcess);
|
||||
}
|
||||
return $processes;
|
||||
}
|
||||
|
||||
|
||||
private function startServers()
|
||||
{
|
||||
foreach ($this->servers as $server) {
|
||||
Coroutine::create(fn() => $server->start());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param mixed $server
|
||||
* @param array $config
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
private function eventListener(mixed $server, array $config): mixed
|
||||
{
|
||||
foreach ($config['events'] as $key => $value) {
|
||||
if (is_array($value) && is_string($value[0])) {
|
||||
$value[0] = Kiri::getDi()->get($value[0]);
|
||||
}
|
||||
$server->on($key, $value);
|
||||
}
|
||||
return $server;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server;
|
||||
|
||||
use Note\Inject;
|
||||
use Exception;
|
||||
use Kiri\Abstracts\Config;
|
||||
use Kiri\Error\Logger;
|
||||
use Kiri\Exception\ConfigException;
|
||||
use Kiri\Kiri;
|
||||
use Kiri\Server\Abstracts\BaseProcess;
|
||||
use ReflectionException;
|
||||
use Swoole\Http\Server as HServer;
|
||||
use Swoole\Process;
|
||||
use Swoole\Server;
|
||||
use Swoole\WebSocket\Server as WServer;
|
||||
|
||||
class SoloAsyncServer implements SwooleServerInterface
|
||||
{
|
||||
|
||||
use TraitServer;
|
||||
|
||||
|
||||
private HServer|WServer|Server|null $server = null;
|
||||
|
||||
|
||||
#[Inject(Logger::class)]
|
||||
public Logger $logger;
|
||||
|
||||
|
||||
const SERVER_CLASS = [
|
||||
Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
|
||||
Constant::SERVER_TYPE_UDP => Server::class,
|
||||
Constant::SERVER_TYPE_HTTP => HServer::class,
|
||||
Constant::SERVER_TYPE_WEBSOCKET => WServer::class
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* @param array $configs
|
||||
* @param bool $daemon
|
||||
* @throws Exception
|
||||
*/
|
||||
public function initBaseServer(array $configs, bool $daemon)
|
||||
{
|
||||
$configs['ports'] = $this->sortService($configs['ports']);
|
||||
foreach ($configs['ports'] as $config) {
|
||||
$service = $this->addListener($config);
|
||||
if (!$this->server) {
|
||||
$this->server = $service;
|
||||
}
|
||||
}
|
||||
$this->startProcess();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @throws ConfigException|ReflectionException
|
||||
*/
|
||||
private function startProcess()
|
||||
{
|
||||
$system = sprintf('[%s].process', Config::get('id', 'system-service'));
|
||||
foreach ($this->process as $process) {
|
||||
/** @var BaseProcess $process */
|
||||
if (is_string($process)) {
|
||||
$process = Kiri::getDi()->get($process);
|
||||
}
|
||||
$sowProcess = new Process([$process, 'onHandler'], $process->getRedirectStdinAndStdout(),
|
||||
$process->getPipeType(), $process->isEnableCoroutine());
|
||||
if (Kiri::getPlatform()->isLinux()) {
|
||||
$sowProcess->name($system . '(' . $process->getName() . ')');
|
||||
}
|
||||
$this->server->addProcess($sowProcess);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $config
|
||||
* @return mixed
|
||||
* @throws Exception
|
||||
*/
|
||||
private function addListener(array $config): Server\Port
|
||||
{
|
||||
$config = $this->resetConfig($config);
|
||||
if (!$this->server) {
|
||||
$class = self::SERVER_CLASS[$config['type']];
|
||||
$port = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']);
|
||||
$config['settings'] = array_merge(Config::get('server.settings', []), $config['settings']);
|
||||
$config['settings'][Constant::OPTION_DAEMONIZE] = 0;
|
||||
} else {
|
||||
$port = $this->server->addlistener($config['host'], $config['port'], $config['mode']);
|
||||
if ($port === false) {
|
||||
throw new Exception("The port is already in use[{$config['host']}::{$config['port']}]");
|
||||
}
|
||||
}
|
||||
$port->set($config['settings'] ?? []);
|
||||
return $this->eventListener($port, $config);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param Server\Port|Server|HServer|WServer $server
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
private function eventListener(mixed $server, array $config): Server\Port|HServer|Server|WServer
|
||||
{
|
||||
foreach ($config['events'] as $key => $value) {
|
||||
if (is_array($value) && is_string($value[0])) {
|
||||
$value[0] = Kiri::getDi()->get($value[0]);
|
||||
}
|
||||
$server->on($key, $value);
|
||||
}
|
||||
return $server;
|
||||
}
|
||||
|
||||
|
||||
public function start()
|
||||
{
|
||||
$this->server->start();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $config
|
||||
* @return array
|
||||
*/
|
||||
private function resetConfig(array $config): array
|
||||
{
|
||||
if ($config['type'] == Constant::SERVER_TYPE_HTTP && !isset($config['settings']['open_http_protocol'])) {
|
||||
$config['settings']['open_http_protocol'] = true;
|
||||
if ($this->server && in_array($this->server->setting['dispatch_mode'], [2, 4])) {
|
||||
$config['settings']['open_http2_protocol'] = true;
|
||||
}
|
||||
}
|
||||
if ($config['type'] == Constant::SERVER_TYPE_WEBSOCKET && !isset($config['settings']['open_websocket_protocol'])) {
|
||||
$config['settings']['open_websocket_protocol'] = true;
|
||||
}
|
||||
return $config;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server;
|
||||
|
||||
interface SwooleServerInterface
|
||||
{
|
||||
|
||||
|
||||
public function start();
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
namespace Kiri\Server;
|
||||
|
||||
use Kiri\Server\Contract\OnProcessInterface;
|
||||
|
||||
trait TraitServer
|
||||
{
|
||||
|
||||
|
||||
protected array $process = [];
|
||||
|
||||
|
||||
/**
|
||||
* @param OnProcessInterface|string $process
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function addProcess(OnProcessInterface|string $process)
|
||||
{
|
||||
if (is_string($process) && !in_array(OnProcessInterface::class, class_implements($process))) {
|
||||
throw new \Exception('Other Process must instance ' . OnProcessInterface::class);
|
||||
}
|
||||
$this->process[] = $process;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $ports
|
||||
* @return array
|
||||
*/
|
||||
public function sortService(array $ports): array
|
||||
{
|
||||
$array = [];
|
||||
foreach ($ports as $port) {
|
||||
if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
|
||||
array_unshift($array, $port);
|
||||
} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
|
||||
if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
|
||||
$array[] = $port;
|
||||
} else {
|
||||
array_unshift($array, $port);
|
||||
}
|
||||
} else {
|
||||
$array[] = $port;
|
||||
}
|
||||
}
|
||||
return $array;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user