claw-subagent-service 0.0.168 → 0.0.172

package/cli.js

@@ -24,6 +24,17 @@ const SERVICE_NAME = 'claw-subagent-service';
 const args = process.argv.slice(2);
 const command = args[0] || '--run';
 
+// --version 支持：直接显示版本并退出，不启动 daemon
+if (command === '--version' || command === '-v') {
+  try {
+    const version = require('./package.json').version;
+    console.log(version);
+  } catch {
+    console.log('unknown');
+  }
+  process.exit(0);
+}
+
 function runDaemon() {
   console.log('[CLI] 启动 Daemon...');
   console.log(`[CLI] CLI 路径: ${__filename}`);
@@ -254,15 +265,38 @@ function controlService(action) {
 function checkStatus() {
   const platform = process.platform;
   let cmd;
-  
+
   if (platform === 'win32') {
-    cmd = `sc.exe query ${SERVICE_NAME}`;
+    // Windows: 先尝试 sc.exe query，若服务未安装则回退到进程检查
+    cmd = `sc.exe query "${SERVICE_NAME}"`;
+    exec(cmd, (err, stdout, stderr) => {
+      if (err) {
+        // 1060 = 服务未安装，给出更友好的提示
+        if (stderr && stderr.includes('1060')) {
+          console.log(`[CLI] 服务 "${SERVICE_NAME}" 未安装`);
+          console.log(`[CLI] 请运行: claw-subagent-service --install`);
+        } else {
+          console.error(`[CLI] 查询状态失败: ${err.message}`);
+        }
+        // 回退：检查 daemon 进程是否在前台运行
+        try {
+          const list = execSync('tasklist /FI "IMAGENAME eq node.exe" /FO CSV /NH', { encoding: 'utf8', windowsHide: true });
+          const hasDaemon = list.includes('daemon.js');
+          if (hasDaemon) {
+            console.log('[CLI] 检测到 Daemon 进程正在前台运行');
+          }
+        } catch { /* 忽略 */ }
+        return;
+      }
+      console.log(stdout);
+    });
+    return;
   } else if (platform === 'linux') {
     cmd = `systemctl status ${SERVICE_NAME}`;
   } else if (platform === 'darwin') {
     cmd = `launchctl list | grep ${SERVICE_NAME}`;
   }
-  
+
   exec(cmd, (err, stdout) => {
     if (err) {
       console.error(`[CLI] 查询状态失败: ${err.message}`);

package/package.json

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

package/scripts/post-install.js

@@ -130,25 +130,40 @@ function installAndStartService() {
     svc.on('install', () => {
       console.log('[postinstall] 服务注册成功，正在启动...');
 
-      // 延迟 2 秒确保服务注册到 SCM，再设置开机自启 + 崩溃恢复
+      // 延迟 3 秒确保服务注册到 SCM，再设置开机自启 + 崩溃恢复
       setTimeout(() => {
-        const cmdFailure = `sc.exe failure "${SERVICE_NAME}" reset= 0 actions= restart/0/restart/0/restart/0`;
-        exec(cmdFailure, (err) => {
-          if (err) console.error(`[postinstall] 设置恢复策略失败: ${err.message}`);
-          else console.log('[postinstall] 恢复策略已设置：崩溃后自动重启');
-        });
-
-        exec(`sc.exe config "${SERVICE_NAME}" start= auto`, (err) => {
-          if (err) console.error(`[postinstall] 设置自动启动失败: ${err.message}`);
-          else console.log('[postinstall] 启动类型已设为：自动');
-        });
-      }, 2000);
+        // 使用 execSync 确保配置在启动前生效
+        try {
+          execSync(`sc.exe failure "${SERVICE_NAME}" reset= 0 actions= restart/0/restart/0/restart/0`, { stdio: 'ignore', timeout: 10000 });
+          console.log('[postinstall] 恢复策略已设置：崩溃后自动重启');
+        } catch (err) {
+          console.error(`[postinstall] 设置恢复策略失败: ${err.message}`);
+        }
 
-      svc.start();
+        try {
+          execSync(`sc.exe config "${SERVICE_NAME}" start= auto`, { stdio: 'ignore', timeout: 10000 });
+          console.log('[postinstall] 启动类型已设为：自动');
+        } catch (err) {
+          console.error(`[postinstall] 设置自动启动失败: ${err.message}`);
+        }
+
+        // 配置完成后启动服务
+        svc.start();
+      }, 3000);
     });
 
     svc.on('start', () => {
       console.log('[postinstall] 服务已启动');
+      // 启动后验证服务状态
+      setTimeout(() => {
+        try {
+          const status = execSync(`sc.exe query "${SERVICE_NAME}"`, { encoding: 'utf8', timeout: 5000 });
+          console.log('[postinstall] 服务状态验证:');
+          console.log(status);
+        } catch (err) {
+          console.warn(`[postinstall] 服务状态验证失败: ${err.message}`);
+        }
+      }, 2000);
     });
 
     svc.on('error', (err) => {

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

@@ -610,9 +610,29 @@ class RongyunMessageHandler {
     const requestId = data.request_id;
     const userId = data.userId || data.source_im_id;
     const sourceId = data.source_im_id;
-    const content = data.content || data._raw_content;
+    let content = data.content || data._raw_content;
+    const voiceUrl = data.voiceUrl;
+    const voiceDuration = data.voiceDuration;
+
+    this.logInfo(`[RongyunMessageHandler] 收到客服消息, userId=${userId}, content=${content?.substring(0, 50)}, voiceUrl=${voiceUrl ? '有' : '无'}`);
 
-    this.logInfo(`[RongyunMessageHandler] 收到客服消息, userId=${userId}, content=${content?.substring(0, 50)}`);
+    // 处理语音消息：如果有语音URL，先进行语音识别
+    if (voiceUrl && (!content || content === '[语音]')) {
+      try {
+        this.logInfo(`[RongyunMessageHandler] 检测到语音消息，开始语音识别: ${voiceUrl}`);
+        const recognizedText = await this.recognizeVoice(voiceUrl);
+        if (recognizedText) {
+          content = recognizedText;
+          this.logInfo(`[RongyunMessageHandler] 语音识别成功: ${content.substring(0, 50)}`);
+        } else {
+          content = '[语音消息识别失败]';
+          this.logWarn(`[RongyunMessageHandler] 语音识别失败，使用占位文本`);
+        }
+      } catch (e) {
+        this.logError(`[RongyunMessageHandler] 语音识别异常: ${e.message}`);
+        content = '[语音消息识别失败]';
+      }
+    }
 
     if (!content) {
       this.logWarn('客服消息内容为空');
@@ -691,6 +711,42 @@ class RongyunMessageHandler {
     }
   }
 
+  /**
+   * 语音识别 - 调用后端 Python 服务
+   * @param {string} voiceUrl - 语音文件 URL
+   * @returns {Promise<string>} 识别文本
+   */
+  async recognizeVoice(voiceUrl) {
+    try {
+      const axios = require('axios');
+      
+      // 从配置中获取后端 API 地址
+      const apiBaseUrl = this.config.apiBaseUrl || process.env.API_BASE_URL || 'http://localhost:5000';
+      const recognizeUrl = `${apiBaseUrl}/im/api/voice/recognize`;
+      
+      this.logInfo(`[RongyunMessageHandler] 调用语音识别 API: ${recognizeUrl}`);
+      
+      const response = await axios.post(recognizeUrl, {
+        audioUrl: voiceUrl,
+        format: 'mp3',
+        sampleRate: 16000
+      }, {
+        timeout: 30000,
+        headers: { 'Content-Type': 'application/json' }
+      });
+      
+      if (response.data && response.data.code === 200) {
+        return response.data.data.text;
+      } else {
+        this.logError(`[RongyunMessageHandler] 语音识别 API 返回错误: ${JSON.stringify(response.data)}`);
+        return null;
+      }
+    } catch (e) {
+      this.logError(`[RongyunMessageHandler] 语音识别请求失败: ${e.message}`);
+      return null;
+    }
+  }
+
   async sendResponse(msgType, content, requestId, targetId) {
     if (!this.messageSender) {
       this.logError('MessageSender 未设置，无法发送响应');

package/service/worker.js

@@ -135,7 +135,7 @@ try {
   process.cwd();
 } catch (e) {
   if (e.code === 'ENOENT') {
-    try { process.chdir(os.tmpdir()); } catch {}
+    try { process.chdir(os.tmpdir()); } catch { }
   }
 }
 
@@ -224,7 +224,6 @@ function loadRongCloudConfig() {
 
   if (!config.appKey) {
     config.appKey = process.env.DM_APP_KEY || 'bmdehs6pbyyks';
-    log.info(`[WORKER] 使用默认 appKey: ${config.appKey}`);
   }
 
   // 设置默认心跳间隔为20秒
@@ -232,7 +231,7 @@ function loadRongCloudConfig() {
     config.heartbeatInterval = 20;
   }
 
-  log.info(`[WORKER] 最终 apiBaseUrl: ${config.apiBaseUrl}`);
+  // log.info(`[WORKER] 最终 apiBaseUrl: ${config.apiBaseUrl}`);
 
   if (config.token && config.accountId) {
     return config;
@@ -263,6 +262,7 @@ async function refreshRongCloudToken() {
     const resp = await axios.get(`${serverUrl}/api/claw/token/${nodeId}`, { timeout: 15000 });
     if (resp.data?.code === 200) {
       const newToken = resp.data.data?.token || resp.data.token || '';
+      const newAppKey = resp.data.data?.app_key || resp.data.app_key || '';
       if (!newToken) {
         log.error('[WORKER] 服务端返回了空 token');
         return false;
@@ -271,12 +271,19 @@ async function refreshRongCloudToken() {
 
       // 更新内存配置
       rongcloudConfig.token = newToken;
+      if (newAppKey) {
+        rongcloudConfig.appKey = newAppKey;
+        log.info(`[WORKER] appKey 已更新: ${newAppKey}`);
+      }
 
       // 保存到 config.json
       try {
         if (fs.existsSync(clawBridgeConfigPath)) {
           const clawConfig = JSON.parse(fs.readFileSync(clawBridgeConfigPath, 'utf8'));
           clawConfig.token = newToken;
+          if (newAppKey) {
+            clawConfig.appKey = newAppKey;
+          }
           clawConfig.expiresAt = Date.now() + 7 * 24 * 60 * 60 * 1000; // 7天
           fs.writeFileSync(clawBridgeConfigPath, JSON.stringify(clawConfig, null, 2));
           log.info('[WORKER] 新 token 已保存到 config.json');
@@ -289,7 +296,7 @@ async function refreshRongCloudToken() {
     log.error(`[WORKER] 刷新 token 失败: ${resp.data?.message || '未知错误'}`);
     return false;
   } catch (err) {
-      log.error(`[WORKER] 刷新 token 异常: ${err.message}`);
+    log.error(`[WORKER] 刷新 token 异常: ${err.message}`);
     return false;
   }
 }
@@ -341,12 +348,17 @@ async function syncCustomerServiceAccountId() {
 
         if (tokenResp.data?.code === 200) {
           const newToken = tokenResp.data.data?.token || tokenResp.data.token || '';
+          const newAppKey = tokenResp.data.data?.app_key || tokenResp.data.app_key || '';
           if (newToken) {
             log.info(`[WORKER] 获取客服账号 token 成功: ${csAccountId}`);
 
             // 更新内存配置（影响后续融云连接）
             rongcloudConfig.accountId = csAccountId;
             rongcloudConfig.token = newToken;
+            if (newAppKey) {
+              rongcloudConfig.appKey = newAppKey;
+              log.info(`[WORKER] 客服账号 appKey 已更新: ${newAppKey}`);
+            }
 
             // 持久化到本地 config.json（确保重启后仍使用新配置）
             try {
@@ -354,6 +366,9 @@ async function syncCustomerServiceAccountId() {
                 const clawConfig = JSON.parse(fs.readFileSync(clawBridgeConfigPath, 'utf8'));
                 clawConfig.nodeId = csAccountId;
                 clawConfig.token = newToken;
+                if (newAppKey) {
+                  clawConfig.appKey = newAppKey;
+                }
                 clawConfig.expiresAt = Date.now() + 7 * 24 * 60 * 60 * 1000; // 7天
                 fs.writeFileSync(clawBridgeConfigPath, JSON.stringify(clawConfig, null, 2));
                 log.info(`[WORKER] 客服账号已持久化到 config.json: ${csAccountId}`);
@@ -402,7 +417,7 @@ async function initRongCloud() {
   const configChanged = await syncCustomerServiceAccountId();
   if (configChanged) {
     log.info('[WORKER] 客服账号已切换到数据库配置的 ID，将使用新配置连接融云');
-  }
+  }
   log.info(`[WORKER] 代码版本特征: isOffLineMessage-pass-through, messageDirection-log, addEventListener-exclusive`);
 
   // 启动 opencode 服务（与桌面客户端对齐）
@@ -443,7 +458,7 @@ async function initRongCloud() {
     // 融云 SDK 对自定义消息可能直接返回对象而非 JSON 字符串
     if (msg.content) {
       let parsed = null;
-      
+
       if (typeof msg.content === 'string') {
         // 字符串类型：尝试 JSON 解析
         try {
@@ -568,7 +583,7 @@ async function shutdownRongCloud() {
   if (global.dashboardReporter) {
     global.dashboardReporter.stop();
   }
-  
+
   if (rongcloudClient) {
     // 发送 CLIENT_DISCONNECTED
     try {
@@ -578,11 +593,11 @@ async function shutdownRongCloud() {
     } catch (err) {
       log.error(`[WORKER] 发送 CLIENT_DISCONNECTED 失败: ${err.message}`);
     }
-    
+
     await rongcloudClient.disconnect();
     log.info('[WORKER] 融云已断开');
   }
-  
+
   // 停止 opencode 服务
   stopOpencodeService(log);
 }
@@ -644,7 +659,7 @@ server.on('error', (err) => {
     // 延迟 3 秒后重试，给进程退出和端口释放留出足够时间
     setTimeout(() => {
       log.info(`[WORKER] 重新尝试监听端口 ${PORT}...`);
-      server.close(() => {});
+      server.close(() => { });
       server.listen(PORT, HOST);
     }, 3000);
     return;
@@ -681,20 +696,20 @@ async function gracefulShutdown(signal) {
     return;
   }
   isShuttingDown = true;
-  
+
   log.info(`[WORKER] 收到 ${signal} 信号，开始优雅退出...`);
-  
+
   try {
     await shutdownRongCloud();
   } catch (err) {
     log.error(`[WORKER] 关闭融云异常: ${err.message}`);
   }
-  
+
   // 关闭 HTTP 服务
   server.close(() => {
     log.info('[WORKER] HTTP 服务已关闭');
   });
-  
+
   // 给 3 秒时间完成关闭操作
   setTimeout(() => {
     log.info('[WORKER] 退出进程');
@@ -739,7 +754,7 @@ process.on('unhandledRejection', async (reason) => {
 
 // 拦截 process.exit 以定位调用来源
 const originalExit = process.exit;
-process.exit = function(code) {
+process.exit = function (code) {
   const stack = new Error('process.exit called from:').stack;
   log.error(`[WORKER] process.exit(${code}) 被调用:\n${stack}`);
   originalExit.call(process, code);
@@ -752,7 +767,7 @@ process.on('exit', (code) => {
     // 同步发送，因为 exit 事件不支持异步
     try {
       const messageSender = new RongyunMessageSender(rongcloudClient, rongcloudConfig, log);
-      messageSender.sendClientDisconnected().catch(() => {});
+      messageSender.sendClientDisconnected().catch(() => { });
     } catch (e) {
       // 忽略错误
     }