claw-subagent-service 0.0.75 → 0.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "description": "虾说智能助手",
   "main": "cli.js",
   "bin": {

package/service/rongcloud/message-handler.js

@@ -369,17 +369,17 @@ class MessageHandler {
 
           this.log?.info(`[MessageHandler] 流式消息完成，streamId=${streamId}, 总长度: ${fullText.length}`);
           
-          // 清理已存储的 messageUID，防止内存泄漏
-          this._streamMessageUIDs.delete(streamId);
-          
           // 发送持久化的普通文本消息作为历史记录（融云会保存 RC:TxtMsg）
           if (buffer.trim()) {
             try {
-              this.log?.info(`[MessageHandler] 发送历史记录文本消息: length=${buffer.length}`);
+              // 使用融云首流返回的 messageUID 作为 streamId，确保与前端匹配
+              const rongCloudMsgUID = this._streamMessageUIDs.get(streamId);
+              const historyStreamId = rongCloudMsgUID || streamId;
+              this.log?.info(`[MessageHandler] 发送历史记录文本消息: length=${buffer.length}, streamId=${historyStreamId}`);
               // 使用 JSON 格式包含 streamId，前端可据此关联并更新流式消息内容
               const historyContent = JSON.stringify({
                 __stream_history__: true,
-                streamId: streamId,
+                streamId: historyStreamId,
                 text: buffer,
                 sentTime: Date.now()
               });
@@ -388,6 +388,9 @@ class MessageHandler {
               this.log?.error(`[MessageHandler] 发送历史记录失败: ${err.message}`);
             }
           }
+          
+          // 清理已存储的 messageUID，防止内存泄漏
+          this._streamMessageUIDs.delete(streamId);
         }
       );
     } catch (err) {

package/service/rongcloud/rongcloud-server-api.js

@@ -63,11 +63,22 @@ class RongCloudServerAPI {
     };
   }
 
+  _getFormHeaders(appKey, appSecret) {
+    const sign = this._generateSignature(appSecret);
+    return {
+      'App-Key': appKey,
+      'Nonce': sign.nonce,
+      'Timestamp': String(sign.timestamp),
+      'Signature': sign.signature,
+      'Content-Type': 'application/x-www-form-urlencoded'
+    };
+  }
+
   async request(path, data, appKey, appSecret, retry = true) {
     const url = `https://${this.currentHost}${path}`;
     const headers = this._getHeaders(appKey, appSecret);
 
-    this.log?.info(`[RongCloudServerAPI] 请求: POST ${url}`);
+    this.log?.info(`[RongCloudServerAPI] 请求: POST ${url} (JSON)`);
 
     try {
       const response = await axios.post(url, data, {
@@ -99,6 +110,50 @@ class RongCloudServerAPI {
     }
   }
 
+  async requestForm(path, data, appKey, appSecret, retry = true) {
+    const url = `https://${this.currentHost}${path}`;
+    const headers = this._getFormHeaders(appKey, appSecret);
+
+    // 将对象转换为 URLSearchParams (form-urlencoded)
+    const params = new URLSearchParams();
+    for (const [key, value] of Object.entries(data)) {
+      if (value !== undefined && value !== null) {
+        params.append(key, typeof value === 'object' ? JSON.stringify(value) : String(value));
+      }
+    }
+
+    this.log?.info(`[RongCloudServerAPI] 请求: POST ${url} (Form)`);
+
+    try {
+      const response = await axios.post(url, params.toString(), {
+        headers,
+        timeout: this.timeout,
+        responseType: 'json'
+      });
+
+      const result = response.data;
+
+      if (result.code && result.code !== 200) {
+        throw new Error(`[${result.code}] ${result.errorMessage || 'Unknown error'}`);
+      }
+
+      return result;
+    } catch (err) {
+      if (err.response?.status === 401) {
+        this.log?.error('[RongCloudServerAPI] 签名验证失败，请检查 App Key 和 App Secret');
+        throw err;
+      }
+
+      if (retry && this._switchHost()) {
+        this.log?.warn(`[RongCloudServerAPI] 请求失败，使用备用域名重试: ${err.message}`);
+        return this.requestForm(path, data, appKey, appSecret, false);
+      }
+
+      this.log?.error(`[RongCloudServerAPI] 请求失败: ${err.message}`);
+      throw err;
+    }
+  }
+
   /**
    * 获取融云配置
    */
@@ -227,9 +282,9 @@ class RongCloudServerAPI {
     this.log?.info(`[RongCloudServerAPI] 发送 typing 状态: ${fromUserId} -> ${toUserId}`);
     
     if (conversationType === 3) {
-      return this.request('/message/group/publish.json', data, appKey, appSecret);
+      return this.requestForm('/message/group/publish.json', data, appKey, appSecret);
     }
-    return this.request('/message/private/publish.json', data, appKey, appSecret);
+    return this.requestForm('/message/private/publish.json', data, appKey, appSecret);
   }
 }