1

function.php

@@ -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;
@@ -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')) {
 
 
@@ -900,6 +916,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 +948,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;
 	}
 
 }

kiri-engine/Abstracts/BaseApplication.php

@@ -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);
 	}
 
 

kiri-engine/Abstracts/BaseObject.php

@@ -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);
-	}
-
-}

kiri-engine/Abstracts/Component.php

@@ -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
+	 * BaseAbstract constructor.
-	 * @param $value
+	 *
+	 * @param array $config
 	 * @throws Exception
 	 */
-	public function __set($name, $value)
+	public function __construct(array $config = [])
 	{
-		if (property_exists($this, $name)) {
+		if (!empty($config) && is_array($config)) {
-			$this->$name = $value;
+			Kiri::configure($this, $config);
-		} else {
-			parent::__set($name, $value);
 		}
 	}
 
 
+	/**
+	 * @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)) {
+		$method = 'get' . ucfirst($name);
-			return $this->$name ?? null;
+		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);
+	}
+
 }

kiri-engine/Abstracts/Logger.php

@@ -2,11 +2,13 @@
 
 namespace Kiri\Abstracts;
 
+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;
 
 
@@ -26,12 +28,6 @@ class Logger implements LoggerInterface
 	const DEBUG = 'debug';
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
 	private array $_loggers = [];
 
 
@@ -39,11 +35,12 @@ class Logger implements LoggerInterface
 
 
 	/**
-	 * 监听事件
+	 * @return void
+	 * @throws ReflectionException
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
+		Kiri::getDi()->get(EventProvider::class)->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
 	}
 
 
@@ -194,7 +191,7 @@ class Logger implements LoggerInterface
 	private function _string($message, $context): string
 	{
 		if (!empty($context)) {
-			return $message . ' ' . print_r($context, true) . PHP_EOL;
+			return $message . ' ' . PHP_EOL . print_r($context, true) . PHP_EOL;
 		}
 		return $message . PHP_EOL;
 	}

kiri-engine/Async.php

@@ -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 = di(AsyncTaskExecute::class);
-    	$context->task(static::$_absences[$name], $params);
+    	$context->execute(static::$_absences[$name], $params);
     }
 
 }

kiri-engine/Cache/Base/Redis.php

@@ -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 array $config
-	 * @param int $port
-	 * @param int $database
-	 * @param string $auth
-	 * @param string $prefix
-	 * @param int $timeout
-	 * @param int $read_timeout
 	 */
-	public function __construct(public string $host, public int $port, public int $database = 0,
+	public function __construct(array $config)
-	                            public string $auth = '', public string $prefix = '', public int $timeout = 30,
-	                            public int    $read_timeout = 30)
 	{
+		$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()) {
+		if ($this->_timer === -1) {
-			$this->_timer = Timer::tick(1000, function () {
+			$this->_timer = Timer::tick(1000, fn() => $this->waite());
-				try {
+		}
-					if (env('state', 'start') == 'exit') {
+	}
-						Kiri::getDi()->get(Logger::class)->critical('timer end');
+
-						$this->stopHeartbeatCheck();
+
-					}
+	/**
-					if (time() - $this->_last > 10 * 60) {
+	 * @throws Exception
-						$this->stopHeartbeatCheck();
+	 */
-						$this->pdo = null;
+	private function waite(): void
-					}
+	{
-				} catch (\Throwable $throwable) {
+		try {
-					error($throwable);
+			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);
 		}
 	}
 

kiri-engine/Cache/Redis.php

@@ -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
+	const REDIS_OPTION_HOST = 'host';
-	 */
+	const REDIS_OPTION_PORT = 'port';
-	#[Inject(EventProvider::class)]
+	const REDIS_OPTION_PREFIX = 'prefix';
-	public EventProvider $eventProvider;
+	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();
 

kiri-engine/Core/Network.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Kiri\Core;
+
+class Network
+{
+
+
+	/**
+	 * @return string
+	 */
+	public static function local(): string
+	{
+		return current(swoole_get_local_ip());
+	}
+
+
+}

kiri-engine/Di/Container.php

@@ -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
 	{

kiri-engine/Di/NoteManager.php

@@ -11,279 +11,293 @@ class NoteManager
 {
 
 
-    private static array $_classTarget = [];
+	private static array $_classTarget = [];
-    private static array $_classMethodNote = [];
+	private static array $_classMethodNote = [];
-    private static array $_classMethod = [];
+	private static array $_classMethod = [];
-    private static array $_classPropertyNote = [];
+	private static array $_classPropertyNote = [];
-    private static array $_classProperty = [];
+	private static array $_classProperty = [];
-    private static array $_mapping = [];
+	private static array $_mapping = [];
 
 
-    /**
+	/**
-     * @param ReflectionClass $class
+	 * @return void
-     */
+	 */
-    public static function setTargetNote(ReflectionClass $class)
+	public static function clear()
-    {
+	{
-        $className = $class->getName();
+		static::$_classTarget = [];
-        if (!isset(static::$_classTarget[$className])) {
+		static::$_classMethodNote = [];
-            static::$_classTarget[$className] = [];
+		static::$_classMethod = [];
-        }
+		static::$_classPropertyNote = [];
-        foreach ($class->getAttributes() as $attribute) {
+		static::$_classProperty = [];
-            if (!class_exists($attribute->getName())) {
+		static::$_mapping = [];
-                continue;
+	}
-            }
-
-            $instance = $attribute->newInstance();
-
-            static::$_classTarget[$className][] = $instance;
-
-            self::setMappingClass($attribute, $className);
-        }
-    }
 
 
-    /**
+	/**
-     * @param ReflectionAttribute $attribute
+	 * @param ReflectionClass $class
-     * @param string $class
+	 */
-     */
+	public static function setTargetNote(ReflectionClass $class)
-    public static function setMappingClass(ReflectionAttribute $attribute, string $class)
+	{
-    {
+		$className = $class->getName();
-        if (!isset(static::$_mapping[$attribute->getName()])) {
+		if (!isset(static::$_classTarget[$className])) {
-            static::$_mapping[$attribute->getName()] = [];
+			static::$_classTarget[$className] = [];
-        }
+		}
-        if (!isset(static::$_mapping[$attribute->getName()][$class])) {
+		foreach ($class->getAttributes() as $attribute) {
-            static::$_mapping[$attribute->getName()][$class] = [];
+			if (!class_exists($attribute->getName())) {
-        }
+				continue;
-    }
+			}
+
+			$instance = $attribute->newInstance();
+
+			static::$_classTarget[$className][] = $instance;
+
+			self::setMappingClass($attribute, $className);
+		}
+	}
 
 
-    /**
+	/**
-     * @param ReflectionAttribute $attribute
+	 * @param ReflectionAttribute $attribute
-     * @param string $class
+	 * @param string $class
-     * @param string $method
+	 */
-     * @param mixed $instance
+	public static function setMappingClass(ReflectionAttribute $attribute, string $class)
-     */
+	{
-    public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
+		if (!isset(static::$_mapping[$attribute->getName()])) {
-    {
+			static::$_mapping[$attribute->getName()] = [];
-        self::setMappingClass($attribute, $class);
+		}
-
+		if (!isset(static::$_mapping[$attribute->getName()][$class])) {
-        if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
+			static::$_mapping[$attribute->getName()][$class] = [];
-            static::$_mapping[$attribute->getName()][$class]['method'] = [];
+		}
-        }
+	}
-        static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
-    }
 
 
-    /**
+	/**
-     * @param ReflectionAttribute $attribute
+	 * @param ReflectionAttribute $attribute
-     * @param string $class
+	 * @param string $class
-     * @param string $property
+	 * @param string $method
-     * @param $instance
+	 * @param mixed $instance
-     */
+	 */
-    public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
+	public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
-    {
+	{
-        self::setMappingClass($attribute, $class);
+		self::setMappingClass($attribute, $class);
 
-        $mapping = static::$_mapping[$attribute->getName()][$class];
+		if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
-        if (!isset($mapping['property'])) {
+			static::$_mapping[$attribute->getName()][$class]['method'] = [];
-            $mapping['property'] = [];
+		}
-        }
+		static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
-        $mapping['property'][] = [$property => $instance];
+	}
-        static::$_mapping[$attribute->getName()][$class] = $mapping;
-    }
 
 
-    /**
+	/**
-     * @param mixed $class
+	 * @param ReflectionAttribute $attribute
-     * @return array
+	 * @param string $class
-     */
+	 * @param string $property
-    public static function getTargetNote(mixed $class): array
+	 * @param $instance
-    {
+	 */
-        if (!is_string($class)) {
+	public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
-            $class = $class::class;
+	{
-        }
+		self::setMappingClass($attribute, $class);
-        return static::$_classTarget[$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
+	 * @param mixed $class
-     */
+	 * @return array
-    public static function setMethodNote(ReflectionClass $class)
+	 */
-    {
+	public static function getTargetNote(mixed $class): array
-        $className = $class->getName();
+	{
-        static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
+		if (!is_string($class)) {
-        foreach ($class->getMethods() as $ReflectionMethod) {
+			$class = $class::class;
-            static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
+		}
-            static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
+		return static::$_classTarget[$class] ?? [];
-            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 string $class
+	 * @param ReflectionClass $class
-     * @param string $method
+	 */
-     * @return bool
+	public static function setMethodNote(ReflectionClass $class)
-     */
+	{
-    public static function hasMethod(string $class, string $method): bool
+		$className = $class->getName();
-    {
+		static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
-        return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
+		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
+	 * @param string $class
-     * @return array
+	 * @param string $method
-     */
+	 * @return bool
-    #[Pure] public static function getMethodNote(ReflectionClass $class): array
+	 */
-    {
+	public static function hasMethod(string $class, string $method): bool
-        return static::$_classMethodNote[$class->getName()] ?? [];
+	{
-    }
+		return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
+	}
 
 
-    /**
+	/**
-     * @param \ReflectionClass $reflect
+	 * @param ReflectionClass $class
-     * @return \ReflectionMethod|null
+	 * @return array
-     */
+	 */
-    public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
+	#[Pure] public static function getMethodNote(ReflectionClass $class): array
-    {
+	{
-        NoteManager::setPropertyNote($reflect);
+		return static::$_classMethodNote[$class->getName()] ?? [];
-        NoteManager::setTargetNote($reflect);
+	}
-        NoteManager::setMethodNote($reflect);
-
-        return $reflect->getConstructor();
-    }
 
 
-    /**
+	/**
-     * @param ReflectionClass $class
+	 * @param \ReflectionClass $reflect
-     */
+	 * @return \ReflectionMethod|null
-    public static function setPropertyNote(ReflectionClass $class)
+	 */
-    {
+	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
-        $className = $class->getName();
+	{
-        static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
+		NoteManager::setPropertyNote($reflect);
-        foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
+		NoteManager::setTargetNote($reflect);
-            ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
+		NoteManager::setMethodNote($reflect);
-            static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-            foreach ($ReflectionMethod->getAttributes() as $attribute) {
-                if (!class_exists($attribute->getName())) {
-                    continue;
-                }
 
-                $instance = $attribute->newInstance();
+		return $reflect->getConstructor();
-
+	}
-                static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
-
-                self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
-            }
-        }
-    }
 
 
-    /**
+	/**
-     * @param string $attribute
+	 * @param ReflectionClass $class
-     * @param string|null $class
+	 */
-     * @return array[]
+	public static function setPropertyNote(ReflectionClass $class)
-     */
+	{
-    public static function getAttributeTrees(string $attribute, string $class = null): array
+		$className = $class->getName();
-    {
+		static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
-        $mapping = static::$_mapping[$attribute] ?? [];
+		foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
-        if (empty($mapping) || empty($class)) {
+			ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
-            return $mapping;
+			static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-        }
+			foreach ($ReflectionMethod->getAttributes() as $attribute) {
-        return $mapping[$class] ?? [];
+				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 $attribute
-     * @param string $class
+	 * @param string|null $class
-     * @param string|null $method
+	 * @return array[]
-     * @return array
+	 */
-     */
+	public static function getAttributeTrees(string $attribute, string $class = null): array
-    public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
+	{
-    {
+		$mapping = static::$_mapping[$attribute] ?? [];
-        $class = self::getAttributeTrees($attribute, $class);
+		if (empty($mapping) || empty($class)) {
-        if (empty($class) || !isset($class['method'])){
+			return $mapping;
-            return null;
+		}
-        }
+		return $mapping[$class] ?? [];
-        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 $attribute
-     * @param string $class
+	 * @param string $class
-     * @param string $method
+	 * @param string|null $method
-     * @return mixed
+	 * @return array
-     */
+	 */
-    public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
+	public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
-    {
+	{
-        $class = self::getAttributeTrees($attribute, $class);
+		$class = self::getAttributeTrees($attribute, $class);
-        if (empty($class) || !isset($class['property'])) {
+		if (empty($class) || !isset($class['method'])) {
-            return [];
+			return null;
-        }
+		}
-        foreach ($class['property'] as $value) {
+		if (empty($method)) {
-            $key = key($value);
+			return $class['method'];
-            if ($method == $key) {
+		}
-                return $value[$key];
+		foreach ($class['method'] as $value) {
-            }
+			$key = key($value);
-        }
+			if ($method == $key) {
-        return null;
+				return $value[$key];
-    }
+			}
+		}
+		return null;
+	}
 
 
-    /**
+	/**
-     * @param ReflectionClass|string $class
+	 * @param string $attribute
-     * @return array
+	 * @param string $class
-     * @throws \ReflectionException
+	 * @param string $method
-     */
+	 * @return mixed
-    public static function getMethods(ReflectionClass|string $class): array
+	 */
-    {
+	public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
-        if (is_string($class)) {
+	{
-            $class = self::getReflect($class);
+		$class = self::getAttributeTrees($attribute, $class);
-        }
+		if (empty($class) || !isset($class['property'])) {
-        return static::$_classMethod[$class->getName()] ?? [];
+			return [];
-    }
+		}
+		foreach ($class['property'] as $value) {
+			$key = key($value);
+			if ($method == $key) {
+				return $value[$key];
+			}
+		}
+		return null;
+	}
 
 
-    /**
+	/**
-     * @param ReflectionClass $class
+	 * @param ReflectionClass|string $class
-     * @return ReflectionProperty[]
+	 * @return array
-     */
+	 * @throws \ReflectionException
-    #[Pure] public static function getProperty(ReflectionClass $class): array
+	 */
-    {
+	public static function getMethods(ReflectionClass|string $class): array
-        return static::$_classProperty[$class->getName()] ?? [];
+	{
-    }
+		if (is_string($class)) {
+			$class = self::getReflect($class);
+		}
+		return static::$_classMethod[$class->getName()] ?? [];
+	}
 
 
-    /**
+	/**
-     * @param ReflectionClass $class
+	 * @param ReflectionClass $class
-     * @return array
+	 * @return ReflectionProperty[]
-     */
+	 */
-    #[Pure] public static function getPropertyNote(ReflectionClass $class): array
+	#[Pure] public static function getProperty(ReflectionClass $class): array
-    {
+	{
-        return static::$_classPropertyNote[$class->getName()] ?? [];
+		return static::$_classProperty[$class->getName()] ?? [];
-    }
+	}
+
+
+	/**
+	 * @param ReflectionClass $class
+	 * @return array
+	 */
+	#[Pure] public static function getPropertyNote(ReflectionClass $class): array
+	{
+		return static::$_classPropertyNote[$class->getName()] ?? [];
+	}
 
 
 }

kiri-engine/Error/Logger.php

@@ -29,11 +29,6 @@ class Logger extends Component
 	private array $logs = [];
 
 
-	/** @var EventProvider */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * inject logger
 	 *

kiri-engine/Error/LoggerAspect.php

@@ -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));
 	}
 
 }

kiri-engine/Error/LoggerProcess.php

@@ -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);

kiri-engine/Event.php

@@ -6,14 +6,13 @@ namespace Kiri;
 
 
 use Exception;
-use Kiri\Abstracts\BaseObject;
+use Kiri\Abstracts\Component;
-use Swoole\Coroutine;
 
 /**
  * Class Event
  * @package Kiri
  */
-class Event extends BaseObject
+class Event extends Component
 {
 
 	public bool $isVide = true;

kiri-engine/FileListen/HotReload.php

@@ -4,6 +4,7 @@ namespace Kiri\FileListen;
 
 use Exception;
 use Kiri\Abstracts\Config;
+use Kiri\Core\Json;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
@@ -13,6 +14,7 @@ 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;
 
 
@@ -23,152 +25,211 @@ class HotReload extends Command
 {
 
 
-	public bool $isReloading = false;
+    public bool $isReloading = FALSE;
-	public bool $isReloadingOut = false;
+    public bool $isReloadingOut = FALSE;
-	public ?array $dirs = [];
+    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)]
+    #[Inject(Logger::class)]
-	public Logger $logger;
+    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()
-	protected function configure()
+    {
-	{
+        $this->setName('sw:wather')->setDescription('server start');
-		$this->setName('sw:wather')
+    }
-			->setDescription('server start');
-	}
 
 
-	/**
+    /**
-	 * @param InputInterface $input
+     * @throws ConfigException
-	 * @param OutputInterface $output
+     * @throws \ReflectionException
-	 * @return int
+     * @throws Exception
-	 * @throws ConfigException
+     */
-	 * @throws Exception
+    protected function initCore()
-	 */
+    {
-	public function execute(InputInterface $input, OutputInterface $output): int
+        set_error_handler([$this, 'errorHandler']);
-	{
+        $this->dirs = Config::get('inotify', [APP_PATH . 'app']);
-		// TODO: Implement onHandler() method.
+        if (!extension_loaded('inotify')) {
-		set_error_handler([$this, 'onErrorHandler']);
+            $this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
-		$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
+        } else {
-		swoole_async_set(['enable_coroutine' => false]);
+            $this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
-		if (!extension_loaded('inotify')) {
+        }
-			$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
+        $this->clearOtherService();
-		} else {
+        $this->setProcessName();
-			$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();
-
-		Timer::tick(1000, fn() => $this->healthCheck());
-
-		Process::signal(SIGTERM, [$this, 'onSignal']);
-		Process::signal(SIGKILL, [$this, 'onSignal']);
-
-		$this->driver->start();
-		return 0;
-	}
 
 
-	/**
+    /**
-	 * @throws Exception
+     * @throws ConfigException
-	 */
+     */
-	public function healthCheck()
+    public function setProcessName()
-	{
+    {
-		$pid = (int)file_get_contents(storage('.swoole.pid'));
+        swoole_async_set(['enable_coroutine' => FALSE]);
-		if (empty($pid)) {
+        if (Kiri::getPlatform()->isLinux()) {
-			$this->logger->warning('service is shutdown you need reload.');
+            swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
-			$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
-	 * @throws Exception
+     */
-	 */
+    public function clearOtherService()
-	public function onSignal($data)
+    {
-	{
+        if (file_exists(storage('.manager.pid'))) {
-		if (!$data) {
+            $pid = (int)file_get_contents(storage('.manager.pid'));
-			return;
+            if ($pid > 0 && Process::kill($pid, 0)) {
-		}
+                Process::kill($pid, 15) && Process::wait(TRUE);
-		$this->driver->clear();
+            }
-		$pid = file_get_contents(storage('.swoole.pid'));
+        }
-		if (!empty($pid) && Process::kill($pid, 0)) {
+        file_put_contents(storage('.manager.pid'), getmypid());
-			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);
-		}
-	}
 
 
-	/**
+    /**
-	 * @param $code
+     * @throws Exception
-	 * @param $message
+     */
-	 * @param $file
+    public function errorHandler()
-	 * @param $line
+    {
-	 * @throws Exception
+        $error = func_get_args();
-	 */
+
-	public function onErrorHandler($code, $message, $file, $line)
+        $path = ['file' => $error[2], 'line' => $error[3]];
-	{
+
-		if (str_contains($message, 'The file descriptor is not an inotify instance')) {
+        if ($error[0] === 0) {
-			return;
+            $error[0] = 500;
-		}
+        }
-		debug('Error:' . $message . ' at ' . $file . ':' . $line);
+        $data = Json::to(500, $error[1], $path);
-	}
+
+        $this->logger->error($data, 'error');
+    }
 
 
-	/**
+    /**
-	 * 重启
+     * @param InputInterface $input
-	 *
+     * @param OutputInterface $output
-	 * @throws Exception
+     * @return int
-	 */
+     * @throws ConfigException
-	public function trigger_reload()
+     * @throws Exception
-	{
+     */
-		$this->logger->warning('change reload');
+    public function execute(InputInterface $input, OutputInterface $output): int
-		$pid = $this->process?->pid;
+    {
-		$process = new Process(function (Process $process) {
+        $this->initCore();
-			$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
 
-			$this->logger->warning('service stop.');
+        $this->trigger_reload();
-		});
+        Timer::tick(1000, fn() => $this->healthCheck());
-		$process->start();
+
-		if ($pid && Process::kill($pid, 0)) {
+        Process::signal(SIGTERM, [$this, 'onSignal']);
-			Process::kill($pid) && Process::wait(true);
+        Process::signal(SIGKILL, [$this, 'onSignal']);
-		}
+
-		$this->process = null;
+        $this->driver->start();
-		$this->process = $process;
+        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;
+    }
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -9,150 +9,161 @@ use Swoole\Timer;
 class Inotify
 {
 
-	private mixed $inotify;
+    private mixed $inotify;
-	private mixed $events;
+    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 array $dirs
-	 * @param HotReload $process
+     * @param HotReload $process
-	 */
+     */
-	public function __construct(protected array $dirs, public HotReload $process)
+    public function __construct(protected array $dirs, public HotReload $process)
-	{
+    {
-	}
+        set_error_handler([$this, 'error']);
+        set_exception_handler([$this, 'error']);
+    }
 
 
-	/**
+    /**
-	 * @throws Exception
+     * @return void
-	 */
+     */
-	public function start()
+    public function error(): void
-	{
+    {
-		$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();
-	}
 
 
-	public function clear()
+    /**
-	{
+     * @throws Exception
-		Event::del($this->inotify);
+     */
-		Event::exit();
+    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();
+    }
 
 
-	/**
+    public function clear()
-	 * 开始监听
+    {
-	 * @throws Exception
+        Event::del($this->inotify);
-	 */
+        Event::exit();
-	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;
+     * @throws Exception
-			}
+     */
-			//非重启类型
+    public function check()
-			if (str_ends_with($ev['name'], '.php')) {
+    {
-                Timer::after(3000, fn()=>$this->reload());
+        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
+     * @throws Exception
-	 */
+     */
-	public function reload()
+    public function reload()
-	{
+    {
-		$this->process->trigger_reload();
+        $this->process->trigger_reload();
-		$this->clearWatch();
+        $this->clearWatch();
-		foreach ($this->dirs as $root) {
+        foreach ($this->dirs as $root) {
-			$this->watch($root);
+            $this->watch($root);
-		}
+        }
-		$this->process->int = -1;
+        $this->process->int = -1;
         $this->isReloading = FALSE;
-	}
+    }
 
 
-	/**
+    /**
-	 * @throws Exception
+     * @throws Exception
-	 */
+     */
-	public function clearWatch()
+    public function clearWatch()
-	{
+    {
-		foreach ($this->watchFiles as $wd) {
+        foreach ($this->watchFiles as $wd) {
-			try {
+            try {
-				inotify_rm_watch($this->inotify, $wd);
+                @inotify_rm_watch($this->inotify, $wd);
-			} catch (\Throwable $exception) {
+            } catch (\Throwable $exception) {
-				logger()->addError($exception, 'throwable');
+//				logger()->addError($exception->getMessage(), 'throwable');
-			}
+            }
-		}
+        }
-		$this->watchFiles = [];
+        $this->watchFiles = [];
-	}
+    }
 
 
-	/**
+    /**
-	 * @param $dir
+     * @param $dir
-	 * @return bool
+     * @return bool
-	 * @throws Exception
+     * @throws Exception
-	 */
+     */
-	public function watch($dir): bool
+    public function watch($dir): bool
-	{
+    {
-		//目录不存在
+        //目录不存在
-		if (!is_dir($dir)) {
+        if (!is_dir($dir)) {
-			return logger()->addError("[$dir] is not a directory.");
+            return logger()->addError("[$dir] is not a directory.");
-		}
+        }
-		//避免重复监听
+        //避免重复监听
-		if (isset($this->watchFiles[$dir])) {
+        if (isset($this->watchFiles[$dir])) {
-			return FALSE;
+            return FALSE;
-		}
+        }
 
-		if (in_array($dir, self::IG_DIR)) {
+        if (in_array($dir, self::IG_DIR)) {
-			return FALSE;
+            return FALSE;
-		}
+        }
 
-		$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
+        $wd = @inotify_add_watch($this->inotify, $dir, $this->events);
-		$this->watchFiles[$dir] = $wd;
+        $this->watchFiles[$dir] = $wd;
 
-		$files = scandir($dir);
+        $files = scandir($dir);
-		foreach ($files as $f) {
+        foreach ($files as $f) {
-			if ($f == '.' || $f == '..') {
+            if ($f == '.' || $f == '..') {
-				continue;
+                continue;
-			}
+            }
-			$path = $dir . '/' . $f;
+            $path = $dir . '/' . $f;
-			//递归目录
+            //递归目录
-			if (is_dir($path)) {
+            if (is_dir($path)) {
-				$this->watch($path);
+                $this->watch($path);
-			} else if (!str_ends_with($f, '.php')) {
+            } else if (!str_ends_with($f, '.php')) {
-				continue;
+                continue;
-			}
+            }
-			//检测文件类型
+            //检测文件类型
-			if (strstr($f, '.') == '.php') {
+            if (strstr($f, '.') == '.php') {
-				$wd = @inotify_add_watch($this->inotify, $path, $this->events);
+                $wd = @inotify_add_watch($this->inotify, $path, $this->events);
-				$this->watchFiles[$path] = $wd;
+                $this->watchFiles[$path] = $wd;
-			}
+            }
-		}
+        }
-		return TRUE;
+        return TRUE;
-	}
+    }
 }

kiri-engine/FileListen/Scaner.php

@@ -3,145 +3,147 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Swoole\Timer;
 
 class Scaner
 {
 
-	private array $md5Map = [];
+    private array $md5Map = [];
 
-	/**
+    public bool $isReloading = FALSE;
-	 * @param array $dirs
-	 * @param HotReload $process
-	 */
-	public function __construct(protected array $dirs, public HotReload $process)
-	{
-	}
 
 
-	/**
+    /**
-	 * @throws Exception
+     * @param array $dirs
-	 */
+     * @param HotReload $process
-	public function start(): void
+     */
-	{
+    public function __construct(protected array $dirs, public HotReload $process)
-		$this->loadDirs();
+    {
-		$this->tick();
+    }
-	}
 
 
-	/**
+    /**
-	 * @param bool $isReload
+     * @throws Exception
-	 * @throws Exception
+     */
-	 */
+    public function start(): void
-	private function loadDirs(bool $isReload = false)
+    {
-	{
+        $this->loadDirs();
-		foreach ($this->dirs as $value) {
+        $this->tick();
-			if (is_bool($path = realpath($value))) {
+    }
-				continue;
-			}
-
-			if (!is_dir($path)) continue;
-
-			$this->loadByDir($path, $isReload);
-		}
-	}
 
 
-	/**
+    /**
-	 * @param $path
+     * @param bool $isReload
-	 * @param bool $isReload
+     * @throws Exception
-	 * @return void
+     */
-	 * @throws Exception
+    private function loadDirs(bool $isReload = FALSE)
-	 */
+    {
-	private function loadByDir($path, bool $isReload = false): void
+        foreach ($this->dirs as $value) {
-	{
+            if (is_bool($path = realpath($value))) {
-		if (!is_string($path)) {
+                continue;
-			return;
+            }
-		}
+
-		$path = rtrim($path, '/');
+            if (!is_dir($path)) continue;
-		foreach (glob(realpath($path) . '/*') as $value) {
+
-			if (is_dir($value)) {
+            $this->loadByDir($path, $isReload);
-				$this->loadByDir($value, $isReload);
+        }
-			}
+    }
-			if (is_file($value)) {
-				if ($this->checkFile($value, $isReload)) {
-					$this->timerReload();
-					break;
-				}
-			}
-		}
-	}
 
 
-	/**
+    /**
-	 * @param $value
+     * @param $path
-	 * @param $isReload
+     * @param bool $isReload
-	 * @return bool
+     * @return void
-	 */
+     * @throws Exception
-	private function checkFile($value, $isReload): bool
+     */
-	{
+    private function loadByDir($path, bool $isReload = FALSE): void
-		$md5 = md5($value);
+    {
-		$mTime = filectime($value);
+        if (!is_string($path)) {
-		if (!isset($this->md5Map[$md5])) {
+            return;
-			if ($isReload) {
+        }
-				return true;
+        $path = rtrim($path, '/');
-			}
+        foreach (glob(realpath($path) . '/*') as $value) {
-			$this->md5Map[$md5] = $mTime;
+            if (is_dir($value)) {
-		} else {
+                $this->loadByDir($value, $isReload);
-			if ($this->md5Map[$md5] != $mTime) {
+            }
-				if ($isReload) {
+            if (is_file($value)) {
-					return true;
+                if ($this->checkFile($value, $isReload)) {
-				}
+                    Timer::after(2000, fn() => $this->timerReload());
-				$this->md5Map[$md5] = $mTime;
+                    $this->isReloading = TRUE;
-			}
+                    break;
-		}
+                }
-		return false;
+            }
-	}
+        }
+    }
 
 
-	/**
+    /**
-	 * @throws Exception
+     * @param $value
-	 */
+     * @param $isReload
-	public function timerReload()
+     * @return bool
-	{
+     */
-		if ($this->process->isReloading) {
+    private function checkFile($value, $isReload): bool
-			return;
+    {
-		}
+        $md5 = md5($value);
-		$this->process->isReloading = true;
+        $mTime = filectime($value);
-		$this->process->trigger_reload();
+        if (!isset($this->md5Map[$md5])) {
-
+            if ($isReload) {
-		$this->process->int = -1;
+                return TRUE;
-
+            }
-		$this->loadDirs();
+            $this->md5Map[$md5] = $mTime;
-
+        } else {
-		$this->process->isReloading = FALSE;
+            if ($this->md5Map[$md5] != $mTime) {
-		$this->process->isReloadingOut = FALSE;
+                if ($isReload) {
-
+                    return TRUE;
-		$this->tick();
+                }
-	}
+                $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->process->int = -1;
-	{
+
-		$this->isStop = true;
+        $this->loadDirs();
-	}
+
+        $this->isReloading = FALSE;
+        $this->process->isReloadingOut = FALSE;
+
+        $this->tick();
+    }
 
 
-	/**
+    private bool $isStop = FALSE;
-	 * @throws Exception
-	 */
-	public function tick()
-	{
-		if ($this->process->isReloading || $this->isStop) {
-			return;
-		}
 
-		$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();
+    }
 
 }

kiri-engine/Kiri.php

@@ -16,6 +16,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 +458,8 @@ class Kiri
 	 */
 	public static function async(string $class, array $params = [])
 	{
-		$manager = di(ServerManager::class);
+		$manager = di(AsyncTaskExecute::class);
-		$manager->task(new $class(...$params));
+		$manager->execute(new $class(...$params));
 	}
 
 

kiri-engine/Pool/Connection.php

@@ -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, [
+			return Kiri::getDi()->create(PDO::class, [$config]);
-				$config['database'], $config['cds'], $config['username'], $config['password'], $config['charset'] ?? 'utf8mb4'
-			]);
 		};
 	}
 

kiri-engine/Pool/Redis.php

@@ -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, [
+			return Kiri::getDi()->create(\Kiri\Cache\Base\Redis::class, [$config]);
-				$config['host'], (int)$config['port'], $config['databases'] ?? 0,
-				$config['auth'], $config['prefix'] ?? '', $config['timeout'] ?? 30,
-				$config['read_timeout'] ?? 30
-			]);
 		};
 	}
 

kiri-gii/Gii.php

@@ -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);
 		}

kiri-gii/GiiController.php

@@ -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");
 

kiri-gii/GiiModel.php

@@ -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\'],';
 	}
 
 	/**

kiri-note/Loader.php

@@ -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
 {
 
 

p.php

@@ -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"
+		],
+	],
+]));