@baishuyun/chat-sdk 0.1.6 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@baishuyun/chat-sdk",
3
- "version": "0.1.6",
3
+ "version": "0.1.7",
4
4
  "description": "",
5
5
  "main": "src/index.jsx",
6
6
  "module": "dist/chat-sdk.js",
@@ -51,8 +51,8 @@
51
51
  "tailwindcss": "^4.1.17",
52
52
  "vite": "^5.1.4",
53
53
  "vite-plugin-dts": "^4.5.4",
54
- "@baishuyun/types": "1.1.0",
55
- "@baishuyun/typescript-config": "0.1.0"
54
+ "@baishuyun/typescript-config": "0.1.0",
55
+ "@baishuyun/types": "1.1.0"
56
56
  },
57
57
  "exports": {
58
58
  ".": {
package/src/lib/utils.ts CHANGED
@@ -419,17 +419,87 @@ export const formatJSONIfValid = (str: string): string | null => {
419
419
  }
420
420
  };
421
421
 
422
+ const MIME_MAP: Record<string, string> = {
423
+ // 文档
424
+ xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
425
+ xls: 'application/vnd.ms-excel',
426
+ docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
427
+ pdf: 'application/pdf',
428
+ txt: 'text/plain',
429
+ // 图片
430
+ png: 'image/png',
431
+ jpg: 'image/jpeg',
432
+ jpeg: 'image/jpeg',
433
+ gif: 'image/gif',
434
+ webp: 'image/webp',
435
+ svg: 'image/svg+xml',
436
+ // 音视频
437
+ mp4: 'video/mp4',
438
+ mp3: 'audio/mpeg',
439
+ // 压缩包
440
+ zip: 'application/zip',
441
+ rar: 'application/x-rar-compressed',
442
+ '7z': 'application/x-7z-compressed',
443
+ // 代码/数据
444
+ json: 'application/json',
445
+ js: 'application/javascript',
446
+ ts: 'application/typescript',
447
+ csv: 'text/csv',
448
+ xml: 'application/xml',
449
+ // 默认回退
450
+ default: 'application/octet-stream',
451
+ };
452
+
453
+ const getMimeType = (filename: string, serverType: string | null): string => {
454
+ // 如果服务器给了具体类型(不是 octet-stream),就信任它
455
+ if (serverType && serverType !== 'application/octet-stream') {
456
+ return serverType;
457
+ }
458
+
459
+ // 否则从扩展名推断
460
+ const ext = filename.split('.').pop()?.toLowerCase() || '';
461
+ return MIME_MAP[ext] || MIME_MAP.default;
462
+ };
463
+
422
464
  /**
423
465
  * 从 URL 下载文件,返回 File 对象
424
466
  */
425
467
  export const downloadFile = async (url: string): Promise<File> => {
426
- const response = await fetch(url);
468
+ const response = await fetch(url, {
469
+ credentials: 'include', // 必须携带,因为 Allow-Credentials: true
470
+ mode: 'cors',
471
+ });
472
+
427
473
  if (!response.ok) {
428
- throw new Error(`Failed to download file from ${url}: ${response.status}`);
474
+ throw new Error(`Failed to download: ${response.status}`);
429
475
  }
476
+
430
477
  const blob = await response.blob();
431
- const contentType = response.headers.get('content-type') || 'application/octet-stream';
432
- const filename = new URL(url).pathname.split('/').pop() || 'attachment';
478
+
479
+ // 1. Content-Disposition 解析文件名(优先)
480
+ const disposition = response.headers.get('content-disposition');
481
+ let filename = 'attachment';
482
+
483
+ if (disposition) {
484
+ // 尝试 filename*=UTF-8'' 格式(RFC 5987)
485
+ const utf8Match = disposition.match(/filename\*=UTF-8''([^;]+)/i);
486
+ // 尝试 filename="..." 或 filename=... 格式(需要解码 MinIO 的 URL 编码)
487
+ const asciiMatch = disposition.match(/filename=["']?([^"';]+)["']?/i);
488
+
489
+ if (utf8Match) {
490
+ filename = decodeURIComponent(utf8Match[1]);
491
+ } else if (asciiMatch) {
492
+ // MinIO 特殊处理:filename 可能是 URL 编码的
493
+ filename = decodeURIComponent(asciiMatch[1]);
494
+ }
495
+ }
496
+
497
+ // 2. 修正 MIME 类型(如果服务器返回的是 octet-stream)
498
+ let contentType = response.headers.get('content-type') || 'application/octet-stream';
499
+ if (contentType === 'application/octet-stream') {
500
+ contentType = getMimeType(filename, contentType);
501
+ }
502
+
433
503
  return new File([blob], filename, { type: contentType });
434
504
  };
435
505
 
@@ -468,12 +538,18 @@ export const urls2fileParts = async (attachmentsUrl: string[], uploadEndpoint: s
468
538
  return [];
469
539
  }
470
540
 
471
- const results = await Promise.all(
472
- attachmentsUrl.map(async (url) => {
473
- const file = await downloadFile(url);
474
- return uploadFile(file, uploadEndpoint);
475
- })
476
- );
541
+ let results: (Attachment | undefined)[];
542
+ try {
543
+ results = await Promise.all(
544
+ attachmentsUrl.map(async (url) => {
545
+ const file = await downloadFile(url);
546
+ return uploadFile(file, uploadEndpoint);
547
+ })
548
+ );
549
+ } catch (error) {
550
+ console.error('Error processing attachments:', error);
551
+ return [];
552
+ }
477
553
 
478
554
  return results
479
555
  .filter((attachment): attachment is Attachment => attachment !== undefined)
package/src/sdk.impl.tsx CHANGED
@@ -133,16 +133,19 @@ export class ChatSDK implements IChatSDK {
133
133
  let fileParts: ChatMessage['parts'] = await urls2fileParts(attachmentsUrl || [], uploadEndpoint);
134
134
  this.Store.getState().clearGlobalFakeLoadingMessage();
135
135
 
136
+ const textParts = text.trim() ? [{ type: 'text' as const, text }] : [];
137
+
136
138
  const msg = fileParts.length > 0
137
139
  ? {
138
140
  role: 'user',
139
141
  parts: [
140
142
  ...fileParts,
141
- { type: 'text' as const, text },
143
+ ...textParts,
142
144
  ],
143
145
  } as ChatMessage
144
146
  : { text };
145
147
 
148
+
146
149
  this._sendMessage?.(
147
150
  msg,
148
151
  {