claw-subagent-service 0.0.100 → 0.0.102

package/package.json

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

package/service/modules/upload-service.js

@@ -0,0 +1,186 @@
+const axios = require('axios');
+const FormData = require('form-data');
+const fs = require('fs');
+
+/**
+ * 文件上传服务
+ * 
+ * 架构：
+ * 1. 调用服务端 requestUpload 获取上传配置
+ * 2. 根据配置选择上传方式：
+ *    - server_proxy: 通过服务端代理上传
+ *    - direct: 直传到 OSS（未来支持）
+ * 3. 返回下载 URL
+ * 
+ * @param {Object} config - 配置对象
+ * @param {string} config.apiBaseUrl - API 基础地址
+ * @param {Function} log - 日志函数
+ */
+class UploadService {
+  constructor(config, log) {
+    this.config = config;
+    this.log = log;
+    this.apiBaseUrl = config.apiBaseUrl;
+  }
+
+  /**
+   * 上传文件
+   * 
+   * @param {Object} options
+   * @param {string} options.filePath - 本地文件路径
+   * @param {string} options.fileType - 文件类型 (image, video, audio, file)
+   * @param {string} options.fileName - 原始文件名
+   * @param {number} options.fileSize - 文件大小
+   * @param {Function} options.onProgress - 进度回调 (progress: number) => void
+   * @returns {Promise<{url: string, filename: string}>}
+   */
+  async uploadFile(options) {
+    const { filePath, fileType = 'file', fileName = '', fileSize = 0, onProgress } = options;
+
+    if (!filePath) {
+      throw new Error('filePath 不能为空');
+    }
+
+    this.log?.info(`[UploadService] 开始上传: filePath=${filePath}, type=${fileType}`);
+
+    try {
+      // 1. 请求上传配置
+      const uploadConfig = await this._requestUpload(fileType, fileName, fileSize);
+      this.log?.info(`[UploadService] 获取上传配置: mode=${uploadConfig.mode}`);
+
+      // 2. 根据模式上传
+      let result;
+      if (uploadConfig.mode === 'direct' && uploadConfig.presignedUrl) {
+        // 直传模式（OSS 预签名 URL）
+        result = await this._uploadDirect(filePath, uploadConfig, onProgress);
+      } else {
+        // 服务端代理模式
+        result = await this._uploadViaServer(filePath, uploadConfig, onProgress);
+      }
+
+      this.log?.info(`[UploadService] 上传成功: url=${result.url}`);
+      return result;
+    } catch (err) {
+      this.log?.error(`[UploadService] 上传失败: ${err.message}`);
+      throw err;
+    }
+  }
+
+  /**
+   * 请求上传配置
+   */
+  async _requestUpload(fileType, fileName, fileSize) {
+    const url = `${this.apiBaseUrl}/im/api/system/service`;
+    
+    const payload = {
+      service: 'upload',
+      action: 'requestUpload',
+      payload: {
+        fileType,
+        fileName,
+        fileSize,
+      },
+    };
+
+    this.log?.info(`[UploadService] 请求上传配置: ${url}`);
+
+    const response = await axios.post(url, payload, {
+      timeout: 10000,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+
+    if (response.data?.code !== 200) {
+      throw new Error(response.data?.message || '获取上传配置失败');
+    }
+
+    return response.data.data;
+  }
+
+  /**
+   * 通过服务端代理上传
+   */
+  async _uploadViaServer(filePath, uploadConfig, onProgress) {
+    const { uploadUrl, method, formData, fileField, headers } = uploadConfig;
+
+    // 读取文件
+    const fileBuffer = fs.readFileSync(filePath);
+    
+    // 构建 FormData
+    const form = new FormData();
+    
+    // 添加表单字段
+    if (formData) {
+      Object.entries(formData).forEach(([key, value]) => {
+        form.append(key, value);
+      });
+    }
+    
+    // 添加文件
+    form.append(fileField || 'file', fileBuffer, {
+      filename: uploadConfig.fileName || path.basename(filePath),
+    });
+
+    this.log?.info(`[UploadService] 服务端代理上传: ${uploadUrl}`);
+
+    const response = await axios({
+      method: method || 'POST',
+      url: uploadUrl,
+      data: form,
+      headers: {
+        ...headers,
+        ...form.getHeaders(),
+      },
+      timeout: 120000, // 2分钟
+      onUploadProgress: (progressEvent) => {
+        if (progressEvent.total) {
+          const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+          onProgress?.(progress);
+        }
+      },
+    });
+
+    if (response.data?.code !== 200) {
+      throw new Error(response.data?.message || '上传失败');
+    }
+
+    return {
+      url: response.data.data?.url || uploadConfig.downloadUrl,
+      filename: response.data.data?.filename || uploadConfig.fileName,
+    };
+  }
+
+  /**
+   * 直传到 OSS（预签名 URL）
+   * 未来支持阿里云 OSS、腾讯云 COS 等
+   */
+  async _uploadDirect(filePath, uploadConfig, onProgress) {
+    const { presignedUrl, downloadUrl, headers = {} } = uploadConfig;
+
+    const fileBuffer = fs.readFileSync(filePath);
+
+    this.log?.info(`[UploadService] 直传上传: ${presignedUrl}`);
+
+    await axios.put(presignedUrl, fileBuffer, {
+      headers: {
+        'Content-Type': 'application/octet-stream',
+        ...headers,
+      },
+      timeout: 120000,
+      onUploadProgress: (progressEvent) => {
+        if (progressEvent.total) {
+          const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+          onProgress?.(progress);
+        }
+      },
+    });
+
+    return {
+      url: downloadUrl,
+      filename: uploadConfig.fileName,
+    };
+  }
+}
+
+module.exports = { UploadService };

package/service/rongcloud/message-handler.js

@@ -3,6 +3,7 @@ const { OpenClawClient } = require('./openclaw-client');
 const { handleNormalMessage } = require('../modules/normal-message-handler');
 const { RongCloudServerAPI } = require('./rongcloud-server-api');
 const { SystemConfigManager } = require('../modules/system-config');
+const { UploadService } = require('../modules/upload-service');
 const axios = require('axios');
 const MENTION_REGEX = /@(claw_[a-zA-Z0-9]+)/g;
 
@@ -18,6 +19,9 @@ class MessageHandler {
     // 初始化融云服务端 API 客户端（直接调用融云 API，无需通过服务端代理）
     this.serverAPI = new RongCloudServerAPI(this.configManager, log);
     this.log?.info('[MessageHandler] 融云服务端 API 客户端已初始化（配置从服务端动态获取）');
+    // 初始化文件上传服务
+    this.uploadService = new UploadService(config, log);
+    this.log?.info('[MessageHandler] 文件上传服务已初始化');
     this.nodeId = config.accountId || '';
     this.handleNormalMessage = handleNormalMessage;
     this._streamQueue = Promise.resolve();
@@ -507,33 +511,74 @@ class MessageHandler {
 
     // 图片消息
     if (msgType === 'RC:ImgMsg') {
-      const imageUri = content?.imageUri || content?.imageUrl || content?.url || '';
+      // content 可能是对象（包含 imageUri）或字符串（base64 缩略图）
+      let imageUri = '';
+      
+      if (typeof content === 'string') {
+        // content 是 base64 缩略图，需要查找其他字段获取 URL
+        imageUri = msg.imageUri || msg.imageUrl || msg.url || msg.localPath || '';
+      } else if (typeof content === 'object' && content !== null) {
+        // content 是对象，包含 imageUri
+        imageUri = content.imageUri || content.imageUrl || content.url || '';
+      }
+      
       this.log?.info(`[_extractMessageContent] 图片消息: imageUri=${imageUri}`);
+      
+      if (!imageUri) {
+        return '[图片]（无法获取图片地址）';
+      }
+      
       return `[图片] ${imageUri}`;
     }
 
     // 视频消息
     if (msgType === 'RC:SightMsg') {
-      const sightUrl = content?.sightUrl || content?.url || '';
-      const name = content?.name || '未知视频';
-      const duration = content?.duration || 0;
+      let sightUrl = '';
+      let name = '未知视频';
+      let duration = 0;
+      
+      if (typeof content === 'object' && content !== null) {
+        sightUrl = content.sightUrl || content.url || '';
+        name = content.name || '未知视频';
+        duration = content.duration || 0;
+      } else {
+        sightUrl = msg.sightUrl || msg.url || msg.localPath || '';
+      }
+      
       this.log?.info(`[_extractMessageContent] 视频消息: sightUrl=${sightUrl}`);
       return `[视频] ${sightUrl} ${name} ${duration}秒`;
     }
 
     // 文件消息
     if (msgType === 'RC:FileMsg') {
-      const fileUrl = content?.fileUrl || content?.fileUri || content?.url || '';
-      const name = content?.name || '未知文件';
-      const size = content?.size || 0;
+      let fileUrl = '';
+      let name = '未知文件';
+      let size = 0;
+      
+      if (typeof content === 'object' && content !== null) {
+        fileUrl = content.fileUrl || content.fileUri || content.url || '';
+        name = content.name || '未知文件';
+        size = content.size || 0;
+      } else {
+        fileUrl = msg.fileUrl || msg.fileUri || msg.url || msg.localPath || '';
+      }
+      
       this.log?.info(`[_extractMessageContent] 文件消息: fileUrl=${fileUrl}`);
       return `[文件] ${fileUrl} ${name} ${size}`;
     }
 
     // 语音消息
     if (msgType === 'RC:HQVCMsg') {
-      const remoteUrl = content?.remoteUrl || content?.url || '';
-      const duration = content?.duration || 0;
+      let remoteUrl = '';
+      let duration = 0;
+      
+      if (typeof content === 'object' && content !== null) {
+        remoteUrl = content.remoteUrl || content.url || '';
+        duration = content.duration || 0;
+      } else {
+        remoteUrl = msg.remoteUrl || msg.url || msg.localPath || '';
+      }
+      
       this.log?.info(`[_extractMessageContent] 语音消息: remoteUrl=${remoteUrl}`);
       return `[语音] ${remoteUrl} ${duration}秒`;
     }
@@ -552,6 +597,21 @@ class MessageHandler {
       senderId
     };
   }
+
+  /**
+   * 上传文件（由 silent-service 代理上传）
+   * 
+   * @param {Object} options
+   * @param {string} options.filePath - 本地文件路径
+   * @param {string} options.fileType - 文件类型 (image, video, audio, file)
+   * @param {string} options.fileName - 原始文件名
+   * @param {number} options.fileSize - 文件大小
+   * @param {Function} options.onProgress - 进度回调
+   * @returns {Promise<{url: string, filename: string}>}
+   */
+  async uploadFile(options) {
+    return this.uploadService.uploadFile(options);
+  }
 }
 
 module.exports = { MessageHandler };