Compare commits

...

89 Commits

Author SHA1 Message Date
as2252258 6c46a54d4b Revert "改名"
This reverts commit fdf58326
2021-12-28 17:54:51 +08:00
as2252258 03287cfd65 Revert "改名"
This reverts commit fdf58326
2021-12-28 14:16:45 +08:00
as2252258 93ce4c16b6 Revert "改名"
This reverts commit fdf58326
2021-12-27 15:24:29 +08:00
as2252258 4b92edd40f 1 2021-12-24 01:19:43 +08:00
as2252258 a76c81df8e 改名 2021-12-23 18:36:14 +08:00
as2252258 aa59caad07 改名 2021-12-23 18:22:27 +08:00
as2252258 6fd8a5dd34 1 2021-12-22 03:29:27 +08:00
as2252258 9ca53a73ce 1 2021-12-22 03:29:14 +08:00
as2252258 d904e78864 1 2021-12-18 03:27:14 +08:00
as2252258 0d64ef7ac4 1 2021-12-17 04:57:46 +08:00
as2252258 154d9d74d6 1 2021-12-17 04:43:20 +08:00
as2252258 2c61abff01 1 2021-12-17 04:41:00 +08:00
as2252258 b4ce762cf3 1 2021-12-17 04:26:54 +08:00
as2252258 4b3c2234af 1 2021-12-17 04:24:40 +08:00
as2252258 7ee78a9642 1 2021-12-17 04:24:01 +08:00
as2252258 f9838f781d 1 2021-12-17 04:23:12 +08:00
as2252258 848416af4f 1 2021-12-17 04:22:13 +08:00
as2252258 0216e761be 1 2021-12-17 04:17:53 +08:00
as2252258 acf6631c5c 1 2021-12-17 04:15:59 +08:00
as2252258 64e4307a57 1 2021-12-12 06:37:52 +08:00
as2252258 ab672127e6 1 2021-12-12 02:46:30 +08:00
as2252258 6e5b545a1e 1 2021-12-12 02:45:39 +08:00
as2252258 8229395e6d 1 2021-12-12 02:41:31 +08:00
as2252258 d5d2b04321 1 2021-12-11 17:56:35 +08:00
as2252258 ce9c184c83 1 2021-12-11 17:40:16 +08:00
as2252258 620de34559 1 2021-12-11 17:38:53 +08:00
as2252258 b01c71ea5e 1 2021-12-11 17:38:15 +08:00
as2252258 90e1f7eb29 1 2021-12-11 17:35:44 +08:00
as2252258 f3ad09ef66 1 2021-12-11 17:34:05 +08:00
as2252258 dfccb8816c 1 2021-12-11 17:32:28 +08:00
as2252258 1670ff3fef 1 2021-12-11 05:33:46 +08:00
as2252258 8870a7ca27 1 2021-12-11 05:33:00 +08:00
as2252258 ebb7ac9673 改名 2021-12-09 17:01:18 +08:00
as2252258 5aad8d2001 改名 2021-12-08 11:45:19 +08:00
as2252258 80713788c9 改名 2021-12-08 11:39:57 +08:00
as2252258 9f36acbbca 改名 2021-12-08 11:32:32 +08:00
as2252258 044d213a69 改名 2021-12-07 16:44:12 +08:00
as2252258 e5fe525f82 改名 2021-12-07 16:02:07 +08:00
as2252258 39e4e52908 改名 2021-12-07 16:00:52 +08:00
as2252258 f62014ff34 改名 2021-12-07 15:59:13 +08:00
as2252258 7935e6a6a3 改名 2021-12-07 15:53:56 +08:00
as2252258 d2acd50352 改名 2021-12-06 18:07:33 +08:00
as2252258 d02337ec22 改名 2021-12-06 17:58:11 +08:00
as2252258 57f12b6701 改名 2021-12-06 17:22:26 +08:00
as2252258 d500fd21ce 改名 2021-12-06 16:14:48 +08:00
as2252258 30d7b8684e 改名 2021-12-06 16:13:52 +08:00
as2252258 d8eb4d4e45 改名 2021-12-06 16:03:39 +08:00
as2252258 7004c5c0f8 改名 2021-12-06 15:54:31 +08:00
as2252258 81e55ecdf1 改名 2021-12-06 15:52:05 +08:00
as2252258 20adc186d4 改名 2021-12-06 15:51:29 +08:00
as2252258 8c16d9f4b3 改名 2021-12-06 15:48:57 +08:00
as2252258 b3e06a680a 改名 2021-12-06 15:47:12 +08:00
as2252258 3176443e5c 改名 2021-12-06 15:39:35 +08:00
as2252258 83962fa3ba 改名 2021-12-06 14:49:47 +08:00
as2252258 5475f2cd51 改名 2021-12-06 14:45:12 +08:00
as2252258 30212c0b86 改名 2021-12-06 14:44:18 +08:00
as2252258 4731463897 改名 2021-12-06 14:43:46 +08:00
as2252258 87e901f5b1 改名 2021-12-06 14:42:54 +08:00
as2252258 66f87b6da4 改名 2021-12-06 14:41:05 +08:00
as2252258 0007242b70 改名 2021-12-06 14:40:18 +08:00
as2252258 8653e6914b 改名 2021-12-06 14:39:03 +08:00
as2252258 816fec8ef4 改名 2021-12-06 14:38:17 +08:00
as2252258 b0ef09fd35 改名 2021-12-06 14:38:06 +08:00
as2252258 f7a2d6f30e 改名 2021-12-06 14:32:04 +08:00
as2252258 2950ba8fd5 改名 2021-12-06 14:24:41 +08:00
as2252258 2de5c82a73 改名 2021-12-06 14:22:08 +08:00
as2252258 758c4e7d5b 改名 2021-12-06 14:12:03 +08:00
as2252258 33f045aec7 改名 2021-12-06 13:49:01 +08:00
as2252258 35189de442 改名 2021-12-06 11:44:01 +08:00
as2252258 34e7fc0392 改名 2021-12-03 18:40:27 +08:00
as2252258 a3ce9f52ba 改名 2021-12-03 18:22:26 +08:00
as2252258 6e7da1b0ed 改名 2021-12-03 17:40:21 +08:00
as2252258 a6e0b5c1a2 改名 2021-12-03 16:24:44 +08:00
as2252258 13ab14f965 改名 2021-12-03 15:42:05 +08:00
as2252258 6729094f63 改名 2021-12-03 15:35:16 +08:00
as2252258 e1aeb17a5a 改名 2021-12-03 14:46:38 +08:00
as2252258 b9e20051ef 改名 2021-12-02 14:06:57 +08:00
as2252258 4ab6332176 改名 2021-12-01 19:05:10 +08:00
as2252258 abe2dad521 改名 2021-12-01 19:05:00 +08:00
as2252258 b0f70a13da 改名 2021-12-01 15:16:08 +08:00
as2252258 1e8aca91dd 改名 2021-12-01 14:08:09 +08:00
as2252258 b4ac5c4758 改名 2021-11-30 19:04:29 +08:00
as2252258 d161477957 改名 2021-11-30 19:04:16 +08:00
as2252258 a26b99dd1e 改名 2021-11-30 18:33:22 +08:00
as2252258 86e4a92ab0 改名 2021-11-30 18:31:41 +08:00
as2252258 ea425bb82d 改名 2021-11-30 18:30:15 +08:00
as2252258 ad0154d319 改名 2021-11-30 18:29:10 +08:00
as2252258 edb70d2b9b 改名 2021-11-30 18:26:23 +08:00
as2252258 9f3355cab4 改名 2021-11-30 18:23:56 +08:00
52 changed files with 1405 additions and 2086 deletions
+104 -35
View File
@@ -3,8 +3,6 @@
defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
use Note\Note;
use Note\Route\Route;
use Http\Handler\Router;
use JetBrains\PhpStorm\Pure;
use Kiri\Abstracts\Config;
@@ -16,6 +14,8 @@ use Kiri\Events\EventDispatch;
use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Note\Note;
use Note\Route\Route;
use Psr\Log\LoggerInterface;
use Swoole\Process;
use Swoole\WebSocket\Server;
@@ -29,7 +29,7 @@ if (!function_exists('make')) {
* @return mixed
* @throws
*/
function make($name, $default = null): mixed
function make($name, $default = NULL): mixed
{
if (class_exists($name)) {
return Kiri::createObject($name);
@@ -44,7 +44,7 @@ if (!function_exists('make')) {
return Kiri::app()->get($default);
}
$class = Kiri::createObject($default);
class_alias($name, $default, true);
class_alias($name, $default, TRUE);
return $class;
}
@@ -52,6 +52,22 @@ if (!function_exists('make')) {
}
if (!function_exists('map')) {
/**
* @param array $params
* @param Closure $closure
* @return mixed
*/
function map(array $params, Closure $closure): mixed
{
return array_map($closure, $params);
}
}
if (!function_exists('checkPortIsAlready')) {
@@ -64,7 +80,7 @@ if (!function_exists('checkPortIsAlready')) {
{
if (!Kiri::getPlatform()->isLinux()) {
exec("lsof -i :" . $port . " | grep -i 'LISTEN' | awk '{print $2}'", $output);
if (empty($output)) return false;
if (empty($output)) return FALSE;
$output = explode(PHP_EOL, $output[0]);
return $output[0];
}
@@ -76,7 +92,7 @@ if (!function_exists('checkPortIsAlready')) {
exec('netstat -lnp | grep ' . $port . ' | grep "LISTEN" | awk \'{print $7}\'', $output);
if (empty($output)) {
return false;
return FALSE;
}
return explode('/', $output[0])[0];
}
@@ -156,7 +172,7 @@ if (!function_exists('now')) {
*/
function now(): string
{
return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(true));
return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(TRUE));
}
}
@@ -212,6 +228,22 @@ if (!function_exists('scan_directory')) {
}
if (!class_exists('ReturnTypeWillChange')) {
/**
* @since 8.1
*/
#[Attribute(Attribute::TARGET_METHOD)]
final class ReturnTypeWillChange
{
public function __construct()
{
}
}
}
if (!function_exists('injectRuntime')) {
@@ -230,6 +262,9 @@ if (!function_exists('injectRuntime')) {
$router = [];
foreach ($fileLists as $class) {
foreach (NoteManager::getTargetNote($class) as $value) {
if (!method_exists($value, 'execute')) {
continue;
}
$value->execute($class);
}
$methods = $di->getMethodAttribute($class);
@@ -241,6 +276,9 @@ if (!function_exists('injectRuntime')) {
if ($item instanceof Route) {
$router[] = [$item, $class, $method];
} else {
if (!method_exists($item, 'execute')) {
continue;
}
$item->execute($class, $method);
}
}
@@ -249,6 +287,9 @@ if (!function_exists('injectRuntime')) {
if (!empty($router)) {
foreach ($router as $class) {
[$item, $class, $method] = $class;
if (!method_exists($item, 'execute')) {
continue;
}
$item->execute($class, $method);
}
}
@@ -296,25 +337,28 @@ if (!function_exists('isUrl')) {
* @param bool $get_info
* @return false|array
*/
function isUrl($url, bool $get_info = true): bool|array
function isUrl($url, bool $get_info = TRUE): bool|array
{
if (str_starts_with($url, '/')) {
return false;
return FALSE;
}
$queryMatch = '/((http[s]?):\/\/)?(([\w\-\_]+\.)+\w+(:\d+)?)(\/.*)?/';
if (!preg_match($queryMatch, $url, $outPut)) {
return false;
return FALSE;
}
$port = str_replace(':', '', $outPut[5]);
[$isHttps, $domain, $port, $path] = [$outPut[2] == 'https', $outPut[3], $port, $outPut[6] ?? ''];
if ($isHttps && empty($port)) {
[$scheme, $host, $port, $user, $pass, $query, $path, $fragment] = parse_url($url);
if ($scheme == 'https' && empty($port)) {
$port = 443;
}
if (!empty($query)) $path .= '?' . $query;
if (!empty($fragment)) $path .= '#' . $fragment;
unset($outPut);
return [$isHttps == 'https', $domain, $port, $path];
return [$scheme == 'https', $host, $port, $path];
}
}
@@ -329,8 +373,8 @@ if (!function_exists('split_request_uri')) {
*/
function split_request_uri($url): bool|array
{
if (($parse = isUrl($url, null)) === false) {
return false;
if (($parse = isUrl($url, NULL)) === FALSE) {
return FALSE;
}
[$isHttps, $domain, $port, $path] = $parse;
@@ -354,7 +398,7 @@ if (!function_exists('hadDomain')) {
function hadDomain($url): bool|array
{
$param = split_request_uri($url);
return !is_array($param) ? false : $param[0];
return !is_array($param) ? FALSE : $param[0];
}
}
@@ -403,7 +447,7 @@ if (!function_exists('loadByDir')) {
classAutoload($namespace, $value);
} else {
$pos = strpos($value, '.php');
if ($pos === false || strlen($value) - 4 != $pos) {
if ($pos === FALSE || strlen($value) - 4 != $pos) {
continue;
}
@@ -481,7 +525,7 @@ if (!function_exists('instance_load')) {
function instance_load()
{
$content = json_decode(file_get_contents(__DIR__ . '/composer.json'), true);
$content = json_decode(file_get_contents(__DIR__ . '/composer.json'), TRUE);
if (isset($content['autoload']) && isset($content['autoload']['psr-4'])) {
$psr4 = $content['autoload']['psr-4'];
foreach ($psr4 as $namespace => $dirname) {
@@ -531,7 +575,7 @@ if (!function_exists('trim_blank')) {
* @param bool $htmlTags
* @return array|string|null
*/
function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = true): array|string|null
function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = TRUE): array|string|null
{
$str = trim($content);
if ($htmlTags) {
@@ -771,12 +815,12 @@ if (!function_exists('get_file_extension')) {
$ext = strtolower(array_pop($explode));
if (array_key_exists($ext, $mime_types)) {
return $ext;
} elseif (function_exists('finfo_open')) {
} else if (function_exists('finfo_open')) {
$fInfo = finfo_open(FILEINFO_MIME);
$mimeType = finfo_file($fInfo, $filename);
finfo_close($fInfo);
$mimeType = current(explode('; ', $mimeType));
if (($search = array_search($mimeType, $mime_types)) == false) {
if (($search = array_search($mimeType, $mime_types)) == FALSE) {
return $mimeType;
}
return $search;
@@ -801,7 +845,7 @@ if (!function_exists('storage')) {
if (!empty($path)) {
$path = ltrim($path, '/');
if (!is_dir($basePath . '/' . $path)) {
mkdir($basePath . '/' . $path, 0777, true);
mkdir($basePath . '/' . $path, 0777, TRUE);
}
}
if (empty($fileName)) {
@@ -825,7 +869,7 @@ if (!function_exists('event')) {
* @param bool $isAppend
* @throws Exception
*/
function event($name, $callback, bool $isAppend = true)
function event($name, $callback, bool $isAppend = TRUE)
{
$pro = di(EventProvider::class);
$pro->on($name, $callback, 0);
@@ -842,7 +886,7 @@ if (!function_exists('name')) {
* @throws ConfigException
* @throws Exception
*/
function name(int $pid, string $prefix = null)
function name(int $pid, string $prefix = NULL)
{
if (Kiri::getPlatform()->isMac()) {
return;
@@ -873,10 +917,10 @@ if (!function_exists('env')) {
* @param null $default
* @return array|string|null
*/
#[Pure] function env($key, $default = null): null|array|string
#[Pure] function env($key, $default = NULL): null|array|string
{
$env = getenv($key);
if ($env === false) {
if ($env === FALSE) {
return $default;
}
return $env;
@@ -900,6 +944,27 @@ if (!function_exists('di')) {
}
if (!function_exists('interval')) {
/**
* @param callable $callback
* @param int $interval
* @param bool $is
*/
function interval(callable $callback, int $interval = 1000, bool $is = FALSE)
{
usleep($interval * 1000);
$callback();
interval($callback, $interval, $is);
}
}
if (!function_exists('duplicate')) {
@@ -911,7 +976,11 @@ if (!function_exists('duplicate')) {
function duplicate(string $className): mixed
{
$class = di($className);
return clone $class;
$clone = clone $class;
if (method_exists($clone, 'clear')) {
$clone->clear();
}
return $clone;
}
}
@@ -963,7 +1032,7 @@ if (!function_exists('swoole_unserialize')) {
function swoole_unserialize($data): mixed
{
if (empty($data)) {
return null;
return NULL;
}
// if (class_exists('swoole_serialize')) {
// return \swoole_serialize::unpack($data);
@@ -1044,7 +1113,7 @@ if (!function_exists('jTraceEx')) {
* @param bool $toHtml
* @return string
*/
function jTraceEx($e, $seen = null, bool $toHtml = false): string
function jTraceEx($e, $seen = NULL, bool $toHtml = FALSE): string
{
$starter = $seen ? 'Caused by: ' : '';
$result = [];
@@ -1060,12 +1129,12 @@ if (!function_exists('jTraceEx')) {
count($value) && array_key_exists('class', $value) ? str_replace('\\', '.', $value['class']) : '',
count($value) && array_key_exists('class', $value) && array_key_exists('function', $value) ? '.' : '',
count($value) && array_key_exists('function', $value) ? str_replace('\\', '.', $value['function']) : '(main)',
$line === null ? $file : basename($file),
$line === null ? '' : ':',
$line === null ? '' : $line);
$line === NULL ? $file : basename($file),
$line === NULL ? '' : ':',
$line === NULL ? '' : $line);
$file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source';
$line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : null;
$line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : NULL;
}
$result = join($toHtml ? "<br>" : "\n", $result);
if ($prev) {
@@ -1089,7 +1158,7 @@ if (!function_exists('swoole_substr_json_decode')) {
*/
function swoole_substr_json_decode($packet, int $length = 0): mixed
{
return json_decode($packet, true);
return json_decode($packet, TRUE);
}
}
+2 -1
View File
@@ -29,6 +29,7 @@ use Kiri\Kiri;
use ReflectionException;
use Server\ServerManager;
use Server\Contract\OnTaskInterface;
use Server\Tasker\AsyncTaskExecute;
use Swoole\Table;
/**
@@ -210,7 +211,7 @@ abstract class BaseApplication extends Component
*/
public function task(OnTaskInterface $execute): void
{
di(ServerManager::class)->task($execute);
di(AsyncTaskExecute::class)->execute($execute);
}
-243
View File
@@ -1,243 +0,0 @@
<?php
/**
* Created by PhpStorm.
* User: whwyy
* Date: 2018/3/30 0030
* Time: 14:10
*/
declare(strict_types=1);
namespace Kiri\Abstracts;
use Exception;
use JetBrains\PhpStorm\Pure;
use Kiri\Kiri;
use Swoole\Coroutine;
/**
* Class BaseObject
* @package Kiri\Kiri\Base
*/
class BaseObject implements Configure
{
/**
* BaseAbstract constructor.
*
* @param array $config
* @throws Exception
*/
public function __construct(array $config = [])
{
if (!empty($config) && is_array($config)) {
Kiri::configure($this, $config);
}
}
/**
* @throws Exception
*/
public function init()
{
}
/**
* @param array|callable $callback
* @param object $scope
*/
public function async_create(array|callable $callback, object $scope)
{
Coroutine::create($callback, $scope);
}
/**
* @return string
*/
#[Pure] public static function className(): string
{
return static::class;
}
/**
* @param $name
* @param $value
*
* @throws Exception
*/
public function __set($name, $value)
{
$method = 'set' . ucfirst($name);
if (method_exists($this, $method)) {
$this->{$method}($value);
} else {
throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
}
}
/**
* @param $name
*
* @return mixed
* @throws Exception
*/
public function __get($name): mixed
{
$method = 'get' . ucfirst($name);
if (method_exists($this, $method)) {
return $this->$method();
} else {
throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
}
}
/**
* @param $message
* @param string $model
* @return bool
* @throws Exception
*/
public function addError($message, string $model = 'app'): bool
{
if ($message instanceof \Throwable) {
$this->error(jTraceEx($message));
} else {
if (!is_string($message)) {
$message = json_encode($message, JSON_UNESCAPED_UNICODE);
}
$this->error($message);
}
return FALSE;
}
/**
* @return Logger
* @throws Exception
*/
private function logger(): Logger
{
return Kiri::getDi()->get(Logger::class);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function debug(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
$message = "\033[35m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->debug($message, $context);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function info(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
$message = "\033[34m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->info($message, $context);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function success(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
$message = "\033[36m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->notice($message, $context);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function warning(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
$message = "\033[33m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->critical($message, $context);
}
/**
* @param mixed $message
* @param null $method
* @param null $file
* @throws Exception
*/
public function error(mixed $message, $method = null, $file = null)
{
if ($message instanceof \Throwable) {
$message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
}
$content = (empty($method) ? '' : $method . ': ') . $message;
$message = "\033[41;37m" . $content . "\033[0m";
if (!empty($file)) {
$message .= PHP_EOL . "\03341;37m[" . $file . "\033[0m";
}
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->error($message, $context);
}
}
+215 -14
View File
@@ -11,45 +11,246 @@ namespace Kiri\Abstracts;
use Exception;
use JetBrains\PhpStorm\Pure;
use Kiri\Exception\ComponentException;
use Kiri\Di\Container;
use Kiri\Events\EventProvider;
use Kiri\Kiri;
use Psr\Container\ContainerInterface;
/**
* Class Component
* @package Kiri\Kiri\Base
* @property ContainerInterface|Container $container
* @property EventProvider $eventProvider
*/
class Component extends BaseObject
class Component implements Configure
{
/**
* @param $name
* @param $value
* BaseAbstract constructor.
*
* @param array $config
* @throws Exception
*/
public function __set($name, $value)
public function __construct(array $config = [])
{
if (property_exists($this, $name)) {
$this->$name = $value;
} else {
parent::__set($name, $value);
if (!empty($config) && is_array($config)) {
Kiri::configure($this, $config);
}
}
/**
* @throws Exception
*/
public function init()
{
}
/**
* @return EventProvider
* @throws \ReflectionException
*/
public function getEventProvider(): EventProvider
{
return Kiri::getDi()->get(EventProvider::class);
}
/**
* @return Container
*/
#[Pure] public function getContainer(): ContainerInterface
{
return Kiri::getDi();
}
/**
* @return string
*/
#[Pure] public static function className(): string
{
return static::class;
}
/**
* @param $name
* @param $value
*
* @throws Exception
*/
public function __set($name, $value)
{
$method = 'set' . ucfirst($name);
if (method_exists($this, $method)) {
$this->{$method}($value);
} else {
throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
}
}
/**
* @param $name
*
* @return mixed
* @throws Exception
*/
public function __get($name): mixed
{
if (property_exists($this, $name)) {
return $this->$name ?? null;
$method = 'get' . ucfirst($name);
if (method_exists($this, $method)) {
return $this->$method();
} else {
return parent::__get($name);
throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
}
}
/**
* @param $message
* @param string $model
* @return bool
* @throws Exception
*/
public function addError($message, string $model = 'app'): bool
{
if ($message instanceof \Throwable) {
$this->error(jTraceEx($message));
} else {
if (!is_string($message)) {
$message = json_encode($message, JSON_UNESCAPED_UNICODE);
}
$this->error($message);
}
return FALSE;
}
/**
* @return Logger
* @throws Exception
*/
private function logger(): Logger
{
return Kiri::getDi()->get(Logger::class);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function debug(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
// $message = "\033[35m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->debug($message, $context);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function info(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
// $message = "\033[34m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->info($message, $context);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function success(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
// $message = "\033[36m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->notice($message, $context);
}
/**
* @param mixed $message
* @param string $method
* @param string $file
* @throws Exception
*/
public function warning(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
// $message = "\033[33m" . $message . "\033[0m";
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->critical($message, $context);
}
/**
* @param mixed $message
* @param null $method
* @param null $file
* @throws Exception
*/
public function error(mixed $message, $method = null, $file = null)
{
if ($message instanceof \Throwable) {
$message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
}
$context = [];
if (is_string($method)) {
$message = (empty($method) ? '' : $method . ': ') . $message;
} else {
if (is_null($method)) {
$method = [];
}
$context = $method;
}
// $message = "\033[41;37m" . $message . "\033[0m";
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->error($message, $context);
}
}
+11 -17
View File
@@ -23,15 +23,15 @@ class Config extends Component
const ERROR_MESSAGE = 'The not find %s in app configs.';
protected mixed $data = [];
protected static mixed $data = [];
/**
* @return mixed
*/
public function getData(): mixed
public static function getData(): mixed
{
return $this->data;
return static::$data;
}
@@ -40,23 +40,21 @@ class Config extends Component
* @param $value
* @return mixed
*/
public function setData($key, $value): mixed
public static function setData($key, $value): mixed
{
return $this->data[$key] = $value;
return static::$data[$key] = $value;
}
/**
* @param array $configs
* @throws Exception
*/
public static function sets(array $configs)
{
$config = Kiri::app()->getConfig();
if (empty($configs)) {
return;
}
$config->data = $configs;
static::$data = $configs;
}
/**
@@ -64,11 +62,11 @@ class Config extends Component
* @param bool $try
* @param mixed|null $default
* @return mixed
* @throws
* @throws ConfigException
*/
public static function get($key, mixed $default = null, bool $try = FALSE): mixed
{
$instance = Kiri::app()->getConfig()->getData();
$instance = static::$data;
if (!str_contains($key, '.')) {
return $instance[$key] ?? $default;
}
@@ -94,27 +92,23 @@ class Config extends Component
* @param $key
* @param $value
* @return mixed
* @throws Exception
*/
public static function set($key, $value): mixed
{
$config = Kiri::app()->getConfig();
return $config->setData($key, $value);
return static::setData($key, $value);
}
/**
* @param $key
* @param bool $must_not_null
* @return bool
* @throws Exception
*/
public static function has($key, bool $must_not_null = false): bool
{
$config = Kiri::app()->getConfig();
if (!isset($config->data[$key])) {
if (!isset(static::$data[$key])) {
return false;
}
$config = $config->data[$key];
$config = static::$data[$key];
if ($must_not_null === false) {
return true;
}
+180 -151
View File
@@ -2,11 +2,14 @@
namespace Kiri\Abstracts;
use DirectoryIterator;
use Kiri\Kiri;
use Note\Inject;
use Exception;
use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Psr\Log\LoggerInterface;
use ReflectionException;
use Server\Events\OnWorkerStop;
@@ -16,186 +19,212 @@ use Server\Events\OnWorkerStop;
class Logger implements LoggerInterface
{
const EMERGENCY = 'emergency';
const ALERT = 'alert';
const CRITICAL = 'critical';
const ERROR = 'error';
const WARNING = 'warning';
const NOTICE = 'notice';
const INFO = 'info';
const DEBUG = 'debug';
const EMERGENCY = 'emergency';
const ALERT = 'alert';
const CRITICAL = 'critical';
const ERROR = 'error';
const WARNING = 'warning';
const NOTICE = 'notice';
const INFO = 'info';
const DEBUG = 'debug';
/**
* @var EventProvider
*/
#[Inject(EventProvider::class)]
public EventProvider $eventProvider;
private array $_loggers = [];
private array $_loggers = [];
const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG];
const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG];
/**
* 监听事件
*/
public function init()
{
$this->eventProvider->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
}
/**
* @return void
* @throws ReflectionException
*/
public function init()
{
Kiri::getDi()->get(EventProvider::class)->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*
* 紧急情况
*/
public function emergency($message, array $context = [])
{
// TODO: Implement emergency() method.
$this->log(Logger::EMERGENCY, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*
* 紧急情况
*/
public function emergency($message, array $context = [])
{
// TODO: Implement emergency() method.
$this->log(Logger::EMERGENCY, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*
* 应该警惕的
*/
public function alert($message, array $context = [])
{
// TODO: Implement alert() method.
$this->log(Logger::ALERT, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*
* 应该警惕的
*/
public function alert($message, array $context = [])
{
// TODO: Implement alert() method.
$this->log(Logger::ALERT, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*
* 关键性的日志
*/
public function critical($message, array $context = [])
{
// TODO: Implement critical() method.
$this->log(Logger::CRITICAL, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*
* 关键性的日志
*/
public function critical($message, array $context = [])
{
// TODO: Implement critical() method.
$this->log(Logger::CRITICAL, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function error($message, array $context = [])
{
// TODO: Implement error() method.
$this->log(Logger::ERROR, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function error($message, array $context = [])
{
// TODO: Implement error() method.
$this->log(Logger::ERROR, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function warning($message, array $context = [])
{
// TODO: Implement warning() method.
$this->log(Logger::WARNING, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function warning($message, array $context = [])
{
// TODO: Implement warning() method.
$this->log(Logger::WARNING, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function notice($message, array $context = [])
{
// TODO: Implement notice() method.
$this->log(Logger::NOTICE, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function notice($message, array $context = [])
{
// TODO: Implement notice() method.
$this->log(Logger::NOTICE, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function info($message, array $context = [])
{
// TODO: Implement info() method.
$this->log(Logger::INFO, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function info($message, array $context = [])
{
// TODO: Implement info() method.
$this->log(Logger::INFO, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function debug($message, array $context = [])
{
// TODO: Implement debug() method.
$this->log(Logger::DEBUG, $message, $context);
}
/**
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function debug($message, array $context = [])
{
// TODO: Implement debug() method.
$this->log(Logger::DEBUG, $message, $context);
}
/**
* @param mixed $level
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function log($level, $message, array $context = [])
{
// TODO: Implement log() method.
$levels = Config::get('log.level', Logger::LOGGER_LEVELS);
if (!in_array($level, $levels)) {
return;
}
/**
* @param mixed $level
* @param string $message
* @param array $context
* @throws ConfigException
*/
public function log($level, $message, array $context = [])
{
// TODO: Implement log() method.
$levels = Config::get('log.level', Logger::LOGGER_LEVELS);
if (!in_array($level, $levels)) {
return;
}
$_string = '[' . now() . '] production.' . $level . ': ' . $this->_string($message, $context);
$_string = '[' . now() . '] production.' . $level . ': ' . $this->_string($message, $context);
file_put_contents('php://output', $_string);
file_put_contents('php://output', $_string);
$this->_loggers[] = $_string;
}
$this->_loggers[] = $_string;
}
/**
* @param OnWorkerStop $param
* @throws Exception
*/
public function onAfterRequest(OnWorkerStop $param)
{
$loggers = implode(PHP_EOL, $this->_loggers);
$this->_loggers = [];
if (!empty($loggers)) {
$filename = storage('log-' . date('Y-m-d') . '.log', 'logs/');
/**
* @param OnWorkerStop $param
* @throws Exception
*/
public function onAfterRequest(OnWorkerStop $param)
{
$loggers = implode(PHP_EOL, $this->_loggers);
$this->_loggers = [];
if (!empty($loggers)) {
$filename = storage('log-' . date('Y-m-d') . '.log', 'log/');
file_put_contents($filename, $loggers);
}
}
file_put_contents($filename, $loggers);
}
}
/**
* @param $message
* @param $context
* @return string
*/
private function _string($message, $context): string
{
if (!empty($context)) {
return $message . ' ' . print_r($context, true) . PHP_EOL;
}
return $message . PHP_EOL;
}
/**
* @return void
* @throws Exception
*/
public function flush()
{
$this->removeFile(storage());
}
/**
* @param string $dirname
* @return void
*/
private function removeFile(string $dirname)
{
$paths = new DirectoryIterator($dirname);
/** @var DirectoryIterator $path */
foreach ($paths as $path) {
if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
continue;
}
if ($path->isDir()) {
$directory = rtrim($path->getRealPath(), '/');
$this->removeFile($directory);
}
@unlink($path->getRealPath());
}
}
/**
* @param $message
* @param $context
* @return string
*/
private function _string($message, $context): string
{
if (!empty($context)) {
return $message . ' ' . PHP_EOL . print_r($context, TRUE) . PHP_EOL;
}
return $message . PHP_EOL;
}
}
+3 -2
View File
@@ -7,6 +7,7 @@ namespace Kiri;
use Exception;
use Kiri\Abstracts\Component;
use Server\ServerManager;
use Server\Tasker\AsyncTaskExecute;
/**
* Class Async
@@ -36,8 +37,8 @@ class Async extends Component
*/
public function dispatch(string $name, array $params = [])
{
$context = di(ServerManager::class);
$context->task(static::$_absences[$name], $params);
$context = di(AsyncTaskExecute::class);
$context->execute(static::$_absences[$name], $params);
}
}
+46 -27
View File
@@ -2,12 +2,12 @@
namespace Kiri\Cache\Base;
use Exception;
use Kiri\Abstracts\Logger;
use Kiri\Exception\RedisConnectException;
use Kiri\Kiri;
use Kiri\Pool\StopHeartbeatCheck;
use RedisException;
use Kiri\Context;
use Swoole\Timer;
@@ -22,9 +22,21 @@ class Redis implements StopHeartbeatCheck
private ?\Redis $pdo = null;
public string $host;
private int $_transaction = 0;
public int $port;
public int $database = 0;
public string $auth = '';
public string $prefix = '';
public int $timeout = 30;
public int $read_timeout = 30;
public array $pool = [];
private int $_timer = -1;
@@ -32,18 +44,18 @@ class Redis implements StopHeartbeatCheck
/**
* @param string $host
* @param int $port
* @param int $database
* @param string $auth
* @param string $prefix
* @param int $timeout
* @param int $read_timeout
* @param array $config
*/
public function __construct(public string $host, public int $port, public int $database = 0,
public string $auth = '', public string $prefix = '', public int $timeout = 30,
public int $read_timeout = 30)
public function __construct(array $config)
{
$this->host = $config['host'];
$this->port = $config['port'];
$this->database = $config['databases'];
$this->auth = $config['auth'];
$this->prefix = $config['prefix'];
$this->timeout = $config['timeout'];
$this->read_timeout = $config['read_timeout'];
$this->pool = $config['pool'];
}
@@ -61,21 +73,28 @@ class Redis implements StopHeartbeatCheck
if (env('state', 'start') == 'exit') {
return;
}
if ($this->_timer === -1 && Context::inCoroutine()) {
$this->_timer = Timer::tick(1000, function () {
try {
if (env('state', 'start') == 'exit') {
Kiri::getDi()->get(Logger::class)->critical('timer end');
$this->stopHeartbeatCheck();
}
if (time() - $this->_last > 10 * 60) {
$this->stopHeartbeatCheck();
$this->pdo = null;
}
} catch (\Throwable $throwable) {
error($throwable);
}
});
if ($this->_timer === -1) {
$this->_timer = Timer::tick(1000, fn() => $this->waite());
}
}
/**
* @throws Exception
*/
private function waite(): void
{
try {
if (env('state', 'start') == 'exit') {
Kiri::getDi()->get(Logger::class)->critical('timer end');
$this->stopHeartbeatCheck();
}
if (time() - $this->_last > intval($this->pool['tick'] ?? 60)) {
$this->stopHeartbeatCheck();
$this->pdo = null;
}
} catch (\Throwable $throwable) {
error($throwable);
}
}
+17 -11
View File
@@ -9,9 +9,7 @@ declare(strict_types=1);
namespace Kiri\Cache;
use Note\Inject;
use Exception;
use Server\Events\OnWorkerExit;
use Kiri\Abstracts\Component;
use Kiri\Abstracts\Config;
use Kiri\Core\Json;
@@ -19,6 +17,8 @@ use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri\Pool\Redis as PoolRedis;
use Note\Inject;
use Server\Events\OnWorkerExit;
/**
* Class Redis
@@ -28,11 +28,17 @@ use Kiri\Pool\Redis as PoolRedis;
class Redis extends Component
{
/**
* @var EventProvider
*/
#[Inject(EventProvider::class)]
public EventProvider $eventProvider;
const REDIS_OPTION_HOST = 'host';
const REDIS_OPTION_PORT = 'port';
const REDIS_OPTION_PREFIX = 'prefix';
const REDIS_OPTION_AUTH = 'auth';
const REDIS_OPTION_DATABASES = 'databases';
const REDIS_OPTION_TIMEOUT = 'timeout';
const REDIS_OPTION_POOL = 'pool';
const REDIS_OPTION_POOL_TICK = 'tick';
const REDIS_OPTION_POOL_MIN = 'min';
const REDIS_OPTION_POOL_MAX = 'max';
/**
@@ -41,11 +47,11 @@ class Redis extends Component
*/
public function init()
{
$connections = Kiri::getDi()->get(PoolRedis::class);
$connections = Kiri::getDi()->get(PoolRedis::class);
$config = $this->get_config();
$length = Config::get('connections.pool.max', 10);
$length = Config::get('cache.redis.pool.max', 10);
$this->eventProvider->on(OnWorkerExit::class, [$this, 'destroy'], 0);
@@ -111,7 +117,7 @@ SCRIPT;
*/
public function release()
{
$connections = Kiri::getDi()->get(PoolRedis::class);
$connections = Kiri::getDi()->get(PoolRedis::class);
$connections->release($this->get_config(), true);
}
@@ -135,7 +141,7 @@ SCRIPT;
*/
public function proxy($name, $arguments): mixed
{
$connections = Kiri::getDi()->get(PoolRedis::class);
$connections = Kiri::getDi()->get(PoolRedis::class);
$config = $this->get_config();
+28 -8
View File
@@ -24,10 +24,13 @@ class Context extends BaseContext
*/
public static function setContext($id, $context, $coroutineId = null): mixed
{
if (Coroutine::getCid() === -1) {
return static::$_contents[$id] = $context;
}
return Coroutine::getContext($coroutineId)[$id] = $context;
if (is_null($coroutineId)) {
$coroutineId = Coroutine::getCid();
}
if (Coroutine::getCid() !== -1) {
return Coroutine::getContext($coroutineId)[$id] = $context;
}
return static::$_contents[$id] = $context;
}
/**
@@ -38,6 +41,9 @@ class Context extends BaseContext
*/
public static function increment($id, int $value = 1, $coroutineId = null): bool|int
{
if (is_null($coroutineId)) {
$coroutineId = Coroutine::getCid();
}
if (!isset(Coroutine::getContext($coroutineId)[$id])) {
Coroutine::getContext($coroutineId)[$id] = 0;
}
@@ -52,6 +58,9 @@ class Context extends BaseContext
*/
public static function decrement($id, int $value = 1, $coroutineId = null): bool|int
{
if (is_null($coroutineId)) {
$coroutineId = Coroutine::getCid();
}
if (!isset(Coroutine::getContext($coroutineId)[$id])) {
Coroutine::getContext($coroutineId)[$id] = 0;
}
@@ -81,6 +90,9 @@ class Context extends BaseContext
*/
private static function loadByContext($id, $default = null, $coroutineId = null): mixed
{
if (is_null($coroutineId)) {
$coroutineId = Coroutine::getCid();
}
return Coroutine::getContext($coroutineId)[$id] ?? $default;
}
@@ -115,6 +127,9 @@ class Context extends BaseContext
*/
public static function remove(string $id, $coroutineId = null)
{
if (is_null($coroutineId)) {
$coroutineId = Coroutine::getCid();
}
if (!static::hasContext($id, $coroutineId)) {
return;
}
@@ -150,8 +165,9 @@ class Context extends BaseContext
if (!isset(static::$_contents[$id])) {
return false;
}
if (!empty($key) && !isset(static::$_contents[$id][$key])) {
return false;
$value = static::$_contents[$id];
if (!empty($key) && is_array($value)) {
return isset($value[$key]);
}
return true;
}
@@ -165,11 +181,15 @@ class Context extends BaseContext
*/
private static function searchByCoroutine($id, $key = null, $coroutineId = null): bool
{
if (is_null($coroutineId)) {
$coroutineId = Coroutine::getCid();
}
if (!isset(Coroutine::getContext($coroutineId)[$id])) {
return false;
}
if ($key !== null) {
return isset((Coroutine::getContext($coroutineId)[$id] ?? [])[$key]);
$value = Coroutine::getContext($coroutineId)[$id];
if ($key !== null && is_array($value)) {
return isset($value[$key]);
}
return true;
}
+3
View File
@@ -200,6 +200,9 @@ class Help
*/
public static function sendEmail($email, string $Subject, $messageContent)
{
if (!class_exists('\Swift_Mailer')) {
return;
}
$mailer = new \Swift_Mailer((new \Swift_SmtpTransport($email['host'], $email['port']))
->setUsername($email['username'])->setPassword($email['password']));
$message = (new \Swift_Message($Subject))
+5 -5
View File
@@ -66,11 +66,11 @@ class Json
{
$params['code'] = $code;
if (!is_string($message)) {
$params['param'] = $message;
if (!empty($data)) {
$params['exPageInfo'] = $data;
}
$params['message'] = 'System success.';
$params['message'] = 'System success.';
$params['param'] = $message;
if (!empty($data)) {
$params['exPageInfo'] = $data;
}
} else {
$params['message'] = $message;
$params['param'] = $data;
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace Kiri\Core;
class Network
{
/**
* @return string
*/
public static function local(): string
{
return current(swoole_get_local_ip());
}
}
+2 -3
View File
@@ -9,10 +9,10 @@ declare(strict_types=1);
namespace Kiri\Di;
use Kiri\Abstracts\Component;
use Note\Inject;
use Closure;
use Exception;
use Kiri\Abstracts\BaseObject;
use Kiri\Abstracts\Logger;
use Kiri\Kiri;
use Psr\Log\LoggerInterface;
@@ -27,7 +27,7 @@ use Psr\Container\ContainerInterface;
* Class Container
* @package Kiri\Di
*/
class Container extends BaseObject implements ContainerInterface
class Container extends Component implements ContainerInterface
{
/**
@@ -261,7 +261,6 @@ class Container extends BaseObject implements ContainerInterface
/**
* @param $class
* @return ReflectionClass
* @throws ReflectionException
*/
private function resolveDependencies($class): ReflectionClass
{
+253 -239
View File
@@ -11,279 +11,293 @@ class NoteManager
{
private static array $_classTarget = [];
private static array $_classMethodNote = [];
private static array $_classMethod = [];
private static array $_classPropertyNote = [];
private static array $_classProperty = [];
private static array $_mapping = [];
private static array $_classTarget = [];
private static array $_classMethodNote = [];
private static array $_classMethod = [];
private static array $_classPropertyNote = [];
private static array $_classProperty = [];
private static array $_mapping = [];
/**
* @param ReflectionClass $class
*/
public static function setTargetNote(ReflectionClass $class)
{
$className = $class->getName();
if (!isset(static::$_classTarget[$className])) {
static::$_classTarget[$className] = [];
}
foreach ($class->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) {
continue;
}
$instance = $attribute->newInstance();
static::$_classTarget[$className][] = $instance;
self::setMappingClass($attribute, $className);
}
}
/**
* @return void
*/
public static function clear()
{
static::$_classTarget = [];
static::$_classMethodNote = [];
static::$_classMethod = [];
static::$_classPropertyNote = [];
static::$_classProperty = [];
static::$_mapping = [];
}
/**
* @param ReflectionAttribute $attribute
* @param string $class
*/
public static function setMappingClass(ReflectionAttribute $attribute, string $class)
{
if (!isset(static::$_mapping[$attribute->getName()])) {
static::$_mapping[$attribute->getName()] = [];
}
if (!isset(static::$_mapping[$attribute->getName()][$class])) {
static::$_mapping[$attribute->getName()][$class] = [];
}
}
/**
* @param ReflectionClass $class
*/
public static function setTargetNote(ReflectionClass $class)
{
$className = $class->getName();
if (!isset(static::$_classTarget[$className])) {
static::$_classTarget[$className] = [];
}
foreach ($class->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) {
continue;
}
$instance = $attribute->newInstance();
static::$_classTarget[$className][] = $instance;
self::setMappingClass($attribute, $className);
}
}
/**
* @param ReflectionAttribute $attribute
* @param string $class
* @param string $method
* @param mixed $instance
*/
public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
{
self::setMappingClass($attribute, $class);
if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
static::$_mapping[$attribute->getName()][$class]['method'] = [];
}
static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
}
/**
* @param ReflectionAttribute $attribute
* @param string $class
*/
public static function setMappingClass(ReflectionAttribute $attribute, string $class)
{
if (!isset(static::$_mapping[$attribute->getName()])) {
static::$_mapping[$attribute->getName()] = [];
}
if (!isset(static::$_mapping[$attribute->getName()][$class])) {
static::$_mapping[$attribute->getName()][$class] = [];
}
}
/**
* @param ReflectionAttribute $attribute
* @param string $class
* @param string $property
* @param $instance
*/
public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
{
self::setMappingClass($attribute, $class);
/**
* @param ReflectionAttribute $attribute
* @param string $class
* @param string $method
* @param mixed $instance
*/
public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
{
self::setMappingClass($attribute, $class);
$mapping = static::$_mapping[$attribute->getName()][$class];
if (!isset($mapping['property'])) {
$mapping['property'] = [];
}
$mapping['property'][] = [$property => $instance];
static::$_mapping[$attribute->getName()][$class] = $mapping;
}
if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
static::$_mapping[$attribute->getName()][$class]['method'] = [];
}
static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
}
/**
* @param mixed $class
* @return array
*/
public static function getTargetNote(mixed $class): array
{
if (!is_string($class)) {
$class = $class::class;
}
return static::$_classTarget[$class] ?? [];
}
/**
* @param ReflectionAttribute $attribute
* @param string $class
* @param string $property
* @param $instance
*/
public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
{
self::setMappingClass($attribute, $class);
$mapping = static::$_mapping[$attribute->getName()][$class];
if (!isset($mapping['property'])) {
$mapping['property'] = [];
}
$mapping['property'][] = [$property => $instance];
static::$_mapping[$attribute->getName()][$class] = $mapping;
}
/**
* @param ReflectionClass $class
*/
public static function setMethodNote(ReflectionClass $class)
{
$className = $class->getName();
static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
foreach ($class->getMethods() as $ReflectionMethod) {
static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
foreach ($ReflectionMethod->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) {
continue;
}
$instance = $attribute->newInstance();
static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
}
}
}
/**
* @param mixed $class
* @return array
*/
public static function getTargetNote(mixed $class): array
{
if (!is_string($class)) {
$class = $class::class;
}
return static::$_classTarget[$class] ?? [];
}
/**
* @param string $class
* @param string $method
* @return bool
*/
public static function hasMethod(string $class, string $method): bool
{
return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
}
/**
* @param ReflectionClass $class
*/
public static function setMethodNote(ReflectionClass $class)
{
$className = $class->getName();
static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
foreach ($class->getMethods() as $ReflectionMethod) {
static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
foreach ($ReflectionMethod->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) {
continue;
}
$instance = $attribute->newInstance();
static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
}
}
}
/**
* @param ReflectionClass $class
* @return array
*/
#[Pure] public static function getMethodNote(ReflectionClass $class): array
{
return static::$_classMethodNote[$class->getName()] ?? [];
}
/**
* @param string $class
* @param string $method
* @return bool
*/
public static function hasMethod(string $class, string $method): bool
{
return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
}
/**
* @param \ReflectionClass $reflect
* @return \ReflectionMethod|null
*/
public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
{
NoteManager::setPropertyNote($reflect);
NoteManager::setTargetNote($reflect);
NoteManager::setMethodNote($reflect);
return $reflect->getConstructor();
}
/**
* @param ReflectionClass $class
* @return array
*/
#[Pure] public static function getMethodNote(ReflectionClass $class): array
{
return static::$_classMethodNote[$class->getName()] ?? [];
}
/**
* @param ReflectionClass $class
*/
public static function setPropertyNote(ReflectionClass $class)
{
$className = $class->getName();
static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
foreach ($ReflectionMethod->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) {
continue;
}
/**
* @param \ReflectionClass $reflect
* @return \ReflectionMethod|null
*/
public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
{
NoteManager::setPropertyNote($reflect);
NoteManager::setTargetNote($reflect);
NoteManager::setMethodNote($reflect);
$instance = $attribute->newInstance();
static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
}
}
}
return $reflect->getConstructor();
}
/**
* @param string $attribute
* @param string|null $class
* @return array[]
*/
public static function getAttributeTrees(string $attribute, string $class = null): array
{
$mapping = static::$_mapping[$attribute] ?? [];
if (empty($mapping) || empty($class)) {
return $mapping;
}
return $mapping[$class] ?? [];
}
/**
* @param ReflectionClass $class
*/
public static function setPropertyNote(ReflectionClass $class)
{
$className = $class->getName();
static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
foreach ($ReflectionMethod->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) {
continue;
}
$instance = $attribute->newInstance();
static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
}
}
}
/**
* @param string $attribute
* @param string $class
* @param string|null $method
* @return array
*/
public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
{
$class = self::getAttributeTrees($attribute, $class);
if (empty($class) || !isset($class['method'])){
return null;
}
if (empty($method)) {
return $class['method'];
}
foreach ($class['method'] as $value) {
$key = key($value);
if ($method == $key) {
return $value[$key];
}
}
return null;
}
/**
* @param string $attribute
* @param string|null $class
* @return array[]
*/
public static function getAttributeTrees(string $attribute, string $class = null): array
{
$mapping = static::$_mapping[$attribute] ?? [];
if (empty($mapping) || empty($class)) {
return $mapping;
}
return $mapping[$class] ?? [];
}
/**
* @param string $attribute
* @param string $class
* @param string $method
* @return mixed
*/
public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
{
$class = self::getAttributeTrees($attribute, $class);
if (empty($class) || !isset($class['property'])) {
return [];
}
foreach ($class['property'] as $value) {
$key = key($value);
if ($method == $key) {
return $value[$key];
}
}
return null;
}
/**
* @param string $attribute
* @param string $class
* @param string|null $method
* @return array
*/
public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
{
$class = self::getAttributeTrees($attribute, $class);
if (empty($class) || !isset($class['method'])) {
return null;
}
if (empty($method)) {
return $class['method'];
}
foreach ($class['method'] as $value) {
$key = key($value);
if ($method == $key) {
return $value[$key];
}
}
return null;
}
/**
* @param ReflectionClass|string $class
* @return array
* @throws \ReflectionException
*/
public static function getMethods(ReflectionClass|string $class): array
{
if (is_string($class)) {
$class = self::getReflect($class);
}
return static::$_classMethod[$class->getName()] ?? [];
}
/**
* @param string $attribute
* @param string $class
* @param string $method
* @return mixed
*/
public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
{
$class = self::getAttributeTrees($attribute, $class);
if (empty($class) || !isset($class['property'])) {
return [];
}
foreach ($class['property'] as $value) {
$key = key($value);
if ($method == $key) {
return $value[$key];
}
}
return null;
}
/**
* @param ReflectionClass $class
* @return ReflectionProperty[]
*/
#[Pure] public static function getProperty(ReflectionClass $class): array
{
return static::$_classProperty[$class->getName()] ?? [];
}
/**
* @param ReflectionClass|string $class
* @return array
* @throws \ReflectionException
*/
public static function getMethods(ReflectionClass|string $class): array
{
if (is_string($class)) {
$class = self::getReflect($class);
}
return static::$_classMethod[$class->getName()] ?? [];
}
/**
* @param ReflectionClass $class
* @return array
*/
#[Pure] public static function getPropertyNote(ReflectionClass $class): array
{
return static::$_classPropertyNote[$class->getName()] ?? [];
}
/**
* @param ReflectionClass $class
* @return ReflectionProperty[]
*/
#[Pure] public static function getProperty(ReflectionClass $class): array
{
return static::$_classProperty[$class->getName()] ?? [];
}
/**
* @param ReflectionClass $class
* @return array
*/
#[Pure] public static function getPropertyNote(ReflectionClass $class): array
{
return static::$_classPropertyNote[$class->getName()] ?? [];
}
}
-5
View File
@@ -29,11 +29,6 @@ class Logger extends Component
private array $logs = [];
/** @var EventProvider */
#[Inject(EventProvider::class)]
public EventProvider $eventProvider;
/**
* inject logger
*
+4 -3
View File
@@ -9,6 +9,7 @@ use Http\Aspect\OnAspectInterface;
use Http\Aspect\OnJoinPointInterface;
use Http\Constrict\RequestInterface;
use Kiri\Kiri;
use Psr\Log\LoggerInterface;
/**
@@ -43,10 +44,10 @@ class LoggerAspect implements OnAspectInterface
private function print_runtime($startTime)
{
$request = Kiri::getDi()->get(RequestInterface::class);
$runTime = round(microtime(true) - $startTime, 6);
echo sprintf('run %s use time %6f', $request->getUri()->__toString(), $runTime);
echo PHP_EOL;
$logger = Kiri::getDi()->get(LoggerInterface::class);
$logger->debug(sprintf('run %s use time %6f', $request->getUri()->__toString(), $runTime));
}
}
+4 -3
View File
@@ -5,13 +5,12 @@ namespace Kiri\Error;
use Exception;
use JetBrains\PhpStorm\Pure;
use Kiri\Core\Json;
use Kiri\Exception\ComponentException;
use Kiri\Kiri;
use Server\Abstracts\BaseProcess;
use Swoole\Coroutine;
use Swoole\Process;
use Server\Abstracts\BaseProcess;
/**
* Class LoggerProcess
@@ -24,7 +23,6 @@ class LoggerProcess extends BaseProcess
public string $name = 'logger process';
/**
* @param Process $process
* @throws ComponentException
@@ -43,6 +41,9 @@ class LoggerProcess extends BaseProcess
*/
public function message(Process $process)
{
if ($this->isStop()) {
return;
}
$message = Json::decode($process->read());
if (!empty($message)) {
Kiri::writeFile($this->getDirName($message), $message[0], FILE_APPEND);
+2 -3
View File
@@ -6,14 +6,13 @@ namespace Kiri;
use Exception;
use Kiri\Abstracts\BaseObject;
use Swoole\Coroutine;
use Kiri\Abstracts\Component;
/**
* Class Event
* @package Kiri
*/
class Event extends BaseObject
class Event extends Component
{
public bool $isVide = true;
+187 -106
View File
@@ -2,16 +2,19 @@
namespace Kiri\FileListen;
use Note\Inject;
use Exception;
use Kiri\Abstracts\Config;
use Kiri\Core\Json;
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\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
@@ -22,133 +25,211 @@ class HotReload extends Command
{
public bool $isReloading = false;
public bool $isReloadingOut = false;
public ?array $dirs = [];
public bool $isReloading = FALSE;
public bool $isReloadingOut = FALSE;
public ?array $dirs = [];
public int $events;
public int $events;
public int $int = -1;
public int $int = -1;
private ?Process $process = null;
private ?Process $process = NULL;
public Inotify|Scaner $driver;
public Inotify|Scaner $driver;
#[Inject(Logger::class)]
public Logger $logger;
#[Inject(Logger::class)]
public Logger $logger;
protected mixed $source = null;
protected mixed $source = NULL;
protected mixed $pipes = [];
protected mixed $pipes = [];
protected ?Coroutine\Channel $channel = null;
protected ?Coroutine\Channel $channel = NULL;
/**
*
*/
protected function configure()
{
$this->setName('sw:wather')
->setDescription('server start');
}
/**
*/
protected function configure()
{
$this->setName('sw:wather')->setDescription('server start');
}
/**
* @param InputInterface $input
* @param OutputInterface $output
* @return int
* @throws ConfigException
* @throws Exception
*/
public function execute(InputInterface $input, OutputInterface $output): int
{
// TODO: Implement onHandler() method.
set_error_handler([$this, 'onErrorHandler']);
$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
swoole_async_set(['enable_coroutine' => false]);
if (!extension_loaded('inotify')) {
$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
} else {
$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
}
if (Kiri::getPlatform()->isLinux()) {
swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
}
$this->trigger_reload();
var_dump(getmypid());
Process::signal(SIGTERM, [$this, 'onSignal']);
Process::signal(SIGKILL, [$this, 'onSignal']);
$this->driver->start();
return 0;
}
/**
* @throws ConfigException
* @throws \ReflectionException
* @throws Exception
*/
protected function initCore()
{
set_error_handler([$this, 'errorHandler']);
$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
if (!extension_loaded('inotify')) {
$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
} else {
$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
}
$this->clearOtherService();
$this->setProcessName();
}
/**
* @param $data
* @throws Exception
*/
public function onSignal($data)
{
if (!$data) {
return;
}
$this->driver->clear();
$pid = file_get_contents(storage('.swoole.pid'));
if (!empty($pid) && Process::kill($pid, 0)) {
Process::kill($pid, SIGTERM);
}
if ($this->process && Process::kill($this->process->pid, 0)) {
Process::kill($this->process->pid) && Process::wait(true);
}
while ($ret = Process::wait(true)) {
echo "PID={$ret['pid']}\n";
sleep(1);
}
}
/**
* @throws ConfigException
*/
public function setProcessName()
{
swoole_async_set(['enable_coroutine' => FALSE]);
if (Kiri::getPlatform()->isLinux()) {
swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
}
}
/**
* @param $code
* @param $message
* @param $file
* @param $line
* @throws Exception
*/
public function onErrorHandler($code, $message, $file, $line)
{
if (str_contains($message, 'The file descriptor is not an inotify instance')) {
return;
}
debug('Error:' . $message . ' at ' . $file . ':' . $line);
}
/**
* @throws Exception
*/
public function clearOtherService()
{
if (file_exists(storage('.manager.pid'))) {
$pid = (int)file_get_contents(storage('.manager.pid'));
if ($pid > 0 && Process::kill($pid, 0)) {
Process::kill($pid, 15) && Process::wait(TRUE);
}
}
file_put_contents(storage('.manager.pid'), getmypid());
}
/**
* 重启
*
* @throws Exception
*/
public function trigger_reload()
{
$this->logger->warning('change reload');
$pid = $this->process?->pid;
$process = new Process(function (Process $process) {
$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
});
$process->start();
if ($pid && Process::kill($pid, 0)) {
Process::kill($pid) && Process::wait(true);
}
$this->process = null;
$this->process = $process;
}
/**
* @throws Exception
*/
public function errorHandler()
{
$error = func_get_args();
$path = ['file' => $error[2], 'line' => $error[3]];
if ($error[0] === 0) {
$error[0] = 500;
}
$data = Json::to(500, $error[1], $path);
$this->logger->error($data, 'error');
}
/**
* @param InputInterface $input
* @param OutputInterface $output
* @return int
* @throws ConfigException
* @throws Exception
*/
public function execute(InputInterface $input, OutputInterface $output): int
{
$this->initCore();
$this->trigger_reload();
Timer::tick(1000, fn() => $this->healthCheck());
Process::signal(SIGTERM, [$this, 'onSignal']);
Process::signal(SIGKILL, [$this, 'onSignal']);
$this->driver->start();
return 0;
}
/**
* @throws Exception
*/
public function healthCheck()
{
$pid = (int)file_get_contents(storage('.swoole.pid'));
if ($this->int == 1) {
return;
}
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
*/
public function onSignal($data)
{
if (!$data) {
return;
}
Timer::clearAll();
$this->driver->clear();
$this->stopServer();
$this->stopManager();
while ($ret = Process::wait(TRUE)) {
echo "PID={$ret['pid']}\n";
sleep(1);
}
}
/**
* @throws Exception
*/
protected function stopServer()
{
$pid = file_get_contents(storage('.swoole.pid'));
if (!empty($pid) && Process::kill($pid, 0)) {
Process::kill($pid, SIGTERM);
}
}
/**
*
*/
protected function stopManager()
{
if ($this->process && Process::kill($this->process->pid, 0)) {
Process::kill($this->process->pid) && Process::wait(TRUE);
}
}
/**
* 重启
*
* @throws Exception
*/
public function trigger_reload()
{
if ($this->int == 1) {
return;
}
$this->int = 1;
$this->logger->warning('change reload');
$this->stopServer();
$this->stopManager();
$this->process = new Process(function (Process $process) {
$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
});
$this->process->start();
$this->int = -1;
}
}
+132 -121
View File
@@ -9,150 +9,161 @@ use Swoole\Timer;
class Inotify
{
private mixed $inotify;
private mixed $events;
private mixed $inotify;
private mixed $events;
private array $watchFiles = [];
private array $watchFiles = [];
protected bool $isReloading = FALSE;
public bool $isReloading = FALSE;
protected int $cid;
protected int $cid;
const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
/**
* @param array $dirs
* @param HotReload $process
*/
public function __construct(protected array $dirs, public HotReload $process)
{
}
/**
* @param array $dirs
* @param HotReload $process
*/
public function __construct(protected array $dirs, public HotReload $process)
{
set_error_handler([$this, 'error']);
set_exception_handler([$this, 'error']);
}
/**
* @throws Exception
*/
public function start()
{
$this->inotify = inotify_init();
$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
foreach ($this->dirs as $dir) {
if (!is_dir($dir)) continue;
$this->watch($dir);
}
Event::add($this->inotify, [$this, 'check']);
Event::wait();
}
/**
* @return void
*/
public function error(): void
{
}
public function clear()
{
Event::del($this->inotify);
Event::exit();
}
/**
* @throws Exception
*/
public function start()
{
$this->inotify = inotify_init();
$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
foreach ($this->dirs as $dir) {
if (!is_dir($dir)) continue;
$this->watch($dir);
}
Event::add($this->inotify, [$this, 'check']);
Event::wait();
}
/**
* 开始监听
* @throws Exception
*/
public function check()
{
if (!($events = inotify_read($this->inotify))) {
return;
}
if ($this->isReloading) {
return;
}
public function clear()
{
Event::del($this->inotify);
Event::exit();
}
$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
foreach ($events as $ev) {
if (!in_array($ev['mask'], $LISTEN_TYPE)) {
continue;
}
//非重启类型
if (str_ends_with($ev['name'], '.php')) {
Timer::after(3000, fn()=>$this->reload());
/**
* 开始监听
* @throws Exception
*/
public function check()
{
if (!($events = inotify_read($this->inotify))) {
return;
}
if ($this->isReloading) {
return;
}
$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
foreach ($events as $ev) {
if (!in_array($ev['mask'], $LISTEN_TYPE)) {
continue;
}
//非重启类型
if (str_ends_with($ev['name'], '.php')) {
Timer::after(3000, fn() => $this->reload());
$this->isReloading = TRUE;
}
}
}
}
}
}
/**
* @throws Exception
*/
public function reload()
{
$this->process->trigger_reload();
$this->clearWatch();
foreach ($this->dirs as $root) {
$this->watch($root);
}
$this->process->int = -1;
/**
* @throws Exception
*/
public function reload()
{
$this->process->trigger_reload();
$this->clearWatch();
foreach ($this->dirs as $root) {
$this->watch($root);
}
$this->process->int = -1;
$this->isReloading = FALSE;
}
}
/**
* @throws Exception
*/
public function clearWatch()
{
foreach ($this->watchFiles as $wd) {
try {
inotify_rm_watch($this->inotify, $wd);
} catch (\Throwable $exception) {
logger()->addError($exception, 'throwable');
}
}
$this->watchFiles = [];
}
/**
* @throws Exception
*/
public function clearWatch()
{
foreach ($this->watchFiles as $wd) {
try {
@inotify_rm_watch($this->inotify, $wd);
} catch (\Throwable $exception) {
// logger()->addError($exception->getMessage(), 'throwable');
}
}
$this->watchFiles = [];
}
/**
* @param $dir
* @return bool
* @throws Exception
*/
public function watch($dir): bool
{
//目录不存在
if (!is_dir($dir)) {
return logger()->addError("[$dir] is not a directory.");
}
//避免重复监听
if (isset($this->watchFiles[$dir])) {
return FALSE;
}
/**
* @param $dir
* @return bool
* @throws Exception
*/
public function watch($dir): bool
{
//目录不存在
if (!is_dir($dir)) {
return logger()->addError("[$dir] is not a directory.");
}
//避免重复监听
if (isset($this->watchFiles[$dir])) {
return FALSE;
}
if (in_array($dir, self::IG_DIR)) {
return FALSE;
}
if (in_array($dir, self::IG_DIR)) {
return FALSE;
}
$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
$this->watchFiles[$dir] = $wd;
$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
$this->watchFiles[$dir] = $wd;
$files = scandir($dir);
foreach ($files as $f) {
if ($f == '.' || $f == '..') {
continue;
}
$path = $dir . '/' . $f;
//递归目录
if (is_dir($path)) {
$this->watch($path);
} else if (!str_ends_with($f, '.php')) {
continue;
}
//检测文件类型
if (strstr($f, '.') == '.php') {
$wd = @inotify_add_watch($this->inotify, $path, $this->events);
$this->watchFiles[$path] = $wd;
}
}
return TRUE;
}
$files = scandir($dir);
foreach ($files as $f) {
if ($f == '.' || $f == '..') {
continue;
}
$path = $dir . '/' . $f;
//递归目录
if (is_dir($path)) {
$this->watch($path);
} else if (!str_ends_with($f, '.php')) {
continue;
}
//检测文件类型
if (strstr($f, '.') == '.php') {
$wd = @inotify_add_watch($this->inotify, $path, $this->events);
$this->watchFiles[$path] = $wd;
}
}
return TRUE;
}
}
+119 -117
View File
@@ -3,145 +3,147 @@
namespace Kiri\FileListen;
use Exception;
use Swoole\Timer;
class Scaner
{
private array $md5Map = [];
private array $md5Map = [];
/**
* @param array $dirs
* @param HotReload $process
*/
public function __construct(protected array $dirs, public HotReload $process)
{
}
public bool $isReloading = FALSE;
/**
* @throws Exception
*/
public function start(): void
{
$this->loadDirs();
$this->tick();
}
/**
* @param array $dirs
* @param HotReload $process
*/
public function __construct(protected array $dirs, public HotReload $process)
{
}
/**
* @param bool $isReload
* @throws Exception
*/
private function loadDirs(bool $isReload = false)
{
foreach ($this->dirs as $value) {
if (is_bool($path = realpath($value))) {
continue;
}
if (!is_dir($path)) continue;
$this->loadByDir($path, $isReload);
}
}
/**
* @throws Exception
*/
public function start(): void
{
$this->loadDirs();
$this->tick();
}
/**
* @param $path
* @param bool $isReload
* @return void
* @throws Exception
*/
private function loadByDir($path, bool $isReload = false): void
{
if (!is_string($path)) {
return;
}
$path = rtrim($path, '/');
foreach (glob(realpath($path) . '/*') as $value) {
if (is_dir($value)) {
$this->loadByDir($value, $isReload);
}
if (is_file($value)) {
if ($this->checkFile($value, $isReload)) {
$this->timerReload();
break;
}
}
}
}
/**
* @param bool $isReload
* @throws Exception
*/
private function loadDirs(bool $isReload = FALSE)
{
foreach ($this->dirs as $value) {
if (is_bool($path = realpath($value))) {
continue;
}
if (!is_dir($path)) continue;
$this->loadByDir($path, $isReload);
}
}
/**
* @param $value
* @param $isReload
* @return bool
*/
private function checkFile($value, $isReload): bool
{
$md5 = md5($value);
$mTime = filectime($value);
if (!isset($this->md5Map[$md5])) {
if ($isReload) {
return true;
}
$this->md5Map[$md5] = $mTime;
} else {
if ($this->md5Map[$md5] != $mTime) {
if ($isReload) {
return true;
}
$this->md5Map[$md5] = $mTime;
}
}
return false;
}
/**
* @param $path
* @param bool $isReload
* @return void
* @throws Exception
*/
private function loadByDir($path, bool $isReload = FALSE): void
{
if (!is_string($path)) {
return;
}
$path = rtrim($path, '/');
foreach (glob(realpath($path) . '/*') as $value) {
if (is_dir($value)) {
$this->loadByDir($value, $isReload);
}
if (is_file($value)) {
if ($this->checkFile($value, $isReload)) {
Timer::after(2000, fn() => $this->timerReload());
$this->isReloading = TRUE;
break;
}
}
}
}
/**
* @throws Exception
*/
public function timerReload()
{
if ($this->process->isReloading) {
return;
}
$this->process->isReloading = true;
$this->process->trigger_reload();
$this->process->int = -1;
$this->loadDirs();
$this->process->isReloading = FALSE;
$this->process->isReloadingOut = FALSE;
$this->tick();
}
/**
* @param $value
* @param $isReload
* @return bool
*/
private function checkFile($value, $isReload): bool
{
$md5 = md5($value);
$mTime = filectime($value);
if (!isset($this->md5Map[$md5])) {
if ($isReload) {
return TRUE;
}
$this->md5Map[$md5] = $mTime;
} else {
if ($this->md5Map[$md5] != $mTime) {
if ($isReload) {
return TRUE;
}
$this->md5Map[$md5] = $mTime;
}
}
return FALSE;
}
private bool $isStop = false;
/**
* @throws Exception
*/
public function timerReload()
{
$this->isReloading = TRUE;
$this->process->trigger_reload();
public function clear()
{
$this->isStop = true;
}
$this->process->int = -1;
$this->loadDirs();
$this->isReloading = FALSE;
$this->process->isReloadingOut = FALSE;
$this->tick();
}
/**
* @throws Exception
*/
public function tick()
{
if ($this->process->isReloading || $this->isStop) {
return;
}
private bool $isStop = FALSE;
$this->loadDirs(true);
public function clear()
{
$this->isStop = TRUE;
}
sleep(2);
$this->tick();
}
/**
* @throws Exception
*/
public function tick()
{
if ($this->isReloading || $this->isStop) {
return;
}
$this->loadDirs(TRUE);
sleep(2);
$this->tick();
}
}
+5 -2
View File
@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace Kiri;
error_reporting(0);
use Note\Note;
use Database\Collection;
@@ -16,6 +18,7 @@ use Kiri\Di\Container;
use Psr\Container\ContainerInterface;
use ReflectionException;
use Server\ServerManager;
use Server\Tasker\AsyncTaskExecute;
use Swoole\Coroutine;
use Swoole\Process;
use Swoole\WebSocket\Server;
@@ -457,8 +460,8 @@ class Kiri
*/
public static function async(string $class, array $params = [])
{
$manager = di(ServerManager::class);
$manager->task(new $class(...$params));
$manager = di(AsyncTaskExecute::class);
$manager->execute(new $class(...$params));
}
+1 -3
View File
@@ -113,9 +113,7 @@ class Connection extends Component
public function create($coroutineName, $config): Closure
{
return static function () use ($coroutineName, $config) {
return Kiri::getDi()->create(PDO::class, [
$config['database'], $config['cds'], $config['username'], $config['password'], $config['charset'] ?? 'utf8mb4'
]);
return Kiri::getDi()->create(PDO::class, [$config]);
};
}
+1 -5
View File
@@ -50,11 +50,7 @@ class Redis extends Component
public function create(string $name, mixed $config): Closure
{
return static function () use ($name, $config) {
return Kiri::getDi()->create(\Kiri\Cache\Base\Redis::class, [
$config['host'], (int)$config['port'], $config['databases'] ?? 0,
$config['auth'], $config['prefix'] ?? '', $config['timeout'] ?? 30,
$config['read_timeout'] ?? 30
]);
return Kiri::getDi()->create(\Kiri\Cache\Base\Redis::class, [$config]);
};
}
+2 -2
View File
@@ -5,6 +5,7 @@ namespace Kiri;
use Exception;
use Kiri\Abstracts\Config;
use Kiri\Abstracts\Input;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
@@ -62,8 +63,7 @@ class Runtime extends Command
public function configEach(): string
{
$array = [];
$configs = Kiri::app()->getConfig();
foreach ($configs->getData() as $key => $datum) {
foreach (Config::getData() as $key => $datum) {
if ($datum instanceof \Closure) {
continue;
}
+4 -3
View File
@@ -68,7 +68,7 @@ class Gii
$this->input = $input;
$this->db = $db;
$make = $this->input->getArgument('action');
$make = $this->input->getOption('make');
if (empty($make)) {
throw new Exception('构建类型不能为空~');
}
@@ -120,8 +120,8 @@ class Gii
private function makeByDatabases($make, InputInterface $input): array
{
$redis = Kiri::getDi()->get(Redis::class);
if ($input->hasArgument('name')) {
$this->tableName = $input->getArgument('name');
if ($input->hasOption('name')) {
$this->tableName = $input->getOption('name');
$redis->del('column:' . $this->tableName);
}
return match ($make) {
@@ -334,6 +334,7 @@ class Gii
private function getClassName($tableName): string
{
$res = [];
$tableName = str_replace($this->db->tablePrefix,'', $tableName);
foreach (explode('_', $tableName) as $n => $val) {
$res[] = ucfirst($val);
}
+5 -5
View File
@@ -32,9 +32,9 @@ class GiiCommand extends Command
protected function configure()
{
$this->setName('sw:gii')
->addArgument('action', InputArgument::REQUIRED)
->addArgument('name', InputArgument::OPTIONAL)
->addArgument('databases', InputArgument::OPTIONAL)
->addOption('make','m', InputArgument::OPTIONAL)
->addOption('name','t', InputArgument::OPTIONAL)
->addOption('databases','d', InputArgument::OPTIONAL)
->setDescription('./snowflake sw:gii make=model|controller|task|interceptor|limits|middleware name=xxxx');
}
@@ -52,12 +52,12 @@ class GiiCommand extends Command
$gii = Kiri::app()->get('gii');
$connections = Kiri::app()->get('db');
if (($db = $input->getArgument('databases')) != null) {
if (($db = $input->getOption('databases')) != null) {
$gii->run($connections->get($db), $input);
return 1;
}
$action = $input->getArgument('action');
$action = $input->getOption('make');
if (!in_array($action, ['model', 'controller'])) {
$gii->run(null, $input);
return 1;
-3
View File
@@ -47,9 +47,6 @@ class GiiController extends GiiBase
$namespace = rtrim($path['namespace'], '\\');
$model_namespace = rtrim($modelPath['namespace'], '\\');
$prefix = str_replace('_', '', $this->db->tablePrefix);
$managerName = str_replace(ucfirst($prefix), '', $managerName);
$class = '';
$controller = str_replace('\\\\', '\\', "$namespace\\{$managerName}Controller");
+10 -10
View File
@@ -51,9 +51,6 @@ class GiiModel extends GiiBase
$namespace = rtrim($modelPath['namespace'], '\\');
$prefix = str_replace('_', '', $this->db->tablePrefix);
$managerName = str_replace(ucfirst($prefix), '', $managerName);
if (file_exists($modelPath['path'] . '/' . $managerName . '.php')) {
try {
$className = str_replace('\\\\', '\\', "{$modelPath['namespace']}\\{$managerName}");
@@ -263,7 +260,7 @@ use Database\Model;
$field = '\'' . current($val)['Field'] . '\'';
}
$_field_one .= '
[' . $field . ', \'' . $key . '\'],';
[' . $field . ', \'' . $key . '\'],';
}
foreach ($data as $key => $val) {
$length = $this->getLength($val);
@@ -279,8 +276,11 @@ use Database\Model;
/**
* @return array
*/
protected array $rules = [' . $_field_one . '
];
public function rules(): array
{
return [' . $_field_one . '
];
}
';
}
@@ -311,10 +311,10 @@ use Database\Model;
}
if (count($_val) == 1) {
$_tmp = '
[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
} else {
$_tmp = '
[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
}
$string[] = $_tmp;
}
@@ -338,7 +338,7 @@ use Database\Model;
return '';
}
return '
[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
}
/**
@@ -358,7 +358,7 @@ use Database\Model;
return '';
}
return '
[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
}
/**
+1
View File
@@ -17,6 +17,7 @@ abstract class Attribute implements INote
* @param mixed|string $method
* @return mixed
*/
#[\ReturnTypeWillChange]
public function execute(mixed $class, mixed $method = ''): mixed
{
// TODO: Implement execute() method.
+2 -2
View File
@@ -6,7 +6,7 @@ namespace Note;
use DirectoryIterator;
use Exception;
use Kiri\Abstracts\BaseObject;
use Kiri\Abstracts\Component;
use Kiri\Kiri;
use ReflectionClass;
use ReflectionException;
@@ -17,7 +17,7 @@ use Throwable;
* Class Loader
* @package Note
*/
class Loader extends BaseObject
class Loader extends Component
{
-143
View File
@@ -1,143 +0,0 @@
<?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);
}
}
}
-133
View File
@@ -1,133 +0,0 @@
<?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';
}
@@ -1,8 +0,0 @@
<?php
namespace Server\Contract;
interface OnBeforeShutdown
{
}
-22
View File
@@ -1,22 +0,0 @@
<?php
namespace Kiri\Server\Contract;
use Swoole\Server;
/**
*
*/
interface OnCloseInterface
{
/**
* @param Server $server
* @param int $fd
*/
public function onClose(Server $server, int $fd): void;
}
@@ -1,18 +0,0 @@
<?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;
}
@@ -1,19 +0,0 @@
<?php
namespace Kiri\Server\Contract;
use Swoole\Server;
interface OnDisconnectInterface
{
/**
* @param Server $server
* @param int $fd
*/
public function onDisconnect(Server $server, int $fd): void;
}
@@ -1,12 +0,0 @@
<?php
namespace Kiri\Server\Contract;
use Swoole\Http\Response;
interface OnDownloadInterface
{
public function dispatch(Response $response);
}
@@ -1,22 +0,0 @@
<?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;
}
@@ -1,19 +0,0 @@
<?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;
}
-18
View File
@@ -1,18 +0,0 @@
<?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;
}
@@ -1,19 +0,0 @@
<?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;
}
@@ -1,21 +0,0 @@
<?php
namespace Kiri\Server\Contract;
/**
* Interface OnPipeMessageInterface
* @package Server\Contract
*/
interface OnPipeMessageInterface
{
/**
*
*/
public function process(): void;
}
@@ -1,29 +0,0 @@
<?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;
}
@@ -1,25 +0,0 @@
<?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;
}
-17
View File
@@ -1,17 +0,0 @@
<?php
namespace Kiri\Server\Contract;
use Swoole\Server;
interface OnTaskInterface
{
public function execute();
public function finish(Server $server, int $task_id);
}
-207
View File
@@ -1,207 +0,0 @@
<?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;
}
}
-143
View File
@@ -1,143 +0,0 @@
<?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;
}
}
-12
View File
@@ -1,12 +0,0 @@
<?php
namespace Kiri\Server;
interface SwooleServerInterface
{
public function start();
}
-50
View File
@@ -1,50 +0,0 @@
<?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;
}
}
+39
View File
@@ -49,3 +49,42 @@
// after($process);
//});
var_dump(json_encode([
"Datacenter" => "dc1",
"Node" => "iz8vbi3edjyskl7kpuwudqz",
"SkipNodeUpdate" => false,
"Service" => [
"ID" => "redis1",
"Service" => "FriendRpcService",
"Address" => "172.26.221.211",
"TaggedAddresses" => [
"lan" => [
"address" => "127.0.0.1",
"port" => 9627
],
"wan" => [
"address" => "172.26.221.211",
"port" => 9627
]
],
"Meta" => [
"redis_version" => "4.0"
],
"Port" => 9627
],
"Check" => [
"Node" => "iz8vbi3edjyskl7kpuwudqz",
"CheckId" => "service:redis1",
"Name" => "Redis health check",
"Notes" => "Script based health check",
"Status" => "passing",
"ServiceID" => "redis1",
"Definition" => [
"Http" => "http://172.26.221.211:9627",
"Interval" => "5s",
"Timeout" => "1s",
"DeregisterCriticalServiceAfter" => "30s"
],
],
]));