Revert "改名"

This reverts commit fdf58326

Kiri.php

@@ -0,0 +1,364 @@
+<?php
+declare(strict_types=1);
+
+
+error_reporting(0);
+
+
+use Database\Collection;
+use Database\ModelInterface;
+use JetBrains\PhpStorm\Pure;
+use Kiri\Abstracts\Config;
+use Kiri\Annotation\Annotation;
+use Kiri\Application;
+use Kiri\Core\Json;
+use Kiri\Di\Container;
+use Kiri\Environmental;
+use Psr\Container\ContainerInterface;
+use Swoole\Coroutine;
+use Swoole\Process;
+use Swoole\WebSocket\Server;
+
+defined('DB_ERROR_BUSY') or define('DB_ERROR_BUSY', 'The database is busy. Please try again later.');
+defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
+defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
+defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', realpath(APP_PATH . 'controllers/'));
+defined('MODEL_PATH') or define('MODEL_PATH', realpath(APP_PATH . 'models/'));
+defined('COMPONENT_PATH') or define('COMPONENT_PATH', realpath(APP_PATH . 'components/'));
+
+
+/**
+ * Class Kiri
+ * @package Kiri
+ */
+class Kiri
+{
+
+	/** @var Container */
+	private static Container $container;
+
+
+	/** @var ?Application */
+	private static ?Application $service = null;
+
+
+	/**
+	 * @param $service
+	 *
+	 * 初始化服务
+	 */
+	public static function init($service)
+	{
+		static::$service = $service;
+	}
+
+
+	/**
+	 * @param Container $container
+	 */
+	public static function setContainer(Container $container)
+	{
+		$container->setBindings(ContainerInterface::class, $container);
+		static::$container = $container;
+	}
+
+
+	/**
+	 * @return Container
+	 */
+	public static function getContainer(): Container
+	{
+		return static::$container;
+	}
+
+
+	/**
+	 * @param $alias
+	 * @param array $array
+	 * @throws Exception
+	 */
+	public static function set($alias, array $array = [])
+	{
+		static::app()->set($alias, $array);
+	}
+
+
+	/**
+	 * @param string $name
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public static function getApp(string $name): mixed
+	{
+		return static::app()->get($name);
+	}
+
+	/**
+	 * @return Application|null
+	 */
+	public static function app(): ?Application
+	{
+		return static::$service;
+	}
+
+
+	/**
+	 * @return Application|null
+	 */
+	public static function getFactory(): ?Application
+	{
+		return static::$service;
+	}
+
+
+	/**
+	 * @return Application|null
+	 */
+	public static function getApplicationContext(): ?Application
+	{
+		return static::$service;
+	}
+
+
+	/**
+	 * @return Container|null
+	 */
+	public static function getContainerContext(): ?Container
+	{
+		return static::$container;
+	}
+
+	/**
+	 * @param $name
+	 * @return bool
+	 */
+	public static function has($name): bool
+	{
+		return static::$service->has($name);
+	}
+
+
+	/**
+	 * @return Annotation
+	 * @throws Exception
+	 */
+	public static function getAnnotation(): Annotation
+	{
+		return static::app()->getAnnotation();
+	}
+
+
+
+	/**
+	 * @param $className
+	 * @param array $construct
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public static function createObject($className, array $construct = []): mixed
+	{
+		if (is_string($className) && class_exists($className)) {
+			return static::$container->get($className, $construct);
+		} else if (is_array($className) && isset($className['class'])) {
+			$class = $className['class'];
+			unset($className['class']);
+			return static::$container->create($class, $construct, $className);
+		} else if (is_callable($className, TRUE)) {
+			return call_user_func($className, $construct);
+		} else {
+			throw new Exception('Unsupported configuration type: ' . gettype($className));
+		}
+	}
+
+
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function getStoragePath(): string
+	{
+		$default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR;
+		$path = Config::get('storage', $default);
+		if (!is_dir($path)) {
+			mkdir($path, 0777, true);
+		}
+		return $path;
+	}
+
+
+	/**
+	 * @return Container
+	 */
+	public static function getDi(): Container
+	{
+		return static::$container;
+	}
+
+
+	/**
+	 * @return Container
+	 */
+	public static function di(): Container
+	{
+		return static::$container;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public static function isDocker(): bool
+	{
+		$output = shell_exec('[ -f /.dockerenv ] && echo yes || echo no');
+		if (trim($output) === 'yes') {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param $fileName
+	 * @param $content
+	 * @param null $is_append
+	 * @return mixed
+	 */
+	public static function writeFile($fileName, $content, $is_append = null): mixed
+	{
+		$params = [$fileName, (string)$content];
+		if ($is_append !== null) {
+			$params[] = $is_append;
+		}
+		return !(Coroutine::getCid() > 0) ? file_put_contents(...$params) : Coroutine::writeFile(...$params);
+	}
+
+
+	/**
+	 * @param $object
+	 * @param $config
+	 * @return mixed
+	 */
+	public static function configure($object, $config): mixed
+	{
+		foreach ($config as $key => $value) {
+			if (!property_exists($object, $key)) {
+				continue;
+			}
+			$object->$key = $value;
+		}
+		return $object;
+	}
+
+
+	/**
+	 * @return mixed
+	 */
+	public static function localhost(): mixed
+	{
+		return current(swoole_get_local_ip());
+	}
+
+
+	/**
+	 * @param array $v1
+	 * @param array $v2
+	 * @return float
+	 */
+	#[Pure] public static function distance(array $v1, array $v2): float
+	{
+		$maxX = max($v1['x'], $v2['x']);
+		$minX = min($v1['x'], $v2['x']);
+
+		$maxZ = max($v1['z'], $v2['z']);
+		$minZ = min($v1['z'], $v2['z']);
+
+		$dx = abs($maxX - $minX);
+		$dy = abs($maxZ - $minZ);
+
+		$sqrt = sqrt($dx * $dx + $dy * $dy);
+		if ($sqrt < 0) {
+			$sqrt = abs($sqrt);
+		}
+		return (float)$sqrt;
+	}
+
+
+	/**
+	 * @param $tmp_name
+	 * @return string
+	 */
+	public static function rename($tmp_name): string
+	{
+		$hash = md5_file($tmp_name);
+
+		$later = '.' . exif_imagetype($tmp_name);
+
+		$match = '/(\w{12})(\w{5})(\w{9})(\w{6})/';
+		$tmp = preg_replace($match, '$1-$2-$3-$4', $hash);
+
+		return strtoupper($tmp) . $later;
+	}
+
+
+	/**
+	 * @return Environmental
+	 * @throws
+	 */
+	public static function getPlatform(): Environmental
+	{
+		return Kiri::createObject(Environmental::class);
+	}
+
+
+	/**
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public static function reload(): mixed
+	{
+		return Kiri::app()->getSwoole()->reload();
+	}
+
+
+	const PROCESS = 'process';
+	const TASK = 'task';
+	const WORKER = 'worker';
+
+	/**
+	 * @return string|null
+	 */
+	#[Pure] public static function getEnvironmental(): ?string
+	{
+		return env('environmental');
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	#[Pure] public static function isTask(): bool
+	{
+		return static::getEnvironmental() == static::TASK;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	#[Pure] public static function isWorker(): bool
+	{
+		return static::getEnvironmental() == static::WORKER;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	#[Pure] public static function isProcess(): bool
+	{
+		return static::getEnvironmental() == static::PROCESS;
+	}
+
+}
+
+Kiri::setContainer(new Container());

composer.json

@@ -36,9 +36,11 @@
       "Kiri\\Websocket\\": "kiri-websocket-server/",
       "Gii\\": "kiri-gii/",
       "Kiri\\Annotation\\": "kiri-annotation/",
+      "Kiri\\Server\\": "kiri-server/",
       "Kiri\\Task\\": "kiri-task/"
     },
     "files": [
+      "Kiri.php",
       "error.php",
       "function.php"
     ]

function.php

@@ -3,9 +3,10 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Kiri\Message\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Annotation;
+use Kiri\Annotation\Route\Route;
 use Kiri\Application;
 use Kiri\Core\ArrayAccess;
 use Kiri\Di\NoteManager;
@@ -13,9 +14,7 @@ use Kiri\Error\Logger;
 use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri\Message\Handler\Router;
-use Kiri\Annotation\Annotation;
-use Kiri\Annotation\Route\Route;
 use Psr\Log\LoggerInterface;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
@@ -298,22 +297,6 @@ if (!function_exists('injectRuntime')) {
 }
 
 
-if (!function_exists('swoole')) {
-
-
-	/**
-	 * @return Server|null
-	 * @throws Exception
-	 */
-	function swoole(): ?Server
-	{
-		return Kiri::getWebSocket();
-	}
-
-
-}
-
-
 if (!function_exists('directory')) {
 
 	/**
@@ -1232,3 +1215,27 @@ if (!function_exists('success')) {
 	}
 }
 
+
+if (!function_exists('error_trigger_format')) {
+
+
+	/**
+	 * @param Throwable|Error $throwable
+	 * @return string
+	 */
+	function error_trigger_format(\Throwable|\Error $throwable): string
+	{
+		$message = "Throwable: " . $throwable->getMessage() . "\n" . '	' . $throwable->getFile() . " at line " . $throwable->getLine() . "\n";
+
+		$message .= "trance\n";
+		foreach ($throwable->getTrace() as $value) {
+			if (!isset($value['file'])) {
+				continue;
+			}
+			$message .= $value['file'] . " -> " . $value['line'] . "(" . (isset($value['class']) ? $value['class'] . '::' : '') . ($value['function'] ?? 'Closure') . ")\n";
+		}
+		return "\033[41;37m" . $message . "\033[0m";
+	}
+
+}
+

kiri-annotation/Event.php

@@ -6,7 +6,7 @@ namespace Kiri\Annotation;
 
 use Exception;
 use Kiri\Events\EventProvider;
-use Kiri\Kiri;
+use Kiri;
 
 
 /**

kiri-annotation/Inject.php

@@ -6,7 +6,7 @@ namespace Kiri\Annotation;
 
 use Exception;
 use Kiri\Core\Str;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 use ReflectionProperty;
 

kiri-annotation/Loader.php

@@ -6,8 +6,8 @@ namespace Kiri\Annotation;
 
 use DirectoryIterator;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
 use ReflectionClass;
 use ReflectionException;
 use Throwable;
@@ -84,6 +84,9 @@ class Loader extends Component
 	public function _scanDir(DirectoryIterator $paths, $namespace, array $exclude = [])
 	{
 		foreach ($paths as $path) {
+			if (function_exists('opcache_invalidate')) {
+				opcache_invalidate($path->getRealPath(), true);
+			}
 			if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
 				continue;
 			}

kiri-annotation/Mapping.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Annotation;
 
-use Kiri\Kiri;
+use Kiri;
 
 #[\Attribute(\Attribute::TARGET_CLASS)] class Mapping extends Attribute
 {

kiri-annotation/Route/Route.php

@@ -6,7 +6,7 @@ namespace Kiri\Annotation\Route;
 
 use Kiri\Annotation\Attribute;
 use Kiri\Message\Handler\Router;
-use Kiri\Kiri;
+use Kiri;
 
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Route extends Attribute
 {

kiri-annotation/Task.php

@@ -1,44 +0,0 @@
-<?php
-
-
-namespace Kiri\Annotation;
-
-
-use Exception;
-use Kiri\Kiri;
-use Kiri\Server\Tasker\AsyncTaskExecute;
-
-
-/**
- * Class Task
- * @package Annotation
- * Task任务
- */
-#[\Attribute(\Attribute::TARGET_CLASS)] class Task extends Attribute
-{
-
-
-	/**
-	 * Task constructor.
-	 * @param string $name
-	 */
-	public function __construct(public string $name)
-	{
-
-	}
-
-
-	/**
-	 * @param mixed $class
-	 * @param mixed|null $method
-	 * @return bool
-	 * @throws Exception
-	 */
-    public function execute(mixed $class, mixed $method = null): bool
-    {
-		$task = Kiri::getDi()->get(AsyncTaskExecute::class);
-		$task->reg($this->name, $class);
-		return true;
-	}
-
-}

kiri-engine/Abstracts/BaseApplication.php

@@ -14,19 +14,22 @@ use Database\Connection;
 use Exception;
 use Kiri\Message\Handler\Router;
 use Kafka\KafkaProvider;
-use Kiri\{Async, Kiri};
+use Kiri\Async;
+use Kiri;
 use Kiri\Annotation\Annotation as SAnnotation;
 use Kiri\Cache\Redis;
 use Kiri\Di\LocalService;
 use Kiri\Error\{ErrorHandler, Logger};
 use Kiri\Exception\{InitException, NotFindClassException};
 use ReflectionException;
-use Kiri\Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
+use Kiri\Server\{Server, ServerManager};
+use Kiri\Task\AsyncTaskExecute;
+use Kiri\Task\OnTaskInterface;
 use Swoole\Table;
 
 /**
  * Class BaseApplication
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 abstract class BaseApplication extends Component
 {
@@ -199,7 +202,7 @@ abstract class BaseApplication extends Component
 
 	/**
 	 * @param OnTaskInterface $execute
-	 * @throws ReflectionException
+	 * @throws ReflectionException|Exception
 	 */
 	public function task(OnTaskInterface $execute): void
 	{
@@ -369,7 +372,7 @@ abstract class BaseApplication extends Component
 	 */
 	public function getServer(): Server
 	{
-		return $this->get('server');
+		return Kiri::getDi()->get(Server::class);
 	}
 
 
@@ -443,7 +446,6 @@ abstract class BaseApplication extends Component
 			'logger'          => ['class' => Logger::class],
 			'Annotation'      => ['class' => SAnnotation::class],
 			'databases'       => ['class' => Connection::class],
-			'jwt'             => ['class' => Jwt::class],
 			'async'           => ['class' => Async::class],
 			'kafka-container' => ['class' => KafkaProvider::class],
 		]);

kiri-engine/Abstracts/Component.php

@@ -15,14 +15,14 @@ use JetBrains\PhpStorm\Pure;
 use Kiri\Di\Container;
 use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
-use Kiri\Kiri;
+use Kiri;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Component
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  * @property ContainerInterface|Container $container
  * @property EventProvider $eventProvider
  * @property EventDispatch $eventDispatch
@@ -70,7 +70,7 @@ class Component implements Configure
 	 */
 	protected function getEventDispatch(): EventDispatch
 	{
-		return Kiri::getDi()->get(EventDispatch::class);
+		return $this->getContainer()->get(EventDispatch::class);
 	}
 
 	/**
@@ -147,7 +147,7 @@ class Component implements Configure
 	 * @return Logger
 	 * @throws Exception
 	 */
-	private function logger(): Logger
+	protected function logger(): Logger
 	{
 		return Kiri::getDi()->get(Logger::class);
 	}

kiri-engine/Abstracts/Config.php

@@ -14,7 +14,7 @@ use Kiri\Exception\ConfigException;
 
 /**
  * Class Config
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 class Config extends Component
 {

kiri-engine/Abstracts/Configure.php

@@ -10,7 +10,7 @@ namespace Kiri\Abstracts;
 
 /**
  * Interface Configure
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 interface Configure
 {

kiri-engine/Abstracts/Logger.php

@@ -6,10 +6,10 @@ use DirectoryIterator;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
+use Kiri\Server\Events\OnWorkerStop;
 use Psr\Log\LoggerInterface;
 use ReflectionException;
-use Kiri\Server\Events\OnWorkerStop;
 
 
 /**
@@ -222,7 +222,7 @@ class Logger implements LoggerInterface
 	private function _string($message, $context): string
 	{
 		if (!empty($context)) {
-			return $message . ' ' . PHP_EOL . print_r($context, TRUE) . PHP_EOL;
+			return $message . ' ' . PHP_EOL . print_r($context, true) . PHP_EOL;
 		}
 		return $message . PHP_EOL;
 	}

kiri-engine/Application.php

@@ -13,23 +13,24 @@ namespace Kiri;
 use Closure;
 use Database\DatabasesProviders;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\{BaseApplication, Config, Kernel};
 use Kiri\Crontab\CrontabProviders;
 use Kiri\Events\{OnAfterCommandExecute, OnBeforeCommandExecute};
 use Kiri\FileListen\HotReload;
-use ReflectionException;
 use Kiri\Server\ServerProviders;
+use ReflectionException;
 use stdClass;
 use Swoole\Process;
 use Swoole\Timer;
 use Symfony\Component\Console\{Application as ConsoleApplication,
 	Command\Command,
 	Input\ArgvInput,
-	Input\InputInterface,
 	Output\ConsoleOutput,
 	Output\OutputInterface
 };
 
+
 /**
  * Class Init
  *
@@ -229,7 +230,13 @@ class Application extends BaseApplication
 	{
 		fire(new OnBeforeCommandExecute());
 		if (!($class instanceof HotReload)) {
-			scan_directory(directory('app'), 'App');
+			$config = Config::get('scanner', []);
+			if (!empty($config)) {
+				foreach ($config as $key => $value) {
+					scan_directory($value, $key);
+				}
+			}
+			scan_directory(MODEL_PATH, 'app\Model');
 		}
 
 		$this->container->setBindings(OutputInterface::class, $output);

kiri-engine/Async.php

@@ -7,8 +7,8 @@ namespace Kiri;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Server\ServerManager;
-use Kiri\Server\Tasker\AsyncTaskExecute;
+use Kiri\Task\AsyncTaskExecute;
-
+use Kiri;
 /**
  * Class Async
  * @package Kiri

kiri-engine/Cache/Base/Redis.php

@@ -4,9 +4,11 @@ namespace Kiri\Cache\Base;
 
 use Exception;
 use Kiri\Abstracts\Logger;
+use Kiri\Events\EventProvider;
 use Kiri\Exception\RedisConnectException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
+use Kiri\Server\Events\OnWorkerExit;
 use RedisException;
 use Swoole\Timer;
 
@@ -43,6 +45,9 @@ class Redis implements StopHeartbeatCheck
 	private int $_last = 0;
 
 
+	private EventProvider $eventProvider;
+
+
 	/**
 	 * @param array $config
 	 */
@@ -62,6 +67,21 @@ class Redis implements StopHeartbeatCheck
 	public function init()
 	{
 		$this->heartbeat_check();
+
+		$this->eventProvider = Kiri::getDi()->get(EventProvider::class);
+		$this->eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
+	}
+
+
+
+
+	/**
+	 * @param Kiri\Server\Events\OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		$this->stopHeartbeatCheck();
 	}
 
 
@@ -70,9 +90,7 @@ class Redis implements StopHeartbeatCheck
 	 */
 	public function heartbeat_check(): void
 	{
-		if (env('state', 'start') == 'exit') {
+
-			return;
-		}
 		if ($this->_timer === -1) {
 			$this->_timer = Timer::tick(1000, fn() => $this->waite());
 		}
@@ -85,12 +103,15 @@ class Redis implements StopHeartbeatCheck
 	private function waite(): void
 	{
 		try {
-			if (env('state', 'start') == 'exit') {
+			if ($this->_timer === -1) {
 				Kiri::getDi()->get(Logger::class)->critical('timer end');
 				$this->stopHeartbeatCheck();
 			}
 			if (time() - $this->_last > intval($this->pool['tick'] ?? 60)) {
 				$this->stopHeartbeatCheck();
+
+				$this->eventProvider->off(OnWorkerExit::class, [$this, 'stopHeartbeatCheck']);
+
 				$this->pdo = null;
 			}
 		} catch (\Throwable $throwable) {

kiri-engine/Cache/File.php

@@ -16,7 +16,7 @@ use Swoole\Coroutine\System;
 
 /**
  * Class File
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  */
 class File extends Component implements ICache
 {

kiri-engine/Cache/ICache.php

@@ -11,7 +11,7 @@ namespace Kiri\Cache;
 
 /**
  * Interface ICache
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  */
 interface ICache
 {

kiri-engine/Cache/Redis.php

@@ -15,7 +15,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Core\Json;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\Redis as PoolRedis;
 use Kiri\Annotation\Inject;
 use Kiri\Server\Events\OnWorkerExit;
@@ -23,7 +23,7 @@ use Swoole\Timer;
 
 /**
  * Class Redis
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  * @mixin \Redis
  */
 class Redis extends Component

kiri-engine/Context.php

@@ -5,7 +5,7 @@ namespace Kiri;
 
 use Kiri\Abstracts\BaseContext;
 use Swoole\Coroutine;
-
+use Kiri;
 /**
  * Class Context
  * @package Yoc\http

kiri-engine/Core/DateFormat.php

@@ -13,7 +13,7 @@ namespace Kiri\Core;
 
 /**
  * Class DateFormat
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class DateFormat
 {

kiri-engine/Core/Help.php

@@ -10,7 +10,7 @@ use Exception;
 
 /**
  * Class Help
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Help
 {

kiri-engine/Core/Json.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class JSON
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Json
 {

kiri-engine/Core/Reader.php

@@ -6,7 +6,7 @@ namespace Kiri\Core;
 
 /**
  * Class Reader
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Reader
 {

kiri-engine/Core/Str.php

@@ -9,7 +9,7 @@ use Exception;
 
 /**
  * Class Str
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Str
 {

kiri-engine/Core/Xml.php

@@ -13,7 +13,7 @@ use Exception;
 
 /**
  * Class Xml
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Xml
 {

kiri-engine/Di/Container.php

@@ -9,18 +9,18 @@ declare(strict_types=1);
 
 namespace Kiri\Di;
 
-use Kiri\Annotation\Inject;
 use Closure;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
+use Kiri\Annotation\Inject;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
 use ReflectionMethod;
 use ReflectionProperty;
-use Psr\Container\ContainerInterface;
 
 /**
  * Class Container
@@ -61,36 +61,40 @@ class Container implements ContainerInterface
 	];
 
 
-    /**
+	/**
-     * @param string $id
+	 * @param string $id
-     * @return mixed
+	 * @return mixed
-     * @throws
+	 * @throws
-     */
+	 */
 	public function get(string $id): mixed
 	{
+		if ($id == ContainerInterface::class) {
+			return $this;
+		}
 		return $this->make($id, [], []);
 	}
 
 
-
+	/**
-    /**
+	 * @param $class
-     * @param $class
+	 * @param array $constrict
-     * @param array $constrict
+	 * @param array $config
-     * @param array $config
+	 * @return mixed
-     * @return mixed
+	 * @throws
-     * @throws
+	 */
-     */
+	public function make($class, array $constrict = [], array $config = []): mixed
-    public function make($class, array $constrict = [], array $config = []): mixed
+	{
-    {
+		if ($class == ContainerInterface::class) {
-        if ($this->isInterface($class)) {
+			return $this;
-            $class = $this->_interfaces[$class];
+		}
-        }
+		if ($this->isInterface($class)) {
-        if (!isset($this->_singletons[$class])) {
+			$class = $this->_interfaces[$class];
-            $this->_singletons[$class] = $this->resolve($class, $constrict, $config);
+		}
-        }
+		if (!isset($this->_singletons[$class])) {
-        return $this->_singletons[$class];
+			$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
-    }
+		}
-
+		return $this->_singletons[$class];
+	}
 
 
 	/**
@@ -439,12 +443,12 @@ class Container implements ContainerInterface
 		return $old;
 	}
 
-    /**
+	/**
-     * @param string $id
+	 * @param string $id
-     * @return bool
+	 * @return bool
-     */
+	 */
-    public function has(string $id): bool
+	public function has(string $id): bool
-    {
+	{
-        return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
+		return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
-    }
+	}
 }

kiri-engine/Di/LocalService.php

@@ -3,7 +3,7 @@
 namespace Kiri\Di;
 
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
+use Kiri;
 
 
 /**

kiri-engine/Environmental.php

@@ -5,7 +5,7 @@ namespace Kiri;
 
 
 use JetBrains\PhpStorm\Pure;
-
+use Kiri;
 
 /**
  * Class Environmental

kiri-engine/Error/ErrorHandler.php

@@ -14,13 +14,13 @@ use Kiri\Message\Handler\Formatter\IFormatter;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
 use Kiri\Events\EventDispatch;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Message\Events\OnAfterRequest;
 
 /**
  * Class ErrorHandler
  *
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  * @property-read $asError
  */
 class ErrorHandler extends Component implements ErrorInterface

kiri-engine/Error/ErrorInterface.php

@@ -11,7 +11,7 @@ namespace Kiri\Error;
 
 /**
  * Interface ErrorInterface
- * @package Kiri\Kiri\Error
+ * @package Kiri\Error
  */
 interface ErrorInterface
 {

kiri-engine/Error/Logger.php

@@ -12,14 +12,14 @@ namespace Kiri\Error;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Annotation\Inject;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
 /**
  * Class Logger
- * @package Kiri\Kiri\Error
+ * @package Kiri\Error
  * @mixin \Kiri\Abstracts\Logger
  */
 class Logger extends Component

kiri-engine/Error/LoggerAspect.php

@@ -8,7 +8,7 @@ use Exception;
 use Kiri\Message\Aspect\OnAspectInterface;
 use Kiri\Message\Aspect\OnJoinPointInterface;
 use Kiri\Message\Constrict\RequestInterface;
-use Kiri\Kiri;
+use Kiri;
 use Psr\Log\LoggerInterface;
 
 

kiri-engine/Error/LoggerProcess.php

@@ -7,8 +7,10 @@ namespace Kiri\Error;
 use Exception;
 use Kiri\Core\Json;
 use Kiri\Exception\ComponentException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Broadcast\OnBroadcastInterface;
+use Psr\Log\LoggerInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 
@@ -34,6 +36,17 @@ class LoggerProcess extends BaseProcess
 	}
 
 
+	/**
+	 * @param OnBroadcastInterface $message
+	 * @return void
+	 */
+	public function onBroadcast(OnBroadcastInterface $message): void
+	{
+		$logger = Kiri::getDi()->get(LoggerInterface::class);
+		$logger->debug($message->data . '::' . static::class);
+	}
+
+
 	/**
 	 * @param Process $process
 	 * @throws ComponentException

kiri-engine/Event.php

@@ -7,7 +7,7 @@ namespace Kiri;
 
 use Exception;
 use Kiri\Abstracts\Component;
-
+use Kiri;
 /**
  * Class Event
  * @package Kiri

kiri-engine/Exception/ComponentException.php

@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class ComponentException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class ComponentException extends \Exception
 {

kiri-engine/Exception/NotFindClassException.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class NotFindClassException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class NotFindClassException extends \Exception
 {

kiri-engine/Exception/NotFindPropertyException.php

@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class NotFindClassException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class NotFindPropertyException extends \Exception
 {

kiri-engine/FileListen/HotReload.php

@@ -3,18 +3,17 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
 use Kiri\Core\Json;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Kiri\Annotation\Inject;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\Timer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
@@ -25,201 +24,202 @@ 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');
-    }
+	}
 
 
-    /**
+	/**
-     * @throws ConfigException
+	 * @throws ConfigException
-     * @throws \ReflectionException
+	 * @throws Exception
-     * @throws Exception
+	 */
-     */
+	protected function initCore()
-    protected function initCore()
+	{
-    {
+		set_error_handler([$this, 'errorHandler']);
-        set_error_handler([$this, 'errorHandler']);
+		$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
-        $this->dirs = Config::get('inotify', [APP_PATH . 'app']);
+		if (!extension_loaded('inotify')) {
-        if (!extension_loaded('inotify')) {
+			$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
-            $this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
+		} else {
-        } else {
+			$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
-            $this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
+		}
-        }
+		$this->clearOtherService();
-        $this->clearOtherService();
+		$this->setProcessName();
-        $this->setProcessName();
+	}
-    }
 
 
-    /**
+	/**
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function setProcessName()
+	public function setProcessName()
-    {
+	{
-        swoole_async_set(['enable_coroutine' => FALSE]);
+		swoole_async_set(['enable_coroutine' => FALSE]);
-        if (Kiri::getPlatform()->isLinux()) {
+		if (Kiri::getPlatform()->isLinux()) {
-            swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
+			swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function clearOtherService()
+	public function clearOtherService()
-    {
+	{
-        if (file_exists(storage('.manager.pid'))) {
+		if (file_exists(storage('.manager.pid'))) {
-            $pid = (int)file_get_contents(storage('.manager.pid'));
+			$pid = (int)file_get_contents(storage('.manager.pid'));
-            if ($pid > 0 && Process::kill($pid, 0)) {
+			if ($pid > 0 && Process::kill($pid, 0)) {
-                Process::kill($pid, 15) && Process::wait(TRUE);
+				Process::kill($pid, 15) && Process::wait(TRUE);
-            }
+			}
-        }
+		}
-        file_put_contents(storage('.manager.pid'), getmypid());
+		file_put_contents(storage('.manager.pid'), getmypid());
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function errorHandler()
+	public function errorHandler()
-    {
+	{
-        $error = func_get_args();
+		$error = func_get_args();
 
-        $path = ['file' => $error[2], 'line' => $error[3]];
+		$path = ['file' => $error[2], 'line' => $error[3]];
 
-        if ($error[0] === 0) {
+		if ($error[0] === 0) {
-            $error[0] = 500;
+			$error[0] = 500;
-        }
+		}
-        $data = Json::to(500, $error[1], $path);
+		$data = Json::to(500, $error[1], $path);
 
-        $this->logger->error($data, 'error');
+		$this->logger->error($data, 'error');
-    }
+	}
 
 
-    /**
+	/**
-     * @param InputInterface $input
+	 * @param InputInterface $input
-     * @param OutputInterface $output
+	 * @param OutputInterface $output
-     * @return int
+	 * @return int
-     * @throws ConfigException
+	 * @throws ConfigException
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function execute(InputInterface $input, OutputInterface $output): int
+	public function execute(InputInterface $input, OutputInterface $output): int
-    {
+	{
-        $this->initCore();
+		$this->initCore();
 
-        $this->trigger_reload();
+		$this->trigger_reload();
-        Timer::tick(1000, fn() => $this->healthCheck());
+		Timer::tick(1000, fn() => $this->healthCheck());
 
-        Process::signal(SIGTERM, [$this, 'onSignal']);
+		Process::signal(SIGTERM, [$this, 'onSignal']);
-        Process::signal(SIGKILL, [$this, 'onSignal']);
+		Process::signal(SIGKILL, [$this, 'onSignal']);
 
-        $this->driver->start();
+		$this->driver->start();
-        return 0;
+		return 0;
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function healthCheck()
+	public function healthCheck()
-    {
+	{
-        $pid = (int)file_get_contents(storage('.swoole.pid'));
+		$pid = (int)file_get_contents(storage('.swoole.pid'));
-        if ($this->int == 1) {
+		if ($this->int == 1) {
-            return;
+			return;
-        }
+		}
-        if (empty($pid)) {
+		if (empty($pid)) {
-            $this->logger->warning('service is shutdown you need reload.');
+			$this->logger->warning('service is shutdown you need reload.');
-            $this->trigger_reload();
+			$this->trigger_reload();
-        } else if (!Process::kill($pid, 0)) {
+		} else if (!Process::kill($pid, 0)) {
-            $this->logger->warning('service is shutdown you need reload.');
+			$this->logger->warning('service is shutdown you need reload.');
-            $this->trigger_reload();
+			$this->trigger_reload();
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @param $data
+	 * @param $data
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function onSignal($data)
+	public function onSignal($data)
-    {
+	{
-        if (!$data) {
+		if (!$data) {
-            return;
+			return;
-        }
+		}
-        Timer::clearAll();
+		Timer::clearAll();
-        $this->driver->clear();
+		$this->driver->clear();
-        $this->stopServer();
+		$this->stopServer();
-        while ($ret = Process::wait(TRUE)) {
+		while ($ret = Process::wait(TRUE)) {
-            echo "PID={$ret['pid']}\n";
+			echo "PID={$ret['pid']}\n";
-            sleep(1);
+			sleep(1);
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    protected function stopServer()
+	protected function stopServer()
-    {
+	{
-        $pid = file_get_contents(storage('.swoole.pid'));
+		$pid = file_get_contents(storage('.swoole.pid'));
-        if (!empty($pid) && Process::kill($pid, 0)) {
+		if (!empty($pid) && Process::kill($pid, 0)) {
-            Process::kill($pid, SIGTERM);
+			Process::kill($pid, SIGTERM);
-        }
+		}
-        if ($this->process && Process::kill($this->process->pid, 0)) {
+		if ($this->process && Process::kill($this->process->pid, 0)) {
-            Process::kill($this->process->pid) && Process::wait(TRUE);
+			Process::kill($this->process->pid) && Process::wait(TRUE);
-        }
+		}
-    }
+	}
 
 
-
+	/**
-    /**
+	 * 重启
-     * 重启
+	 *
-     *
+	 * @throws Exception
-     * @throws Exception
+	 */
-     */
+	public function trigger_reload(string $path = '')
-    public function trigger_reload()
+	{
-    {
+		$this->logger->warning('change reload');
-        if ($this->int == 1) {
+		var_dump($path);
-            return;
+		if (!empty($path) && str_starts_with($path, CONTROLLER_PATH)) {
-        }
+			$pid = file_get_contents(storage('.swoole.pid'));
-        $this->int = 1;
+			if (!empty($pid) && Process::kill($pid, 0)) {
-        $this->logger->warning('change reload');
+				Process::kill($pid, SIGUSR1);
-
+			}
-        $this->stopServer();
+		} else {
-        $this->process = new Process(function (Process $process) {
+			$this->int = 1;
-            $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
+			$this->stopServer();
-        });
+			$this->process = new Process(function (Process $process) {
-
+				$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
-        $this->process->start();
+			});
-        $this->int = -1;
+			$this->process->start();
-    }
+			$this->int = -1;
+		}
+	}
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -9,161 +9,163 @@ use Swoole\Timer;
 class Inotify
 {
 
-    private mixed $inotify;
+	private mixed $inotify;
-    private mixed $events;
+	private mixed $events;
 
-    private array $watchFiles = [];
+	private array $watchFiles = [];
 
 
-    public 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_error_handler([$this, 'error']);
-        set_exception_handler([$this, 'error']);
+		set_exception_handler([$this, 'error']);
-    }
+	}
 
 
-    /**
+	/**
-     * @return void
+	 * @return void
-     */
+	 */
-    public function error(): void
+	public function error(): void
-    {
+	{
 
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function start()
+	public function start()
-    {
+	{
-        $this->inotify = inotify_init();
+		$this->inotify = inotify_init();
-        $this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
+		$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
-        foreach ($this->dirs as $dir) {
+		foreach ($this->dirs as $dir) {
-            if (!is_dir($dir)) continue;
+			if (!is_dir($dir)) continue;
-            $this->watch($dir);
+			$this->watch($dir);
-        }
+		}
-        Event::add($this->inotify, [$this, 'check']);
+		$this->process->int = -1;
-        Event::wait();
+		Event::add($this->inotify, [$this, 'check']);
-    }
+		Event::wait();
+	}
 
 
-    public function clear()
+	public function clear()
-    {
+	{
-        Event::del($this->inotify);
+		Event::del($this->inotify);
-        Event::exit();
+		Event::exit();
-    }
+	}
 
 
-    /**
+	/**
-     * 开始监听
+	 * 开始监听
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function check()
+	public function check()
-    {
+	{
-        if (!($events = inotify_read($this->inotify))) {
+		if (!($events = inotify_read($this->inotify))) {
-            return;
+			return;
-        }
+		}
-        if ($this->isReloading) {
+		if ($this->isReloading) {
-            return;
+			return;
-        }
+		}
 
-        $LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
+		$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
-        foreach ($events as $ev) {
+		foreach ($events as $ev) {
-            if (!in_array($ev['mask'], $LISTEN_TYPE)) {
+			if (!in_array($ev['mask'], $LISTEN_TYPE)) {
-                continue;
+				continue;
-            }
+			}
-            //非重启类型
-            if (str_ends_with($ev['name'], '.php')) {
-                Timer::after(3000, fn() => $this->reload());
-                $this->isReloading = TRUE;
-            }
-        }
-    }
 
-    /**
+			$search = array_search($ev['wd'], $this->watchFiles);
-     * @throws Exception
+
-     */
+			//非重启类型
-    public function reload()
+			if (str_ends_with($ev['name'], '.php')) {
-    {
+
-        $this->process->trigger_reload();
+				Timer::after(3000, fn() => $this->reload($search));
-        $this->clearWatch();
+				$this->isReloading = TRUE;
-        foreach ($this->dirs as $root) {
+			}
-            $this->watch($root);
+		}
-        }
+	}
-        $this->process->int = -1;
+
-        $this->isReloading = FALSE;
+	/**
-    }
+	 * @throws Exception
+	 */
+	public function reload($path)
+	{
+		$this->process->trigger_reload($path);
+		$this->process->int = -1;
+
+		$this->clearWatch();
+		foreach ($this->dirs as $root) {
+			$this->watch($root);
+		}
+		$this->isReloading = FALSE;
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function clearWatch()
+	public function clearWatch()
-    {
+	{
-        foreach ($this->watchFiles as $wd) {
+		foreach ($this->watchFiles as $wd) {
-            try {
+			@inotify_rm_watch($this->inotify, $wd);
-                @inotify_rm_watch($this->inotify, $wd);
+		}
-            } catch (\Throwable $exception) {
+		$this->watchFiles = [];
-//				logger()->addError($exception->getMessage(), 'throwable');
+	}
-            }
-        }
-        $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,147 +3,150 @@
 namespace Kiri\FileListen;
 
 use Exception;
-use Swoole\Timer;
 
 class Scaner
 {
 
-    private array $md5Map = [];
+	private array $md5Map = [];
 
-    public bool $isReloading = FALSE;
+	public bool $isReloading = FALSE;
 
 
-    /**
+	/**
-     * @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)
-    {
+	{
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function start(): void
+	public function start(): void
-    {
+	{
-        $this->loadDirs();
+		$this->loadDirs();
-        $this->tick();
+		$this->tick();
-    }
+	}
 
 
-    /**
+	/**
-     * @param bool $isReload
+	 * @param bool $isReload
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    private function loadDirs(bool $isReload = FALSE)
+	private function loadDirs(bool $isReload = FALSE)
-    {
+	{
-        foreach ($this->dirs as $value) {
+		foreach ($this->dirs as $value) {
-            if (is_bool($path = realpath($value))) {
+			if (is_bool($path = realpath($value))) {
-                continue;
+				continue;
-            }
+			}
 
-            if (!is_dir($path)) continue;
+			if (!is_dir($path)) continue;
 
-            $this->loadByDir($path, $isReload);
+			$this->loadByDir($path, $isReload);
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @param $path
+	 * @param $path
-     * @param bool $isReload
+	 * @param bool $isReload
-     * @return void
+	 * @return void
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    private function loadByDir($path, bool $isReload = FALSE): void
+	private function loadByDir($path, bool $isReload = FALSE): void
-    {
+	{
-        if (!is_string($path)) {
+		if (!is_string($path)) {
-            return;
+			return;
-        }
+		}
-        $path = rtrim($path, '/');
+		$path = rtrim($path, '/');
-        foreach (glob(realpath($path) . '/*') as $value) {
+		foreach (glob(realpath($path) . '/*') as $value) {
-            if (is_dir($value)) {
+			if (is_dir($value)) {
-                $this->loadByDir($value, $isReload);
+				$this->loadByDir($value, $isReload);
-            }
+			}
-            if (is_file($value)) {
+			if (is_file($value)) {
-                if ($this->checkFile($value, $isReload)) {
+				if ($this->checkFile($value, $isReload)) {
-                    Timer::after(2000, fn() => $this->timerReload());
+					$this->isReloading = TRUE;
-                    $this->isReloading = TRUE;
+
-                    break;
+					sleep(2);
-                }
+
-            }
+					$this->timerReload($value);
-        }
+					break;
-    }
+				}
+			}
+		}
+	}
 
 
-    /**
+	/**
-     * @param $value
+	 * @param $value
-     * @param $isReload
+	 * @param $isReload
-     * @return bool
+	 * @return bool
-     */
+	 */
-    private function checkFile($value, $isReload): bool
+	private function checkFile($value, $isReload): bool
-    {
+	{
-        $md5 = md5($value);
+		$md5 = md5($value);
-        $mTime = filectime($value);
+		$mTime = filectime($value);
-        if (!isset($this->md5Map[$md5])) {
+		if (!isset($this->md5Map[$md5])) {
-            if ($isReload) {
+			if ($isReload) {
-                return TRUE;
+				return TRUE;
-            }
+			}
-            $this->md5Map[$md5] = $mTime;
+			$this->md5Map[$md5] = $mTime;
-        } else {
+		} else {
-            if ($this->md5Map[$md5] != $mTime) {
+			if ($this->md5Map[$md5] != $mTime) {
-                if ($isReload) {
+				if ($isReload) {
-                    return TRUE;
+					return TRUE;
-                }
+				}
-                $this->md5Map[$md5] = $mTime;
+				$this->md5Map[$md5] = $mTime;
-            }
+			}
-        }
+		}
-        return FALSE;
+		return FALSE;
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function timerReload()
+	public function timerReload($path)
-    {
+	{
-        $this->isReloading = TRUE;
+		$this->isReloading = TRUE;
-        $this->process->trigger_reload();
 
-        $this->process->int = -1;
+		$this->process->trigger_reload($path);
 
-        $this->loadDirs();
+		$this->loadDirs();
 
-        $this->isReloading = FALSE;
+		$this->process->int = -1;
-        $this->process->isReloadingOut = FALSE;
 
-        $this->tick();
+		$this->isReloading = FALSE;
-    }
+		$this->process->isReloadingOut = FALSE;
+
+		$this->tick();
+	}
 
 
-    private bool $isStop = FALSE;
+	private bool $isStop = FALSE;
 
-    public function clear()
+	public function clear()
-    {
+	{
-        $this->isStop = TRUE;
+		$this->isStop = TRUE;
-    }
+	}
 
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function tick()
+	public function tick()
-    {
+	{
-        if ($this->isReloading || $this->isStop) {
+		if ($this->isReloading || $this->isStop) {
-            return;
+			return;
-        }
+		}
 
-        $this->loadDirs(TRUE);
+		$this->loadDirs(TRUE);
 
-        sleep(2);
+		sleep(2);
 
-        $this->tick();
+		$this->tick();
-    }
+	}
 
 }

kiri-engine/Kiri.php

@@ -1,636 +0,0 @@
-<?php
-declare(strict_types=1);
-
-
-namespace Kiri;
-
-error_reporting(0);
-
-
-use Kiri\Annotation\Annotation;
-use Database\Collection;
-use Database\ModelInterface;
-use Exception;
-use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\Config;
-use Kiri\Core\Json;
-use Kiri\Di\Container;
-use Psr\Container\ContainerInterface;
-use ReflectionException;
-use Kiri\Server\ServerManager;
-use Kiri\Server\Tasker\AsyncTaskExecute;
-use Swoole\Coroutine;
-use Swoole\Process;
-use Swoole\WebSocket\Server;
-
-
-defined('DB_ERROR_BUSY') or define('DB_ERROR_BUSY', 'The database is busy. Please try again later.');
-defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
-defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
-defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', APP_PATH . 'app/Controllers/');
-defined('CRONTAB_PATH') or define('CRONTAB_PATH', APP_PATH . 'app/Crontab/');
-defined('CLIENT_PATH') or define('CLIENT_PATH', APP_PATH . 'app/Client/');
-defined('TASK_PATH') or define('TASK_PATH', APP_PATH . 'app/Async/');
-defined('LISTENER_PATH') or define('LISTENER_PATH', APP_PATH . 'app/Listener/');
-defined('KAFKA_PATH') or define('KAFKA_PATH', APP_PATH . 'app/Kafka/');
-defined('RPC_CLIENT_PATH') or define('RPC_CLIENT_PATH', APP_PATH . 'app/Client/Rpc/');
-defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Model/');
-
-
-/**
- * Class Kiri
- * @package Kiri
- */
-class Kiri
-{
-
-	/** @var Container */
-	private static Container $container;
-
-
-	/** @var ?Application */
-	private static ?Application $service = null;
-
-
-	/**
-	 * @param $service
-	 *
-	 * 初始化服务
-	 */
-	public static function init($service)
-	{
-		static::$service = $service;
-	}
-
-
-	/**
-	 * @param Container $container
-	 */
-	public static function setContainer(Container $container)
-	{
-		$container->setBindings(ContainerInterface::class, $container);
-		static::$container = $container;
-	}
-
-
-	/**
-	 * @param $alias
-	 * @param array $array
-	 * @throws Exception
-	 */
-	public static function set($alias, array $array = [])
-	{
-		static::app()->set($alias, $array);
-	}
-
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function getApp(string $name): mixed
-	{
-		return static::app()->get($name);
-	}
-
-	/**
-	 * @return Application|null
-	 */
-	public static function app(): ?Application
-	{
-		return static::$service;
-	}
-
-
-	/**
-	 * @return Application|null
-	 */
-	public static function getFactory(): ?Application
-	{
-		return static::$service;
-	}
-
-
-	/**
-	 * @return Application|null
-	 */
-	public static function getApplicationContext(): ?Application
-	{
-		return static::$service;
-	}
-
-
-	/**
-	 * @return Container|null
-	 */
-	public static function getContainerContext(): ?Container
-	{
-		return static::$container;
-	}
-
-	/**
-	 * @param $name
-	 * @return bool
-	 */
-	public static function has($name): bool
-	{
-		return static::$service->has($name);
-	}
-
-
-	/**
-	 * @param $port
-	 * @return bool
-	 * @throws Exception
-	 */
-	public static function port_already($port): bool
-	{
-		if (empty($port)) {
-			return false;
-		}
-		if (Kiri::getPlatform()->isLinux()) {
-			exec('netstat -tunlp | grep ' . $port, $output);
-		} else {
-			exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
-		}
-		return !empty($output);
-	}
-
-
-	/**
-	 * @return Annotation
-	 * @throws Exception
-	 */
-	public static function getAnnotation(): Annotation
-	{
-		return static::app()->getAnnotation();
-	}
-
-
-	/**
-	 * @param $service
-	 * @return string
-	 */
-	#[Pure] public static function listen($service): string
-	{
-		return sprintf('Check listen %s::%d -> ok', $service['host'], $service['port']);
-	}
-
-
-	/**
-	 * @param $className
-	 * @param array $construct
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function createObject($className, array $construct = []): mixed
-	{
-		if (is_string($className) && class_exists($className)) {
-			return static::$container->get($className, $construct);
-		} else if (is_array($className) && isset($className['class'])) {
-			$class = $className['class'];
-			unset($className['class']);
-			return static::$container->create($class, $construct, $className);
-		} else if (is_callable($className, TRUE)) {
-			return call_user_func($className, $construct);
-		} else {
-			throw new Exception('Unsupported configuration type: ' . gettype($className));
-		}
-	}
-
-	/**
-	 * @return string
-	 * @throws Exception
-	 */
-	public static function getStoragePath(): string
-	{
-		$default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR;
-		$path = Config::get('storage', $default);
-		if (!is_dir($path)) {
-			mkdir($path, 0777, true);
-		}
-		return $path;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public static function inCoroutine(): bool
-	{
-		return Coroutine::getCid() > 0;
-	}
-
-
-	/**
-	 * @return Container
-	 */
-	public static function getDi(): Container
-	{
-		return static::$container;
-	}
-
-
-	/**
-	 * @return Container
-	 */
-	public static function di(): Container
-	{
-		return static::$container;
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setManagerId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/manager');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setProcessId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/process');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public static function isDocker(): bool
-	{
-		$output = shell_exec('[ -f /.dockerenv ] && echo yes || echo no');
-		if (trim($output) === 'yes') {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setWorkerId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/worker');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setTaskId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/task');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-	/**
-	 * @param $fileName
-	 * @param $content
-	 * @param null $is_append
-	 * @return mixed
-	 */
-	public static function writeFile($fileName, $content, $is_append = null): mixed
-	{
-		$params = [$fileName, (string)$content];
-		if ($is_append !== null) {
-			$params[] = $is_append;
-		}
-		return !self::inCoroutine() ? file_put_contents(...$params) : Coroutine::writeFile(...$params);
-	}
-
-
-	/**
-	 * @param $object
-	 * @param $config
-	 * @return mixed
-	 */
-	public static function configure($object, $config): mixed
-	{
-		foreach ($config as $key => $value) {
-			if (!property_exists($object, $key)) {
-				continue;
-			}
-			$object->$key = $value;
-		}
-		return $object;
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @param bool $isWorker
-	 * @throws Exception
-	 */
-	public static function clearProcessId($workerId, bool $isWorker = false)
-	{
-		clearstatcache();
-		$directory = $isWorker === true ? 'pid/worker' : 'pid/task';
-		if (!file_exists($file = storage($workerId, $directory))) {
-			return;
-		}
-		shell_exec('rm -rf ' . $file);
-	}
-
-
-	/**
-	 * @param string|null $taskPid
-	 * @throws Exception
-	 */
-	public static function clearTaskPid(string $taskPid = null)
-	{
-		if (empty($taskPid)) {
-			exec('rm -rf ' . storage(null, 'pid/task'));
-		} else {
-			static::clearProcessId($taskPid);
-		}
-	}
-
-
-	/**
-	 * @param $taskPid
-	 * @throws Exception
-	 */
-	public static function clearWorkerPid($taskPid = null)
-	{
-		if (empty($taskPid)) {
-			exec('rm -rf ' . storage(null, 'pid/worker'));
-		} else {
-			static::clearProcessId($taskPid, true);
-		}
-	}
-
-
-	/**
-	 * @return Server|null
-	 * @throws
-	 */
-	public static function getWebSocket(): ?\Swoole\Server
-	{
-		$server = static::app()->getSwoole();
-		if (!($server instanceof \Swoole\Server)) {
-			return null;
-		}
-		return $server;
-	}
-
-
-	/**
-	 * @return false|string
-	 * @throws Exception
-	 */
-	public static function getMasterPid(): bool|string
-	{
-		$pid = Kiri::app()->getSwoole()->setting['pid_file'];
-
-		return file_get_contents($pid);
-	}
-
-
-	/**
-	 * @param int $fd
-	 * @param $data
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function push(int $fd, $data): mixed
-	{
-		$server = static::getWebSocket();
-		if (empty($server) || !$server->isEstablished($fd)) {
-			return false;
-		}
-		if (!is_string($data)) {
-			$data = Json::encode($data);
-		}
-		return $server->push($fd, $data);
-	}
-
-
-	/**
-	 * @return mixed
-	 */
-	public static function localhost(): mixed
-	{
-		return current(swoole_get_local_ip());
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param array $params
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	public static function async(string $class, array $params = [])
-	{
-		$manager = di(AsyncTaskExecute::class);
-		$manager->execute(new $class(...$params));
-	}
-
-
-	/**
-	 * @param array $v1
-	 * @param array $v2
-	 * @return float
-	 */
-	#[Pure] public static function distance(array $v1, array $v2): float
-	{
-		$maxX = max($v1['x'], $v2['x']);
-		$minX = min($v1['x'], $v2['x']);
-
-		$maxZ = max($v1['z'], $v2['z']);
-		$minZ = min($v1['z'], $v2['z']);
-
-		$dx = abs($maxX - $minX);
-		$dy = abs($maxZ - $minZ);
-
-		$sqrt = sqrt($dx * $dx + $dy * $dy);
-		if ($sqrt < 0) {
-			$sqrt = abs($sqrt);
-		}
-		return (float)$sqrt;
-	}
-
-
-	/**
-	 * @param $process
-	 * @throws Exception
-	 */
-	public static function shutdown($process): void
-	{
-		static::app()->getSwoole()->shutdown();
-		if ($process instanceof Process) {
-			$process->exit(0);
-		}
-	}
-
-
-	/**
-	 * @param $tmp_name
-	 * @return string
-	 */
-	public static function rename($tmp_name): string
-	{
-		$hash = md5_file($tmp_name);
-
-		$later = '.' . exif_imagetype($tmp_name);
-
-		$match = '/(\w{12})(\w{5})(\w{9})(\w{6})/';
-		$tmp = preg_replace($match, '$1-$2-$3-$4', $hash);
-
-		return strtoupper($tmp) . $later;
-	}
-
-
-	/**
-	 * @return Environmental
-	 * @throws
-	 */
-	public static function getPlatform(): Environmental
-	{
-		return Kiri::createObject(Environmental::class);
-	}
-
-
-	/**
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function reload(): mixed
-	{
-		return Kiri::app()->getSwoole()->reload();
-	}
-
-
-	private static array $_autoload = [];
-
-
-	const PROCESS = 'process';
-	const TASK = 'task';
-	const WORKER = 'worker';
-
-
-	/**
-	 * @param string $event
-	 * @param null $data
-	 * @return false|string
-	 * @throws Exception
-	 */
-	public static function param(string $event, $data = NULL): bool|string
-	{
-		if (is_object($data)) {
-			if ($data instanceof ModelInterface || $data instanceof Collection) {
-				$data = $data->getAttributes();
-			} else {
-				$data = get_object_vars($data);
-			}
-		}
-		if (!is_array($data)) $data = ['data' => $data];
-		return json_encode(array_merge(['callback' => $event], $data));
-	}
-
-
-	/**
-	 * @return string|null
-	 */
-	#[Pure] public static function getEnvironmental(): ?string
-	{
-		return env('environmental');
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public static function isTask(): bool
-	{
-		return static::getEnvironmental() == static::TASK;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public static function isWorker(): bool
-	{
-		return static::getEnvironmental() == static::WORKER;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public static function isProcess(): bool
-	{
-		return static::getEnvironmental() == static::PROCESS;
-	}
-
-
-	/**
-	 * @param $class
-	 * @param $file
-	 */
-	public static function setAutoload($class, $file)
-	{
-		if (isset(static::$_autoload[$class])) {
-			return;
-		}
-		static::$_autoload[$class] = $file;
-		include_once "Kiri.php";
-	}
-
-
-	/**
-	 * @param $className
-	 */
-	public static function autoload($className)
-	{
-		if (!isset(static::$_autoload[$className])) {
-			return;
-		}
-		$file = static::$_autoload[$className];
-		require_once "Kiri.php";
-	}
-
-
-}
-
-//spl_autoload_register([Kiri::class, 'autoload'], true, true);
-Kiri::setContainer(new Container());

kiri-engine/Pool/Connection.php

@@ -6,10 +6,10 @@ namespace Kiri\Pool;
 use Closure;
 use Database\Mysql\PDO;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Context;
-use Kiri\Kiri;
 use Swoole\Error;
 use Throwable;
 
@@ -118,6 +118,19 @@ class Connection extends Component
 	}
 
 
+	/**
+	 * @param string $name
+	 * @param PDO $PDO
+	 * @return void
+	 * @throws Kiri\Exception\ConfigException
+	 * @throws Exception
+	 */
+	public function addItem(string $name, PDO $PDO)
+	{
+		$this->getPool()->push($name, $PDO);
+	}
+
+
 	/**
 	 * @param $name
 	 * @param $isMaster
@@ -126,21 +139,24 @@ class Connection extends Component
 	 */
 	public function initConnections($name, $isMaster, $max)
 	{
-		$this->getPool()->initConnections($name, $isMaster, $max);
+		$pool = $this->getPool();
+		$pool->initConnections($name, $isMaster, $max);
 	}
 
 
 	/**
 	 * @param $coroutineName
 	 * @param $isMaster
+	 * @param array $config
+	 * @throws Kiri\Exception\ConfigException
 	 * @throws Exception
 	 */
-	public function release($coroutineName, $isMaster)
+	public function release($coroutineName, $isMaster, array $config)
 	{
 		$coroutineName = $this->name('Mysql:' . $coroutineName, $isMaster);
 		/** @var PDO $client */
 		if (!($client = Context::getContext($coroutineName)) instanceof PDO) {
-			return;
+			$client = call_user_func($this->create($coroutineName, $config));
 		}
 		if ($client->inTransaction()) {
 			return;
@@ -184,7 +200,7 @@ class Connection extends Component
 			} else {
 				$result = true;
 			}
-		} catch (Error | Throwable $exception) {
+		} catch (Error|Throwable $exception) {
 			$result = $this->addError($exception, 'mysql');
 		} finally {
 			return $result;

kiri-engine/Pool/Redis.php

@@ -10,11 +10,11 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Context;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class RedisClient
- * @package Kiri\Kiri\Pool
+ * @package Kiri\Pool
  */
 class Redis extends Component
 {

kiri-engine/Runtime.php

@@ -10,7 +10,7 @@ use Kiri\Abstracts\Input;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-
+use Kiri;
 
 /**
  * Class Runtime

kiri-gii/Gii.php

@@ -13,7 +13,7 @@ use Database\Connection;
 use Database\Db;
 use Exception;
 use Kiri\Cache\Redis;
-use Kiri\Kiri;
+use Kiri;
 use Symfony\Component\Console\Input\InputInterface;
 
 /**

kiri-gii/GiiCommand.php

@@ -7,7 +7,7 @@ namespace Gii;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

kiri-gii/GiiController.php

@@ -6,7 +6,7 @@ namespace Gii;
 
 use Exception;
 use ReflectionException;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiController

kiri-gii/GiiMiddleware.php

@@ -6,7 +6,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiMiddleware

kiri-gii/GiiModel.php

@@ -8,7 +8,7 @@ use Database\Db;
 use Database\Model;
 use Exception;
 use ReflectionException;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiModel

kiri-gii/GiiProviders.php

@@ -8,7 +8,7 @@ namespace Gii;
 use Exception;
 use Kiri\Abstracts\Providers;
 use Kiri\Application;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class DatabasesProviders

kiri-gii/GiiRpcClient.php

@@ -5,7 +5,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiRpcClient
@@ -42,7 +42,7 @@ use Kiri\Annotation\Target;
 use Exception;
 use Rpc\Client;
 use Kiri\Core\Json;
-use Kiri\Kiri;
+use Kiri;
 
 ';
 

kiri-gii/GiiRpcService.php

@@ -5,7 +5,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiRpcClient

kiri-gii/GiiTask.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Gii;
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiModel
@@ -31,7 +31,7 @@ class GiiTask extends GiiBase
 		
 namespace App\Async;
 
-use Kiri\Server\Contract\OnTaskInterface;
+use Kiri\Task\OnTaskInterface;
 
 ';
 

kiri-server/CoroutineServer.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace Kiri\Server;
+
+use Kiri;
+use Kiri\Context;
+use Kiri\Events\EventDispatch;
+use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Contract\OnProcessInterface;
+use Kiri\Server\Events\OnProcessStart;
+use Swoole\Coroutine;
+use Swoole\Coroutine\Http\Server;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\Process\Manager;
+use Swoole\Process\Pool;
+
+
+class CoroutineServer
+{
+
+
+	private Manager $manager;
+
+
+	/**
+	 * @param string|OnProcessInterface|BaseProcess $customProcess
+	 * @param string $system
+	 * @return void
+	 */
+	public function addProcess(string|OnProcessInterface|BaseProcess $customProcess, string $system)
+	{
+		if (is_string($customProcess)) {
+			$customProcess = Kiri::getDi()->get($customProcess);
+		}
+		$this->manager->add(function (Pool $pool, int $workerId) use ($customProcess, $system) {
+			$process = $pool->getProcess($workerId);
+
+			if (Kiri::getPlatform()->isLinux()) {
+				$process->name($system . '(' . $customProcess->getName() . ')');
+			}
+
+			Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnProcessStart());
+
+			set_env('environmental', Kiri::PROCESS);
+			$channel = Coroutine::create(function () use ($process, $customProcess) {
+				while (!$customProcess->isStop()) {
+					$message = $process->read();
+					if (!empty($message)) {
+						$message = unserialize($message);
+					}
+					if (is_null($message)) {
+						continue;
+					}
+					$customProcess->onBroadcast($message);
+				}
+			});
+			Context::setContext('waite:process:message', $channel);
+
+			$customProcess->onSigterm()->process($process);
+
+		}, $customProcess->isEnableCoroutine());
+	}
+
+
+	/**
+	 * @param array $settings
+	 * @return void
+	 */
+	public function httpServer(array $settings = []): void
+	{
+		$this->manager->add(function (Pool $pool, int $workerId) use ($settings) {
+			$host = $settings['host'];
+			$port = $settings['port'];
+
+			$server = new Server($host, $port, false, true);
+			$server->set($settings);
+
+			$callback = $settings['events'][Constant::REQUEST] ?? null;
+			if (is_null($callback)) {
+				$pool->shutdown();
+				return;
+			}
+			if (is_string($callback[0])) {
+				$callback[0] = Kiri::getDi()->get($callback[0]);
+			}
+			$server->handle('/', $callback);
+			$server->start();
+		}, true);
+	}
+
+
+	/**
+	 * @param array $settings
+	 * @return void
+	 */
+	public function websocketServer(array $settings)
+	{
+		$this->manager->add(function () use ($settings) {
+			$host = $settings['host'];
+			$port = $settings['port'];
+
+			$server = new Server($host, $port, false, true);
+			$server->set($settings);
+			$hServer = \Kiri::getDi()->get(\Kiri\Message\Server::class);
+			$server->handle('/', function (Request $request, Response $response) use ($hServer) {
+				call_user_func([$hServer, 'onRequest'], $request, $response);
+			});
+			$server->start();
+		}, true);
+
+	}
+
+
+}

kiri-task/Annotation/AsynchronousTask.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Kiri\Task\Annotation;
+
+
+use Kiri\Annotation\Attribute;
+use Kiri\Task\TaskManager;
+
+#[\Attribute(\Attribute::TARGET_CLASS)] class AsynchronousTask extends Attribute
+{
+
+
+	/**
+	 * @param string $name
+	 */
+	public function __construct(public string $name)
+	{
+	}
+
+
+	/**
+	 * @param mixed $class
+	 * @param mixed $method
+	 * @return mixed
+	 */
+	public function execute(mixed $class, mixed $method = ''): mixed
+	{
+		$AsyncTaskExecute = \Kiri::getDi()->get(TaskManager::class);
+		$AsyncTaskExecute->add($this->name, $class::class);
+		return parent::execute($class, $method); // TODO: Change the autogenerated stub
+	}
+
+}

kiri-task/AsyncTaskExecute.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Kiri\Task;
+
+use Exception;
+use Kiri;
+use Kiri\Abstracts\Component;
+use Kiri\Server\SwooleServerInterface;
+use Swoole\Coroutine;
+
+
+/**
+ *
+ */
+class AsyncTaskExecute extends Component
+{
+
+
+	use TaskResolve;
+
+
+	/**
+	 * @param OnTaskInterface|string $handler
+	 * @param array $params
+	 * @param int $workerId
+	 * @throws Exception
+	 */
+	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = -1)
+	{
+		if (is_string($handler)) {
+			$handler = $this->handle($handler, $params);
+		}
+
+		$server = Kiri::getDi()->get(SwooleServerInterface::class);
+		if ($workerId < 0 || $workerId > $server->setting['task_worker_num']) {
+			$workerId = random_int(0, $server->setting['task_worker_num'] - 1);
+		}
+		$server->task(serialize($handler), $workerId);
+	}
+
+
+}

kiri-task/CoroutineTaskExecute.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Kiri\Task;
+
+use Kiri\Abstracts\Component;
+use Kiri\Core\HashMap;
+use Kiri\Exception\ConfigException;
+use ReflectionException;
+use Swoole\Coroutine;
+use Swoole\Server\Task;
+
+class CoroutineTaskExecute extends Component
+{
+
+	use TaskResolve;
+
+
+	private HashMap $hashMap;
+
+
+	private Coroutine\Channel $channel;
+
+
+	private OnServerTask $taskServer;
+
+
+	private int $total = 50;
+
+
+	/**
+	 *
+	 */
+	public function init()
+	{
+		$this->hashMap = new HashMap();
+
+		$this->channel = new Coroutine\Channel($this->total);
+
+		$this->taskServer = \Kiri::getDi()->get(OnServerTask::class);
+
+		Coroutine::create(function () {
+			$barrier = Coroutine\Barrier::make();
+			for ($i = 0; $i < 50; $i++) {
+				Coroutine::create(function () {
+					$this->handler();
+				});
+			}
+			Coroutine\Barrier::wait($barrier);
+		});
+	}
+
+
+	/**
+	 * @return void
+	 * @throws ConfigException
+	 */
+	protected function handler()
+	{
+		$data = $this->channel->pop(-1);
+
+		$task = new Task();
+		$task->data = $data;
+
+		$this->taskServer->onCoroutineTask(null, $task);
+
+		$this->handler();
+	}
+
+
+	/**
+	 * @param OnTaskInterface|string $handler
+	 * @param array $params
+	 * @param int $workerId
+	 * @return void
+	 * @throws ReflectionException
+	 */
+	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = -1)
+	{
+		if (is_string($handler)) {
+			$handler = $this->handle($handler, $params);
+		}
+		$this->channel->push(serialize($handler));
+	}
+
+}

kiri-task/OnServerTask.php

@@ -0,0 +1,94 @@
+<?php
+
+
+namespace Kiri\Task;
+
+
+use Kiri\Annotation\Inject;
+use Kiri\Abstracts\Logger;
+use Kiri\Exception\ConfigException;
+use Kiri\Task\OnTaskInterface;
+use Swoole\Server;
+
+
+/**
+ * Class OnServerTask
+ * @package Server\Task
+ */
+class OnServerTask
+{
+
+
+	#[Inject(Logger::class)]
+	public Logger $logger;
+
+
+	/**
+	 * @param Server $server
+	 * @param int $task_id
+	 * @param int $src_worker_id
+	 * @param mixed $data
+	 * @throws ConfigException
+	 */
+	public function onTask(Server $server, int $task_id, int $src_worker_id, mixed $data)
+	{
+		try {
+			$data = $this->resolve($data);
+		} catch (\Throwable $exception) {
+			$data = jTraceEx($exception);
+
+			$this->logger->error('task', [error_trigger_format($exception)]);
+		} finally {
+			$server->finish($data);
+		}
+	}
+
+
+	/**
+	 * @param Server|null $server
+	 * @param Server\Task $task
+	 * @throws ConfigException
+	 */
+	public function onCoroutineTask(?Server $server, Server\Task $task)
+	{
+		try {
+			$data = $this->resolve($task->data);
+		} catch (\Throwable $exception) {
+			$data = jTraceEx($exception);
+
+			$this->logger->error('task', [error_trigger_format($exception)]);
+		} finally {
+			$task->finish($data);
+		}
+	}
+
+
+	/**
+	 * @param $data
+	 * @return null
+	 */
+	private function resolve($data)
+	{
+		$execute = unserialize($data);
+		if ($execute instanceof OnTaskInterface) {
+			return $execute->execute();
+		}
+		return null;
+	}
+
+
+	/**
+	 * @param Server $server
+	 * @param int $task_id
+	 * @param mixed $data
+	 */
+	public function onFinish(Server $server, int $task_id, mixed $data)
+	{
+		if (!($data instanceof OnTaskInterface)) {
+			return;
+		}
+		$data->finish($server, $task_id);
+	}
+
+
+}

kiri-task/OnTaskInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace Kiri\Task;
+
+
+use Swoole\Server;
+
+interface OnTaskInterface
+{
+
+	public function execute();
+
+
+	public function finish(Server $server, int $task_id);
+
+}

kiri-task/TaskManager.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Kiri\Task;
+
+use Kiri\Abstracts\Component;
+use Kiri\Core\HashMap;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Swoole\Server;
+
+class TaskManager extends Component
+{
+
+
+	private HashMap $hashMap;
+
+
+	/**
+	 *
+	 */
+	public function init()
+	{
+		$this->hashMap = new HashMap();
+	}
+
+
+	/**
+	 * @param Server $swollen
+	 * @return void
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function taskListener(Server $swollen)
+	{
+		if (!isset($swollen->setting['task_worker_num']) || $swollen->setting['task_worker_num'] < 1) {
+			return;
+		}
+
+		$task_use_object = $swollen->setting['task_object'] ?? $swollen->setting['task_use_object'] ?? false;
+		$reflect = $this->container->get(OnServerTask::class);
+
+		$swollen->on('finish', [$reflect, 'onFinish']);
+		if ($task_use_object || $swollen->setting['task_enable_coroutine']) {
+			$swollen->on('task', [$reflect, 'onCoroutineTask']);
+		} else {
+			$swollen->on('task', [$reflect, 'onTask']);
+		}
+	}
+
+
+	/**
+	 * @param string $key
+	 * @param $handler
+	 */
+	public function add(string $key, $handler)
+	{
+		$this->hashMap->put($key, $handler);
+	}
+
+
+	/**
+	 * @param string $key
+	 * @return OnTaskInterface
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function get(string $key): OnTaskInterface
+	{
+		$task = $this->hashMap->get($key);
+		if (is_string($task)) {
+			$task = $this->getContainer()->get($task);
+		}
+		return $task;
+	}
+
+
+}

kiri-task/TaskResolve.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Kiri\Task;
+
+use Exception;
+use ReflectionException;
+
+trait TaskResolve
+{
+
+
+	/**
+	 * @param $handler
+	 * @param $params
+	 * @return object
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	private function handle($handler, $params): object
+	{
+		if (!class_exists($handler) && $this->hashMap->has($handler)) {
+			$handler = $this->hashMap->get($handler);
+		}
+		$implements = $this->container->getReflect($handler);
+		if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
+			throw new Exception('Task must instance ' . OnTaskInterface::class);
+		}
+		return $implements->newInstanceArgs($params);
+	}
+
+}

kiri-websocket-server/Sender.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Websocket;
 
-use Kiri\Kiri;
+use Kiri;
 use Swoole\{Coroutine\Http\Server as AliasServer, WebSocket\Server};
 
 
@@ -28,6 +28,16 @@ class Sender implements WebSocketInterface
 	}
 
 
+
+	/**
+	 * @param AliasServer|Server $server
+	 */
+	public function setServer(mixed $server): void
+	{
+		$this->server = $server;
+	}
+
+
 	/**
 	 * @param int $fd
 	 * @param mixed $data

kiri-websocket-server/Server.php

@@ -3,21 +3,18 @@
 namespace Kiri\Websocket;
 
 use Exception;
-use Kiri\Message\Handler\DataGrip;
-use Kiri\Message\Handler\Router;
 use Kiri\Abstracts\AbstractServer;
-use Kiri\Annotation\Inject;
+use Kiri\Message\Handler\DataGrip;
-use Psr\Container\ContainerExceptionInterface;
+use Kiri\Message\Handler\RouterCollector;
-use Psr\Container\NotFoundExceptionInterface;
 use Kiri\Server\Contract\OnCloseInterface;
 use Kiri\Server\Contract\OnHandshakeInterface;
 use Kiri\Server\Contract\OnMessageInterface;
 use Kiri\Server\Contract\OnOpenInterface;
-use Kiri\Server\SwooleServerInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\WebSocket\Frame;
-use Swoole\WebSocket\Server as WebSocketServer;
 
 
 /**
@@ -26,7 +23,7 @@ use Swoole\WebSocket\Server as WebSocketServer;
 class Server extends AbstractServer
 {
 
-	public Router $router;
+	public RouterCollector $router;
 
 
 	const SHA1_KEY = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
@@ -35,12 +32,7 @@ class Server extends AbstractServer
 	public mixed $callback = null;
 
 
-	/**
+	public Sender $sender;
-	 * @var WebSocketInterface
-	 */
-	#[Inject(WebSocketInterface::class)]
-	public WebSocketInterface $server;
-
 
 
 	/**
@@ -55,6 +47,9 @@ class Server extends AbstractServer
 			return;
 		}
 		$this->callback = $handler->callback[0];
+
+		$this->sender = $this->container->get(Sender::class);
+		$this->sender->setServer($this->server);
 	}