@baishuyun/chat-sdk 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/chat-sdk",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "",
   "main": "src/index.jsx",
   "module": "dist/chat-sdk.js",

package/src/lib/utils.ts

@@ -419,17 +419,87 @@ export const formatJSONIfValid = (str: string): string | null => {
   }
 };
 
+const MIME_MAP: Record<string, string> = {
+  // 文档
+  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  xls: 'application/vnd.ms-excel',
+  docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  pdf: 'application/pdf',
+  txt: 'text/plain',
+  // 图片
+  png: 'image/png',
+  jpg: 'image/jpeg',
+  jpeg: 'image/jpeg',
+  gif: 'image/gif',
+  webp: 'image/webp',
+  svg: 'image/svg+xml',
+  // 音视频
+  mp4: 'video/mp4',
+  mp3: 'audio/mpeg',
+  // 压缩包
+  zip: 'application/zip',
+  rar: 'application/x-rar-compressed',
+  '7z': 'application/x-7z-compressed',
+  // 代码/数据
+  json: 'application/json',
+  js: 'application/javascript',
+  ts: 'application/typescript',
+  csv: 'text/csv',
+  xml: 'application/xml',
+  // 默认回退
+  default: 'application/octet-stream',
+};
+
+const getMimeType = (filename: string, serverType: string | null): string => {
+  // 如果服务器给了具体类型（不是 octet-stream），就信任它
+  if (serverType && serverType !== 'application/octet-stream') {
+    return serverType;
+  }
+
+  // 否则从扩展名推断
+  const ext = filename.split('.').pop()?.toLowerCase() || '';
+  return MIME_MAP[ext] || MIME_MAP.default;
+};
+
 /**
  * 从 URL 下载文件，返回 File 对象
  */
 export const downloadFile = async (url: string): Promise<File> => {
-  const response = await fetch(url);
+  const response = await fetch(url, {
+    credentials: 'include', // 必须携带，因为 Allow-Credentials: true
+    mode: 'cors',
+  });
+
   if (!response.ok) {
-    throw new Error(`Failed to download file from ${url}: ${response.status}`);
+    throw new Error(`Failed to download: ${response.status}`);
   }
+
   const blob = await response.blob();
-  const contentType = response.headers.get('content-type') || 'application/octet-stream';
-  const filename = new URL(url).pathname.split('/').pop() || 'attachment';
+
+  // 1. 从 Content-Disposition 解析文件名（优先）
+  const disposition = response.headers.get('content-disposition');
+  let filename = 'attachment';
+
+  if (disposition) {
+    // 尝试 filename*=UTF-8'' 格式（RFC 5987）
+    const utf8Match = disposition.match(/filename\*=UTF-8''([^;]+)/i);
+    // 尝试 filename="..." 或 filename=... 格式（需要解码 MinIO 的 URL 编码）
+    const asciiMatch = disposition.match(/filename=["']?([^"';]+)["']?/i);
+
+    if (utf8Match) {
+      filename = decodeURIComponent(utf8Match[1]);
+    } else if (asciiMatch) {
+      // MinIO 特殊处理：filename 可能是 URL 编码的
+      filename = decodeURIComponent(asciiMatch[1]);
+    }
+  }
+
+  // 2. 修正 MIME 类型（如果服务器返回的是 octet-stream）
+  let contentType = response.headers.get('content-type') || 'application/octet-stream';
+  if (contentType === 'application/octet-stream') {
+    contentType = getMimeType(filename, contentType);
+  }
+
   return new File([blob], filename, { type: contentType });
 };
 
@@ -468,12 +538,18 @@ export const urls2fileParts = async (attachmentsUrl: string[], uploadEndpoint: s
     return [];
   }
 
-  const results = await Promise.all(
-    attachmentsUrl.map(async (url) => {
-      const file = await downloadFile(url);
-      return uploadFile(file, uploadEndpoint);
-    })
-  );
+  let results: (Attachment | undefined)[];
+  try {
+    results = await Promise.all(
+      attachmentsUrl.map(async (url) => {
+        const file = await downloadFile(url);
+        return uploadFile(file, uploadEndpoint);
+      })
+    );
+  } catch (error) {
+    console.error('Error processing attachments:', error);
+    return [];
+  }
 
   return results
     .filter((attachment): attachment is Attachment => attachment !== undefined)

package/src/sdk.impl.tsx

@@ -125,18 +125,27 @@ export class ChatSDK implements IChatSDK {
     const { attachmentsUrl, ...restOptions } = options;
 
     const uploadEndpoint = `${ensureEndSlash(this.options.backendApiEndpoint!)}form/attachment/upload`;
+
+    if (attachmentsUrl && attachmentsUrl.length > 0) {
+      this.Store.getState().setGlobalFakeLoadingMessage("正在处理附件...");
+    }
+
     let fileParts: ChatMessage['parts'] = await urls2fileParts(attachmentsUrl || [], uploadEndpoint);
+    this.Store.getState().clearGlobalFakeLoadingMessage();
+
+    const textParts = text.trim() ? [{ type: 'text' as const, text }] : [];
 
     const msg = fileParts.length > 0
       ? {
           role: 'user',
           parts: [
             ...fileParts,
-            { type: 'text' as const, text },
+            ...textParts,
           ],
         } as ChatMessage
       : { text };
 
+
     this._sendMessage?.(
       msg,
       {