adp-openclaw 0.0.42 → 0.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adp-openclaw",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "ADP-OpenClaw demo channel plugin (Go WebSocket backend)",
   "type": "module",
   "dependencies": {

package/src/adp-upload-tool.ts

@@ -66,42 +66,65 @@ const REQUEST_TIMEOUT_MS = 30000;
 
 // ==================== 工具函数 ====================
 
+/** 扩展名到 MIME 类型的映射 */
+const EXT_TO_MIME_MAP: Record<string, string> = {
+  ".txt": "text/plain",
+  ".md": "text/markdown",
+  ".json": "application/json",
+  ".html": "text/html",
+  ".css": "text/css",
+  ".js": "text/javascript",
+  ".ts": "text/x.typescript",
+  ".xml": "application/xml",
+  ".yaml": "application/yaml",
+  ".yml": "application/yaml",
+  ".pdf": "application/pdf",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".svg": "image/svg+xml",
+  ".csv": "text/csv",
+  ".zip": "application/zip",
+  ".doc": "application/msword",
+  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".xls": "application/vnd.ms-excel",
+  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".ppt": "application/vnd.ms-powerpoint",
+  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".mp3": "audio/mpeg",
+  ".mp4": "video/mp4",
+  ".wav": "audio/wav",
+};
+
+/** MIME 类型到扩展名的映射（反向映射） */
+const MIME_TO_EXT_MAP: Record<string, string> = Object.fromEntries(
+  Object.entries(EXT_TO_MIME_MAP).map(([ext, mime]) => [mime, ext.slice(1)]) // 去掉 "." 前缀
+);
+
 /**
  * 根据文件扩展名推断 MIME 类型
- */
+*/
 function inferMimeType(fileName: string): string {
   const ext = extname(fileName).toLowerCase();
-  const mimeMap: Record<string, string> = {
-    ".txt": "text/plain",
-    ".md": "text/markdown",
-    ".json": "application/json",
-    ".html": "text/html",
-    ".css": "text/css",
-    ".js": "text/javascript",
-    ".ts": "text/x.typescript",
-    ".xml": "application/xml",
-    ".yaml": "application/yaml",
-    ".yml": "application/yaml",
-    ".pdf": "application/pdf",
-    ".png": "image/png",
-    ".jpg": "image/jpeg",
-    ".jpeg": "image/jpeg",
-    ".gif": "image/gif",
-    ".webp": "image/webp",
-    ".svg": "image/svg+xml",
-    ".csv": "text/csv",
-    ".zip": "application/zip",
-    ".doc": "application/msword",
-    ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    ".xls": "application/vnd.ms-excel",
-    ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-    ".ppt": "application/vnd.ms-powerpoint",
-    ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-    ".mp3": "audio/mpeg",
-    ".mp4": "video/mp4",
-    ".wav": "audio/wav",
-  };
-  return mimeMap[ext] || "application/octet-stream";
+  return EXT_TO_MIME_MAP[ext] || "application/octet-stream";
+}
+
+/**
+ * 把 MIME 类型或扩展名转换为纯扩展名（不带点）
+ * 服务端 API 期望的是文件扩展名，而不是 MIME 类型
+ */
+function toFileExtension(fileTypeOrMime: string): string {
+  if (!fileTypeOrMime) return "";
+  
+  // 如果已经是扩展名格式（不包含 /），直接返回（去掉可能的前导点）
+  if (!fileTypeOrMime.includes("/")) {
+    return fileTypeOrMime.replace(/^\./, "");
+  }
+  
+  // 如果是 MIME 类型，转换为扩展名
+  return MIME_TO_EXT_MAP[fileTypeOrMime] || fileTypeOrMime;
 }
 
 /**
@@ -163,13 +186,16 @@ export async function getStorageCredential(
   token: string,
   fileType?: string
 ): Promise<DescribeRemoteBotStorageCredentialRsp> {
+  // 把 MIME 类型转换为文件扩展名，服务端 API 期望的是扩展名
+  const fileExtension = toFileExtension(fileType || "");
+  
   const requestBody: DescribeRemoteBotStorageCredentialReq = {
     token,
-    file_type: fileType || "",
+    file_type: fileExtension,
   };
 
   console.log(`[ADP-UPLOAD] Calling credential API: ${CREDENTIAL_API_URL}`);
-  console.log(`[ADP-UPLOAD] Request body: token=${token.substring(0, 10)}..., file_type=${fileType || ""}`);
+  console.log(`[ADP-UPLOAD] Request body: token=${token.substring(0, 10)}..., file_type=${fileExtension} (original: ${fileType || ""})`);
 
   const response = await fetchWithTimeout(
     CREDENTIAL_API_URL,
@@ -229,12 +255,14 @@ export async function uploadFileToCos(
   // 2. 读取文件内容
   const fileContent = await readFile(filePath);
 
-  // 3. 解码预签名的上传URL和下载URL
-  const uploadUrl = decodeURIComponent(credential.upload_url);
-  const fileUrl = decodeURIComponent(credential.file_url);
+  // 3. 获取预签名的上传URL和下载URL
+  // 注意：不要用 decodeURIComponent 解码整个 URL，会破坏签名参数
+  // JSON 解析已经处理了 \u0026 -> & 的转换
+  const uploadUrl = credential.upload_url;
+  const fileUrl = credential.file_url;
   
   console.log(`[ADP-UPLOAD] upload_url: ${uploadUrl.substring(0, 100)}...`);
-  console.log(`[ADP-UPLOAD] file_url (download): ${fileUrl.substring(0, 100)}...`);
+  console.log(`[ADP-UPLOAD] file_url (download): ${fileUrl}...`);
 
   // 4. 执行上传（直接PUT到预签名URL，不需要额外签名）
   const response = await fetchWithTimeout(
@@ -255,7 +283,7 @@ export async function uploadFileToCos(
     throw new Error(`上传文件失败: ${response.status} ${errorText}`);
   }
 
-  console.log(`[ADP-UPLOAD] Upload success, returning file_url: ${fileUrl.substring(0, 100)}...`);
+  console.log(`[ADP-UPLOAD] Upload success, returning file_url: ${fileUrl}...`);
 
   // 5. 返回下载URL
   return fileUrl;