Revert "改名"

This reverts commit fdf58326

a.php

@@ -12,12 +12,12 @@ function version($oldVersion, $newVersion): bool
             continue;
         }
         if ($endShift < $shift) {
-			return true;
+            return TRUE;
         } 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,24 +21,22 @@
     "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": [
       "error.php",

function.php

@@ -3,7 +3,7 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
 use Kiri\Application;
@@ -14,8 +14,8 @@ use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Note;
-use Note\Route\Route;
+use Kiri\Annotation\Annotation;
+use Kiri\Annotation\Route\Route;
 use Psr\Log\LoggerInterface;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
@@ -192,16 +192,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 +220,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 +256,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 +849,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 +935,6 @@ if (!function_exists('di')) {
 	/**
 	 * @param string $className
 	 * @return mixed
-	 * @throws ReflectionException
 	 */
 	function di(string $className): mixed
 	{

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
- * @package Note
+ * Class Annotation
+ * @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,7 +1,7 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use Exception;
@@ -11,7 +11,7 @@ use Kiri\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,7 +1,7 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use Exception;
@@ -12,7 +12,7 @@ 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,7 +1,7 @@
 <?php
 
 
-namespace Note;
+namespace Kiri\Annotation;
 
 
 use DirectoryIterator;
@@ -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
@@ -147,7 +130,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,6 +1,6 @@
 <?php
 
-namespace Note;
+namespace Kiri\Annotation;
 
 use Kiri\Kiri;
 

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 Http\Handler\Abstracts\MiddlewareManager;
+use Kiri\Annotation\Attribute;
+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,11 +1,11 @@
 <?php
 
 
-namespace Note\Route;
+namespace Kiri\Annotation\Route;
 
 
-use Note\Attribute;
-use Http\Handler\Router;
+use Kiri\Annotation\Attribute;
+use Kiri\Message\Handler\Router;
 use Kiri\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 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,26 +10,18 @@ declare(strict_types=1);
 namespace Kiri\Abstracts;
 
 
-use Note\Note as SNote;
 use Database\Connection;
 use Exception;
-use Http\Handler\Router;
-use Kiri\Events\OnBeforeCommandExecute;
-use Server\Server;
+use Kiri\Message\Handler\Router;
 use Kafka\KafkaProvider;
-use Kiri\Async;
+use Kiri\{Async, Kiri};
+use Kiri\Annotation\Annotation as SAnnotation;
 use Kiri\Cache\Redis;
 use Kiri\Di\LocalService;
-use Kiri\Error\ErrorHandler;
-use Kiri\Error\Logger;
-use Kiri\Events\EventProvider;
-use Kiri\Exception\InitException;
-use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri\Error\{ErrorHandler, Logger};
+use Kiri\Exception\{InitException, NotFindClassException};
 use ReflectionException;
-use Server\ServerManager;
-use Server\Contract\OnTaskInterface;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri\Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute};
 use Swoole\Table;
 
 /**
@@ -223,22 +215,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 +238,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);
 			}
 		}
 
@@ -393,12 +384,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 +403,6 @@ abstract class BaseApplication extends Component
 	}
 
 
-
 	/**
 	 * @param $array
 	 */
@@ -451,7 +441,7 @@ 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],

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 Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Component
  * @package Kiri\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 Kiri::getDi()->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;
 	}
 
@@ -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,9 +9,7 @@ declare(strict_types=1);
 
 namespace Kiri\Abstracts;
 
