Revert "改名"

This reverts commit fdf58326

Kiri.php

@@ -2,39 +2,30 @@
 declare(strict_types=1);
 
 
-namespace Kiri;
-
 error_reporting(0);
 
 
-use Note\Note;
 use Database\Collection;
 use Database\ModelInterface;
-use Exception;
 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 Kiri\Server\Tasker\AsyncTaskExecute;
 use Psr\Container\ContainerInterface;
-use ReflectionException;
-use Server\ServerManager;
-use 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('CONTROLLER_PATH') or define('CONTROLLER_PATH', realpath(APP_PATH . 'controllers/'));
-defined('CRONTAB_PATH') or define('CRONTAB_PATH', APP_PATH . 'app/Crontab/');
+defined('MODEL_PATH') or define('MODEL_PATH', realpath(APP_PATH . 'models/'));
-defined('CLIENT_PATH') or define('CLIENT_PATH', APP_PATH . 'app/Client/');
+defined('COMPONENT_PATH') or define('COMPONENT_PATH', realpath(APP_PATH . 'components/'));
-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/');
 
 
 /**
@@ -73,6 +64,15 @@ class Kiri
 	}
 
 
+	/**
+	 * @return Container
+	 */
+	public static function getContainer(): Container
+	{
+		return static::$container;
+	}
+
+
 	/**
 	 * @param $alias
 	 * @param array $array
@@ -159,12 +159,12 @@ class Kiri
 
 
 	/**
-	 * @return Note
+	 * @return Annotation
 	 * @throws Exception
 	 */
-	public static function getNote(): Note
+	public static function getAnnotation(): Annotation
 	{
-		return static::app()->getNote();
+		return static::app()->getAnnotation();
 	}
 
 
@@ -199,6 +199,7 @@ class Kiri
 		}
 	}
 
+
 	/**
 	 * @return string
 	 * @throws Exception

a.php

@@ -3,21 +3,21 @@
 
 function version($oldVersion, $newVersion): bool
 {
-	$first = explode('.', $oldVersion);
+    $first = explode('.', $oldVersion);
-	$end = explode('.', $newVersion);
+    $end = explode('.', $newVersion);
-	while (count($first) > 0) {
+    while (count($first) > 0) {
-		$shift = (int)array_shift($first);
+        $shift = (int)array_shift($first);
-		$endShift = (int)array_shift($end);
+        $endShift = (int)array_shift($end);
-		if ($endShift == $shift) {
+        if ($endShift == $shift) {
-			continue;
+            continue;
-		}
+        }
-		if ($endShift < $shift) {
+        if ($endShift < $shift) {
-			return true;
+            return TRUE;
-		} else {
+        } else {
-			return false;
+            return FALSE;
-		}
+        }
-	}
+    }
-	return false;
+    return FALSE;
 }
 
-var_dump(version('1.4.4','1.4.3'));
+var_dump(version('1.4.4', '1.4.3'));

composer.json

@@ -9,7 +9,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.1",
     "ext-json": "*",
     "ext-fileinfo": "*",
     "ext-pdo": "*",
@@ -21,26 +21,25 @@
     "ext-xml": "*",
     "ext-curl": "*",
     "ext-openssl": "*",
-    "symfony/console": "v5.3.10",
+    "symfony/console": "~v5.3.10",
     "psr/log": "1.*",
-    "ext-sockets": "*",
-    "ext-pcntl": "*",
-    "ext-posix": "*",
     "composer-runtime-api": "^2.0",
-    "swiftmailer/swiftmailer": "v6.3.*",
     "psr/container": "^2.0",
     "psr/http-server-middleware": "1.0.1",
-    "game-worker/kiri-event": "^v1.0",
+    "game-worker/kiri-event": "~v2.0",
     "ext-inotify": "*"
   },
   "autoload": {
     "psr-4": {
       "Kiri\\": "kiri-engine/",
       "Kiri\\Gateway\\": "kiri-gateway/",
+      "Kiri\\Websocket\\": "kiri-websocket-server/",
       "Gii\\": "kiri-gii/",
-      "Note\\": "kiri-note/"
+      "Kiri\\Annotation\\": "kiri-annotation/",
+      "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 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\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 Note\Note;
-use Note\Route\Route;
 use Psr\Log\LoggerInterface;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
@@ -192,16 +191,16 @@ if (!function_exists('workerName')) {
 }
 
 
-if (!function_exists('note')) {
+if (!function_exists('Annotation')) {
 
 
 	/**
-	 * @return Note
+	 * @return Annotation
 	 * @throws Exception
 	 */
-	function annotation(): Note
+	function annotation(): Annotation
 	{
-		return Kiri::getNote();
+		return Kiri::getAnnotation();
 	}
 
 
