Revert "改名"

This reverts commit fdf58326

Kiri.php

@@ -2,37 +2,29 @@
 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 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('CRONTAB_PATH') or define('CRONTAB_PATH', APP_PATH . 'app/Crontab/');
-defined('CLIENT_PATH') or define('CLIENT_PATH', APP_PATH . 'app/Client/');
-defined('TASK_PATH') or define('TASK_PATH', APP_PATH . 'app/Async/');
-defined('LISTENER_PATH') or define('LISTENER_PATH', APP_PATH . 'app/Listener/');
-defined('KAFKA_PATH') or define('KAFKA_PATH', APP_PATH . 'app/Kafka/');
-defined('RPC_CLIENT_PATH') or define('RPC_CLIENT_PATH', APP_PATH . 'app/Client/Rpc/');
-defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Model/');
+defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', realpath(APP_PATH . 'controllers/'));
+defined('MODEL_PATH') or define('MODEL_PATH', realpath(APP_PATH . 'models/'));
+defined('COMPONENT_PATH') or define('COMPONENT_PATH', realpath(APP_PATH . 'components/'));
 
 
 /**
@@ -71,6 +63,15 @@ class Kiri
 	}
 
 
+	/**
+	 * @return Container
+	 */
+	public static function getContainer(): Container
+	{
+		return static::$container;
+	}
+
+
 	/**
 	 * @param $alias
 	 * @param array $array
@@ -138,43 +139,15 @@ class Kiri
 
 
 	/**
-	 * @param $port
-	 * @return bool
+	 * @return Annotation
 	 * @throws Exception
 	 */
-	public static function port_already($port): bool
+	public static function getAnnotation(): Annotation
 	{
-		if (empty($port)) {
-			return false;
-		}
-		if (Kiri::getPlatform()->isLinux()) {
-			exec('netstat -tunlp | grep ' . $port, $output);
-		} else {
-			exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
-		}
-		return !empty($output);
+		return static::app()->getAnnotation();
 	}
 
 
-	/**
-	 * @return Note
-	 * @throws Exception
-	 */
-	public static function getNote(): Note
-	{
-		return static::app()->getNote();
-	}
-
-
-	/**
-	 * @param $service
-	 * @return string
-	 */
-	#[Pure] public static function listen($service): string
-	{
-		return sprintf('Check listen %s::%d -> ok', $service['host'], $service['port']);
-	}
-
 
 	/**
 	 * @param $className
@@ -197,6 +170,7 @@ class Kiri
 		}
 	}
 
+
 	/**
 	 * @return string
 	 * @throws Exception
@@ -212,15 +186,6 @@ class Kiri
 	}
 
 
-	/**
-	 * @return bool
-	 */
-	public static function inCoroutine(): bool
-	{
-		return Coroutine::getCid() > 0;
-	}
-
-
 	/**
 	 * @return Container
 	 */
@@ -239,40 +204,6 @@ class Kiri
 	}
 
 
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setManagerId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/manager');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setProcessId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/process');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
 	/**
 	 * @return bool
 	 */
@@ -286,39 +217,6 @@ class Kiri
 	}
 
 
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setWorkerId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/worker');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setTaskId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/task');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
 	/**
 	 * @param $fileName
 	 * @param $content
@@ -331,7 +229,7 @@ class Kiri
 		if ($is_append !== null) {
 			$params[] = $is_append;
 		}
-		return !self::inCoroutine() ? file_put_contents(...$params) : Coroutine::writeFile(...$params);
+		return !(Coroutine::getCid() > 0) ? file_put_contents(...$params) : Coroutine::writeFile(...$params);
 	}
 
 
@@ -352,95 +250,6 @@ class Kiri
 	}
 
 
-	/**
-	 * @param $workerId
-	 * @param bool $isWorker
-	 * @throws Exception
-	 */
-	public static function clearProcessId($workerId, bool $isWorker = false)
-	{
-		clearstatcache();
-		$directory = $isWorker === true ? 'pid/worker' : 'pid/task';
-		if (!file_exists($file = storage($workerId, $directory))) {
-			return;
-		}
-		shell_exec('rm -rf ' . $file);
-	}
-
-
-	/**
-	 * @param string|null $taskPid
-	 * @throws Exception
-	 */
-	public static function clearTaskPid(string $taskPid = null)
-	{
-		if (empty($taskPid)) {
-			exec('rm -rf ' . storage(null, 'pid/task'));
-		} else {
-			static::clearProcessId($taskPid);
-		}
-	}
-
-
-	/**
-	 * @param $taskPid
-	 * @throws Exception
-	 */
-	public static function clearWorkerPid($taskPid = null)
-	{
-		if (empty($taskPid)) {
-			exec('rm -rf ' . storage(null, 'pid/worker'));
-		} else {
-			static::clearProcessId($taskPid, true);
-		}
-	}
-
-
-	/**
-	 * @return Server|null
-	 * @throws
-	 */
-	public static function getWebSocket(): ?\Swoole\Server
-	{
-		$server = static::app()->getSwoole();
-		if (!($server instanceof \Swoole\Server)) {
-			return null;
-		}
-		return $server;
-	}
-
-
-	/**
-	 * @return false|string
-	 * @throws Exception
-	 */
-	public static function getMasterPid(): bool|string
-	{
-		$pid = Kiri::app()->getSwoole()->setting['pid_file'];
-
-		return file_get_contents($pid);
-	}
-
-
-	/**
-	 * @param int $fd
-	 * @param $data
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function push(int $fd, $data): mixed
-	{
-		$server = static::getWebSocket();
-		if (empty($server) || !$server->isEstablished($fd)) {
-			return false;
-		}
-		if (!is_string($data)) {
-			$data = Json::encode($data);
-		}
-		return $server->push($fd, $data);
-	}
-
-
 	/**
 	 * @return mixed
 	 */
@@ -450,19 +259,6 @@ class Kiri
 	}
 
 
-	/**
-	 * @param string $class
-	 * @param array $params
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	public static function async(string $class, array $params = [])
-	{
-		$manager = di(AsyncTaskExecute::class);
-		$manager->execute(new $class(...$params));
-	}
-
-
 	/**
 	 * @param array $v1
 	 * @param array $v2
@@ -487,19 +283,6 @@ class Kiri
 	}
 
 
-	/**
-	 * @param $process
-	 * @throws Exception
-	 */
-	public static function shutdown($process): void
-	{
-		static::app()->getSwoole()->shutdown();
-		if ($process instanceof Process) {
-			$process->exit(0);
-		}
-	}
-
-
 	/**
 	 * @param $tmp_name
 	 * @return string
@@ -537,34 +320,10 @@ class Kiri
 	}
 
 
-	private static array $_autoload = [];
-
-
 	const PROCESS = 'process';
 	const TASK = 'task';
 	const WORKER = 'worker';
 
-
-	/**
-	 * @param string $event
-	 * @param null $data
-	 * @return false|string
-	 * @throws Exception
-	 */
-	public static function param(string $event, $data = NULL): bool|string
-	{
-		if (is_object($data)) {
-			if ($data instanceof ModelInterface || $data instanceof Collection) {
-				$data = $data->getAttributes();
-			} else {
-				$data = get_object_vars($data);
-			}
-		}
-		if (!is_array($data)) $data = ['data' => $data];
-		return json_encode(array_merge(['callback' => $event], $data));
-	}
-
-
 	/**
 	 * @return string|null
 	 */
@@ -600,35 +359,6 @@ class Kiri
 		return static::getEnvironmental() == static::PROCESS;
 	}
 
-
-	/**
-	 * @param $class
-	 * @param $file
-	 */
-	public static function setAutoload($class, $file)
-	{
-		if (isset(static::$_autoload[$class])) {
-			return;
-		}
-		static::$_autoload[$class] = $file;
-		include_once "Kiri.php";
 }
 
-
-	/**
-	 * @param $className
-	 */
-	public static function autoload($className)
-	{
-		if (!isset(static::$_autoload[$className])) {
-			return;
-		}
-		$file = static::$_autoload[$className];
-		require_once "Kiri.php";
-	}
-
-
-}
-
-//spl_autoload_register([Kiri::class, 'autoload'], true, true);
 Kiri::setContainer(new Container());

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'));

composer.json

@@ -9,7 +9,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.1",
     "ext-json": "*",
     "ext-fileinfo": "*",
     "ext-pdo": "*",
@@ -21,26 +21,27 @@
     "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",
+    "game-worker/kiri-di": "~v1.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\\Server\\": "kiri-server/",
+      "Kiri\\Task\\": "kiri-task/"
     },
     "files": [
+      "Kiri.php",
       "error.php",
       "function.php"
     ]

function.php

@@ -3,9 +3,10 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use 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 Note\Note;
-use Note\Route\Route;
+use Kiri\Message\Handler\Router;
 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);
@@ -236,7 +235,9 @@ if (!class_exists('ReturnTypeWillChange')) {
 	#[Attribute(Attribute::TARGET_METHOD)]
 	final class ReturnTypeWillChange
 	{
-        public function __construct() {}
+		public function __construct()
+		{
+		}
 	}
 
 
@@ -254,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;
 				}
@@ -296,22 +297,6 @@ if (!function_exists('injectRuntime')) {
 }
 
 
