Revert "改名"

This reverts commit fdf58326

composer.json

@@ -39,6 +39,7 @@
       "Kiri\\Task\\": "kiri-task/"
     },
     "files": [
+      "Kiri.php",
       "error.php",
       "function.php"
     ]

function.php

@@ -3,19 +3,18 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Http\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\AnnotationManager;
+use Kiri\Di\NoteManager;
 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;
@@ -261,7 +260,7 @@ if (!function_exists('injectRuntime')) {
 
 		$router = [];
 		foreach ($fileLists as $class) {
-			foreach (AnnotationManager::getTargetAnnotation($class) as $value) {
+			foreach (NoteManager::getTargetAnnotation($class) as $value) {
 				if (!method_exists($value, 'execute')) {
 					continue;
 				}
@@ -1232,3 +1231,28 @@ 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() . "\r\n" . '
+	' . $throwable->getFile() . " at line" . $throwable->getLine();
+
+		$message .= 'trance' . "\r\n";
+		foreach ($throwable->getTrace() as $value) {
+			if (!isset($value['file'])) {
+				continue;
+			}
+			$message .= $value['file'] . '->' . $value['line'] . '(' . $value['class'] . '::' . $value['function'] . ')';
+		}
+		return $message;
+	}
+
+}
+

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

@@ -7,7 +7,7 @@ namespace Kiri\Annotation;
 use DirectoryIterator;
 use Exception;
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionClass;
 use ReflectionException;
 use Throwable;

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/Middleware.php

@@ -5,7 +5,7 @@ namespace Kiri\Annotation\Route;
 
 
 use Kiri\Annotation\Attribute;
-use Http\Handler\Abstracts\MiddlewareManager;
+use Kiri\Message\Handler\Abstracts\MiddlewareManager;
 use Psr\Http\Server\MiddlewareInterface;
 
 /**

kiri-annotation/Route/Route.php

@@ -5,8 +5,8 @@ namespace Kiri\Annotation\Route;
 
 
 use Kiri\Annotation\Attribute;
-use Http\Handler\Router;
+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

@@ -5,8 +5,8 @@ namespace Kiri\Annotation;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 
 
 /**

kiri-engine/Abstracts/BaseApplication.php

@@ -12,7 +12,7 @@ namespace Kiri\Abstracts;
 
 use Database\Connection;
 use Exception;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
 use Kafka\KafkaProvider;
 use Kiri\{Async, Kiri};
 use Kiri\Annotation\Annotation as SAnnotation;
@@ -21,12 +21,12 @@ use Kiri\Di\LocalService;
 use Kiri\Error\{ErrorHandler, Logger};
 use Kiri\Exception\{InitException, NotFindClassException};
 use ReflectionException;
-use Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
+use Kiri\Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
 use Swoole\Table;
 
 /**
  * Class BaseApplication
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 abstract class BaseApplication extends Component
 {

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
@@ -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 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/Abstracts/TraitApplication.php

@@ -7,8 +7,8 @@ namespace Kiri\Abstracts;
 use Kiri\Annotation\Annotation as SAnnotation;
 use Database\Connection;
 use Database\DatabasesProviders;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
-use Server\Server;
+use Kiri\Server\Server;
 use Kiri\Async;
 use Kiri\Error\Logger;
 use Kiri\Jwt\JWTAuth;

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 Kiri\Server\ServerProviders;
 use ReflectionException;
-use Server\ServerProviders;
 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

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

kiri-engine/Cache/Base/Redis.php

@@ -5,7 +5,7 @@ namespace Kiri\Cache\Base;
 use Exception;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\RedisConnectException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use RedisException;
 use Swoole\Timer;

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,15 +15,15 @@ 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 Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerExit;
 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];
+	}
 
 
 	/**
@@ -197,7 +201,7 @@ class Container implements ContainerInterface
 	 */
 	public function propertyInject(ReflectionClass $reflect, $object): mixed
 	{
-		foreach (AnnotationManager::getPropertyAnnotation($reflect) as $property => $inject) {
+		foreach (NoteManager::getPropertyAnnotation($reflect) as $property => $inject) {
 			/** @var Inject $inject */
 			$inject->execute($object, $property);
 		}
@@ -212,7 +216,7 @@ class Container implements ContainerInterface
 	 */
 	public function getMethodAttribute($className, $method = null): array
 	{
-		$methods = AnnotationManager::getMethodAnnotation($this->getReflect($className));
+		$methods = NoteManager::getMethodAnnotation($this->getReflect($className));
 		if (!empty($method)) {
 			return $methods[$method] ?? [];
 		}
@@ -227,7 +231,7 @@ class Container implements ContainerInterface
 	 */
 	public function getClassReflectionProperty(string $class, string $property = null): ReflectionProperty|null|array
 	{
-		$lists = AnnotationManager::getProperty($this->getReflect($class));
+		$lists = NoteManager::getProperty($this->getReflect($class));
 		if (empty($lists)) {
 			return null;
 		}
@@ -266,7 +270,7 @@ class Container implements ContainerInterface
 		if ($reflect->isAbstract() || $reflect->isTrait() || $reflect->isInterface()) {
 			return $this->_reflection[$class] = $reflect;
 		}
-		$construct = AnnotationManager::resolveTarget($reflect);
+		$construct = NoteManager::resolveTarget($reflect);
 		if (!empty($construct) && $construct->getNumberOfParameters() > 0) {
 			$this->_constructs[$class] = $construct;
 		}
@@ -284,7 +288,7 @@ class Container implements ContainerInterface
 		if (is_string($class)) {
 			$class = $this->getReflect($class);
 		}
-		return AnnotationManager::getMethods($class);
+		return NoteManager::getMethods($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/Di/NoteManager.php

@@ -7,7 +7,7 @@ use ReflectionAttribute;
 use ReflectionClass;
 use ReflectionProperty;
 
-class AnnotationManager
+class NoteManager
 {
 
 
@@ -171,9 +171,9 @@ class AnnotationManager
 	 */
 	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
 	{
-		AnnotationManager::setPropertyAnnotation($reflect);
+		NoteManager::setPropertyAnnotation($reflect);
-		AnnotationManager::setTargetAnnotation($reflect);
+		NoteManager::setTargetAnnotation($reflect);
-		AnnotationManager::setMethodAnnotation($reflect);
+		NoteManager::setMethodAnnotation($reflect);
 
 		return $reflect->getConstructor();
 	}

kiri-engine/Environmental.php

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

kiri-engine/Error/ErrorHandler.php

@@ -10,17 +10,17 @@ declare(strict_types=1);
 namespace Kiri\Error;
 
 use Exception;
-use Http\Handler\Formatter\IFormatter;
+use Kiri\Message\Handler\Formatter\IFormatter;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
 use Kiri\Events\EventDispatch;
-use Kiri\Kiri;
+use Kiri;
-use Http\Events\OnAfterRequest;
+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

@@ -5,10 +5,10 @@ namespace Kiri\Error;
 
 
 use Exception;
-use Http\Aspect\OnAspectInterface;
+use Kiri\Message\Aspect\OnAspectInterface;
-use Http\Aspect\OnJoinPointInterface;
+use Kiri\Message\Aspect\OnJoinPointInterface;
-use Http\Constrict\RequestInterface;
+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 Server\Abstracts\BaseProcess;
+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,211 +24,203 @@ 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();
-        $this->stopManager();
+		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)) {
+			Process::kill($this->process->pid) && Process::wait(TRUE);
+		}
+	}
 
 
-    /**
+	/**
-     *
+	 * 重启
-     */
+	 *
-    protected function stopManager()
+	 * @throws Exception
-    {
+	 */
-        if ($this->process && Process::kill($this->process->pid, 0)) {
+	public function trigger_reload(string $path = '')
-            Process::kill($this->process->pid) && Process::wait(TRUE);
+	{
-        }
+		$this->logger->warning('change reload');
-    }
+		if (!empty($path) && str_starts_with($path, CONTROLLER_PATH)) {
-
+			$pid = file_get_contents(storage('.swoole.pid'));
-
+			if (!empty($pid) && Process::kill($pid, 0)) {
-    /**
+				Process::kill($pid, SIGUSR1);
-     * 重启
+			}
-     *
+		} else {
-     * @throws Exception
+			if ($this->int == 1) {
-     */
+				return;
-    public function trigger_reload()
+			}
-    {
+			$this->int = 1;
-        if ($this->int == 1) {
+			$this->stopServer();
-            return;
+			$this->process = new Process(function (Process $process) {
-        }
+				$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
-        $this->int = 1;
+			});
-        $this->logger->warning('change reload');
+			$this->process->start();
-
+		}
-        $this->stopServer();
+	}
-        $this->stopManager();
-
-        $this->process = new Process(function (Process $process) {
-            $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
-        });
-
-        $this->process->start();
-        $this->int = -1;
-    }
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -9,161 +9,157 @@ 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']);
+		Event::add($this->inotify, [$this, 'check']);
-        Event::wait();
+		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')) {
+			if (str_ends_with($ev['name'], '.php')) {
-                Timer::after(3000, fn() => $this->reload());
+				Timer::after(3000, fn() => $this->reload($ev['name']));
-                $this->isReloading = TRUE;
+				$this->isReloading = TRUE;
-            }
+			}
-        }
+		}
-    }
+	}
 