@@ -220,7 +219,7 @@ if (!function_exists('scan_directory')) {
 	 */
 	function scan_directory($dir, $namespace, array $exclude = [])
 	{
-		$annotation = Kiri::app()->getNote();
+		$annotation = Kiri::app()->getAnnotation();
 		$annotation->read($dir, $namespace, $exclude);
 
 		injectRuntime($dir, $exclude);
@@ -256,12 +255,12 @@ if (!function_exists('injectRuntime')) {
 	 */
 	function injectRuntime(string $path, array $exclude = [])
 	{
-		$fileLists = Kiri::getNote()->runtime($path, $exclude);
+		$fileLists = Kiri::getAnnotation()->runtime($path, $exclude);
 		$di = Kiri::getDi();
 
 		$router = [];
 		foreach ($fileLists as $class) {
-			foreach (NoteManager::getTargetNote($class) as $value) {
+			foreach (NoteManager::getTargetAnnotation($class) as $value) {
 				if (!method_exists($value, 'execute')) {
 					continue;
 				}
@@ -849,9 +848,9 @@ if (!function_exists('storage')) {
 			}
 		}
 		if (empty($fileName)) {
-			return $basePath . '/' . $path . '/';
+			return $basePath . '/' . $path;
 		}
-		$fileName = $basePath . '/' . $path . '/' . $fileName;
+		$fileName = $basePath . '/' . $path . $fileName;
 		if (!file_exists($fileName)) {
 			touch($fileName);
 		}
@@ -935,7 +934,6 @@ if (!function_exists('di')) {
 	/**
 	 * @param string $className
 	 * @return mixed
-	 * @throws ReflectionException
 	 */
 	function di(string $className): mixed
 	{
@@ -1233,3 +1231,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/Annotation.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use DirectoryIterator;
@@ -10,10 +10,10 @@ use ReflectionException;
 use Kiri\Abstracts\Component;
 
 /**
- * Class Note
+ * Class Annotation
- * @package Note
+ * @package Annotation
  */
-class Note extends Component
+class Annotation extends Component
 {
 
 

kiri-annotation/Aspect.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use Exception;
@@ -10,7 +10,7 @@ defined('ASPECT_ERROR') or define('ASPECT_ERROR', 'Aspect annotation must implem
 
 /**
  * Class Aspect
- * @package Note
+ * @package Annotation
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Aspect extends Attribute
 {

kiri-annotation/Attribute.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 /**
  * Class Attribute
- * @package Note
+ * @package Annotation
  */
-abstract class Attribute implements INote
+abstract class Attribute implements IAnnotation
 {
 
 

kiri-annotation/Event.php

@@ -1,17 +1,17 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use Exception;
 use Kiri\Events\EventProvider;
-use Kiri\Kiri;
+use Kiri;
 
 
 /**
  * Class Event
- * @package Note
+ * @package Annotation
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Event extends Attribute
 {

kiri-annotation/IAnnotation.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 
-interface INote
+interface IAnnotation
 {
 
     /**

kiri-annotation/Inject.php

@@ -1,18 +1,18 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use Exception;
 use Kiri\Core\Str;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 use ReflectionProperty;
 
 /**
  * Class Inject
- * @package Note
+ * @package Annotation
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Inject extends Attribute
 {
@@ -70,7 +70,6 @@ use ReflectionProperty;
      * @param $class
      * @param $method
      * @return ReflectionProperty|bool
-     * @throws ReflectionException
      */
     private function getProperty($class, $method): ReflectionProperty|bool
     {

kiri-annotation/Loader.php

@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use DirectoryIterator;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
 use ReflectionClass;
 use ReflectionException;
 use Throwable;
@@ -15,21 +15,15 @@ use Throwable;
 
 /**
  * Class Loader
- * @package Note
+ * @package Annotation
  */
 class Loader extends Component
 {
 
 
-	private array $_classes = [];
-
-
 	private array $_directory = [];
 
 
-	private array $_property = [];
-
-
 	private array $_methods = [];
 
 
@@ -43,17 +37,6 @@ class Loader extends Component
 		$this->_scanDir(new DirectoryIterator($path), $namespace);
 	}
 
-	/**
-	 * @param string $class
-	 * @param string $property
-	 * @return \ReflectionProperty|array|null
-	 * @throws ReflectionException
-	 */
-	public function getProperty(string $class, string $property = ''): \ReflectionProperty|array|null
-	{
-		return Kiri::getDi()->getClassReflectionProperty($class, $property);
-	}
-
 
 	/**
 	 * @param string $class
@@ -101,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;
 			}
@@ -147,7 +133,6 @@ class Loader extends Component
 	 * @param DirectoryIterator $path
 	 * @param string $namespace
 	 * @return ReflectionClass|null
-	 * @throws ReflectionException
 	 */
 	private function getReflect(DirectoryIterator $path, string $namespace): ?ReflectionClass
 	{

kiri-annotation/Mapping.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Note;
+namespace Kiri\Annotation;
 
-use Kiri\Kiri;
+use Kiri;
 
 #[\Attribute(\Attribute::TARGET_CLASS)] class Mapping extends Attribute
 {

kiri-annotation/Route/Document.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Note\Route;
+namespace Kiri\Annotation\Route;
 
 
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
 
 /**
  * Class Document
- * @package Note\Route
+ * @package Annotation\Route
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Document extends Attribute
 {

kiri-annotation/Route/Middleware.php

@@ -1,16 +1,16 @@
 <?php
 
 
-namespace Note\Route;
+namespace Kiri\Annotation\Route;
 
 
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
-use Http\Handler\Abstracts\MiddlewareManager;
+use Kiri\Message\Handler\Abstracts\MiddlewareManager;
 use Psr\Http\Server\MiddlewareInterface;
 
 /**
  * Class Middleware
- * @package Note\Route
+ * @package Annotation\Route
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Middleware extends Attribute
 {

kiri-annotation/Route/Route.php

@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Note\Route;
+namespace Kiri\Annotation\Route;
 
 
-use Note\Attribute;
+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/Route/Socket.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Note\Route;
+namespace Kiri\Annotation\Route;
 
 
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
 
 /**
  * Class Socket
- * @package Note
+ * @package Annotation
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Socket extends Attribute
 {

kiri-annotation/Target.php

@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 /**
  * Class Target
- * @package Note
+ * @package Annotation
  */
 #[\Attribute(\Attribute::TARGET_CLASS)] class Target extends Attribute
 {

kiri-annotation/Task.php

@@ -1,17 +1,17 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use Exception;
-use Kiri\Kiri;
+use Kiri;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 
 
 /**
  * Class Task
- * @package Note
+ * @package Annotation
  * Task任务
  */
 #[\Attribute(\Attribute::TARGET_CLASS)] class Task extends Attribute

kiri-engine/Abstracts/AbstractServer.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Kiri\Abstracts;
+
+abstract class AbstractServer extends Component
+{
+
+
+	public string $name = 'http';
+
+
+}

kiri-engine/Abstracts/BaseApplication.php

@@ -10,31 +10,24 @@ declare(strict_types=1);
 namespace Kiri\Abstracts;
 
 
-use Note\Note as SNote;
 use Database\Connection;
 use Exception;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
-use Kiri\Events\OnBeforeCommandExecute;
-use Server\Server;
 use Kafka\KafkaProvider;
 use Kiri\Async;
+use Kiri;
+use Kiri\Annotation\Annotation as SAnnotation;
 use Kiri\Cache\Redis;
 use Kiri\Di\LocalService;
-use Kiri\Error\ErrorHandler;
+use Kiri\Error\{ErrorHandler, Logger};
-use Kiri\Error\Logger;
+use Kiri\Exception\{InitException, NotFindClassException};
-use Kiri\Events\EventProvider;
-use Kiri\Exception\InitException;
-use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
 use ReflectionException;
-use Server\ServerManager;
+use Kiri\Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
-use Server\Contract\OnTaskInterface;
-use Server\Tasker\AsyncTaskExecute;
 use Swoole\Table;
 
 /**
  * Class BaseApplication
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 abstract class BaseApplication extends Component
 {
@@ -223,22 +216,21 @@ abstract class BaseApplication extends Component
 	 */
 	private function addEvent($key, $value): void
 	{
-		$eventProvider = di(EventProvider::class);
 		if ($value instanceof \Closure || is_object($value)) {
-			$eventProvider->on($key, $value, 0);
+			$this->eventProvider->on($key, $value, 0);
 			return;
 		}
 
 
 		if (is_array($value)) {
 			if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
-				$eventProvider->on($key, $value, 0);
+				$this->eventProvider->on($key, $value, 0);
 				return;
 			}
 
 			if (is_string($value[0])) {
 				$value[0] = Kiri::createObject($value[0]);
-				$eventProvider->on($key, $value, 0);
+				$this->eventProvider->on($key, $value, 0);
 				return;
 			}
 
@@ -247,7 +239,7 @@ abstract class BaseApplication extends Component
 				if (!is_callable($item, true)) {
 					throw new InitException("Class does not hav callback.");
 				}
-				$eventProvider->on($key, $item, 0);
+				$this->eventProvider->on($key, $item, 0);
 			}
 		}
 
@@ -378,7 +370,7 @@ abstract class BaseApplication extends Component
 	 */
 	public function getServer(): Server
 	{
-		return $this->get('server');
+		return Kiri::getDi()->get(Server::class);
 	}
 
 
@@ -393,12 +385,12 @@ abstract class BaseApplication extends Component
 
 
 	/**
-	 * @return SNote
+	 * @return SAnnotation
 	 * @throws
 	 */
-	public function getNote(): SNote
+	public function getAnnotation(): SAnnotation
 	{
-		return $this->get('note');
+		return $this->get('Annotation');
 	}
 
 
@@ -412,7 +404,6 @@ abstract class BaseApplication extends Component
 	}
 
 
-
 	/**
 	 * @param $array
 	 */
@@ -451,9 +442,8 @@ abstract class BaseApplication extends Component
 			'error'           => ['class' => ErrorHandler::class],
 			'config'          => ['class' => Config::class],
 			'logger'          => ['class' => Logger::class],
-			'note'      => ['class' => SNote::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

@@ -13,19 +13,24 @@ namespace Kiri\Abstracts;
 use Exception;
 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
  */
 class Component implements Configure
 {
 
+
 	/**
 	 * BaseAbstract constructor.
 	 *
@@ -41,29 +46,38 @@ class Component implements Configure
 
 
 	/**
-	 * @throws Exception
+	 * @return Container|ContainerInterface
 	 */
-	public function init()
+	#[Pure] public function getContainer(): ContainerInterface|Container
 	{
+		return Kiri::getDi();
 	}
 
 
 	/**
 	 * @return EventProvider
-	 * @throws \ReflectionException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	public function getEventProvider(): EventProvider
 	{
-		return Kiri::getDi()->get(EventProvider::class);
+		return $this->getContainer()->get(EventProvider::class);
 	}
 
 
 	/**
-	 * @return Container
+	 * @return EventDispatch
 	 */
-	#[Pure] public function getContainer(): ContainerInterface
+	protected function getEventDispatch(): EventDispatch
+	{
+		return $this->getContainer()->get(EventDispatch::class);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function init()
 	{
-		return Kiri::getDi();
 	}
 
 
@@ -117,13 +131,14 @@ class Component implements Configure
 	public function addError($message, string $model = 'app'): bool
 	{
 		if ($message instanceof \Throwable) {
-			$this->error(jTraceEx($message));
+			$this->error($message = jTraceEx($message));
 		} else {
 			if (!is_string($message)) {
 				$message = json_encode($message, JSON_UNESCAPED_UNICODE);
 			}
 			$this->error($message);
 		}
+		Kiri::app()->getLogger()->fail($message, $model);
 		return FALSE;
 	}
 
@@ -132,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);
 	}
@@ -149,8 +164,6 @@ class Component implements Configure
 		if (!is_string($message)) {
 			$message = print_r($message, true);
 		}
-//		$message = "\033[35m" . $message . "\033[0m";
-
 		$context = [];
 		if (!empty($method)) $context['method'] = $method;
 		if (!empty($file)) $context['file'] = $file;
@@ -170,8 +183,6 @@ class Component implements Configure
 		if (!is_string($message)) {
 			$message = print_r($message, true);
 		}
-//		$message = "\033[34m" . $message . "\033[0m";
-
 		$context = [];
 		if (!empty($method)) $context['method'] = $method;
 		if (!empty($file)) $context['file'] = $file;
@@ -191,9 +202,6 @@ class Component implements Configure
 		if (!is_string($message)) {
 			$message = print_r($message, true);
 		}
-
-//		$message = "\033[36m" . $message . "\033[0m";
-
 		$context = [];
 		if (!empty($method)) $context['method'] = $method;
 		if (!empty($file)) $context['file'] = $file;
@@ -214,8 +222,6 @@ class Component implements Configure
 			$message = print_r($message, true);
 		}
 
-//		$message = "\033[33m" . $message . "\033[0m";
-
 		$context = [];
 		if (!empty($method)) $context['method'] = $method;
 		if (!empty($file)) $context['file'] = $file;
@@ -245,8 +251,6 @@ class Component implements Configure
 			}
 			$context = $method;
 		}
-//		$message = "\033[41;37m" . $message . "\033[0m";
-
 		if (!empty($method)) $context['method'] = $method;
 		if (!empty($file)) $context['file'] = $file;
 

kiri-engine/Abstracts/Config.php

@@ -9,14 +9,12 @@ declare(strict_types=1);
 
 namespace Kiri\Abstracts;
 
-use Exception;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
 
 
 /**
  * Class Config
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 class Config extends Component
 {
@@ -95,7 +93,19 @@ class Config extends Component
 	 */
 	public static function set($key, $value): mixed
 	{
-		return static::setData($key, $value);
+		$explode = explode('.', $key);
+		$parent = &static::$data;
+		foreach ($explode as $item) {
+			if (!isset($parent[$item])) {
+				$parent[$item] = [];
+			}
+			$parent = &$parent[$item];
+		}
+		$parent = $value;
+
+		unset($parent);
+
+		return static::$data;
 	}
 
 	/**

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

@@ -3,14 +3,13 @@
 namespace Kiri\Abstracts;
 
 use DirectoryIterator;
-use Kiri\Kiri;
-use Note\Inject;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
+use Kiri;
+use Kiri\Server\Events\OnWorkerStop;
 use Psr\Log\LoggerInterface;
 use ReflectionException;
-use Server\Events\OnWorkerStop;
 
 
 /**
@@ -19,212 +18,212 @@ use Server\Events\OnWorkerStop;
 class Logger implements LoggerInterface
 {
 
-    const EMERGENCY = 'emergency';
+	const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
+	const ALERT = 'alert';
-    const CRITICAL = 'critical';
+	const CRITICAL = 'critical';
-    const ERROR = 'error';
+	const ERROR = 'error';
-    const WARNING = 'warning';
+	const WARNING = 'warning';
-    const NOTICE = 'notice';
+	const NOTICE = 'notice';
-    const INFO = 'info';
+	const INFO = 'info';
-    const DEBUG = 'debug';
+	const DEBUG = 'debug';
 
 
-    private array $_loggers = [];
+	private array $_loggers = [];
 
 
-    const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG];
+	const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG];
 
 
-    /**
+	/**
-     * @return void
+	 * @return void
-     * @throws ReflectionException
+	 * @throws ReflectionException
-     */
+	 */
-    public function init()
+	public function init()
-    {
+	{
-        Kiri::getDi()->get(EventProvider::class)->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
+		Kiri::getDi()->get(EventProvider::class)->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     *
+	 *
-     * 紧急情况
+	 * 紧急情况
-     */
+	 */
-    public function emergency($message, array $context = [])
+	public function emergency($message, array $context = [])
-    {
+	{
-        // TODO: Implement emergency() method.
+		// TODO: Implement emergency() method.
-        $this->log(Logger::EMERGENCY, $message, $context);
+		$this->log(Logger::EMERGENCY, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     *
+	 *
-     * 应该警惕的
+	 * 应该警惕的
-     */
+	 */
-    public function alert($message, array $context = [])
+	public function alert($message, array $context = [])
-    {
+	{
-        // TODO: Implement alert() method.
+		// TODO: Implement alert() method.
-        $this->log(Logger::ALERT, $message, $context);
+		$this->log(Logger::ALERT, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     *
+	 *
-     * 关键性的日志
+	 * 关键性的日志
-     */
+	 */
-    public function critical($message, array $context = [])
+	public function critical($message, array $context = [])
-    {
+	{
-        // TODO: Implement critical() method.
+		// TODO: Implement critical() method.
-        $this->log(Logger::CRITICAL, $message, $context);
+		$this->log(Logger::CRITICAL, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function error($message, array $context = [])
+	public function error($message, array $context = [])
-    {
+	{
-        // TODO: Implement error() method.
+		// TODO: Implement error() method.
-        $this->log(Logger::ERROR, $message, $context);
+		$this->log(Logger::ERROR, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function warning($message, array $context = [])
+	public function warning($message, array $context = [])
-    {
+	{
-        // TODO: Implement warning() method.
+		// TODO: Implement warning() method.
-        $this->log(Logger::WARNING, $message, $context);
+		$this->log(Logger::WARNING, $message, $context);
-    }
+	}
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function notice($message, array $context = [])
+	public function notice($message, array $context = [])
-    {
+	{
-        // TODO: Implement notice() method.
+		// TODO: Implement notice() method.
-        $this->log(Logger::NOTICE, $message, $context);
+		$this->log(Logger::NOTICE, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function info($message, array $context = [])
+	public function info($message, array $context = [])
-    {
+	{
-        // TODO: Implement info() method.
+		// TODO: Implement info() method.
-        $this->log(Logger::INFO, $message, $context);
+		$this->log(Logger::INFO, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function debug($message, array $context = [])
+	public function debug($message, array $context = [])
-    {
+	{
-        // TODO: Implement debug() method.
+		// TODO: Implement debug() method.
-        $this->log(Logger::DEBUG, $message, $context);
+		$this->log(Logger::DEBUG, $message, $context);
-    }
+	}
 
 
-    /**
+	/**
-     * @param mixed $level
+	 * @param mixed $level
-     * @param string $message
+	 * @param string $message
-     * @param array $context
+	 * @param array $context
-     * @throws ConfigException
+	 * @throws ConfigException
-     */
+	 */
-    public function log($level, $message, array $context = [])
+	public function log($level, $message, array $context = [])
-    {
+	{
-        // TODO: Implement log() method.
+		// TODO: Implement log() method.
-        $levels = Config::get('log.level', Logger::LOGGER_LEVELS);
+		$levels = Config::get('log.level', Logger::LOGGER_LEVELS);
-        if (!in_array($level, $levels)) {
+		if (!in_array($level, $levels) || str_contains($message, 'Event::rshutdown')) {
-            return;
+			return;
-        }
+		}
 
-        $_string = '[' . now() . '] production.' . $level . ': ' . $this->_string($message, $context);
+		$_string = '[' . now() . '] production.' . $level . ': ' . $this->_string($message, $context);
 
-        file_put_contents('php://output', $_string);
+		file_put_contents('php://output', $_string);
 
-        $this->_loggers[] = $_string;
+		$this->_loggers[] = $_string;
-    }
+	}
 
 
-    /**
+	/**
-     * @param OnWorkerStop $param
+	 * @param OnWorkerStop $param
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function onAfterRequest(OnWorkerStop $param)
+	public function onAfterRequest(OnWorkerStop $param)
-    {
+	{
-        $loggers = implode(PHP_EOL, $this->_loggers);
+		$loggers = implode(PHP_EOL, $this->_loggers);
-        $this->_loggers = [];
+		$this->_loggers = [];
-        if (!empty($loggers)) {
+		if (!empty($loggers)) {
-            $filename = storage('log-' . date('Y-m-d') . '.log', 'log/');
+			$filename = storage('log-' . date('Y-m-d') . '.log', 'log/');
 
-            file_put_contents($filename, $loggers);
+			file_put_contents($filename, $loggers);
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @return void
+	 * @return void
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function flush()
+	public function flush()
-    {
+	{
-        $this->removeFile(storage());
+		$this->removeFile(storage());
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $dirname
+	 * @param string $dirname
-     * @return void
+	 * @return void
-     */
+	 */
-    private function removeFile(string $dirname)
+	private function removeFile(string $dirname)
-    {
+	{
-        $paths = new DirectoryIterator($dirname);
+		$paths = new DirectoryIterator($dirname);
-        /** @var DirectoryIterator $path */
+		/** @var DirectoryIterator $path */
-        foreach ($paths as $path) {
+		foreach ($paths as $path) {
-            if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
+			if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
-                continue;
+				continue;
-            }
+			}
-            if ($path->isDir()) {
+			if ($path->isDir()) {
-                $directory = rtrim($path->getRealPath(), '/');
+				$directory = rtrim($path->getRealPath(), '/');
-                $this->removeFile($directory);
+				$this->removeFile($directory);
-            }
+			}
-            @unlink($path->getRealPath());
+			@unlink($path->getRealPath());
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @param $message
+	 * @param $message
-     * @param $context
+	 * @param $context
-     * @return string
+	 * @return string
-     */
+	 */
-    private function _string($message, $context): string
+	private function _string($message, $context): string
-    {
+	{
-        if (!empty($context)) {
+		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;
+		return $message . PHP_EOL;
-    }
+	}
 }

kiri-engine/Abstracts/TraitApplication.php

@@ -4,14 +4,11 @@
 namespace Kiri\Abstracts;
 
 
-use Note\Note as SNote;
+use Kiri\Annotation\Annotation as SAnnotation;
 use Database\Connection;
 use Database\DatabasesProviders;
-use Http\Handler\Client\Client;
+use Kiri\Message\Handler\Router;
-use Http\Handler\Client\Curl;
+use Kiri\Server\Server;
-use Http\Handler\Router;
-use Server\Server;
-use Kiri\Crontab\Producer;
 use Kiri\Async;
 use Kiri\Error\Logger;
 use Kiri\Jwt\JWTAuth;
@@ -25,11 +22,9 @@ use Kiri\Jwt\JWTAuth;
  * @property Async $async
  * @property Logger $logger
  * @property JWTAuth $jwt
- * @property SNote $annotation
+ * @property SAnnotation $annotation
  * @property BaseGoto $goto
- * @property Client $client
  * @property Connection $databases
- * @property Curl $curl
  */
 trait TraitApplication
 {

kiri-engine/Application.php

@@ -13,24 +13,23 @@ namespace Kiri;
 use Closure;
 use Database\DatabasesProviders;
 use Exception;
-use Kiri\Abstracts\BaseApplication;
+use Kiri;
-use Kiri\Abstracts\Config;
+use Kiri\Abstracts\{BaseApplication, Config, Kernel};
-use Kiri\Abstracts\Kernel;
 use Kiri\Crontab\CrontabProviders;
-use Kiri\Events\OnAfterCommandExecute;
+use Kiri\Events\{OnAfterCommandExecute, OnBeforeCommandExecute};
-use Kiri\Events\OnBeforeCommandExecute;
-use Kiri\Exception\NotFindClassException;
 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;
+use Symfony\Component\Console\{Application as ConsoleApplication,
-use Symfony\Component\Console\Command\Command;
+	Command\Command,
-use Symfony\Component\Console\Input\ArgvInput;
+	Input\ArgvInput,
-use Symfony\Component\Console\Input\InputInterface;
+	Output\ConsoleOutput,
-use Symfony\Component\Console\Output\ConsoleOutput;
+	Output\OutputInterface
+};
+
 
 /**
  * Class Init
@@ -192,7 +191,8 @@ class Application extends BaseApplication
 	 */
 	public function execute(array $argv): void
 	{
-		/** @var InputInterface $input */
+		ini_set('swoole.enable_preemptive_scheduler', 'On');
+		ini_set('swoole.enable_library', 'On');
 		[$input, $output] = $this->argument($argv);
 		try {
 			$console = di(ConsoleApplication::class);
@@ -212,7 +212,6 @@ class Application extends BaseApplication
 	}
 
 
-
 	/**
 	 * @param $argv
 	 * @return array
@@ -223,7 +222,6 @@ class Application extends BaseApplication
 	}
 
 
-
 	/**
 	 * @throws ReflectionException
 	 * @throws Exception
@@ -232,16 +230,23 @@ 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);
+
 		$class->run($input, $output);
 		fire(new OnAfterCommandExecute());
 		$output->writeln('ok' . PHP_EOL);
 	}
 
 
-
-
 	/**
 	 * @param $className
 	 * @param null $abstracts

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

@@ -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,14 +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 Note\Inject;
+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
@@ -80,6 +81,25 @@ class Redis extends Component
 	}
 
 
+    /**
+     * @param $key
+     * @param int $timeout
+     * @return bool
+     */
+    public function waite($key, int $timeout = 5): bool
+    {
+        $time = time();
+        while (!$this->setNx($key, 1)) {
+            if (time()- $time >= $timeout) {
+                return FALSE;
+            }
+            usleep(1000);
+        }
+        $this->expire($key, $timeout);
+        return TRUE;
+    }
+
+
 	/**
 	 * @param $key
 	 * @param int $timeout

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
 {
@@ -27,7 +27,7 @@ class DateFormat
 		if ($time === null) {
 			$time = time();
 		} else if (is_numeric($time)) {
-			$length = strlen(floatval($time));
+			$length = strlen((string)$time);
 			if ($length != 10 && $length != 13) {
 				return false;
 			}
@@ -86,9 +86,7 @@ class DateFormat
 			return false;
 		}
 
-		$time = date('t', $time);
+		return date('t', $time);
-
-		return $time;
 	}
 
 	/**

kiri-engine/Core/Dtl.php

@@ -21,6 +21,7 @@ class Dtl extends Component
 	/**
 	 * Dtl constructor.
 	 * @param $params
+	 * @throws Exception
 	 */
 	public function __construct($params)
 	{
@@ -35,9 +36,6 @@ class Dtl extends Component
 	 */
 	public function toArray(): array
 	{
-		if (!is_array($this->params)) {
-			return ArrayAccess::toArray($this->params);
-		}
 		return $this->params;
 	}
 

kiri-engine/Core/HashMap.php

@@ -3,6 +3,7 @@
 namespace Kiri\Core;
 
 use JetBrains\PhpStorm\Pure;
+use ReturnTypeWillChange;
 
 class HashMap implements \ArrayAccess
 {
@@ -62,7 +63,7 @@ class HashMap implements \ArrayAccess
 	 * @param mixed $offset
 	 * @return bool
 	 */
-	public function offsetExists($offset): bool
+	public function offsetExists(mixed $offset): bool
 	{
 		return isset($this->lists[$offset]);
 	}
@@ -72,7 +73,7 @@ class HashMap implements \ArrayAccess
 	 * @param mixed $offset
 	 * @return mixed
 	 */
-	#[Pure] public function offsetGet($offset): mixed
+	#[Pure] public function offsetGet(mixed $offset): mixed
 	{
 		return $this->get($offset);
 	}
@@ -82,7 +83,8 @@ class HashMap implements \ArrayAccess
 	 * @param mixed $offset
 	 * @param mixed $value
 	 */
-	public function offsetSet($offset, $value)
+	#[ReturnTypeWillChange]
+	public function offsetSet(mixed $offset, mixed $value)
 	{
 		$this->put($offset, $value);
 	}
@@ -91,7 +93,8 @@ class HashMap implements \ArrayAccess
 	/**
 	 * @param mixed $offset
 	 */
-	public function offsetUnset($offset)
+	#[ReturnTypeWillChange]
+	public function offsetUnset(mixed $offset)
 	{
 		unset($this->lists[$offset]);
 	}

kiri-engine/Core/Help.php

@@ -10,7 +10,7 @@ use Exception;
 
 /**
  * Class Help
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Help
 {
@@ -59,6 +59,7 @@ class Help
 	/**
 	 * @param $xml
 	 * @return mixed
+	 * @throws Exception
 	 */
 	public static function toArray($xml): mixed
 	{

kiri-engine/Core/Json.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class JSON
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Json
 {
@@ -43,7 +43,7 @@ class Json
 	 * @param bool $asArray
 	 * @return mixed
 	 */
-	public static function decode($data, $asArray = true): mixed
+	public static function decode($data, bool $asArray = true): mixed
 	{
 		if (is_array($data) || is_numeric($data)) {
 			return $data;
@@ -55,14 +55,13 @@ class Json
 
 	/**
 	 * @param $code
-	 * @param string $message
+	 * @param string|array $message
-	 * @param array $data
+	 * @param array|int $data
 	 * @param int $count
 	 * @param array $exPageInfo
-	 * @return mixed
+	 * @return string|bool
-	 * @throws
 	 */
-	public static function to($code, $message = '', $data = [], $count = 0, $exPageInfo = []): mixed
+	public static function to($code, string|array $message = '', array|int $data = [], int $count = 0, array $exPageInfo = []): string|bool
 	{
 		$params['code'] = $code;
 		if (!is_string($message)) {

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,25 +9,24 @@ declare(strict_types=1);
 
 namespace Kiri\Di;
 
-use Kiri\Abstracts\Component;
-use Note\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
  * @package Kiri\Di
  */
-class Container extends Component implements ContainerInterface
+class Container implements ContainerInterface
 {
 
 	/**
@@ -62,37 +61,40 @@ class Container extends Component implements ContainerInterface
 	];
 
 
-    /**
+	/**
-     * @param string $id
+	 * @param string $id
-     * @return mixed
+	 * @return mixed
-     * @throws ReflectionException
+	 * @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 ReflectionException
+	 */
-     * @throws Exception
+	public function make($class, array $constrict = [], array $config = []): mixed
-     */
+	{
-    public function make($class, array $constrict = [], array $config = []): mixed
+		if ($class == ContainerInterface::class) {
-    {
+			return $this;
-        if ($this->isInterface($class)) {
+		}
-            $class = $this->_interfaces[$class];
+		if ($this->isInterface($class)) {
-        }
+			$class = $this->_interfaces[$class];
-        if (!isset($this->_singletons[$class])) {
+		}
-            $this->_singletons[$class] = $this->resolve($class, $constrict, $config);
+		if (!isset($this->_singletons[$class])) {
-        }
+			$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
-        return $this->_singletons[$class];
+		}
-    }
+		return $this->_singletons[$class];
-
+	}
 
 
 	/**
@@ -108,7 +110,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return bool
-	 * @throws ReflectionException
 	 */
 	public function isInterface($class): bool
 	{
@@ -200,7 +201,7 @@ class Container extends Component implements ContainerInterface
 	 */
 	public function propertyInject(ReflectionClass $reflect, $object): mixed
 	{
-		foreach (NoteManager::getPropertyNote($reflect) as $property => $inject) {
+		foreach (NoteManager::getPropertyAnnotation($reflect) as $property => $inject) {
 			/** @var Inject $inject */
 			$inject->execute($object, $property);
 		}
@@ -212,11 +213,10 @@ class Container extends Component implements ContainerInterface
 	 * @param $className
 	 * @param $method
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	public function getMethodAttribute($className, $method = null): array
 	{
-		$methods = NoteManager::getMethodNote($this->getReflect($className));
+		$methods = NoteManager::getMethodAnnotation($this->getReflect($className));
 		if (!empty($method)) {
 			return $methods[$method] ?? [];
 		}
@@ -228,7 +228,6 @@ class Container extends Component implements ContainerInterface
 	 * @param string $class
 	 * @param string|null $property
 	 * @return ReflectionProperty|ReflectionProperty[]|null
-	 * @throws ReflectionException
 	 */
 	public function getClassReflectionProperty(string $class, string $property = null): ReflectionProperty|null|array
 	{
@@ -339,9 +338,6 @@ class Container extends Component implements ContainerInterface
 		if (!isset($this->_parameters[$class])) {
 			$this->_parameters[$class] = [];
 		}
-		if (!isset($this->_parameters[$class][$method])) {
-			$this->_parameters[$class][$method] = [];
-		}
 		return $this->_parameters[$class][$method] = $parameters;
 	}
 
@@ -360,7 +356,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param ReflectionMethod|ReflectionFunction $reflectionMethod
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
 	{
@@ -394,7 +389,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return ReflectionClass|null
-	 * @throws ReflectionException
 	 */
 	public function getReflect($class): ?ReflectionClass
 	{
@@ -449,12 +443,12 @@ class Container extends Component 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

@@ -12,9 +12,9 @@ class NoteManager
 
 
 	private static array $_classTarget = [];
-	private static array $_classMethodNote = [];
+	private static array $_classMethodAnnotation = [];
 	private static array $_classMethod = [];
-	private static array $_classPropertyNote = [];
+	private static array $_classPropertyAnnotation = [];
 	private static array $_classProperty = [];
 	private static array $_mapping = [];
 
@@ -25,9 +25,9 @@ class NoteManager
 	public static function clear()
 	{
 		static::$_classTarget = [];
-		static::$_classMethodNote = [];
+		static::$_classMethodAnnotation = [];
 		static::$_classMethod = [];
-		static::$_classPropertyNote = [];
+		static::$_classPropertyAnnotation = [];
 		static::$_classProperty = [];
 		static::$_mapping = [];
 	}
@@ -36,7 +36,7 @@ class NoteManager
 	/**
 	 * @param ReflectionClass $class
 	 */
-	public static function setTargetNote(ReflectionClass $class)
+	public static function setTargetAnnotation(ReflectionClass $class)
 	{
 		$className = $class->getName();
 		if (!isset(static::$_classTarget[$className])) {
@@ -111,7 +111,7 @@ class NoteManager
 	 * @param mixed $class
 	 * @return array
 	 */
-	public static function getTargetNote(mixed $class): array
+	public static function getTargetAnnotation(mixed $class): array
 	{
 		if (!is_string($class)) {
 			$class = $class::class;
@@ -123,20 +123,20 @@ class NoteManager
 	/**
 	 * @param ReflectionClass $class
 	 */
-	public static function setMethodNote(ReflectionClass $class)
+	public static function setMethodAnnotation(ReflectionClass $class)
 	{
 		$className = $class->getName();
-		static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
+		static::$_classMethodAnnotation[$className] = static::$_classMethod[$className] = [];
 		foreach ($class->getMethods() as $ReflectionMethod) {
 			static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-			static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
+			static::$_classMethodAnnotation[$className][$ReflectionMethod->getName()] = [];
 			foreach ($ReflectionMethod->getAttributes() as $attribute) {
 				if (!class_exists($attribute->getName())) {
 					continue;
 				}
 				$instance = $attribute->newInstance();
 
-				static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
+				static::$_classMethodAnnotation[$className][$ReflectionMethod->getName()][] = $instance;
 
 				self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
 			}
@@ -159,9 +159,9 @@ class NoteManager
 	 * @param ReflectionClass $class
 	 * @return array
 	 */
-	#[Pure] public static function getMethodNote(ReflectionClass $class): array
+	#[Pure] public static function getMethodAnnotation(ReflectionClass $class): array
 	{
-		return static::$_classMethodNote[$class->getName()] ?? [];
+		return static::$_classMethodAnnotation[$class->getName()] ?? [];
 	}
 
 
@@ -171,9 +171,9 @@ class NoteManager
 	 */
 	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
 	{
-		NoteManager::setPropertyNote($reflect);
+		NoteManager::setPropertyAnnotation($reflect);
-		NoteManager::setTargetNote($reflect);
+		NoteManager::setTargetAnnotation($reflect);
-		NoteManager::setMethodNote($reflect);
+		NoteManager::setMethodAnnotation($reflect);
 
 		return $reflect->getConstructor();
 	}
@@ -182,10 +182,10 @@ class NoteManager
 	/**
 	 * @param ReflectionClass $class
 	 */
-	public static function setPropertyNote(ReflectionClass $class)
+	public static function setPropertyAnnotation(ReflectionClass $class)
 	{
 		$className = $class->getName();
-		static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
+		static::$_classProperty[$className] = static::$_classPropertyAnnotation[$className] = [];
 		foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
 			ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
 			static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
@@ -196,7 +196,7 @@ class NoteManager
 
 				$instance = $attribute->newInstance();
 
-				static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
+				static::$_classPropertyAnnotation[$className][$ReflectionMethod->getName()] = $instance;
 
 				self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
 			}
@@ -250,7 +250,7 @@ class NoteManager
 	 * @param string $method
 	 * @return mixed
 	 */
-	public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
+	public static function getPropertyByAnnotation(string $attribute, string $class, string $method): mixed
 	{
 		$class = self::getAttributeTrees($attribute, $class);
 		if (empty($class) || !isset($class['property'])) {
@@ -294,9 +294,9 @@ class NoteManager
 	 * @param ReflectionClass $class
 	 * @return array
 	 */
-	#[Pure] public static function getPropertyNote(ReflectionClass $class): array
+	#[Pure] public static function getPropertyAnnotation(ReflectionClass $class): array
 	{
-		return static::$_classPropertyNote[$class->getName()] ?? [];
+		return static::$_classPropertyAnnotation[$class->getName()] ?? [];
 	}
 
 

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

@@ -9,18 +9,17 @@ declare(strict_types=1);
 
 namespace Kiri\Error;
 
-use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
-use Kiri\Events\EventProvider;
+use Kiri;
-use Kiri\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
@@ -47,9 +46,21 @@ class Logger extends Component
 	 */
 	public function getLastError(string $application = 'app'): string
 	{
-		return 'Unknown error.';
+		return $this->logs[$application] ?? 'Unknown error.';
 	}
 
+
+	/**
+	 * @param $message
+	 * @param $method
+	 * @return void
+	 */
+	public function fail($message, $method)
+	{
+		$this->logs[$method] = $message;
+	}
+
+
 	/**
 	 * @param string $messages
 	 * @param string $method

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 Note\Inject;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\Timer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
@@ -25,211 +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();
-        $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');
-    }
+		var_dump($path);
-
+		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);
-     *
+			}
-     * @throws Exception
+		} else {
-     */
+			$this->int = 1;
-    public function trigger_reload()
+			$this->stopServer();
-    {
+			$this->process = new Process(function (Process $process) {
-        if ($this->int == 1) {
+				$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
-            return;
+			});
-        }
+			$this->process->start();
-        $this->int = 1;
+			$this->int = -1;
-        $this->logger->warning('change reload');
+		}
-
+	}
-        $this->stopServer();
-        $this->stopManager();
-
-        $this->process = new Process(function (Process $process) {
-            $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
-        });
-
-        $this->process->start();
-        $this->int = -1;
-    }
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -9,161 +9,164 @@ 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;
-            }
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function reload()
-    {
-        $this->process->trigger_reload();
-        $this->clearWatch();
-        foreach ($this->dirs as $root) {
-            $this->watch($root);
-        }
-        $this->process->int = -1;
-        $this->isReloading = FALSE;
-    }
 
 
-    /**
+			var_dump($ev);
-     * @throws Exception
+
-     */
+			//非重启类型
-    public function clearWatch()
+			if (str_ends_with($ev['name'], '.php')) {
-    {
+
-        foreach ($this->watchFiles as $wd) {
+				Timer::after(3000, fn() => $this->reload($ev['name']));
-            try {
+				$this->isReloading = TRUE;
-                @inotify_rm_watch($this->inotify, $wd);
+			}
-            } catch (\Throwable $exception) {
+		}
-//				logger()->addError($exception->getMessage(), 'throwable');
+	}
-            }
+
-        }
+	/**
-        $this->watchFiles = [];
+	 * @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;
+	}
 
 
-    /**
+	/**
-     * @param $dir
+	 * @throws Exception
-     * @return bool
+	 */
-     * @throws Exception
+	public function clearWatch()
-     */
+	{
-    public function watch($dir): bool
+		foreach ($this->watchFiles as $wd) {
-    {
+			@inotify_rm_watch($this->inotify, $wd);
-        //目录不存在
+		}
-        if (!is_dir($dir)) {
+		$this->watchFiles = [];
-            return logger()->addError("[$dir] is not a directory.");
+	}
-        }
-        //避免重复监听
-        if (isset($this->watchFiles[$dir])) {
-            return FALSE;
-        }
 
-        if (in_array($dir, self::IG_DIR)) {
-            return FALSE;
-        }
 
-        $wd = @inotify_add_watch($this->inotify, $dir, $this->events);
+	/**
-        $this->watchFiles[$dir] = $wd;
+	 * @param $dir
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function watch($dir): bool
+	{
+		//目录不存在
+		if (!is_dir($dir)) {
+			return logger()->addError("[$dir] is not a directory.");
+		}
+		//避免重复监听
+		if (isset($this->watchFiles[$dir])) {
+			return FALSE;
+		}
 
-        $files = scandir($dir);
+		if (in_array($dir, self::IG_DIR)) {
-        foreach ($files as $f) {
+			return FALSE;
-            if ($f == '.' || $f == '..') {
+		}
-                continue;
+
-            }
+		$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
-            $path = $dir . '/' . $f;
+		$this->watchFiles[$dir] = $wd;
-            //递归目录
+
-            if (is_dir($path)) {
+		$files = scandir($dir);
-                $this->watch($path);
+		foreach ($files as $f) {
-            } else if (!str_ends_with($f, '.php')) {
+			if ($f == '.' || $f == '..') {
-                continue;
+				continue;
-            }
+			}
-            //检测文件类型
+			$path = $dir . '/' . $f;
-            if (strstr($f, '.') == '.php') {
+			//递归目录
-                $wd = @inotify_add_watch($this->inotify, $path, $this->events);
+			if (is_dir($path)) {
-                $this->watchFiles[$path] = $wd;
+				$this->watch($path);
-            }
+			} else if (!str_ends_with($f, '.php')) {
-        }
+				continue;
-        return TRUE;
+			}
-    }
+			//检测文件类型
+			if (strstr($f, '.') == '.php') {
+				$wd = @inotify_add_watch($this->inotify, $path, $this->events);
+				$this->watchFiles[$path] = $wd;
+			}
+		}
+		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/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
@@ -44,7 +44,7 @@ class Runtime extends Command
 	public function execute(InputInterface $input, OutputInterface $output): int
 	{
 		// TODO: Implement onHandler() method.
-		$annotation = Kiri::app()->getNote();
+		$annotation = Kiri::app()->getAnnotation();
 
 		$runtime = storage(static::CACHE_NAME);
 		$config = storage(static::CONFIG_NAME);

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;
 
 /**
@@ -119,10 +119,8 @@ class Gii
 	 */
 	private function makeByDatabases($make, InputInterface $input): array
 	{
-		$redis = Kiri::getDi()->get(Redis::class);
 		if ($input->hasOption('name')) {
 			$this->tableName = $input->getOption('name');
-			$redis->del('column:' . $this->tableName);
 		}
 		return match ($make) {
 			'controller' => $this->getTable(1, 0),

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
@@ -65,14 +65,14 @@ namespace {$namespace};
 		} else {
 			$import = "use Kiri;
 use Exception;
-use Note\Target;
+use Kiri\Annotation\Target;
-use Note\Route\Middleware;
+use Kiri\Annotation\Route\Middleware;
-use Note\Route\Route;
+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

@@ -51,8 +51,8 @@ interface ' . ucfirst($name) . 'RpcInterface
 namespace Rpc\Producers;
 
 
-use Note\Target;
+use Kiri\Annotation\Target;
-use Note\Mapping;
+use Kiri\Annotation\Mapping;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 use Exception;
 use Kiri\Rpc\JsonRpcConsumers;
@@ -86,9 +86,9 @@ class ' . ucfirst($name) . 'RpcService extends JsonRpcConsumers implements ' . u
 namespace Rpc\Consumers;
 
 
-use Note\Target;
+use Kiri\Annotation\Target;
-use Kiri\Rpc\Note\JsonRpc;
+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
@@ -66,11 +66,11 @@ namespace ' . $namespace . ';
 					$html .= $imports . PHP_EOL;
 				}
 
-				if (!str_contains($imports, 'Database\Note\Set')) {
+				if (!str_contains($imports, 'Database\Annotation\Set')) {
-					$html .= 'use Database\Note\Set;' . PHP_EOL;
+					$html .= 'use Database\Annotation\Set;' . PHP_EOL;
 				}
-				if (!str_contains($imports, 'Database\Note\Get')) {
+				if (!str_contains($imports, 'Database\Annotation\Get')) {
-					$html .= 'use Database\Note\Get;' . PHP_EOL;
+					$html .= 'use Database\Annotation\Get;' . PHP_EOL;
 				}
 			} catch (\Throwable $e) {
 				logger()->addError($e, 'throwable');
@@ -84,11 +84,11 @@ namespace ' . $namespace . ';
 
 
 use Exception;
-use Note\Target;
+use Kiri\Annotation\Target;
 use Kiri\Core\Json;
 use Database\Connection;
-use Database\Note\Get;
+use Database\Annotation\Get;
-use Database\Note\Set;
+use Database\Annotation\Set;
 use Database\Relation;
 use Database\Model;
 ' . PHP_EOL;

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
@@ -36,13 +36,13 @@ class GiiRpcClient extends GiiBase
 		
 namespace App\Client\Rpc;
 
-use Note\Rpc\Consumer;
+use Kiri\Annotation\Rpc\Consumer;
-use Note\Rpc\RpcClient;
+use Kiri\Annotation\Rpc\RpcClient;
-use Note\Target;
+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
@@ -33,10 +33,10 @@ class GiiRpcService extends GiiBase
 		
 namespace App\Rpc;
 
-use Note\Route\RpcProducer;
+use Kiri\Annotation\Route\RpcProducer;
-use Note\Target;
+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/FdCollector.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Websocket;
+
+class FdCollector
+{
+
+
+	public function set($fd)
+	{
+
+	}
+
+}

kiri-websocket-server/Sender.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Kiri\Websocket;
+
+use Kiri;
+use Swoole\{Coroutine\Http\Server as AliasServer, WebSocket\Server};
+
+
+/**
+ *
+ */
+class Sender implements WebSocketInterface
+{
+
+
+	/**
+	 * @var AliasServer|Server
+	 */
+	private AliasServer|Server $server;
+
+
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->server = Kiri::getDi()->get(WebSocketInterface::class);
+	}
+
+
+	/**
+	 * @param int $fd
+	 * @param mixed $data
+	 * @param int $opcode
+	 * @param int $flags
+	 * @return bool
+	 */
+	public function push(int $fd, string $data, int $opcode = WEBSOCKET_OPCODE_TEXT, int $flags = SWOOLE_WEBSOCKET_FLAG_FIN): bool
+	{
+		if ($this->isEstablished($fd)) {
+			return $this->server->push($fd, $data, $opcode, $flags);
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param $fd
+	 * @param $reactor_id
+	 * @return array|null
+	 */
+	public function connection_info($fd, $reactor_id = null): ?array
+	{
+		return $this->server->getClientInfo($fd, $reactor_id);
+	}
+
+
+	/**
+	 * @param int $fd
+	 * @param int $code
+	 * @param string $reason
+	 * @return bool
+	 */
+	public function disconnect(int $fd, int $code = SWOOLE_WEBSOCKET_CLOSE_NORMAL, string $reason = ''): bool
+	{
+		if ($this->isEstablished($fd)) {
+			return $this->server->disconnect($fd, $code, $reason);
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param int $fd
+	 * @return bool
+	 */
+	public function isEstablished(int $fd): bool
+	{
+		return $this->exist($fd) && $this->server->isEstablished($fd);
+	}
+
+
+	/**
+	 * @param int $fd
+	 * @return bool
+	 */
+	public function exist(int $fd): bool
+	{
+		return $this->server->exist($fd);
+	}
+
+}

kiri-websocket-server/Server.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace Kiri\Websocket;
+
+use Exception;
+use Kiri\Message\Handler\DataGrip;
+use Kiri\Abstracts\AbstractServer;
+use Kiri\Message\Handler\RouterCollector;
+use Psr\Container\ContainerExceptionInterface;
+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 Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\WebSocket\Frame;
+
+
+/**
+ * websocket server
+ */
+class Server extends AbstractServer
+{
+
+	public RouterCollector $router;
+
+
+	const SHA1_KEY = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
+
+
+	public mixed $callback = null;
+
+
+	/**
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function init()
+	{
+		$this->router = $this->container->get(DataGrip::class)->get('ws');
+		$handler = $this->router->find('/', 'GET');
+		if (is_int($handler) || is_null($handler)) {
+			return;
+		}
+		$this->callback = $handler->callback[0];
+	}
+
+
+	/**
+	 * @param \Swoole\Server $server
+	 * @param int $fd
+	 */
+	public function onClose(\Swoole\Server $server, int $fd): void
+	{
+		$clientInfo = $server->getClientInfo($fd);
+		if (!isset($clientInfo['websocket_status'])) {
+			return;
+		}
+		if ($this->callback instanceof OnCloseInterface) {
+			$this->callback->onClose($fd);
+		}
+	}
+
+
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 * @return void
+	 * @throws Exception
+	 */
+	protected function setWebSocketProtocol(Request $request, Response $response)
+	{
+		$secWebSocketKey = $request->header['sec-websocket-key'];
+		$patten = '#^[+/0-9A-Za-z]{21}[AQgw]==$#';
+		if (preg_match($patten, $secWebSocketKey) === 0 || strlen(base64_decode($secWebSocketKey)) !== 16) {
+			throw new Exception('protocol error.', 500);
+		}
+		$key = base64_encode(sha1($request->header['sec-websocket-key'] . self::SHA1_KEY, true));
+		$headers = [
+			'Upgrade'               => 'websocket',
+			'Connection'            => 'Upgrade',
+			'Sec-Websocket-Accept'  => $key,
+			'Sec-Websocket-Version' => '13',
+		];
+		if (isset($request->header['sec-websocket-protocol'])) {
+			$headers['Sec-Websocket-Protocol'] = $request->header['sec-websocket-protocol'];
+		}
+		foreach ($headers as $key => $val) {
+			$response->header($key, $val);
+		}
+	}
+
+
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 */
+	public function onHandshake(Request $request, Response $response): void
+	{
+		try {
+			$this->setWebSocketProtocol($request, $response);
+			if ($this->callback instanceof OnHandshakeInterface) {
+				$this->callback->onHandshake($request, $response);
+			} else {
+				$response->setStatusCode(101, 'connection success.');
+				$response->end();
+			}
+//			if ($this->server instanceof \Swoole\Coroutine\Http\Server) {
+//				$response->upgrade();
+//				$this->deferOpen($request);
+//				while (true) {
+//					$receive = $response->recv();
+//					if ($receive === '' || $receive instanceof CloseFrame) {
+//						$response->close();
+//						if ($this->callback instanceof OnCloseInterface) {
+//							$this->callback->onClose($this->server, $response->fd);
+//						}
+//						break;
+//					}
+//					$this->callback->onMessage($this->server, $receive);
+//				}
+//			} else {
+//				$this->deferOpen($request);
+//			}
+			if ($response->isWritable()) {
+				$this->deferOpen($request);
+			}
+		} catch (\Throwable $throwable) {
+			$response->status(4000 + $throwable->getCode(), $throwable->getMessage());
+			$response->end();
+		}
+	}
+
+
+	private function deferOpen($request)
+	{
+		if ($this->callback instanceof OnOpenInterface) {
+			$this->callback->onOpen($request);
+		}
+	}
+
+
+	/**
+	 * @param $server
+	 * @param Frame $frame
+	 */
+	public function onMessage($server, Frame $frame): void
+	{
+		if ($this->callback instanceof OnMessageInterface) {
+			$this->callback->onMessage($frame);
+		}
+	}
+}

kiri-websocket-server/WebSocketInterface.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Kiri\Websocket;
+
+
+/**
+ * @mixin \Swoole\WebSocket\Server
+ * @mixin \Swoole\Coroutine\Http\Server
+ */
+interface WebSocketInterface
+{
+
+
+	/**
+	 * @param int $fd
+	 * @param mixed $data
+	 * @param int $opcode
+	 * @param int $flags
+	 * @return bool
+	 */
+	public function push(int $fd, string $data, int $opcode = WEBSOCKET_OPCODE_TEXT, int $flags = SWOOLE_WEBSOCKET_FLAG_FIN): bool;
+
+
+	/**
+	 * @param int $fd
+	 * @param int $code
+	 * @param string $reason
+	 * @return mixed
+	 */
+	public function disconnect(int $fd, int $code = SWOOLE_WEBSOCKET_CLOSE_NORMAL, string $reason = ''): bool;
+
+
+	/**
+	 * @param int $fd
+	 * @return bool
+	 */
+	public function isEstablished(int $fd): bool;
+
+
+	/**
+	 * @param int $fd
+	 * @return bool
+	 */
+	public function exist(int $fd): bool;
+
+
+}

p.php

@@ -51,40 +51,40 @@
 
 
 var_dump(json_encode([
-	"Datacenter"     => "dc1",
+    "Datacenter"     => "dc1",
-	"Node"           => "iz8vbi3edjyskl7kpuwudqz",
+    "Node"           => "iz8vbi3edjyskl7kpuwudqz",
-	"SkipNodeUpdate" => false,
+    "SkipNodeUpdate" => FALSE,
-	"Service"        => [
+    "Service"        => [
-		"ID"              => "redis1",
+        "ID"              => "redis1",
-		"Service"         => "FriendRpcService",
+        "Service"         => "FriendRpcService",
-		"Address"         => "172.26.221.211",
+        "Address"         => "172.26.221.211",
-		"TaggedAddresses" => [
+        "TaggedAddresses" => [
-			"lan" => [
+            "lan" => [
-				"address" => "127.0.0.1",
+                "address" => "127.0.0.1",
-				"port"    => 9627
+                "port"    => 9627,
-			],
+            ],
-			"wan" => [
+            "wan" => [
-				"address" => "172.26.221.211",
+                "address" => "172.26.221.211",
-				"port"    => 9627
+                "port"    => 9627,
-			]
+            ],
-		],
+        ],
-		"Meta"            => [
+        "Meta"            => [
-			"redis_version" => "4.0"
+            "redis_version" => "4.0",
-		],
+        ],
-		"Port"            => 9627
+        "Port"            => 9627,
-	],
+    ],
-	"Check"          => [
+    "Check"          => [
-		"Node"       => "iz8vbi3edjyskl7kpuwudqz",
+        "Node"       => "iz8vbi3edjyskl7kpuwudqz",
-		"CheckId"    => "service:redis1",
+        "CheckId"    => "service:redis1",
-		"Name"       => "Redis health check",
+        "Name"       => "Redis health check",
-		"Notes"      => "Script based health check",
+        "Notes"      => "Script based health check",
-		"Status"     => "passing",
+        "Status"     => "passing",
-		"ServiceID"  => "redis1",
+        "ServiceID"  => "redis1",
-		"Definition" => [
+        "Definition" => [
-			"Http"                           => "http://172.26.221.211:9627",
+            "Http"                           => "http://172.26.221.211:9627",
-			"Interval"                       => "5s",
+            "Interval"                       => "5s",
-			"Timeout"                        => "1s",
+            "Timeout"                        => "1s",
-			"DeregisterCriticalServiceAfter" => "30s"
+            "DeregisterCriticalServiceAfter" => "30s",
-		],
+        ],
-	],
+    ],
 ]));

test.php

@@ -27,11 +27,21 @@ namespace Ar;
 use Swoole\Coroutine\Http\Client;
 use function Swoole\Coroutine\run;
 
-run(function () {
+//run(function () {
+//
+//	$client = new Client('47.92.194.207',8500);
+//	$client->get('/v1/agent/services?filter=Service == FriendRpcService');
+//	$client->close();
+//	var_dump($client->getBody());
+//
+//});
 
-	$client = new Client('47.92.194.207',8500);
+function order(int $userId): string
-	$client->get('/v1/agent/services?filter=Service == FriendRpcService');
+{
-	$client->close();
+    $explode = current(explode(' ', str_replace('0.', '', round((float)microtime(),6))));
-	var_dump($client->getBody());
 
-});
+    return 'N'.sprintf('%09d', $userId) . '.' . date('YmdHis') . '.' . str_pad($explode,6,0);
+}
+var_dump(
+    order(1)
+);