-if (!function_exists('swoole')) {
-
-
-    /**
-     * @return Server|null
-     * @throws Exception
-     */
-    function swoole(): ?Server
-    {
-        return Kiri::getWebSocket();
-    }
-
-
-}
-
-
 if (!function_exists('directory')) {
 
 	/**
@@ -344,16 +329,19 @@ if (!function_exists('isUrl')) {
 		if (!preg_match($queryMatch, $url, $outPut)) {
 			return FALSE;
 		}
-        $port = str_replace(':', '', $outPut[5]);
 
-        [$isHttps, $domain, $port, $path] = [$outPut[2] == 'https', $outPut[3], $port, $outPut[6] ?? ''];
-        if ($isHttps && empty($port)) {
+		[$scheme, $host, $port, $user, $pass, $query, $path, $fragment] = parse_url($url);
+		if ($scheme == 'https' && empty($port)) {
 			$port = 443;
 		}
 
+		if (!empty($query)) $path .= '?' . $query;
+		if (!empty($fragment)) $path .= '#' . $fragment;
+
+
 		unset($outPut);
 
-        return [$isHttps == 'https', $domain, $port, $path];
+		return [$scheme == 'https', $host, $port, $path];
 	}
 
 }
@@ -844,9 +832,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);
 		}
@@ -930,7 +918,6 @@ if (!function_exists('di')) {
 	/**
 	 * @param string $className
 	 * @return mixed
-     * @throws ReflectionException
 	 */
 	function di(string $className): mixed
 	{
@@ -1228,3 +1215,27 @@ if (!function_exists('success')) {
 	}
 }
 
+
+if (!function_exists('error_trigger_format')) {
+
+
+	/**
+	 * @param Throwable|Error $throwable
+	 * @return string
+	 */
+	function error_trigger_format(\Throwable|\Error $throwable): string
+	{
+		$message = "Throwable: " . $throwable->getMessage() . "\n" . '	' . $throwable->getFile() . " at line " . $throwable->getLine() . "\n";
+
+		$message .= "trance\n";
+		foreach ($throwable->getTrace() as $value) {
+			if (!isset($value['file'])) {
+				continue;
+			}
+			$message .= $value['file'] . " -> " . $value['line'] . "(" . (isset($value['class']) ? $value['class'] . '::' : '') . ($value['function'] ?? 'Closure') . ")\n";
+		}
+		return "\033[41;37m" . $message . "\033[0m";
+	}
+
+}
+

kiri-annotation/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,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 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,12 +1,12 @@
 <?php
 
 
-namespace Note\Route;
+namespace Kiri\Annotation\Route;
 
 
-use Note\Attribute;
-use Http\Handler\Router;
-use Kiri\Kiri;
+use Kiri\Annotation\Attribute;
+use Kiri\Message\Handler\Router;
+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-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,26 @@ 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 Kafka\KafkaProvider;
+use Kiri;
+use Kiri\Annotation\Annotation as SAnnotation;
 use Kiri\Async;
 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 Kiri\Message\Handler\Router;
+use Kiri\Server\{Server, ServerManager};
+use Kiri\Task\AsyncTaskExecute;
+use Kiri\Task\OnTaskInterface;
 use ReflectionException;
-use Server\ServerManager;
-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
 {
@@ -207,7 +202,7 @@ abstract class BaseApplication extends Component
 
 	/**
 	 * @param OnTaskInterface $execute
-	 * @throws ReflectionException
+	 * @throws ReflectionException|Exception
 	 */
 	public function task(OnTaskInterface $execute): void
 	{
@@ -223,22 +218,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->getEventProvider()->on($key, $value, 0);
 			return;
 		}
 
 
 		if (is_array($value)) {
 			if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
-				$eventProvider->on($key, $value, 0);
+				$this->getEventProvider()->on($key, $value, 0);
 				return;
 			}
 
 			if (is_string($value[0])) {
 				$value[0] = Kiri::createObject($value[0]);
-				$eventProvider->on($key, $value, 0);
+				$this->getEventProvider()->on($key, $value, 0);
 				return;
 			}
 
@@ -247,7 +241,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->getEventProvider()->on($key, $item, 0);
 			}
 		}
 
@@ -378,7 +372,7 @@ abstract class BaseApplication extends Component
 	 */
 	public function getServer(): Server
 	{
-		return $this->get('server');
+		return Kiri::getDi()->get(Server::class);
 	}
 
 
@@ -393,12 +387,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 +406,6 @@ abstract class BaseApplication extends Component
 	}
 
 
-
 	/**
 	 * @param $array
 	 */
@@ -451,9 +444,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,21 @@ 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
- * @property ContainerInterface|Container $container
- * @property EventProvider $eventProvider
+ * @package Kiri\Base
  */
 class Component implements Configure
 {
 
+
 	/**
 	 * BaseAbstract constructor.
 	 *
@@ -41,29 +43,40 @@ 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
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
-	#[Pure] public function getContainer(): ContainerInterface
+	protected function getEventDispatch(): EventDispatch
+	{
+		return $this->getContainer()->get(EventDispatch::class);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function init()
 	{
-		return Kiri::getDi();
 	}
 
 
@@ -75,38 +88,6 @@ class Component implements Configure
 		return static::class;
 	}
 
-	/**
-	 * @param $name
-	 * @param $value
-	 *
-	 * @throws Exception
-	 */
-	public function __set($name, $value)
-	{
-		$method = 'set' . ucfirst($name);
-		if (method_exists($this, $method)) {
-			$this->{$method}($value);
-		} else {
-			throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
-		}
-	}
-
-	/**
-	 * @param $name
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function __get($name): mixed
-	{
-		$method = 'get' . ucfirst($name);
-		if (method_exists($this, $method)) {
-			return $this->$method();
-		} else {
-			throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
-		}
-	}
-
 
 	/**
 	 * @param $message
@@ -117,13 +98,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 +114,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 +131,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 +150,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 +169,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 +189,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 +218,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,29 +9,27 @@ 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
 {
 
 	const ERROR_MESSAGE = 'The not find %s in app configs.';
 
-	protected mixed $data = [];
+	protected static mixed $data = [];
 
 
 	/**
 	 * @return mixed
 	 */
-	public function getData(): mixed
+	public static function getData(): mixed
 	{
-		return $this->data;
+		return static::$data;
 	}
 
 
@@ -40,23 +38,21 @@ class Config extends Component
 	 * @param $value
 	 * @return mixed
 	 */
-	public function setData($key, $value): mixed
+	public static function setData($key, $value): mixed
 	{
-		return $this->data[$key] = $value;
+		return static::$data[$key] = $value;
 	}
 
 
 	/**
 	 * @param array $configs
-	 * @throws Exception
 	 */
 	public static function sets(array $configs)
 	{
-		$config = Kiri::app()->getConfig();
 		if (empty($configs)) {
 			return;
 		}
-        $config->data = $configs;
+		static::$data = $configs;
 	}
 
 	/**
@@ -64,11 +60,11 @@ class Config extends Component
 	 * @param bool $try
 	 * @param mixed|null $default
 	 * @return mixed
-	 * @throws
+	 * @throws ConfigException
 	 */
 	public static function get($key, mixed $default = null, bool $try = FALSE): mixed
 	{
-		$instance = Kiri::app()->getConfig()->getData();
+		$instance = static::$data;
 		if (!str_contains($key, '.')) {
 			return $instance[$key] ?? $default;
 		}
@@ -94,27 +90,35 @@ class Config extends Component
 	 * @param $key
 	 * @param $value
 	 * @return mixed
-	 * @throws Exception
 	 */
 	public static function set($key, $value): mixed
 	{
-		$config = Kiri::app()->getConfig();
-		return $config->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;
 	}
 
 	/**
 	 * @param $key
 	 * @param bool $must_not_null
 	 * @return bool
-	 * @throws Exception
 	 */
 	public static function has($key, bool $must_not_null = false): bool
 	{
-		$config = Kiri::app()->getConfig();
-		if (!isset($config->data[$key])) {
+		if (!isset(static::$data[$key])) {
 			return false;
 		}
-		$config = $config->data[$key];
+		$config = static::$data[$key];
 		if ($must_not_null === false) {
 			return true;
 		}

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

@@ -2,14 +2,14 @@
 
 namespace Kiri\Abstracts;
 
-use Kiri\Kiri;
-use Note\Inject;
+use DirectoryIterator;
 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;
 
 
 /**
@@ -155,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;
 		}
 
@@ -176,13 +176,44 @@ class Logger implements LoggerInterface
 		$loggers = implode(PHP_EOL, $this->_loggers);
 		$this->_loggers = [];
 		if (!empty($loggers)) {
-			$filename = storage('log-' . date('Y-m-d') . '.log', 'logs/');
+			$filename = storage('log-' . date('Y-m-d') . '.log', 'log/');
 
 			file_put_contents($filename, $loggers);
 		}
 	}
 
 
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function flush()
+	{
+		$this->removeFile(storage());
+	}
+
+
+	/**
+	 * @param string $dirname
+	 * @return void
+	 */
+	private function removeFile(string $dirname)
+	{
+		$paths = new DirectoryIterator($dirname);
+		/** @var DirectoryIterator $path */
+		foreach ($paths as $path) {
+			if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
+				continue;
+			}
+			if ($path->isDir()) {
+				$directory = rtrim($path->getRealPath(), '/');
+				$this->removeFile($directory);
+			}
+			@unlink($path->getRealPath());
+		}
+	}
+
+
 	/**
 	 * @param $message
 	 * @param $context

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,23 @@ namespace Kiri;
 use Closure;
 use Database\DatabasesProviders;
 use Exception;
-use Kiri\Abstracts\BaseApplication;
-use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Kernel;
+use Kiri;
+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 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\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,
+	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->getContainer()->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 Server\Tasker\AsyncTaskExecute;
-
+use Kiri\Server\ServerManager;
+use Kiri\Task\AsyncTaskExecute;
+use Kiri;
 /**
  * Class Async
  * @package Kiri

kiri-engine/Cache/Base/Redis.php

@@ -4,9 +4,11 @@ namespace Kiri\Cache\Base;
 
 use Exception;
 use Kiri\Abstracts\Logger;
+use Kiri\Events\EventProvider;
 use Kiri\Exception\RedisConnectException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
+use Kiri\Server\Events\OnWorkerExit;
 use RedisException;
 use Swoole\Timer;
 
@@ -43,6 +45,7 @@ class Redis implements StopHeartbeatCheck
 	private int $_last = 0;
 
 
+
 	/**
 	 * @param array $config
 	 */
@@ -65,14 +68,24 @@ class Redis implements StopHeartbeatCheck
 	}
 
 
+
+
+	/**
+	 * @param Kiri\Server\Events\OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		$this->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 +98,13 @@ 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->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,17 @@ 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 Server\Events\OnWorkerExit;
+use Kiri\Annotation\Inject;
+use Kiri\Server\Events\OnWorkerExit;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Swoole\Timer;
 
 /**
  * Class Redis
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  * @mixin \Redis
  */
 class Redis extends Component
@@ -42,7 +45,10 @@ class Redis extends Component
 
 
 	/**
+	 * @return void
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws Exception
 	 */
 	public function init()
@@ -53,7 +59,7 @@ class Redis extends Component
 
 		$length = Config::get('cache.redis.pool.max', 10);
 
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'destroy'], 0);
+		$this->getEventProvider()->on(OnWorkerExit::class, [$this, 'destroy'], 0);
 
 		$connections->initConnections('Redis:' . $config['host'], true, $length);
 	}
