改名

composer.json

@@ -30,7 +30,7 @@
     "swiftmailer/swiftmailer": "v6.3.*",
     "psr/container": "^2.0",
     "psr/http-server-middleware": "1.0.1",
-    "game-worker/kiri-event": "v1.0",
+    "game-worker/kiri-event": "^v1.0",
     "ext-inotify": "*"
   },
   "autoload": {

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,234 @@ namespace Kiri\Abstracts;
 
 
 use Exception;
-
 use JetBrains\PhpStorm\Pure;
-use Kiri\Exception\ComponentException;
+use Kiri\Di\Container;
 use Kiri\Kiri;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class Component
  * @package Kiri\Kiri\Base
+ * @property ContainerInterface|Container $container
  */
-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 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);
+	}
+
 }

kiri-engine/Abstracts/Logger.php

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

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
@@ -35,17 +35,29 @@ class Redis extends Component
 	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';
+
+
 	/**
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
 	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 +123,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 +147,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/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 Swoole\Coroutine;
+use Kiri\Abstracts\Component;
 
 /**
  * Class Event
  * @package Kiri
  */
-class Event extends BaseObject
+class Event extends Component
 {
 
 	public bool $isVide = true;

kiri-engine/FileListen/HotReload.php

@@ -2,14 +2,16 @@
 
 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\Output\OutputInterface;
@@ -49,12 +51,74 @@ class HotReload extends Command
 
 
 	/**
-	 *
 	 */
 	protected function configure()
 	{
-		$this->setName('sw:wather')
-			->setDescription('server start');
+		$this->setName('sw:wather')->setDescription('server start');
+	}
+
+
+	/**
+	 * @throws ConfigException
+	 * @throws \ReflectionException
+	 * @throws Exception
+	 */
+	protected function initCore()
+	{
+		$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();
+	}
+
+
+	/**
+	 * @throws ConfigException
+	 */
+	public function setProcessName()
+	{
+		swoole_async_set(['enable_coroutine' => false]);
+		set_error_handler([$this, 'errorHandler']);
+		if (Kiri::getPlatform()->isLinux()) {
+			swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
+		}
+	}
+
+
+	/**
+	 * @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 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');
 	}
 
 
@@ -67,21 +131,12 @@ class HotReload extends Command
 	 */
 	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->initCore();
+
 		$this->trigger_reload();
 
-		var_dump(getmypid());
+		Timer::tick(1000, fn() => $this->healthCheck());
+
 		Process::signal(SIGTERM, [$this, 'onSignal']);
 		Process::signal(SIGKILL, [$this, 'onSignal']);
 
@@ -90,6 +145,22 @@ class HotReload extends Command
 	}
 
 
+	/**
+	 * @throws Exception
+	 */
+	public function healthCheck()
+	{
+		$pid = (int)file_get_contents(storage('.swoole.pid'));
+		if (empty($pid)) {
+			$this->logger->warning('service is shutdown you need reload.');
+			$this->trigger_reload();
+		} else if (!Process::kill($pid, 0)) {
+			$this->logger->warning('service is shutdown you need reload.');
+			$this->trigger_reload();
+		}
+	}
+
+
 	/**
 	 * @param $data
 	 * @throws Exception
@@ -99,14 +170,10 @@ class HotReload extends Command
 		if (!$data) {
 			return;
 		}
+		Timer::clearAll();
 		$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);
-		}
+		$this->stopServer();
+		$this->stopManager();
 		while ($ret = Process::wait(true)) {
 			echo "PID={$ret['pid']}\n";
 			sleep(1);
@@ -115,18 +182,25 @@ class HotReload extends Command
 
 
 	/**
-	 * @param $code
-	 * @param $message
-	 * @param $file
-	 * @param $line
 	 * @throws Exception
 	 */
-	public function onErrorHandler($code, $message, $file, $line)
+	protected function stopServer()
 	{
-		if (str_contains($message, 'The file descriptor is not an inotify instance')) {
-			return;
+		$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);
 		}
-		debug('Error:' . $message . ' at ' . $file . ':' . $line);
 	}
 
 
@@ -137,17 +211,21 @@ class HotReload extends Command
 	 */
 	public function trigger_reload()
 	{
+		if ($this->int == 1) {
+			return;
+		}
+		$this->int = 1;
 		$this->logger->warning('change reload');
-		$pid  = $this->process?->pid;
-		$process = new Process(function (Process $process) {
+
+		$this->stopServer();
+		$this->stopManager();
+
+		$this->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;
+
+		$this->process->start();
+		$this->int = -1;
 	}
 
 

kiri-engine/FileListen/Inotify.php

@@ -105,7 +105,7 @@ class Inotify
 			try {
 				inotify_rm_watch($this->inotify, $wd);
 			} catch (\Throwable $exception) {
-				logger()->addError($exception, 'throwable');
+				logger()->addError($exception->getMessage(), 'throwable');
 			}
 		}
 		$this->watchFiles = [];

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->task(new $class(...$params));
+		$manager = di(AsyncTaskExecute::class);
+		$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, [
-				$config['database'], $config['cds'], $config['username'], $config['password'], $config['charset'] ?? 'utf8mb4'
-			]);
+			return Kiri::getDi()->create(PDO::class, [$config]);
 		};
 	}
 

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, [
-				$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]);
 		};
 	}
 

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