Revert "改名"

This reverts commit fdf58326

Annotation/JsonRpc.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Kiri\Rpc\Note;
+namespace Kiri\Rpc\Annotation;
 
 use Kiri\Abstracts\Config;
 use Kiri\Core\Network;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Rpc\RpcManager;
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
 use ReflectionException;
 
 #[\Attribute(\Attribute::TARGET_CLASS)] class JsonRpc extends Attribute
@@ -23,10 +23,11 @@ use ReflectionException;
 	 * @param array $tags
 	 * @param array $meta
 	 * @param array $checkOptions
+	 * @param string $checkUrl
 	 */
-	public function __construct(public string $service, public string $driver, public array $tags = [], public array $meta = [], public array $checkOptions = [])
+	public function __construct(public string $service, public string $driver, public array $tags = [], public array $meta = [], public array $checkOptions = [], public string $checkUrl = '')
 	{
-		$this->uniqueId = preg_replace('/(\w{11})(\w{4})(\w{3})(\w{8})(\w{6})/', '$1-$2-$3-$4-$5', md5(__DIR__ . '.' . md5(Network::local())));
+		$this->uniqueId = preg_replace('/(\w{11})(\w{4})(\w{3})(\w{8})(\w{6})/', '$1-$2-$3-$4-$5', md5(__DIR__ . 'Annotation' . md5(Network::local())));
 	}
 
 
