claw-subagent-service 0.0.77 → 0.0.80

package/package.json

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

package/service/modules/rongyun-message-handler.js

@@ -11,6 +11,11 @@ const { RongyunMessageTypeEnum } = require('./rongyun-message-types');
 const { OpenClawCommandEnum } = require('./openclaw-enum');
 const { executeCommand } = require('./openclaw-control');
 const { createOpencodeSession, deleteOpencodeSession, forwardChatMessage } = require('./opencode-service');
+const { ServiceManager } = require('./service-manager');
+const { collectDashboardData } = require('./dashboard-collector');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 
 class RongyunMessageHandler {
   constructor(rongcloudClient, config, log) {
@@ -72,6 +77,12 @@ class RongyunMessageHandler {
         case RongyunMessageTypeEnum.DELETE_OPENCODE_SESSION:
           await this.handleDeleteSession(parsed);
           break;
+        case RongyunMessageTypeEnum.DEVICE_CONTROL:
+          await this.handleDeviceControl(parsed);
+          break;
+        case RongyunMessageTypeEnum.DEVICE_STATUS_REQUEST:
+          await this.handleDeviceStatusRequest(parsed);
+          break;
         default:
           this.logWarn(`未处理的消息类型: ${msgType}`);
       }
@@ -85,8 +96,9 @@ class RongyunMessageHandler {
     const command = data.command;
     const commandId = data.command_id;
     const requestId = data.request_id;
+    const sourceId = data.source_im_id;
 
-    this.logInfo(`[RongyunMessageHandler] 收到命令: command=${command}, command_id=${commandId}`);
+    this.logInfo(`[RongyunMessageHandler] 收到命令: command=${command}, command_id=${commandId}, from=${sourceId || 'guardserver'}`);
 
     // 验证命令是否有效
     const validCommands = Object.values(OpenClawCommandEnum);
@@ -96,7 +108,7 @@ class RongyunMessageHandler {
         command_id: commandId,
         status: 'error',
         message: `未知命令: ${command}`
-      }, requestId);
+      }, requestId, sourceId);
       return;
     }
 
@@ -107,7 +119,7 @@ class RongyunMessageHandler {
         command_id: commandId,
         status: 'busy',
         message: '正在执行上一个指令，请稍后再试'
-      }, requestId);
+      }, requestId, sourceId);
       return;
     }
 
@@ -119,7 +131,7 @@ class RongyunMessageHandler {
         await this.sendResponse(RongyunMessageTypeEnum.COMMAND_RESULT, {
           ...response,
           command_id: commandId
-        }, requestId);
+        }, requestId, sourceId);
       });
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
@@ -129,7 +141,7 @@ class RongyunMessageHandler {
         command_id: commandId,
         status: 'error',
         message: msg
-      }, requestId);
+      }, requestId, sourceId);
     } finally {
       this.commandLock = false;
     }
@@ -229,15 +241,125 @@ class RongyunMessageHandler {
     }
   }
 