@@ -80,6 +86,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
@@ -165,8 +165,9 @@ class Context extends BaseContext
 		if (!isset(static::$_contents[$id])) {
 			return false;
 		}
-		if (!empty($key) && !isset(static::$_contents[$id][$key])) {
-			return false;
+        $value = static::$_contents[$id];
+        if (!empty($key) && is_array($value)) {
+			return isset($value[$key]);
 		}
 		return true;
 	}

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 $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,8 +3,10 @@
 namespace Kiri\Core;
 
 use JetBrains\PhpStorm\Pure;
+use ReturnTypeWillChange;
+use Traversable;
 
-class HashMap implements \ArrayAccess
+class HashMap implements \ArrayAccess, \IteratorAggregate
 {
 
 	/**
@@ -13,6 +15,15 @@ class HashMap implements \ArrayAccess
 	private array $lists = [];
 
 
+    /**
+     * @return Traversable
+     */
+    public function getIterator(): Traversable
+    {
+        return new \ArrayIterator($this->lists);
+    }
+
+
     /**
 	 * @param string $key
 	 * @param $value
@@ -62,7 +73,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 +83,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 +93,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 +103,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
 	{
@@ -200,6 +201,9 @@ class Help
 	 */
 	public static function sendEmail($email, string $Subject, $messageContent)
 	{
+		if (!class_exists('\Swift_Mailer')) {
+			return;
+		}
 		$mailer = new \Swift_Mailer((new \Swift_SmtpTransport($email['host'], $email['port']))
 			->setUsername($email['username'])->setPassword($email['password']));
 		$message = (new \Swift_Message($Subject))

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

@@ -1,460 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/24 0024
- * Time: 17:27
- */
-declare(strict_types=1);
-
-namespace Kiri\Di;
-
-use Kiri\Abstracts\Component;
-use Note\Inject;
-use Closure;
-use Exception;
-use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
-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
-{
-
-	/**
-	 * @var array
-	 *
-	 * instance class by className
-	 */
-	private array $_singletons = [];
-
-	/**
-	 * @var ReflectionMethod[]
-	 *
-	 * class new instance construct parameter
-	 */
-	private array $_constructs = [];
-
-	/**
-	 * @var array
-	 *
-	 * implements \ReflectClass
-	 */
-	private array $_reflection = [];
-
-
-	/** @var array */
-	private array $_parameters = [];
-
-
-	/** @var array|string[] */
-	private array $_interfaces = [
-		LoggerInterface::class => Logger::class
-	];
-
-
-    /**
-     * @param string $id
-     * @return mixed
-     * @throws ReflectionException
-     */
-	public function get(string $id): mixed
-	{
-		return $this->make($id, [], []);
-	}
-
-
-
-    /**
-     * @param $class
-     * @param array $constrict
-     * @param array $config
-     * @return mixed
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function make($class, array $constrict = [], array $config = []): mixed
-    {
-        if ($this->isInterface($class)) {
-            $class = $this->_interfaces[$class];
-        }
-        if (!isset($this->_singletons[$class])) {
-            $this->_singletons[$class] = $this->resolve($class, $constrict, $config);
-        }
-        return $this->_singletons[$class];
-    }
-
-
-
-	/**
-	 * @param string $interface
-	 * @param string $class
-	 */
-	public function mapping(string $interface, string $class)
-	{
-		$this->_interfaces[$interface] = $class;
-	}
-
-
-	/**
-	 * @param $class
-	 * @return bool
-	 * @throws ReflectionException
-	 */
-	public function isInterface($class): bool
-	{
-		$reflect = $this->getReflect($class);
-		if ($reflect->isInterface()) {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * @param string $interface
-	 * @param $object
-	 */
-	public function setBindings(string $interface, $object)
-	{
-		if (is_string($object)) {
-			$this->_interfaces[$interface] = $object;
-		} else {
-			$className = get_class($object);
-			$this->_interfaces[$interface] = $className;
-			$this->_singletons[$className] = $object;
-		}
-	}
-
-
-	/**
-	 * @param $class
-	 * @param array $constrict
-	 * @param array $config
-	 * @return object
-	 * @throws
-	 */
-	public function create($class, array $constrict = [], array $config = []): object
-	{
-		return $this->resolve($class, $constrict, $config);
-	}
-
-
-	/**
-	 * @param $class
-	 * @param $constrict
-	 * @param $config
-	 *
-	 * @return object
-	 * @throws Exception
-	 */
-	private function resolve($class, $constrict, $config): object
-	{
-		$reflect = $this->resolveDependencies($class);
-		if (!$reflect->isInstantiable()) {
-			throw new ReflectionException('Class ' . $class . ' cannot be instantiated');
-		}
-
-		$object = $this->newInstance($reflect, $constrict);
-
-		$this->propertyInject($reflect, $object);
-
-		return $this->onAfterInit($object, $config);
-	}
-
-
-	/**
-	 * @param ReflectionClass $reflect
-	 * @param $dependencies
-	 * @return object
-	 * @throws ReflectionException
-	 */
-	private function newInstance(ReflectionClass $reflect, $dependencies): object
-	{
-		if (!isset($this->_constructs[$reflect->getName()])) {
-			return $reflect->newInstance();
-		}
-		$construct = $this->_constructs[$reflect->getName()];
-		if ($construct->getNumberOfParameters() < 1) {
-			return $reflect->newInstance();
-		}
-		$parameters = $this->mergeParam($this->resolveMethodParameters($construct), $dependencies);
-		return $reflect->newInstanceArgs($parameters);
-	}
-
-
-	/**
-	 * @param ReflectionClass $reflect
-	 * @param $object
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function propertyInject(ReflectionClass $reflect, $object): mixed
-	{
-		foreach (NoteManager::getPropertyNote($reflect) as $property => $inject) {
-			/** @var Inject $inject */
-			$inject->execute($object, $property);
-		}
-		return $object;
-	}
-
-
-	/**
-	 * @param $className
-	 * @param $method
-	 * @return array
-	 * @throws ReflectionException
-	 */
-	public function getMethodAttribute($className, $method = null): array
-	{
-		$methods = NoteManager::getMethodNote($this->getReflect($className));
-		if (!empty($method)) {
-			return $methods[$method] ?? [];
-		}
-		return $methods;
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param string|null $property
-	 * @return ReflectionProperty|ReflectionProperty[]|null
-	 * @throws ReflectionException
-	 */
-	public function getClassReflectionProperty(string $class, string $property = null): ReflectionProperty|null|array
-	{
-		$lists = NoteManager::getProperty($this->getReflect($class));
-		if (empty($lists)) {
-			return null;
-		}
-		if (!empty($property)) {
-			return $lists[$property] ?? null;
-		}
-		return $lists;
-	}
-
-
-	/**
-	 * @param $object
-	 * @param $config
-	 * @return mixed
-	 */
-	private function onAfterInit($object, $config): mixed
-	{
-		Kiri::configure($object, $config);
-		if (method_exists($object, 'init') && is_callable([$object, 'init'])) {
-			call_user_func([$object, 'init']);
-		}
-		return $object;
-	}
-
-
-	/**
-	 * @param $class
-	 * @return ReflectionClass
-	 */
-	private function resolveDependencies($class): ReflectionClass
-	{
-		if (isset($this->_reflection[$class])) {
-			return $this->_reflection[$class];
-		}
-		$reflect = new ReflectionClass($class);
-		if ($reflect->isAbstract() || $reflect->isTrait() || $reflect->isInterface()) {
-			return $this->_reflection[$class] = $reflect;
-		}
-		$construct = NoteManager::resolveTarget($reflect);
-		if (!empty($construct) && $construct->getNumberOfParameters() > 0) {
-			$this->_constructs[$class] = $construct;
-		}
-		return $this->_reflection[$class] = $reflect;
-	}
-
-
-	/**
-	 * @param ReflectionClass|string $class
-	 * @return ReflectionMethod[]
-	 * @throws ReflectionException
-	 */
-	public function getReflectMethods(ReflectionClass|string $class): array
-	{
-		if (is_string($class)) {
-			$class = $this->getReflect($class);
-		}
-		return NoteManager::getMethods($class);
-	}
-
-
-	/**
-	 * @param ReflectionClass|string $class
-	 * @param string $method
-	 * @return ReflectionMethod|null
-	 * @throws ReflectionException
-	 */
-	public function getReflectMethod(ReflectionClass|string $class, string $method): ?ReflectionMethod
-	{
-		return $this->getReflectMethods($class)[$method] ?? null;
-	}
-
-
-	/**
-	 * @param string $className
-	 * @param string $method
-	 * @return array|null
-	 * @throws ReflectionException
-	 */
-	public function getMethodParameters(string $className, string $method): ?array
-	{
-		if (isset($this->_parameters[$className]) && isset($this->_parameters[$className][$method])) {
-			return $this->_parameters[$className][$method];
-		}
-		$reflectMethod = $this->getReflectMethod($this->getReflect($className), $method);
-		if (!($reflectMethod instanceof ReflectionMethod)) {
-			throw new ReflectionException("Class does not have a function $className::$method");
-		}
-		$className = $reflectMethod->getDeclaringClass()->getName();
-		if (isset($this->_parameters[$className]) && isset($this->_parameters[$className][$reflectMethod->getName()])) {
-			return $this->_parameters[$className][$reflectMethod->getName()];
-		}
-		return $this->setParameters($className, $reflectMethod->getName(), $this->resolveMethodParameters($reflectMethod));
-	}
-
-
-	/**
-	 * @param $class
-	 * @param $method
-	 * @param $parameters
-	 * @return mixed
-	 */
-	private function setParameters($class, $method, $parameters): mixed
-	{
-		if (!isset($this->_parameters[$class])) {
-			$this->_parameters[$class] = [];
-		}
-		if (!isset($this->_parameters[$class][$method])) {
-			$this->_parameters[$class][$method] = [];
-		}
-		return $this->_parameters[$class][$method] = $parameters;
-	}
-
-
-	/**
-	 * @param Closure $reflectionMethod
-	 * @return array
-	 * @throws ReflectionException
-	 */
-	public function getFunctionParameters(Closure $reflectionMethod): array
-	{
-		return $this->resolveMethodParameters(new ReflectionFunction($reflectionMethod));
-	}
-
-
-	/**
-	 * @param ReflectionMethod|ReflectionFunction $reflectionMethod
-	 * @return array
-	 * @throws ReflectionException
-	 */
-	private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
-	{
-		if ($reflectionMethod->getNumberOfParameters() < 1) {
-			return [];
-		}
-		$params = [];
-		foreach ($reflectionMethod->getParameters() as $key => $parameter) {
-			if ($parameter->isDefaultValueAvailable()) {
-				$params[$key] = $parameter->getDefaultValue();
-			} else if ($parameter->getType() === null) {
-				$params[$key] = $parameter->getType();
-			} else {
-				$type = $parameter->getType()->getName();
-				if (is_string($type) && class_exists($type) || isset($this->_interfaces[$type])) {
-					$type = Kiri::getDi()->get($type);
-				}
-				$params[$key] = match ($parameter->getType()) {
-					'string' => '',
-					'int', 'float' => 0,
-					'', null, 'object', 'mixed' => NULL,
-					'bool' => false,
-					default => $type
-				};
-			}
-		}
-		return $params;
-	}
-
-
-	/**
-	 * @param $class
-	 * @return ReflectionClass|null
-	 * @throws ReflectionException
-	 */
-	public function getReflect($class): ?ReflectionClass
-	{
-		if (!isset($this->_reflection[$class])) {
-			return $this->resolveDependencies($class);
-		}
-		return $this->_reflection[$class];
-	}
-
-	/**
-	 * @param $class
-	 */
-	public function unset($class)
-	{
-		if (is_array($class) && isset($class['class'])) {
-			$class = $class['class'];
-		} else if (is_object($class)) {
-			$class = $class::class;
-		}
-		unset(
-			$this->_reflection[$class], $this->_singletons[$class], $this->_constructs[$class]
-		);
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function flush(): static
-	{
-		$this->_reflection = [];
-		$this->_singletons = [];
-		$this->_constructs = [];
-		return $this;
-	}
-
-	/**
-	 * @param $old
-	 * @param $newParam
-	 *
-	 * @return mixed
-	 */
-	private function mergeParam($old, $newParam): array
-	{
-		if (empty($old)) {
-			return $newParam;
-		} else if (empty($newParam)) {
-			return $old;
-		}
-		foreach ($newParam as $key => $val) {
-			$old[$key] = $val;
-		}
-		return $old;
-	}
-
-    /**
-     * @param string $id
-     * @return bool
-     */
-    public function has(string $id): bool
-    {
-        return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
-    }
-}

kiri-engine/Di/LocalService.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace Kiri\Di;
-
-use Kiri\Abstracts\Component;
-use Kiri\Kiri;
-
-
-/**
- * 服务定位器
- */
-class LocalService extends Component
-{
-
-
-	private array $_components = [];
-
-
-	private array $_definition = [];
-
-
-	/**
-	 * @param $name
-	 * @param $define
-	 */
-	public function set($name, $define)
-	{
-		unset($this->_components[$name]);
-
-		$this->_definition[$name] = $define;
-		if (is_object($define) || $define instanceof \Closure) {
-			$this->_components[$name] = $define;
-		}
-	}
-
-
-	/**
-	 * @throws \Exception
-	 */
-	public function get(string $name, $throwException = true)
-	{
-		if (isset($this->_components[$name])) {
-			return $this->_components[$name];
-		}
-		if (isset($this->_definition[$name])) {
-			$definition = $this->_definition[$name];
-			if (is_object($definition) && !$definition instanceof \Closure) {
-				return $this->_components[$name] = $definition;
-			}
-			return $this->_components[$name] = Kiri::createObject($definition);
-		} else if ($throwException) {
-			throw new \Exception("Unknown component ID: $name");
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param array $components
-	 */
-	public function setComponents(array $components)
-	{
-		foreach ($components as $name => $component) {
-			$this->set($name, $component);
-		}
-	}
-
-
-	/**
-	 * @param $id
-	 * @return bool
-	 */
-	public function has($id): bool
-	{
-		return isset($this->_components[$id]) || isset($this->_definition[$id]);
-	}
-
-
-	/**
-	 * @param $id
-	 */
-	public function remove($id): void
-	{
-		unset($this->_components[$id], $this->_definition[$id]);
-	}
-
-
-}

kiri-engine/Di/NoteManager.php

@@ -1,303 +0,0 @@
-<?php
-
-namespace Kiri\Di;
-
-use JetBrains\PhpStorm\Pure;
-use ReflectionAttribute;
-use ReflectionClass;
-use ReflectionProperty;
-
-class NoteManager
-{
-
-
-	private static array $_classTarget = [];
-	private static array $_classMethodNote = [];
-	private static array $_classMethod = [];
-	private static array $_classPropertyNote = [];
-	private static array $_classProperty = [];
-	private static array $_mapping = [];
-
-
-	/**
-	 * @return void
-	 */
-	public static function clear()
-	{
-		static::$_classTarget = [];
-		static::$_classMethodNote = [];
-		static::$_classMethod = [];
-		static::$_classPropertyNote = [];
-		static::$_classProperty = [];
-		static::$_mapping = [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 */
-	public static function setTargetNote(ReflectionClass $class)
-	{
-		$className = $class->getName();
-		if (!isset(static::$_classTarget[$className])) {
-			static::$_classTarget[$className] = [];
-		}
-		foreach ($class->getAttributes() as $attribute) {
-			if (!class_exists($attribute->getName())) {
-				continue;
-			}
-
-			$instance = $attribute->newInstance();
-
-			static::$_classTarget[$className][] = $instance;
-
-			self::setMappingClass($attribute, $className);
-		}
-	}
-
-
-	/**
-	 * @param ReflectionAttribute $attribute
-	 * @param string $class
-	 */
-	public static function setMappingClass(ReflectionAttribute $attribute, string $class)
-	{
-		if (!isset(static::$_mapping[$attribute->getName()])) {
-			static::$_mapping[$attribute->getName()] = [];
-		}
-		if (!isset(static::$_mapping[$attribute->getName()][$class])) {
-			static::$_mapping[$attribute->getName()][$class] = [];
-		}
-	}
-
-
-	/**
-	 * @param ReflectionAttribute $attribute
-	 * @param string $class
-	 * @param string $method
-	 * @param mixed $instance
-	 */
-	public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
-	{
-		self::setMappingClass($attribute, $class);
-
-		if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
-			static::$_mapping[$attribute->getName()][$class]['method'] = [];
-		}
-		static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
-	}
-
-
-	/**
-	 * @param ReflectionAttribute $attribute
-	 * @param string $class
-	 * @param string $property
-	 * @param $instance
-	 */
-	public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
-	{
-		self::setMappingClass($attribute, $class);
-
-		$mapping = static::$_mapping[$attribute->getName()][$class];
-		if (!isset($mapping['property'])) {
-			$mapping['property'] = [];
-		}
-		$mapping['property'][] = [$property => $instance];
-		static::$_mapping[$attribute->getName()][$class] = $mapping;
-	}
-
-
-	/**
-	 * @param mixed $class
-	 * @return array
-	 */
-	public static function getTargetNote(mixed $class): array
-	{
-		if (!is_string($class)) {
-			$class = $class::class;
-		}
-		return static::$_classTarget[$class] ?? [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 */
-	public static function setMethodNote(ReflectionClass $class)
-	{
-		$className = $class->getName();
-		static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
-		foreach ($class->getMethods() as $ReflectionMethod) {
-			static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-			static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
-			foreach ($ReflectionMethod->getAttributes() as $attribute) {
-				if (!class_exists($attribute->getName())) {
-					continue;
-				}
-				$instance = $attribute->newInstance();
-
-				static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
-
-				self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
-			}
-		}
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param string $method
-	 * @return bool
-	 */
-	public static function hasMethod(string $class, string $method): bool
-	{
-		return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @return array
-	 */
-	#[Pure] public static function getMethodNote(ReflectionClass $class): array
-	{
-		return static::$_classMethodNote[$class->getName()] ?? [];
-	}
-
-
-	/**
-	 * @param \ReflectionClass $reflect
-	 * @return \ReflectionMethod|null
-	 */
-	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
-	{
-		NoteManager::setPropertyNote($reflect);
-		NoteManager::setTargetNote($reflect);
-		NoteManager::setMethodNote($reflect);
-
-		return $reflect->getConstructor();
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 */
-	public static function setPropertyNote(ReflectionClass $class)
-	{
-		$className = $class->getName();
-		static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
-		foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
-			ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
-			static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-			foreach ($ReflectionMethod->getAttributes() as $attribute) {
-				if (!class_exists($attribute->getName())) {
-					continue;
-				}
-
-				$instance = $attribute->newInstance();
-
-				static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
-
-				self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
-			}
-		}
-	}
-
-
-	/**
-	 * @param string $attribute
-	 * @param string|null $class
-	 * @return array[]
-	 */
-	public static function getAttributeTrees(string $attribute, string $class = null): array
-	{
-		$mapping = static::$_mapping[$attribute] ?? [];
-		if (empty($mapping) || empty($class)) {
-			return $mapping;
-		}
-		return $mapping[$class] ?? [];
-	}
-
-
-	/**
-	 * @param string $attribute
-	 * @param string $class
-	 * @param string|null $method
-	 * @return array
-	 */
-	public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
-	{
-		$class = self::getAttributeTrees($attribute, $class);
-		if (empty($class) || !isset($class['method'])) {
-			return null;
-		}
-		if (empty($method)) {
-			return $class['method'];
-		}
-		foreach ($class['method'] as $value) {
-			$key = key($value);
-			if ($method == $key) {
-				return $value[$key];
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param string $attribute
-	 * @param string $class
-	 * @param string $method
-	 * @return mixed
-	 */
-	public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
-	{
-		$class = self::getAttributeTrees($attribute, $class);
-		if (empty($class) || !isset($class['property'])) {
-			return [];
-		}
-		foreach ($class['property'] as $value) {
-			$key = key($value);
-			if ($method == $key) {
-				return $value[$key];
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param ReflectionClass|string $class
-	 * @return array
-	 * @throws \ReflectionException
-	 */
-	public static function getMethods(ReflectionClass|string $class): array
-	{
-		if (is_string($class)) {
-			$class = self::getReflect($class);
-		}
-		return static::$_classMethod[$class->getName()] ?? [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @return ReflectionProperty[]
-	 */
-	#[Pure] public static function getProperty(ReflectionClass $class): array
-	{
-		return static::$_classProperty[$class->getName()] ?? [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @return array
-	 */
-	#[Pure] public static function getPropertyNote(ReflectionClass $class): array
-	{
-		return static::$_classPropertyNote[$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 Http\Events\OnAfterRequest;
+use Kiri;
+use Kiri\Message\Events\OnAfterRequest;
 
 /**
  * Class ErrorHandler
  *
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  * @property-read $asError
  */
 class ErrorHandler extends Component implements ErrorInterface
@@ -36,13 +36,8 @@ class ErrorHandler extends Component implements ErrorInterface
 	 */
 	public function register()
 	{
-//		ini_set('display_errors', '1');
 		set_exception_handler([$this, 'exceptionHandler']);
-		if (defined('HHVM_VERSION')) {
 		set_error_handler([$this, 'errorHandler']);
-		} else {
-			set_error_handler([$this, 'errorHandler']);
-		}
 		register_shutdown_function([$this, 'shutdown']);
 	}
 
@@ -118,8 +113,6 @@ class ErrorHandler extends Component implements ErrorInterface
 	{
 		$path = ['file' => $file, 'line' => $line];
 
-        var_dump(func_get_args());
-
 		$data = Json::to($code, $this->category . ': ' . $message, $path);
 
 		write($data, $this->category);

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\Kiri;
+use Kiri;
+use Kiri\Annotation\Inject;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
 /**
  * Class Logger
- * @package Kiri\Kiri\Error
+ * @package Kiri\Error
  * @mixin \Kiri\Abstracts\Logger
  */
 class Logger extends Component
@@ -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 Http\Aspect\OnJoinPointInterface;
-use Http\Constrict\RequestInterface;
-use Kiri\Kiri;
+use Kiri\Message\Aspect\OnAspectInterface;
+use Kiri\Message\Aspect\OnJoinPointInterface;
+use Kiri\Message\Constrict\RequestInterface;
+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 Server\Abstracts\BaseProcess;
+use Kiri;
+use Kiri\Server\Abstracts\BaseProcess;
+use Kiri\Server\Broadcast\OnBroadcastInterface;
+use Psr\Log\LoggerInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
 
@@ -34,6 +36,17 @@ class LoggerProcess extends BaseProcess
 	}
 
 
+	/**
+	 * @param OnBroadcastInterface $message
+	 * @return void
+	 */
+	public function onBroadcast(OnBroadcastInterface $message): void
+	{
+		$logger = Kiri::getDi()->get(LoggerInterface::class);
+		$logger->debug($message->data . '::' . static::class);
+	}
+
+
 	/**
 	 * @param Process $process
 	 * @throws ComponentException

kiri-engine/Event.php

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

kiri-engine/Exception/ComponentException.php

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

kiri-engine/Exception/NotFindClassException.php

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

kiri-engine/Exception/NotFindPropertyException.php

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

kiri-engine/FileListen/HotReload.php

@@ -3,18 +3,17 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
 use Kiri\Core\Json;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use 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;
 
 
@@ -61,7 +60,6 @@ class HotReload extends Command
 
 	/**
 	 * @throws ConfigException
-     * @throws \ReflectionException
 	 * @throws Exception
 	 */
 	protected function initCore()
@@ -176,7 +174,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,14 +190,6 @@ 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);
 		}
@@ -212,24 +201,24 @@ class HotReload extends Command
 	 *
 	 * @throws Exception
 	 */
-    public function trigger_reload()
+	public function trigger_reload(string $path = '')
 	{
-        if ($this->int == 1) {
-            return;
-        }
-        $this->int = 1;
 		$this->logger->warning('change reload');
-
+		if (!empty($path) && str_starts_with($path, CONTROLLER_PATH)) {
+			$pid = file_get_contents(storage('.swoole.pid'));
+			if (!empty($pid) && Process::kill($pid, 0)) {
+				Process::kill($pid, SIGUSR1);
+			}
+		} else {
+			$this->int = 1;
 			$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();
 			$this->int = -1;
 		}
+	}
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -54,6 +54,7 @@ class Inotify
 			if (!is_dir($dir)) continue;
 			$this->watch($dir);
 		}
+		$this->process->int = -1;
 		Event::add($this->inotify, [$this, 'check']);
 		Event::wait();
 	}
@@ -84,9 +85,13 @@ class Inotify
 			if (!in_array($ev['mask'], $LISTEN_TYPE)) {
 				continue;
 			}
+
+			$search = array_search($ev['wd'], $this->watchFiles);
+
 			//非重启类型
 			if (str_ends_with($ev['name'], '.php')) {
-                Timer::after(3000, fn() => $this->reload());
+
+				Timer::after(3000, fn() => $this->reload($search));
 				$this->isReloading = TRUE;
 			}
 		}
@@ -95,14 +100,15 @@ class Inotify
 	/**
 	 * @throws Exception
 	 */
-    public function reload()
+	public function reload($path)
 	{
-        $this->process->trigger_reload();
+		$this->process->trigger_reload($path);
+		$this->process->int = -1;
+
 		$this->clearWatch();
 		foreach ($this->dirs as $root) {
 			$this->watch($root);
 		}
-        $this->process->int = -1;
 		$this->isReloading = FALSE;
 	}
 
@@ -113,11 +119,7 @@ class Inotify
 	public function clearWatch()
 	{
 		foreach ($this->watchFiles as $wd) {
-            try {
 			@inotify_rm_watch($this->inotify, $wd);
-            } catch (\Throwable $exception) {
-//				logger()->addError($exception->getMessage(), 'throwable');
-            }
 		}
 		$this->watchFiles = [];
 	}

kiri-engine/FileListen/Scaner.php

@@ -3,7 +3,6 @@
 namespace Kiri\FileListen;
 
 use Exception;
-use Swoole\Timer;
 
 class Scaner
 {
@@ -68,8 +67,11 @@ class Scaner
 			}
 			if (is_file($value)) {
 				if ($this->checkFile($value, $isReload)) {
-                    Timer::after(2000, fn() => $this->timerReload());
 					$this->isReloading = TRUE;
+
+					sleep(2);
+
+					$this->timerReload($value);
 					break;
 				}
 			}
@@ -106,15 +108,16 @@ class Scaner
 	/**
 	 * @throws Exception
 	 */
-    public function timerReload()
+	public function timerReload($path)
 	{
 		$this->isReloading = TRUE;
-        $this->process->trigger_reload();
 
-        $this->process->int = -1;
+		$this->process->trigger_reload($path);
 
 		$this->loadDirs();
 
+		$this->process->int = -1;
+
 		$this->isReloading = FALSE;
 		$this->process->isReloadingOut = FALSE;
 

kiri-engine/Pool/Connection.php

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

kiri-engine/Pool/Pool.php

@@ -41,11 +41,10 @@ class Pool extends Component
 
 
 	/**
-	 * @param Channel $channel
+	 * @param Channel|SplQueue $channel
 	 * @param $retain_number
-	 * @throws Exception
 	 */
-	protected function pop(Channel $channel, $retain_number): void
+	protected function pop(Channel|SplQueue $channel, $retain_number): void
 	{
 		while ($channel->length() > $retain_number) {
 			if (Context::inCoroutine()) {

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

@@ -5,11 +5,12 @@ namespace Kiri;
 
 
 use Exception;
+use Kiri\Abstracts\Config;
 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
@@ -43,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);
@@ -62,8 +63,7 @@ class Runtime extends Command
 	public function configEach(): string
 	{
 		$array = [];
-		$configs = Kiri::app()->getConfig();
-		foreach ($configs->getData() as $key => $datum) {
+		foreach (Config::getData() as $key => $datum) {
 			if ($datum instanceof \Closure) {
 				continue;
 			}

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

@@ -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')) {
-					$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/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 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;
-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 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

@@ -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\Task\OnTaskInterface;
 
 ';
 

kiri-note/Task.php

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

kiri-server/Abstracts/BaseProcess.php

@@ -1,143 +0,0 @@
-<?php
-
-namespace Kiri\Server\Abstracts;
-
-
-use JetBrains\PhpStorm\Pure;
-use Kiri\Server\Contract\OnProcessInterface;
-use Swoole\Coroutine;
-use Swoole\Process;
-
-/**
- *
- */
-abstract class BaseProcess implements OnProcessInterface
-{
-
-	protected bool $isStop = false;
-
-
-	protected mixed $redirect_stdin_and_stdout = null;
-
-
-	protected int $pipe_type = SOCK_DGRAM;
-
-
-	protected bool $enable_coroutine = true;
-
-
-	public string $name = 'swoole process.';
-
-
-	/**
-	 * @return string
-	 */
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function isStop(): bool
-	{
-		return $this->isStop;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getRedirectStdinAndStdout(): mixed
-	{
-		return $this->redirect_stdin_and_stdout;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPipeType(): int
-	{
-		return $this->pipe_type;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isEnableCoroutine(): bool
-	{
-		return $this->enable_coroutine;
-	}
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void
-	{
-		$this->isStop = true;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function checkProcessIsStop(): bool
-	{
-		return $this->isStop === true;
-	}
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function signListen(Process $process): void
-	{
-	}
-
-
-	/**
-	 *
-	 */
-	protected function exit(): void
-	{
-		putenv('process.status=idle');
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public function isWorking(): bool
-	{
-		return env('process.status', 'working') == 'working';
-	}
-
-
-	/**
-	 *
-	 */
-	private function waiteExit(Process $process): void
-	{
-		$this->onProcessStop();
-		while ($this->isWorking()) {
-			$this->sleep();
-		}
-		$process->exit(0);
-	}
-
-
-	/**
-	 *
-	 */
-	private function sleep(): void
-	{
-		if ($this->enable_coroutine) {
-			Coroutine::sleep(0.1);
-		} else {
-			usleep(100);
-		}
-	}
-
-}

kiri-server/Constant.php

@@ -1,133 +0,0 @@
-<?php
-
-
-namespace Kiri\Server;
-
-
-/**
- * Class Constant
- * @package Server
- */
-class Constant
-{
-
-	const START = 'Start';
-	const SHUTDOWN = 'Shutdown';
-	const BEFORE_SHUTDOWN = 'beforeShutdown';
-	const WORKER_START = 'WorkerStart';
-	const WORKER_STOP = 'WorkerStop';
-	const WORKER_EXIT = 'WorkerExit';
-	const CONNECT = 'Connect';
-	const HANDSHAKE = 'handshake';
-	const OPEN = 'open';
-	const DISCONNECT = 'disconnect';
-	const MESSAGE = 'message';
-	const RECEIVE = 'Receive';
-	const PACKET = 'Packet';
-	const REQUEST = 'request';
-	const CLOSE = 'Close';
-	const TASK = 'Task';
-	const FINISH = 'Finish';
-	const PIPE_MESSAGE = 'PipeMessage';
-	const WORKER_ERROR = 'WorkerError';
-	const MANAGER_START = 'ManagerStart';
-	const MANAGER_STOP = 'ManagerStop';
-	const BEFORE_RELOAD = 'BeforeReload';
-	const AFTER_RELOAD = 'AfterReload';
-
-
-	const SERVER_TYPE_HTTP = 'http';
-	const SERVER_TYPE_WEBSOCKET = 'ws';
-	const SERVER_TYPE_TCP = 'tcp';
-	const SERVER_TYPE_UDP = 'udp';
-	const SERVER_TYPE_BASE = 'base';
-
-
-	const STATUS_404_MESSAGE = '<h2>HTTP 404 Not Found</h2><hr><i>Powered by Swoole</i>';
-	const STATUS_405_MESSAGE = '<h2>HTTP 405 Method allow</h2><hr><i>Powered by Swoole</i>';
-
-
-    const OPTION_REACTOR_NUM = 'reactor_num';
-    const OPTION_WORKER_NUM = 'worker_num';
-    const OPTION_MAX_REQUEST = 'max_request';
-    const OPTION_MAX_CONN = 'max_connection';
-    const OPTION_TASK_WORKER_NUM = 'task_worker_num';
-    const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
-    const OPTION_TASK_MAX_REQUEST = 'task_max_request';
-    const OPTION_TASK_TMPDIR = 'task_tmpdir';
-    const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
-    const OPTION_TASK_USE_OBJECT = 'task_use_object';
-    const OPTION_DISPATCH_MODE = 'dispatch_mode';
-    const OPTION_DISPATCH_FUNC = 'dispatch_func';
-    const OPTION_MESSAGE_QUEUE_KEY = 'message_queue_key';
-    const OPTION_DAEMONIZE = 'daemonize';
-    const OPTION_BACKLOG = 'backlog';
-    const OPTION_LOG_FILE = 'log_file';
-    const OPTION_LOG_LEVEL = 'log_level';
-    const OPTION_LOG_DATE_WITH_MICROSECONDS = 'log_date_with_microseconds';
-    const OPTION_LOG_ROTATION = 'log_rotation';
-    const OPTION_LOG_DATE_FORMAT = 'log_date_format';
-    const OPTION_OPEN_TCP_KEEPALIVE = 'open_tcp_keepalive';
-    const OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';
-    const OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';
-    const OPTION_OPEN_EOF_CHECK = 'open_eof_check';
-    const OPTION_OPEN_EOF_SPLIT = 'open_eof_split';
-    const OPTION_PACKAGE_EOF = 'package_eof';
-    const OPTION_OPEN_LENGTH_CHECK = 'open_length_check';
-    const OPTION_PACKAGE_LENGTH_TYPE = 'package_length_type';
-    const OPTION_PACKAGE_LENGTH_FUNC = 'package_length_func';
-    const OPTION_PACKAGE_MAX_LENGTH = 'package_max_length';
-    const OPTION_OPEN_HTTP_PROTOCOL = 'open_http_protocol';
-    const OPTION_OPEN_MQTT_PROTOCOL = 'open_mqtt_protocol';
-    const OPTION_OPEN_REDIS_PROTOCOL = 'open_redis_protocol';
-    const OPTION_OPEN_WEBSOCKET_PROTOCOL = 'open_websocket_protocol';
-    const OPTION_OPEN_WEBSOCKET_CLOSE_FRAME = 'open_websocket_close_frame';
-    const OPTION_OPEN_TCP_NODELAY = 'open_tcp_nodelay';
-    const OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';
-    const OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';
-    const OPTION_TCP_DEFER_ACCEPT = 'tcp_defer_accept';
-    const OPTION_SSL_CERT_FILE = 'ssl_cert_file';
-    const OPTION_SSL_KEY_FILE = 'ssl_key_file';
-    const OPTION_SSL_METHOD = 'ssl_method';
-    const OPTION_SSL_PROTOCOLS = 'ssl_protocols';
-    const OPTION_SSL_SNI_CERTS = 'ssl_sni_certs';
-    const OPTION_SSL_CIPHERS = 'ssl_ciphers';
-    const OPTION_SSL_VERIFY_PEER = 'ssl_verify_peer';
-    const OPTION_SSL_ALLOW_SELF_SIGNED = 'ssl_allow_self_signed';
-    const OPTION_SSL_CLIENT_CERT_FILE = 'ssl_client_cert_file';
-    const OPTION_SSL_COMPRESS = 'ssl_compress';
-    const OPTION_SSL_VERIFY_DEPTH = 'ssl_verify_depth';
-    const OPTION_SSL_PREFER_SERVER_CIPHERS = 'ssl_prefer_server_ciphers';
-    const OPTION_SSL_DHPARAM = 'ssl_dhparam';
-    const OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';
-    const OPTION_USER = 'user';
-    const OPTION_GROUP = 'group';
-    const OPTION_CHROOT = 'chroot';
-    const OPTION_PID_FILE = 'pid_file';
-    const OPTION_BUFFER_INPUT_SIZE = 'buffer_input_size';
-    const OPTION_BUFFER_OUTPUT_SIZE = 'buffer_output_size';
-    const OPTION_SOCKET_BUFFER_SIZE = 'socket_buffer_size';
-    const OPTION_ENABLE_UNSAFE_EVENT = 'enable_unsafe_event';
-    const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
-    const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
-    const OPTION_ENABLE_DELAY_RECEIVE = 'enable_delay_receive';
-    const OPTION_RELOAD_ASYNC = 'reload_async';
-    const OPTION_MAX_WAIT_TIME = 'max_wait_time';
-    const OPTION_TCP_FASTOPEN = 'tcp_fastopen';
-    const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
-    const OPTION_ENABLE_COROUTINE = 'enable_coroutine';
-    const OPTION_MAX_COROUTINE = 'max_coroutine';
-    const OPTION_SEND_YIELD = 'send_yield';
-    const OPTION_SEND_TIMEOUT = 'send_timeout';
-    const OPTION_HOOK_FLAGS = 'hook_flags';
-    const OPTION_BUFFER_HIGH_WATERMARK = 'buffer_high_watermark';
-    const OPTION_BUFFER_LOW_WATERMARK = 'buffer_low_watermark';
-    const OPTION_TCP_USER_TIMEOUT = 'tcp_user_timeout';
-    const OPTION_STATS_FILE = 'stats_file';
-    const OPTION_EVENT_OBJECT = 'event_object';
-    const OPTION_START_SESSION_ID = 'start_session_id';
-    const OPTION_SINGLE_THREAD = 'single_thread';
-    const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';
-
-
-}

kiri-server/Contract/OnBeforeShutdown.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Server\Contract;
-
-interface OnBeforeShutdown
-{
-
-}

kiri-server/Contract/OnCloseInterface.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-
-/**
- *
- */
-interface OnCloseInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 */
-	public function onClose(Server $server, int $fd): void;
-
-
-}

kiri-server/Contract/OnConnectInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-interface OnConnectInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 * @return void
-	 */
-	public function onConnect(Server $server, int $fd): void;
-
-}

kiri-server/Contract/OnDisconnectInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-interface OnDisconnectInterface
-{
-
-
-
-    /**
-     * @param Server $server
-     * @param int $fd
-     */
-    public function onDisconnect(Server $server, int $fd): void;
-
-
-}

kiri-server/Contract/OnDownloadInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Http\Response;
-
-interface OnDownloadInterface
-{
-
-	public function dispatch(Response $response);
-
-}

kiri-server/Contract/OnHandshakeInterface.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Http\Request;
-use Swoole\Http\Response;
-
-
-/**
- *
- */
-interface OnHandshakeInterface
-{
-
-
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 */
-	public function onHandshake(Request $request, Response $response): void;
-
-}

kiri-server/Contract/OnMessageInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-use Swoole\WebSocket\Frame;
-
-interface OnMessageInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param Frame $frame
-	 * @return void
-	 */
-	public function onMessage(Server $server, Frame $frame): void;
-
-}

kiri-server/Contract/OnOpenInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Http\Request;
-use Swoole\WebSocket\Server;
-
-interface OnOpenInterface
-{
-
-
-    /**
-     * @param Server $server
-     * @param Request $request
-     */
-    public function onOpen(Server $server, Request $request): void;
-
-}

kiri-server/Contract/OnPacketInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Server\Abstracts\Server;
-
-interface OnPacketInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param string $data
-	 * @param array $clientInfo
-	 * @return mixed
-	 */
-	public function onPacket(Server $server, string $data, array $clientInfo): void;
-
-}

kiri-server/Contract/OnPipeMessageInterface.php

@@ -1,21 +0,0 @@
-<?php
-
-
-namespace Kiri\Server\Contract;
-
-
-/**
- * Interface OnPipeMessageInterface
- * @package Server\Contract
- */
-interface OnPipeMessageInterface
-{
-
-	/**
-	 *
-	 */
-	public function process(): void;
-
-
-
-}

kiri-server/Contract/OnProcessInterface.php

@@ -1,29 +0,0 @@
-<?php
-
-
-namespace Kiri\Server\Contract;
-
-
-use Swoole\Process;
-
-
-/**
- * Interface BaseProcess
- * @package Contract
- */
-interface OnProcessInterface
-{
-
-	/**
-	 * @param Process $process
-	 */
-	public function onHandler(Process $process): void;
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void;
-
-
-}

kiri-server/Contract/OnReceiveInterface.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-
-/**
- *
- */
-interface OnReceiveInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 * @param int $reactor_id
-	 * @param string $data
-	 * @return void
-	 */
-	public function onReceive(Server $server, int $fd, int $reactor_id, string $data): void;
-
-
-}

kiri-server/CoroutineServer.php

@@ -2,206 +2,114 @@
 
 namespace Kiri\Server;
 
-use Note\Inject;
-use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Error\Logger;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
+use Kiri\Context;
+use Kiri\Events\EventDispatch;
 use Kiri\Server\Abstracts\BaseProcess;
-use ReflectionException;
+use Kiri\Server\Contract\OnProcessInterface;
+use Kiri\Server\Events\OnProcessStart;
 use Swoole\Coroutine;
-use Swoole\Coroutine\Http\Server as HServer;
-use Swoole\Coroutine\Server;
-use Swoole\Coroutine\Server\Connection;
+use Swoole\Coroutine\Http\Server;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
-use Swoole\Process;
-use function Swoole\Coroutine\run;
+use Swoole\Process\Manager;
+use Swoole\Process\Pool;
 
 
-/**
- *
- */
-class CoroutineServer implements SwooleServerInterface
+class CoroutineServer
 {
 
-	use TraitServer;
+
+	private Manager $manager;
 
 
 	/**
-	 * @var HServer[]|Server[]
+	 * @param string|OnProcessInterface|BaseProcess $customProcess
+	 * @param string $system
+	 * @return void
 	 */
-	private array $servers = [];
-
-
-	#[Inject(Logger::class)]
-	public Logger $logger;
-
-
-	const SERVER_CLASS = [
-		Constant::SERVER_TYPE_BASE      => Server::class,
-		Constant::SERVER_TYPE_TCP       => Server::class,
-		Constant::SERVER_TYPE_UDP       => Server::class,
-		Constant::SERVER_TYPE_HTTP      => HServer::class,
-		Constant::SERVER_TYPE_WEBSOCKET => HServer::class,
-	];
-
-
-	/**
-	 * @param array $configs
-	 * @param bool $daemon
-	 * @throws Exception
-	 */
-	public function initBaseServer(array $configs, bool $daemon)
+	public function addProcess(string|OnProcessInterface|BaseProcess $customProcess, string $system)
 	{
-		$configs['ports'] = $this->sortService($configs['ports']);
-		foreach ($configs['ports'] as $n => $config) {
-			$this->servers[$config['name'] ?? $n] = $this->addListener($config);
+		if (is_string($customProcess)) {
+			$customProcess = Kiri::getDi()->get($customProcess);
 		}
+		$this->manager->add(function (Pool $pool, int $workerId) use ($customProcess, $system) {
+			$process = $pool->getProcess($workerId);
+
+			if (Kiri::getPlatform()->isLinux()) {
+				$process->name($system . '(' . $customProcess->getName() . ')');
+			}
+
+			Kiri::getDi()->get(EventDispatch::class)->dispatch(new OnProcessStart());
+
+			set_env('environmental', Kiri::PROCESS);
+			$channel = Coroutine::create(function () use ($process, $customProcess) {
+				while (!$customProcess->isStop()) {
+					$message = $process->read();
+					if (!empty($message)) {
+						$message = unserialize($message);
+					}
+					if (is_null($message)) {
+						continue;
+					}
+					$customProcess->onBroadcast($message);
+				}
+			});
+			Context::setContext('waite:process:message', $channel);
+
+			$customProcess->onSigterm()->process($process);
+
+		}, $customProcess->isEnableCoroutine());
 	}
 
 
 	/**
-	 * @param array $config
-	 * @return mixed
-	 * @throws ReflectionException
+	 * @param array $settings
+	 * @return void
 	 */
-	private function addListener(array $config): mixed
+	public function httpServer(array $settings = []): void
 	{
-		/** @var HServer|Server $port */
-		$class = self::SERVER_CLASS[$config['type']];
-		$port = new $class($config['host'], $config['port'], $config['isSsl'] ?? false, $config['reuse_port'] ?? true);
-		$port->set($config['settings'] ?? []);
-		if ($config['type'] == Constant::SERVER_TYPE_HTTP) {
-			$port->handle('/', fn($request, $response) => $this->onRequestHandle($request, $response, $config));
-		} else if ($config['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-			$port->handle('/', fn($request, $response) => $this->onWebsocketHandle($request, $response, $config));
-		} else {
-			$port->handle(fn(Connection $connection) => $this->onConnectionHandle($connection, $config));
-		}
-		return $this->eventListener($port, $config);
-	}
+		$this->manager->add(function (Pool $pool, int $workerId) use ($settings) {
+			$host = $settings['host'];
+			$port = $settings['port'];
 
+			$server = new Server($host, $port, false, true);
+			$server->set($settings);
 
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 * @param $config
-	 */
-	protected function onRequestHandle(Request $request, Response $response, $config)
-	{
-		if (isset($config[Constant::REQUEST])) {
-			call_user_func($config[Constant::REQUEST], $request, $response);
+			$callback = $settings['events'][Constant::REQUEST] ?? null;
+			if (is_null($callback)) {
+				$pool->shutdown();
 				return;
 			}
-		$response->status(505);
-		$response->end();
+			if (is_string($callback[0])) {
+				$callback[0] = Kiri::getDi()->get($callback[0]);
+			}
+			$server->handle('/', $callback);
+			$server->start();
+		}, true);
 	}
 
 
 	/**
-	 * @param Request $request
-	 * @param Response $response
-	 * @param $config
+	 * @param array $settings
+	 * @return void
 	 */
-	protected function onWebsocketHandle(Request $request, Response $response, $config)
+	public function websocketServer(array $settings)
 	{
-		$handshake = $config[Constant::HANDSHAKE] ?? null;
-		if (!is_null($handshake)) {
-			call_user_func($handshake, $request, $response);
-		} else {
-			$response->upgrade();
-			$open = $config[Constant::OPEN] ?? null;
-			if (!is_null($open)) {
-				call_user_func($open, $request);
-			}
-		}
-		$close = $config[Constant::CLOSE] ?? null;
-		$message = $config[Constant::MESSAGE] ?? null;
-		while (true) {
-			$data = $response->recv();
-			if ($data === '' || $data === false) {
-				$response->close();
-				call_user_func($close, $response->fd);
-			} else {
-				call_user_func($message, $data);
-			}
-		}
-	}
+		$this->manager->add(function () use ($settings) {
+			$host = $settings['host'];
+			$port = $settings['port'];
 
-
-	/**
-	 * @param Connection $connection
-	 * @param $config
-	 */
-	protected function onConnectionHandle(Connection $connection, $config)
-	{
-		call_user_func($config[Constant::RECEIVE] ?? null, $connection);
-	}
-
-
-	/**
-	 * @throws ConfigException
-	 * @throws ReflectionException
-	 */
-	public function start(): void
-	{
-		$this->startProcess();
-		run(function () {
-			$this->startServers();
+			$server = new Server($host, $port, false, true);
+			$server->set($settings);
+			$hServer = \Kiri::getDi()->get(\Kiri\Message\Server::class);
+			$server->handle('/', function (Request $request, Response $response) use ($hServer) {
+				call_user_func([$hServer, 'onRequest'], $request, $response);
 			});
+			$server->start();
+		}, true);
+
 	}
 
 
-	/**
-	 * @return array
-	 * @throws ConfigException|ReflectionException
-	 */
-	private function startProcess(): array
-	{
-		$processes = [];
-		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-		foreach ($this->process as $process) {
-			/** @var BaseProcess $process */
-			if (is_string($process)) {
-				$process = Kiri::getDi()->get($process);
-			}
-			$swowProcess = new Process([$process, 'onHandler'], $process->getRedirectStdinAndStdout(),
-				$process->getPipeType(), $process->isEnableCoroutine());
-			if (Kiri::getPlatform()->isLinux()) {
-				$swowProcess->name($system . '(' . $process->getName() . ')');
-			}
-			$swowProcess->start();
-			array_push($processes, $swowProcess);
-		}
-		return $processes;
-	}
-
-
-	private function startServers()
-	{
-		foreach ($this->servers as $server) {
-			Coroutine::create(fn() => $server->start());
-		}
-	}
-
-
-	/**
-	 * @param mixed $server
-	 * @param array $config
-	 * @return mixed
-	 * @throws ReflectionException
-	 */
-	private function eventListener(mixed $server, array $config): mixed
-	{
-		foreach ($config['events'] as $key => $value) {
-			if (is_array($value) && is_string($value[0])) {
-				$value[0] = Kiri::getDi()->get($value[0]);
-			}
-			$server->on($key, $value);
-		}
-		return $server;
-	}
-
 }

kiri-server/CoroutineTasker.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Kiri\Server;
+
+use Kiri\Abstracts\Component;
+use Kiri\Abstracts\Config;
+use Kiri\Exception\ConfigException;
+use Kiri\Task\OnServerTask;
+use Swoole\Coroutine;
+use Swoole\Coroutine\Channel;
+use Swoole\Server\Task;
+
+class CoroutineTasker extends Component
+{
+
+
+	public Channel $channel;
+
+
+	/**
+	 * @return void
+	 * @throws ConfigException
+	 */
+	public function initCore()
+	{
+		$taskWorker = Config::get('server.settings.task_worker_num', 0);
+
+		if ($taskWorker > 1) {
+			$this->channel = new Channel($taskWorker);
+			for ($i = 0; $i < $taskWorker; $i++) {
+
+				Coroutine::create(function () {
+					while ($this->channel->capacity) {
+						$data = $this->channel->pop(-1);
+
+						$execute = $this->getContainer()->get(OnServerTask::class);
+
+						$task = new Task();
+						$task->data = $data;
+						$execute->onCoroutineTask(null, $task);
+					}
+				});
+			}
+		}
+	}
+
+
+	public function dispatch($data)
+	{
+		$this->channel->push($data);
+	}
+
+
+}

kiri-server/SoloAsyncServer.php

@@ -1,143 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-use Note\Inject;
-use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Error\Logger;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Kiri\Server\Abstracts\BaseProcess;
-use ReflectionException;
-use Swoole\Http\Server as HServer;
-use Swoole\Process;
-use Swoole\Server;
-use Swoole\WebSocket\Server as WServer;
-
-class SoloAsyncServer implements SwooleServerInterface
-{
-
-	use TraitServer;
-
-
-	private HServer|WServer|Server|null $server = null;
-
-
-	#[Inject(Logger::class)]
-	public Logger $logger;
-
-
-	const SERVER_CLASS = [
-		Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
-		Constant::SERVER_TYPE_UDP       => Server::class,
-		Constant::SERVER_TYPE_HTTP      => HServer::class,
-		Constant::SERVER_TYPE_WEBSOCKET => WServer::class
-	];
-
-
-	/**
-	 * @param array $configs
-	 * @param bool $daemon
-	 * @throws Exception
-	 */
-	public function initBaseServer(array $configs, bool $daemon)
-	{
-		$configs['ports'] = $this->sortService($configs['ports']);
-		foreach ($configs['ports'] as $config) {
-			$service = $this->addListener($config);
-			if (!$this->server) {
-				$this->server = $service;
-			}
-		}
-		$this->startProcess();
-	}
-
-
-	/**
-	 * @throws ConfigException|ReflectionException
-	 */
-	private function startProcess()
-	{
-		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-		foreach ($this->process as $process) {
-			/** @var BaseProcess $process */
-			if (is_string($process)) {
-				$process = Kiri::getDi()->get($process);
-			}
-			$sowProcess = new Process([$process, 'onHandler'], $process->getRedirectStdinAndStdout(),
-				$process->getPipeType(), $process->isEnableCoroutine());
-			if (Kiri::getPlatform()->isLinux()) {
-				$sowProcess->name($system . '(' . $process->getName() . ')');
-			}
-			$this->server->addProcess($sowProcess);
-		}
-	}
-
-
-	/**
-	 * @param array $config
-	 * @return mixed
-	 * @throws Exception
-	 */
-	private function addListener(array $config): Server\Port
-	{
-		$config = $this->resetConfig($config);
-		if (!$this->server) {
-			$class = self::SERVER_CLASS[$config['type']];
-			$port = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']);
-			$config['settings'] = array_merge(Config::get('server.settings', []), $config['settings']);
-			$config['settings'][Constant::OPTION_DAEMONIZE] = 0;
-		} else {
-			$port = $this->server->addlistener($config['host'], $config['port'], $config['mode']);
-			if ($port === false) {
-				throw new Exception("The port is already in use[{$config['host']}::{$config['port']}]");
-			}
-		}
-		$port->set($config['settings'] ?? []);
-		return $this->eventListener($port, $config);
-	}
-
-
-	/**
-	 * @param Server\Port|Server|HServer|WServer $server
-	 * @throws ReflectionException
-	 */
-	private function eventListener(mixed $server, array $config): Server\Port|HServer|Server|WServer
-	{
-		foreach ($config['events'] as $key => $value) {
-			if (is_array($value) && is_string($value[0])) {
-				$value[0] = Kiri::getDi()->get($value[0]);
-			}
-			$server->on($key, $value);
-		}
-		return $server;
-	}
-
-
-	public function start()
-	{
-		$this->server->start();
-	}
-
-
-	/**
-	 * @param array $config
-	 * @return array
-	 */
-	private function resetConfig(array $config): array
-	{
-		if ($config['type'] == Constant::SERVER_TYPE_HTTP && !isset($config['settings']['open_http_protocol'])) {
-			$config['settings']['open_http_protocol'] = true;
-			if ($this->server && in_array($this->server->setting['dispatch_mode'], [2, 4])) {
-				$config['settings']['open_http2_protocol'] = true;
-			}
-		}
-		if ($config['type'] == Constant::SERVER_TYPE_WEBSOCKET && !isset($config['settings']['open_websocket_protocol'])) {
-			$config['settings']['open_websocket_protocol'] = true;
-		}
-		return $config;
-	}
-
-
-}

kiri-server/SwooleServerInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-interface SwooleServerInterface
-{
-
-
-	public function start();
-
-
-}

kiri-server/TraitServer.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-use Kiri\Server\Contract\OnProcessInterface;
-
-trait TraitServer
-{
-
-
-	protected array $process = [];
-
-
-	/**
-	 * @param OnProcessInterface|string $process
-	 * @throws \Exception
-	 */
-	public function addProcess(OnProcessInterface|string $process)
-	{
-		if (is_string($process) && !in_array(OnProcessInterface::class, class_implements($process))) {
-			throw new \Exception('Other Process must instance ' . OnProcessInterface::class);
-		}
-		$this->process[] = $process;
-	}
-
-
-	/**
-	 * @param array $ports
-	 * @return array
-	 */
-	public function sortService(array $ports): array
-	{
-		$array = [];
-		foreach ($ports as $port) {
-			if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-				array_unshift($array, $port);
-			} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
-				if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-					$array[] = $port;
-				} else {
-					array_unshift($array, $port);
-				}
-			} else {
-				$array[] = $port;
-			}
-		}
-		return $array;
-	}
-
-}

kiri-task/Annotation/AsynchronousTask.php

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

kiri-task/AsyncTaskExecute.php

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

kiri-task/CoroutineTaskExecute.php

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

kiri-task/OnServerTask.php

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

kiri-task/OnTaskInterface.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Kiri\Server\Contract;
+namespace Kiri\Task;
 
 
 use Swoole\Server;

kiri-task/TaskManager.php

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

kiri-task/TaskResolve.php

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

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,102 @@
+<?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 AliasServer|Server $server
+	 */
+	public function setServer(mixed $server): void
+	{
+		$this->server = $server;
+	}
+
+
+	/**
+	 * @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,160 @@
+<?php
+
+namespace Kiri\Websocket;
+
+use Exception;
+use Kiri\Abstracts\AbstractServer;
+use Kiri\Message\Handler\DataGrip;
+use Kiri\Message\Handler\RouterCollector;
+use Kiri\Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnHandshakeInterface;
+use Kiri\Server\Contract\OnMessageInterface;
+use Kiri\Server\Contract\OnOpenInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+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;
+
+
+	public Sender $sender;
+
+
+	/**
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function init()
+	{
+		$this->router = $this->getContainer()->get(DataGrip::class)->get('ws');
+		$handler = $this->router->find('/', 'GET');
+		if (is_int($handler) || is_null($handler)) {
+			return;
+		}
+		$this->callback = $handler->callback[0];
+
+		$this->sender = $this->getContainer()->get(Sender::class);
+		$this->sender->setServer($this->server);
+	}
+
+
+	/**
+	 * @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;
+
+
+}