-    /**
+	/**
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function reload()
+	public function reload($path)
-    {
+	{
-        $this->process->trigger_reload();
+		$this->process->trigger_reload($path);
-        $this->clearWatch();
+		$this->clearWatch();
-        foreach ($this->dirs as $root) {
+		foreach ($this->dirs as $root) {
-            $this->watch($root);
+			$this->watch($root);
-        }
+		}
-        $this->process->int = -1;
+		$this->process->int = -1;
-        $this->isReloading = FALSE;
+		$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

@@ -8,142 +8,145 @@ 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());
+					Timer::after(2000, fn() => $this->timerReload());
-                    $this->isReloading = TRUE;
+					$this->isReloading = TRUE;
-                    break;
+					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;
+		if (str_contains($path, CONTROLLER_PATH))
 
-        $this->loadDirs();
+		$this->process->trigger_reload($path);
 
-        $this->isReloading = FALSE;
+		$this->loadDirs();
-        $this->process->isReloadingOut = FALSE;
 
-        $this->tick();
+		$this->process->int = -1;
-    }
+
+		$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/Pool/Connection.php

@@ -9,7 +9,7 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Context;
-use Kiri\Kiri;
+use Kiri;
 use Swoole\Error;
 use Throwable;
 

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
@@ -70,9 +70,9 @@ use Kiri\Annotation\Route\Middleware;
 use Kiri\Annotation\Route\Route;
 use Kiri\Core\Str;
 use Kiri\Core\Json;
-use Http\Context\Request;
+use Kiri\Message\Context\Request;
-use Http\Context\Response;
+use Kiri\Message\Context\Response;
-use Http\Controller;
+use Kiri\Message\Controller;
 use JetBrains\PhpStorm\ArrayShape;
 use {$model_namespace}\\{$managerName};
 ";

kiri-gii/GiiJsonRpc.php

@@ -88,7 +88,7 @@ namespace Rpc\Consumers;
 
 use Kiri\Annotation\Target;
 use Kiri\Rpc\Annotation\JsonRpc;
-use Http\Handler\Controller;
+use Kiri\Message\Handler\Controller;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 
 

kiri-gii/GiiMiddleware.php

@@ -6,7 +6,7 @@ namespace Gii;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
 
 /**
  * Class GiiMiddleware
@@ -34,7 +34,7 @@ namespace App\Middleware;
 
 use Closure;
 use Psr\Http\Server\MiddlewareInterface;
-use Server\Constrict\RequestInterface;
+use Kiri\Server\Constrict\RequestInterface;
 
 ';
 

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
@@ -36,7 +36,7 @@ namespace App\Rpc;
 use Kiri\Annotation\Route\RpcProducer;
 use Kiri\Annotation\Target;
 use Exception;
-use Http\Controller;
+use Kiri\Message\Controller;
 use Kiri\Core\Json;
 
 ';

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 Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
 
 ';
 

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

kiri-websocket-server/Server.php

@@ -3,17 +3,17 @@
 namespace Kiri\Websocket;
 
 use Exception;
-use Http\Handler\DataGrip;
+use Kiri\Message\Handler\DataGrip;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
 use Kiri\Abstracts\AbstractServer;
 use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnCloseInterface;
-use Server\Contract\OnHandshakeInterface;
+use Kiri\Server\Contract\OnHandshakeInterface;
-use Server\Contract\OnMessageInterface;
+use Kiri\Server\Contract\OnMessageInterface;
-use Server\Contract\OnOpenInterface;
+use Kiri\Server\Contract\OnOpenInterface;
-use Server\SwooleServerInterface;
+use Kiri\Server\SwooleServerInterface;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\WebSocket\Frame;
@@ -69,7 +69,7 @@ class Server extends AbstractServer
 			return;
 		}
 		if ($this->callback instanceof OnCloseInterface) {
-			$this->callback->onClose($server, $fd);
+			$this->callback->onClose($fd);
 		}
 	}