Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/grpc-client/src/BaseClient.php

Author: limingxinleo

src/CloudName.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\Nacos;
+
+enum CloudName: string
+{
+    case Aliyun = 'aliyun';
+
+    public static function safeFrom(mixed $value): ?CloudName
+    {
+        if ($value instanceof CloudName) {
+            return $value;
+        }
+
+        return CloudName::tryFrom($value);
+    }
+}

src/Config.php

@@ -32,6 +32,8 @@ class Config
 
     protected ?string $version = '1.0';
 
+    protected ?CloudName $cloudName = null;
+
     protected array $grpc = [
         'enable' => true,
         'heartbeat' => 10,
@@ -56,6 +58,7 @@ public function __construct(
             'port' => 'int',
             'grpc' => 'array',
             'version' => 'string',
+            'cloud_name' => 'string',
         ])]
         array $config = []
     ) {
@@ -69,6 +72,7 @@ public function __construct(
         isset($config['port']) && $this->port = (int) $config['port'];
         isset($config['version']) && $this->version = (string) $config['version'];
         isset($config['grpc']) && $this->grpc = array_replace($this->grpc, $config['grpc']);
+        isset($config['cloud_name']) && $this->cloudName = CloudName::safeFrom($config['cloud_name']);
     }
 
     public function getBaseUri(): string
@@ -120,4 +124,9 @@ public function getVersion(): string
     {
         return $this->version;
     }
+
+    public function getCloudName(): ?CloudName
+    {
+        return $this->cloudName;
+    }
 }

src/GrpcClient.php

@@ -315,12 +315,31 @@ protected function serverCheck(): bool
         throw new ConnectToServerFailedException('the nacos server is not ready to work in 30 seconds, connect to server failed');
     }
 
-    private function isWorkerExit(): bool
+    protected function getMetadata(RequestInterface $request): array
     {
-        return CoordinatorManager::until(Constants::WORKER_EXIT)->isClosing();
+        return match ($this->config->getCloudName()) {
+            CloudName::Aliyun => $this->getAliyunMetadata($request),
+            default => $this->getDefaultMetadata($request),
+        };
     }
 
-    private function getMetadata(RequestInterface $request): array
+    protected function getAliyunMetadata(RequestInterface $request): array
+    {
+        $accessKey = $this->config->getAccessKey();
+        $accessSecret = $this->config->getAccessSecret();
+        $signHeaders = $this->getMseSignHeaders($request, $accessSecret);
+
+        return [
+            'type' => $request->getType(),
+            'clientIp' => $this->ip(),
+            'headers' => [
+                'Spas-AccessKey' => $accessKey,
+                ...$signHeaders,
+            ],
+        ];
+    }
+
+    protected function getDefaultMetadata(RequestInterface $request): array
     {
         if ($token = $this->getAccessToken()) {
             return [
@@ -338,6 +357,11 @@ private function getMetadata(RequestInterface $request): array
         ];
     }
 
+    private function isWorkerExit(): bool
+    {
+        return CoordinatorManager::until(Constants::WORKER_EXIT)->isClosing();
+    }
+
     private function grpcDefaultHeaders(): array
     {
         return [
@@ -358,4 +382,33 @@ private function handleResponse(ResponseInterface $response): array
 
         return Json::decode($contents);
     }
+
+    private function getMseSignHeaders(RequestInterface $request, string $secretKey): array
+    {
+        $data = $request->getValue();
+        $group = $data['group'] ?? '';
+        $tenant = $data['tenant'] ?? '';
+        $timeStamp = (string) round(microtime(true) * 1000);
+        $signStr = '';
+
+        if ($tenant) {
+            $signStr .= "{$tenant}+";
+        }
+
+        if ($group) {
+            $signStr .= "{$group}+";
+        }
+
+        $signStr .= "{$timeStamp}";
+
+        return [
+            'charset' => 'utf-8',
+            'exConfigInfo' => 'true',
+            'Client-RequestToken' => md5($timeStamp),
+            'Client-RequestTS' => $timeStamp,
+            'Timestamp' => $timeStamp,
+            'Spas-Signature' => base64_encode(hash_hmac('sha1', $signStr, $secretKey, true)),
+            'Client-AppName' => '',
+        ];
+    }
 }

src/Protobuf/Response/ConfigChangeNotifyRequest.php

@@ -28,10 +28,10 @@ class ConfigChangeNotifyRequest extends Response implements Stringable, JsonSeri
 
     public function __construct(array $json)
     {
-        $this->requestId = $json['requestId'];
-        $this->tenant = $json['tenant'];
-        $this->group = $json['group'];
-        $this->dataId = $json['dataId'];
+        $this->requestId = $json['requestId'] ?? '';
+        $this->tenant = $json['tenant'] ?? '';
+        $this->group = $json['group'] ?? '';
+        $this->dataId = $json['dataId'] ?? '';
         $this->json = $json;
     }