Revert "改名"

This reverts commit fdf58326

function.php

@@ -3,12 +3,12 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
 use Kiri\Application;
 use Kiri\Core\ArrayAccess;
-use Kiri\Di\AnnotationManager;
+use Kiri\Di\NoteManager;
 use Kiri\Error\Logger;
 use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
@@ -261,7 +261,7 @@ if (!function_exists('injectRuntime')) {
 
 		$router = [];
 		foreach ($fileLists as $class) {
-			foreach (AnnotationManager::getTargetAnnotation($class) as $value) {
+			foreach (NoteManager::getTargetAnnotation($class) as $value) {
 				if (!method_exists($value, 'execute')) {
 					continue;
 				}

kiri-annotation/Route/Middleware.php

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

kiri-annotation/Route/Route.php

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

kiri-annotation/Task.php

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

kiri-engine/Abstracts/BaseApplication.php

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

kiri-engine/Abstracts/Logger.php

@@ -9,7 +9,7 @@ use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
 use ReflectionException;
-use Server\Events\OnWorkerStop;
+use Kiri\Server\Events\OnWorkerStop;
 
 
 /**

kiri-engine/Abstracts/TraitApplication.php

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

kiri-engine/Application.php

@@ -18,7 +18,7 @@ use Kiri\Crontab\CrontabProviders;
 use Kiri\Events\{OnAfterCommandExecute, OnBeforeCommandExecute};
 use Kiri\FileListen\HotReload;
 use ReflectionException;
-use Server\ServerProviders;
+use Kiri\Server\ServerProviders;
 use stdClass;
 use Swoole\Process;
 use Swoole\Timer;

kiri-engine/Async.php

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

kiri-engine/Cache/Redis.php

@@ -18,7 +18,7 @@ use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Kiri\Pool\Redis as PoolRedis;
 use Kiri\Annotation\Inject;
-use Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerExit;
 use Swoole\Timer;
 
 /**

kiri-engine/Di/Container.php

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

kiri-engine/Di/NoteManager.php

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

kiri-engine/Error/ErrorHandler.php

@@ -10,12 +10,12 @@ declare(strict_types=1);
 namespace Kiri\Error;
 
 use Exception;
-use Http\Handler\Formatter\IFormatter;
+use Kiri\Message\Handler\Formatter\IFormatter;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
-use Http\Events\OnAfterRequest;
+use Kiri\Message\Events\OnAfterRequest;
 
 /**
  * Class ErrorHandler

kiri-engine/Error/LoggerAspect.php

@@ -5,9 +5,9 @@ namespace Kiri\Error;
 
 
 use Exception;
-use Http\Aspect\OnAspectInterface;
-use Http\Aspect\OnJoinPointInterface;
-use Http\Constrict\RequestInterface;
+use Kiri\Message\Aspect\OnAspectInterface;
+use Kiri\Message\Aspect\OnJoinPointInterface;
+use Kiri\Message\Constrict\RequestInterface;
 use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
 

kiri-engine/Error/LoggerProcess.php

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

kiri-engine/FileListen/HotReload.php

@@ -176,7 +176,6 @@ class HotReload extends Command
         Timer::clearAll();
         $this->driver->clear();
         $this->stopServer();
-        $this->stopManager();
         while ($ret = Process::wait(TRUE)) {
             echo "PID={$ret['pid']}\n";
             sleep(1);
@@ -193,20 +192,13 @@ class HotReload extends Command
         if (!empty($pid) && Process::kill($pid, 0)) {
             Process::kill($pid, SIGTERM);
         }
-    }
-
-
-    /**
-     *
-     */
-    protected function stopManager()
-    {
         if ($this->process && Process::kill($this->process->pid, 0)) {
             Process::kill($this->process->pid) && Process::wait(TRUE);
         }
     }
 
 
+
     /**
      * 重启
      *
@@ -221,8 +213,6 @@ class HotReload extends Command
         $this->logger->warning('change reload');
 
         $this->stopServer();
-        $this->stopManager();
-
         $this->process = new Process(function (Process $process) {
             $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
         });

kiri-engine/Kiri.php

@@ -17,8 +17,8 @@ use Kiri\Core\Json;
 use Kiri\Di\Container;
 use Psr\Container\ContainerInterface;
 use ReflectionException;
-use Server\ServerManager;
-use Server\Tasker\AsyncTaskExecute;
+use Kiri\Server\ServerManager;
+use Kiri\Server\Tasker\AsyncTaskExecute;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\WebSocket\Server;

kiri-gii/GiiController.php

@@ -70,9 +70,9 @@ use Kiri\Annotation\Route\Middleware;
 use Kiri\Annotation\Route\Route;
 use Kiri\Core\Str;
 use Kiri\Core\Json;
-use Http\Context\Request;
-use 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

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

kiri-gii/GiiMiddleware.php

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

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

kiri-gii/GiiTask.php

@@ -31,7 +31,7 @@ class GiiTask extends GiiBase
 		
 namespace App\Async;
 
-use Server\Contract\OnTaskInterface;
+use Kiri\Server\Contract\OnTaskInterface;
 
 ';
 

kiri-websocket-server/Server.php

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