-use Exception;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
 
 
 /**
@@ -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/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\Kiri;
 use Psr\Log\LoggerInterface;
 use ReflectionException;
-use Server\Events\OnWorkerStop;
+use Kiri\Server\Events\OnWorkerStop;
 
 
 /**
@@ -156,7 +155,7 @@ class Logger implements LoggerInterface
 	{
 		// TODO: Implement log() method.
 		$levels = Config::get('log.level', Logger::LOGGER_LEVELS);
-        if (!in_array($level, $levels)) {
+		if (!in_array($level, $levels) || str_contains($message, 'Event::rshutdown')) {
 			return;
 		}
 

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 Http\Handler\Client\Curl;
-use Http\Handler\Router;
-use Server\Server;
-use Kiri\Crontab\Producer;
+use Kiri\Message\Handler\Router;
+use Kiri\Server\Server;
 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,22 @@ namespace Kiri;
 use Closure;
 use Database\DatabasesProviders;
 use Exception;
-use Kiri\Abstracts\BaseApplication;
-use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Kernel;
+use Kiri\Abstracts\{BaseApplication, Config, Kernel};
 use Kiri\Crontab\CrontabProviders;
-use Kiri\Events\OnAfterCommandExecute;
-use Kiri\Events\OnBeforeCommandExecute;
-use Kiri\Exception\NotFindClassException;
+use Kiri\Events\{OnAfterCommandExecute, OnBeforeCommandExecute};
 use Kiri\FileListen\HotReload;
 use ReflectionException;
-use Server\ServerProviders;
+use Kiri\Server\ServerProviders;
 use stdClass;
 use Swoole\Process;
 use Swoole\Timer;
-use Symfony\Component\Console\Application as ConsoleApplication;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\{Application as ConsoleApplication,
+	Command\Command,
+	Input\ArgvInput,
+	Input\InputInterface,
+	Output\ConsoleOutput,
+	Output\OutputInterface
+};
 
 /**
  * Class Init
@@ -192,7 +190,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 +211,6 @@ class Application extends BaseApplication
 	}
 
 
-
 	/**
 	 * @param $argv
 	 * @return array
@@ -223,7 +221,6 @@ class Application extends BaseApplication
 	}
 
 
-
 	/**
 	 * @throws ReflectionException
 	 * @throws Exception
@@ -234,14 +231,15 @@ class Application extends BaseApplication
 		if (!($class instanceof HotReload)) {
 			scan_directory(directory('app'), 'App');
 		}
+
+		$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,8 +6,8 @@ namespace Kiri;
 
 use Exception;
 use Kiri\Abstracts\Component;
-use Server\ServerManager;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri\Server\ServerManager;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 
 /**
  * Class Async

kiri-engine/Cache/Redis.php

@@ -17,8 +17,9 @@ use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Kiri\Pool\Redis as PoolRedis;
-use Note\Inject;
-use Server\Events\OnWorkerExit;
+use Kiri\Annotation\Inject;
+use Kiri\Server\Events\OnWorkerExit;
+use Swoole\Timer;
 
 /**
  * Class Redis
@@ -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/Core/DateFormat.php

@@ -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 $time;
+		return date('t', $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

@@ -59,6 +59,7 @@ class Help
 	/**
 	 * @param $xml
 	 * @return mixed
+	 * @throws Exception
 	 */
 	public static function toArray($xml): mixed
 	{

kiri-engine/Core/Json.php

@@ -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 array $data
+	 * @param string|array $message
+	 * @param array|int $data
 	 * @param int $count
 	 * @param array $exPageInfo
-	 * @return mixed
-	 * @throws
+	 * @return string|bool
 	 */
-	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/Di/Container.php

@@ -9,8 +9,7 @@ declare(strict_types=1);
 
 namespace Kiri\Di;
 
-use Kiri\Abstracts\Component;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Closure;
 use Exception;
 use Kiri\Abstracts\Logger;
@@ -27,7 +26,7 @@ use Psr\Container\ContainerInterface;
  * Class Container
  * @package Kiri\Di
  */
-class Container extends Component implements ContainerInterface
+class Container implements ContainerInterface
 {
 
 	/**
@@ -65,7 +64,7 @@ class Container extends Component implements ContainerInterface
     /**
      * @param string $id
      * @return mixed
-     * @throws ReflectionException
+     * @throws
      */
 	public function get(string $id): mixed
 	{
@@ -79,8 +78,7 @@ class Container extends Component implements ContainerInterface
      * @param array $constrict
      * @param array $config
      * @return mixed
-     * @throws ReflectionException
-     * @throws Exception
+     * @throws
      */
     public function make($class, array $constrict = [], array $config = []): mixed
     {
@@ -108,7 +106,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return bool
-	 * @throws ReflectionException
 	 */
 	public function isInterface($class): bool
 	{
@@ -200,7 +197,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 +209,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 +224,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 +334,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 +352,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param ReflectionMethod|ReflectionFunction $reflectionMethod
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
 	{
@@ -394,7 +385,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return ReflectionClass|null
-	 * @throws ReflectionException
 	 */
 	public function getReflect($class): ?ReflectionClass
 	{

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::setTargetNote($reflect);
-		NoteManager::setMethodNote($reflect);
+		NoteManager::setPropertyAnnotation($reflect);
+		NoteManager::setTargetAnnotation($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/Error/ErrorHandler.php

@@ -10,12 +10,12 @@ 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 Http\Events\OnAfterRequest;
+use Kiri\Message\Events\OnAfterRequest;
 
 /**
  * Class ErrorHandler

kiri-engine/Error/Logger.php

@@ -9,12 +9,11 @@ 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\Kiri;
+use Kiri\Annotation\Inject;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -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,9 +5,9 @@ namespace Kiri\Error;
 
 
 use Exception;
-use Http\Aspect\OnAspectInterface;
-use Http\Aspect\OnJoinPointInterface;
-use Http\Constrict\RequestInterface;
+use Kiri\Message\Aspect\OnAspectInterface;
+use Kiri\Message\Aspect\OnJoinPointInterface;
+use Kiri\Message\Constrict\RequestInterface;
 use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
 

kiri-engine/Error/LoggerProcess.php

@@ -8,7 +8,7 @@ use Exception;
 use Kiri\Core\Json;
 use Kiri\Exception\ComponentException;
 use Kiri\Kiri;
-use Server\Abstracts\BaseProcess;
+use Kiri\Server\Abstracts\BaseProcess;
 use Swoole\Coroutine;
 use Swoole\Process;
 

kiri-engine/FileListen/HotReload.php

@@ -8,7 +8,7 @@ use Kiri\Core\Json;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\Timer;
@@ -176,7 +176,6 @@ class HotReload extends Command
         Timer::clearAll();
         $this->driver->clear();
         $this->stopServer();
-        $this->stopManager();
         while ($ret = Process::wait(TRUE)) {
             echo "PID={$ret['pid']}\n";
             sleep(1);
@@ -193,20 +192,13 @@ class HotReload extends Command
         if (!empty($pid) && Process::kill($pid, 0)) {
             Process::kill($pid, SIGTERM);
         }
-    }
-
-
-    /**
-     *
-     */
-    protected function stopManager()
-    {
         if ($this->process && Process::kill($this->process->pid, 0)) {
             Process::kill($this->process->pid) && Process::wait(TRUE);
         }
     }
 
 
+
     /**
      * 重启
      *
@@ -221,10 +213,8 @@ class HotReload extends Command
         $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"]);
+            $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
         });
 
         $this->process->start();

kiri-engine/Kiri.php

@@ -7,7 +7,7 @@ namespace Kiri;
 error_reporting(0);
 
 
-use Note\Note;
+use Kiri\Annotation\Annotation;
 use Database\Collection;
 use Database\ModelInterface;
 use Exception;
@@ -17,8 +17,8 @@ use Kiri\Core\Json;
 use Kiri\Di\Container;
 use Psr\Container\ContainerInterface;
 use ReflectionException;
-use Server\ServerManager;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri\Server\ServerManager;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
@@ -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();
 	}
 
 

kiri-engine/Runtime.php

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

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

@@ -65,14 +65,14 @@ namespace {$namespace};
 		} else {
 			$import = "use Kiri;
 use Exception;
-use Note\Target;
-use Note\Route\Middleware;
-use Note\Route\Route;
+use Kiri\Annotation\Target;
+use Kiri\Annotation\Route\Middleware;
+use Kiri\Annotation\Route\Route;
 use Kiri\Core\Str;
 use Kiri\Core\Json;
-use Http\Context\Request;
-use Http\Context\Response;
-use Http\Controller;
+use Kiri\Message\Context\Request;
+use Kiri\Message\Context\Response;
+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 Note\Mapping;
+use Kiri\Annotation\Target;
+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\Rpc\Note\JsonRpc;
-use Http\Handler\Controller;
+use Kiri\Annotation\Target;
+use Kiri\Rpc\Annotation\JsonRpc;
+use Kiri\Message\Handler\Controller;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 
 

kiri-gii/GiiMiddleware.php

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

@@ -66,11 +66,11 @@ namespace ' . $namespace . ';
 					$html .= $imports . PHP_EOL;
 				}
 
-				if (!str_contains($imports, 'Database\Note\Set')) {
-					$html .= 'use Database\Note\Set;' . PHP_EOL;
+				if (!str_contains($imports, 'Database\Annotation\Set')) {
+					$html .= 'use Database\Annotation\Set;' . PHP_EOL;
 				}
-				if (!str_contains($imports, 'Database\Note\Get')) {
-					$html .= 'use Database\Note\Get;' . PHP_EOL;
+				if (!str_contains($imports, 'Database\Annotation\Get')) {
+					$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\Note\Set;
+use Database\Annotation\Get;
+use Database\Annotation\Set;
 use Database\Relation;
 use Database\Model;
 ' . PHP_EOL;

kiri-gii/GiiRpcClient.php

@@ -36,9 +36,9 @@ class GiiRpcClient extends GiiBase
 		
 namespace App\Client\Rpc;
 
-use Note\Rpc\Consumer;
-use Note\Rpc\RpcClient;
-use Note\Target;
+use Kiri\Annotation\Rpc\Consumer;
+use Kiri\Annotation\Rpc\RpcClient;
+use Kiri\Annotation\Target;
 use Exception;
 use Rpc\Client;
 use Kiri\Core\Json;

kiri-gii/GiiRpcService.php

@@ -33,10 +33,10 @@ class GiiRpcService extends GiiBase
 		
 namespace App\Rpc;
 
-use Note\Route\RpcProducer;
-use Note\Target;
+use Kiri\Annotation\Route\RpcProducer;
+use Kiri\Annotation\Target;
 use Exception;
-use Http\Controller;
+use Kiri\Message\Controller;
 use Kiri\Core\Json;
 
 ';

kiri-gii/GiiTask.php

@@ -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\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,165 @@
+<?php
+
+namespace Kiri\Websocket;
+
+use Exception;
+use Kiri\Message\Handler\DataGrip;
+use Kiri\Message\Handler\Router;
+use Kiri\Abstracts\AbstractServer;
+use Kiri\Annotation\Inject;
+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 Kiri\Server\SwooleServerInterface;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\WebSocket\Frame;
+use Swoole\WebSocket\Server as WebSocketServer;
+
+
+/**
+ * websocket server
+ */
+class Server extends AbstractServer
+{
+
+	public Router $router;
+
+
+	const SHA1_KEY = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
+
+
+	public mixed $callback = null;
+
+
+	/**
+	 * @var WebSocketInterface
+	 */
+	#[Inject(WebSocketInterface::class)]
+	public WebSocketInterface $server;
+
+
+
+	/**
+	 * @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

@@ -53,7 +53,7 @@
 var_dump(json_encode([
     "Datacenter"     => "dc1",
     "Node"           => "iz8vbi3edjyskl7kpuwudqz",
-	"SkipNodeUpdate" => false,
+    "SkipNodeUpdate" => FALSE,
     "Service"        => [
         "ID"              => "redis1",
         "Service"         => "FriendRpcService",
@@ -61,17 +61,17 @@ var_dump(json_encode([
         "TaggedAddresses" => [
             "lan" => [
                 "address" => "127.0.0.1",
-				"port"    => 9627
+                "port"    => 9627,
             ],
             "wan" => [
                 "address" => "172.26.221.211",
-				"port"    => 9627
-			]
+                "port"    => 9627,
+            ],
         ],
         "Meta"            => [
-			"redis_version" => "4.0"
+            "redis_version" => "4.0",
         ],
-		"Port"            => 9627
+        "Port"            => 9627,
     ],
     "Check"          => [
         "Node"       => "iz8vbi3edjyskl7kpuwudqz",
@@ -84,7 +84,7 @@ var_dump(json_encode([
             "Http"                           => "http://172.26.221.211:9627",
             "Interval"                       => "5s",
             "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);
-	$client->get('/v1/agent/services?filter=Service == FriendRpcService');
-	$client->close();
-	var_dump($client->getBody());
+function order(int $userId): string
+{
+    $explode = current(explode(' ', str_replace('0.', '', round((float)microtime(),6))));
 
-});
+    return 'N'.sprintf('%09d', $userId) . '.' . date('YmdHis') . '.' . str_pad($explode,6,0);
+}
+var_dump(
+    order(1)
+);