-  async sendResponse(msgType, content, requestId) {
+  async handleDeviceControl(data) {
+    const command = data.command;
+    const requestId = data.request_id;
+    const targetId = data.source_im_id;
+
+    this.logInfo(`[RongyunMessageHandler] 收到设备控制命令: command=${command}, from=${targetId}`);
+
+    const validCommands = ['disable', 'enable', 'delete', 'status'];
+    if (!validCommands.includes(command)) {
+      await this.sendDeviceControlResult(targetId, requestId, command, 'error', `未知命令: ${command}`);
+      return;
+    }
+
+    try {
+      let result;
+      switch (command) {
+        case 'disable': {
+          const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
+          await svcMgr.stop();
+          await svcMgr.uninstall();
+          result = { status: 'success', message: '设备服务已禁用' };
+          break;
+        }
+        case 'enable': {
+          const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
+          await svcMgr.install();
+          result = { status: 'success', message: '设备服务已启用' };
+          break;
+        }
+        case 'delete': {
+          const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
+          try { await svcMgr.stop(); } catch (e) {}
+          try { await svcMgr.uninstall(); } catch (e) {}
+          const homeDir = os.homedir();
+          const configPaths = [
+            path.join(homeDir, '.claw-bridge', 'config.json'),
+            path.join(__dirname, '..', '..', 'rongcloud-config.json')
+          ];
+          for (const p of configPaths) {
+            if (fs.existsSync(p)) {
+              fs.unlinkSync(p);
+            }
+          }
+          result = { status: 'success', message: '设备已删除，本地配置已清除' };
+          break;
+        }
+        case 'status': {
+          const dashboard = await collectDashboardData();
+          result = { status: 'success', message: '状态查询成功', data: dashboard };
+          break;
+        }
+      }
+
+      await this.sendDeviceControlResult(targetId, requestId, command, result.status, result.message, result.data);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      this.logError(`设备控制命令执行异常: ${msg}`);
+      await this.sendDeviceControlResult(targetId, requestId, command, 'error', msg);
+    }
+  }
+
+  async handleDeviceStatusRequest(data) {
+    const requestId = data.request_id;
+    const targetId = data.source_im_id;
+
+    this.logInfo(`[RongyunMessageHandler] 收到设备状态请求, from=${targetId}`);
+
+    try {
+      const dashboard = await collectDashboardData();
+      await this.sendDeviceStatusReport(targetId, requestId, dashboard);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      this.logError(`设备状态查询异常: ${msg}`);
+      await this.sendDeviceStatusReport(targetId, requestId, null, msg);
+    }
+  }
+
+  async sendDeviceControlResult(targetId, requestId, command, status, message, data) {
+    if (!this.messageSender) {
+      this.logError('MessageSender 未设置，无法发送响应');
+      return;
+    }
+    try {
+      await this.messageSender.sendDeviceControlResult(targetId, requestId, command, status, message, data);
+      this.logInfo(`设备控制结果已发送: ${command} -> ${targetId}`);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      this.logError(`发送设备控制结果失败: ${msg}`);
+    }
+  }
+
+  async sendDeviceStatusReport(targetId, requestId, data, error) {
+    if (!this.messageSender) {
+      this.logError('MessageSender 未设置，无法发送响应');
+      return;
+    }
+    try {
+      await this.messageSender.sendDeviceStatusReport(targetId, requestId, data, error);
+      this.logInfo(`设备状态报告已发送 -> ${targetId}`);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      this.logError(`发送设备状态报告失败: ${msg}`);
+    }
+  }
+
+  async sendResponse(msgType, content, requestId, targetId) {
     if (!this.messageSender) {
       this.logError('MessageSender 未设置，无法发送响应');
       return;
     }
 
     try {
-      await this.messageSender.sendProtocolMessage(msgType, content, requestId);
-      this.logInfo(`响应已发送: ${msgType}`);
+      if (targetId) {
+        await this.messageSender.sendToTarget(targetId, msgType, content, requestId);
+        this.logInfo(`响应已发送: ${msgType} -> ${targetId}`);
+      } else {
+        await this.messageSender.sendProtocolMessage(msgType, content, requestId);
+        this.logInfo(`响应已发送: ${msgType}`);
+      }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       this.logError(`发送响应失败: ${msg}`);

package/service/modules/rongyun-message-sender.js

@@ -150,6 +150,86 @@ class RongyunMessageSender {
       ...data,
     });
   }
+
+  /**
+   * 发送消息到指定目标（P2P）
+   */
+  async sendToTarget(targetId, msgType, content, requestId) {
+    if (!this.rongcloudClient?.isConnected) {
+      this.log?.error('[RongyunMessageSender] 未连接，无法发送消息');
+      return false;
+    }
+
+    try {
+      const mac = getMacAddress();
+      const secret = generateSecret(mac, this.config.secretKey || 'secret_key');
+      const messagePayload = {
+        msg_type: msgType,
+        source_im_id: this.config.accountId || '',
+        destination_im_id: targetId,
+        mac: mac,
+        secret: secret,
+        content: typeof content === 'string' ? content : JSON.stringify(content),
+        request_id: requestId || '',
+        timestamp: Math.floor(Date.now() / 1000),
+      };
+
+      // 优先使用自定义消息类型发送 P2P 消息
+      let result;
+      if (this.rongcloudClient.SystemServiceMessage) {
+        result = await this.rongcloudClient.sendCustomMessage(
+          targetId,
+          messagePayload,
+          1 // PRIVATE
+        );
+      } else {
+        // 回退到文本消息（兼容旧版本）
+        result = await this.rongcloudClient.sendMessage(
+          targetId,
+          JSON.stringify(messagePayload),
+          1 // PRIVATE
+        );
+      }
+
+      return result;
+    } catch (err) {
+      this.log?.error(`[RongyunMessageSender] P2P发送异常: ${err.message}`);
+      return false;
+    }
+  }
+
+  /**
+   * 发送设备控制结果（P2P）
+   */
+  async sendDeviceControlResult(targetId, requestId, command, status, message, data) {
+    return await this.sendToTarget(
+      targetId,
+      RongyunMessageTypeEnum.DEVICE_CONTROL_RESULT,
+      {
+        command,
+        status,
+        message,
+        data
+      },
+      requestId
+    );
+  }
+
+  /**
+   * 发送设备状态报告（P2P）
+   */
+  async sendDeviceStatusReport(targetId, requestId, data, error) {
+    return await this.sendToTarget(
+      targetId,
+      RongyunMessageTypeEnum.DEVICE_STATUS_REPORT,
+      {
+        status: error ? 'error' : 'success',
+        message: error || '状态报告',
+        data
+      },
+      requestId
+    );
+  }
 }
 
 module.exports = {

package/service/modules/rongyun-message-types.js

@@ -22,7 +22,11 @@ const RongyunMessageTypeEnum = {
   CHAT_MESSAGE: "chat_message",
   CREATE_OPENCODE_SESSION: "create_opencode_session",
   OPENCODE_SESSION_CREATED: "opencode_session_created",
-  DELETE_OPENCODE_SESSION: "delete_opencode_session"
+  DELETE_OPENCODE_SESSION: "delete_opencode_session",
+  DEVICE_CONTROL: "device_control",
+  DEVICE_CONTROL_RESULT: "device_control_result",
+  DEVICE_STATUS_REQUEST: "device_status_request",
+  DEVICE_STATUS_REPORT: "device_status_report"
 };
 
 module.exports = { RongyunMessageTypeEnum };

package/service/rongcloud/rongcloud-client.js

@@ -39,6 +39,18 @@ class RongCloudClient {
     this.log?.info('[RongCloudClient] 初始化 SDK...');
     RongIMLib.init({ appkey: this.config.appKey });
 
+    // 注册 system_service 自定义消息类型（与前端对齐）
+    try {
+      if (typeof RongIMLib.registerMessageType === 'function') {
+        this.SystemServiceMessage = RongIMLib.registerMessageType('system_service', true, false);
+        this.log?.info('[RongCloudClient] system_service 自定义消息类型已注册');
+      } else {
+        this.log?.warn('[RongCloudClient] SDK 不支持 registerMessageType');
+      }
+    } catch (err) {
+      this.log?.warn(`[RongCloudClient] 注册 system_service 消息类型失败: ${err.message}`);
+    }
+
     this.log?.info(`[RongCloudClient] SDK Events: ${JSON.stringify(Object.keys(RongIMLib.Events || {}))}`);
     this.log?.info(`[RongCloudClient] has addEventListener: ${typeof RongIMLib.addEventListener === 'function'}`);
     this.log?.info(`[RongCloudClient] has sendReadReceiptMessage: ${typeof RongIMLib.sendReadReceiptMessage === 'function'}`);
@@ -257,6 +269,50 @@ class RongCloudClient {
     }
   }
 
+  async sendCustomMessage(targetId, content, conversationType, customType = 'system_service') {
+    if (!this.isConnected) {
+      this.log?.error('[RongCloudClient] 未连接，无法发送自定义消息');
+      return false;
+    }
+
+    if (!this.SystemServiceMessage) {
+      this.log?.error('[RongCloudClient] system_service 消息类型未注册');
+      return false;
+    }
+
+    try {
+      const convType = conversationType === ConversationType.GROUP
+        ? (RongIMLib.ConversationType?.GROUP || ConversationType.GROUP)
+        : (RongIMLib.ConversationType?.PRIVATE || ConversationType.PRIVATE);
+
+      const messageContent = typeof content === 'string' ? JSON.parse(content) : content;
+      const customMsg = new this.SystemServiceMessage(messageContent);
+
+      const result = await RongIMLib.sendMessage(
+        { conversationType: convType, targetId },
+        customMsg
+      );
+
+      if (result.code === 0 || result.code === 200) {
+        const sentUId = result.data?.messageUId;
+        if (sentUId) {
+          this.sentMessageUIds.add(sentUId);
+          if (this.sentMessageUIds.size > this.sentMessageDedupMaxSize) {
+            const first = this.sentMessageUIds.values().next().value;
+            this.sentMessageUIds.delete(first);
+          }
+        }
+        return true;
+      } else {
+        this.log?.error(`[RongCloudClient] 自定义消息发送失败, code: ${result.code}`);
+        return false;
+      }
+    } catch (err) {
+      this.log?.error(`[RongCloudClient] 发送自定义消息异常: ${err.message}`);
+      return false;
+    }
+  }
+
   async sendReadReceipt(msg) {
     if (!this.isConnected) {
       this.log?.warn('[RongCloudClient] 未连接，无法发送已读回执');