@@ -49,6 +50,9 @@ use ReflectionException;
 	protected function create(): array
 	{
 		$rpcPort = Config::get('rpc.port');
+		if (empty($this->checkUrl)) {
+			$this->checkUrl = Network::local() . ":" . Config::get('rpc.port');
+		}
 		$defaultConfig = [
 			"ID"                => "rpc.json.{$this->service}." . $this->uniqueId,
 			"Name"              => $this->service,
@@ -68,7 +72,7 @@ use ReflectionException;
 				"Name"                           => "service " . $this->service . ' health check',
 				"Notes"                          => "Script based health check",
 				"ServiceID"                      => $this->service,
-				"TCP"                            => Network::local() . ":" . Config::get('rpc.port'),
+				"TCP"                            => $this->checkUrl,
 				"Interval"                       => "5s",
 				"Timeout"                        => "1s",
 				"DeregisterCriticalServiceAfter" => "30s"

ClientPool.php

@@ -6,7 +6,7 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Context;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\Alias;
 use Kiri\Pool\Pool;
 use Swoole\Client;

JsonRpcConsumers.php

@@ -4,10 +4,10 @@ namespace Kiri\Rpc;
 
 
 use Exception;
-use Http\Message\ServerRequest;
+use Kiri\Message\ServerRequest;
-use Http\Message\Stream;
+use Kiri\Message\Stream;
 use Kiri\Core\Number;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\Pool;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\ResponseInterface;

JsonRpcPoolTransporter.php

@@ -2,10 +2,10 @@
 
 namespace Kiri\Rpc;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Exception;
-use Http\Message\Response;
+use Kiri\Message\Response;
-use Http\Message\Stream;
+use Kiri\Message\Stream;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
 use Psr\Http\Client\ClientInterface;

JsonRpcTransporter.php

@@ -2,8 +2,8 @@
 
 namespace Kiri\Rpc;
 
-use Http\Message\Response;
+use Kiri\Message\Response;
-use Http\Message\Stream;
+use Kiri\Message\Stream;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;

RpcJsonp.php

@@ -2,30 +2,29 @@
 
 namespace Kiri\Rpc;
 
-use Http\Constrict\RequestInterface;
+use Kiri;
-use Http\Handler\Handler;
-use Http\Handler\Router;
-use Http\Message\ServerRequest;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Annotation;
+use Kiri\Annotation\Inject;
 use Kiri\Consul\Agent;
 use Kiri\Context;
-use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri\Message\Constrict\RequestInterface;
-use Note\Inject;
+use Kiri\Message\Handler\Handler;
-use Note\Note;
+use Kiri\Message\Handler\Router;
+use Kiri\Message\ServerRequest;
+use Kiri\Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnConnectInterface;
+use Kiri\Server\Contract\OnReceiveInterface;
+use Kiri\Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnServerBeforeStart;
+use Kiri\Server\Events\OnTaskerStart;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStart;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use ReflectionException;
-use Server\Contract\OnCloseInterface;
-use Server\Contract\OnConnectInterface;
-use Server\Contract\OnReceiveInterface;
-use Server\Events\OnBeforeShutdown;
-use Server\Events\OnServerBeforeStart;
-use Server\Events\OnTaskerStart;
-use Server\Events\OnWorkerStart;
 use Swoole\Coroutine;
 use Swoole\Coroutine\Channel;
 use Swoole\Server;
@@ -43,13 +42,15 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 	public Router $router;
 
 
-	#[Inject(Note::class)]
+	#[Inject(Annotation::class)]
-	public Note $annotation;
+	public Annotation $annotation;
-
 
 
 	private RpcManager $manager;
 
+
+	private int $timerId;
+
 	/**
 	 *
 	 * @throws \Exception
@@ -58,9 +59,10 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 	{
 		$this->eventProvider->on(OnBeforeShutdown::class, [$this, 'onBeforeShutdown']);
 
-		scan_directory(APP_PATH . 'rpc', 'Rpc');
+		scan_directory(APP_PATH . 'rpc', 'app\Rpc');
 
 		$this->eventProvider->on(OnWorkerStart::class, [$this, 'consulWatches']);
+		$this->eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
 		$this->eventProvider->on(OnServerBeforeStart::class, [$this, 'register']);
 
 		$this->manager = Kiri::getDi()->get(RpcManager::class);
@@ -72,7 +74,6 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 	 * @return void
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
 	 */
 	public function onBeforeShutdown(OnBeforeShutdown $beforeShutdown)
 	{
@@ -95,19 +96,24 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 			return;
 		}
 		$async_time = (int)Config::get('consul.async_time', 1000);
-		Timer::tick($async_time, static function ($timeId) {
+		$this->timerId = Timer::tick($async_time, static function () {
-			if (env('state', 'start') == 'exit') {
-				Timer::clear($timeId);
-				return;
-			}
 			Kiri::getDi()->get(RpcManager::class)->tick();
 		});
 	}
 
 
+	/**
+	 * @param OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		Timer::clear($this->timerId);
+	}
+
+
 	/**
 	 * @param OnServerBeforeStart $server
-	 * @throws ReflectionException
 	 */
 	public function register(OnServerBeforeStart $server)
 	{
@@ -266,10 +272,9 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 
 
 	/**
-	 * @param Server $server
 	 * @param int $fd
 	 */
-	public function onClose(Server $server, int $fd): void
+	public function onClose(int $fd): void
 	{
 		// TODO: Implement onClose() method.
 	}

RpcManager.php

@@ -2,11 +2,12 @@
 
 namespace Kiri\Rpc;
 
-use Http\Handler\Handler;
+use Exception;
+use Kiri;
 use Kiri\Abstracts\Component;
 use Kiri\Consul\Agent;
 use Kiri\Consul\Health;
-use Kiri\Kiri;
+use Kiri\Message\Handler\Handler;
 use ReflectionException;
 
 class RpcManager extends Component
@@ -22,11 +23,12 @@ class RpcManager extends Component
 	/**
 	 * @param $serviceName
 	 * @return void
-	 * @throws ReflectionException
+	 * @throws Exception
-	 * @throws \Exception
 	 */
 	public function async($serviceName): void
 	{
+		$this->reRegister($serviceName);
+
 		$lists = Kiri::getDi()->get(Health::class)->setQuery('passing=true')->service($serviceName);
 		if ($lists->getStatusCode() != 200) {
 			return;
@@ -42,20 +44,45 @@ class RpcManager extends Component
 
 
 	/**
-	 * @throws ReflectionException
+	 * @param string $serviceName
+	 * @return void
+	 * @throws Exception
+	 */
+	public function reRegister(string $serviceName)
+	{
+		$config = $this->_rpc[$serviceName] ?? [];
+		if (empty($config)) {
+			return;
+		}
+		$service = Kiri::getDi()->get(Agent::class);
+
+		$info = $service->service->service_health($config['config']['ID']);
+		if ($info->getStatusCode() == 200) {
+			return;
+		}
+		$service->service->register($config['config']);
+	}
+
+
+	/**
+	 * @throws Exception
 	 */
 	public function tick(): void
 	{
+		try {
 			foreach ($this->_rpc as $name => $list) {
 				$this->async($name);
 			}
+		} catch (\Throwable $throwable) {
+			$this->logger()->error(error_trigger_format($throwable));
+		}
 	}
 
 
 	/**
 	 * @param $serviceName
 	 * @return array
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getServices($serviceName): array
 	{
@@ -112,12 +139,12 @@ class RpcManager extends Component
 
 
 	/**
-	 * @throws ReflectionException
 	 */
 	public function register()
 	{
 		$agent = Kiri::getDi()->get(Agent::class);
 		foreach ($this->_rpc as $list) {
+			$agent->service->deregister($list['config']['ID']);
 			$data = $agent->service->register($list['config']);
 			if ($data->getStatusCode() != 200) {
 				return;

composer.json

@@ -16,7 +16,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Kiri\\Rpc\\": "src/"
+      "Kiri\\Rpc\\": "./"
     }
   },
   "require-dev": {

config.php

@@ -3,7 +3,7 @@
 
 use Kiri\Rpc\RpcJsonp;
 use Kiri\Rpc\TestRpcService;
-use Server\Constant;
+use Kiri\Server\Constant;
 
 return [
 	'rpc' => [
@@ -61,7 +61,7 @@ return [
 				"node"       => "t2.320",
 				"checkId"    => "service:redis1",
 				"name"       => "Redis health check",
-				"notes"      => "Script based health check",
+				"Annotations"      => "Script based health check",
 				"status"     => "passing",
 				"serviceID"  => "redis1",
 				"definition" => [