@lobehub/chat 1.85.7 → 1.85.8

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.85.8](https://github.com/lobehub/lobe-chat/compare/v1.85.7...v1.85.8)
+
+<sup>Released on **2025-05-11**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix config import issue in the desktop version.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix config import issue in the desktop version, closes [#7800](https://github.com/lobehub/lobe-chat/issues/7800) ([2cb8635](https://github.com/lobehub/lobe-chat/commit/2cb8635))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.85.7](https://github.com/lobehub/lobe-chat/compare/v1.85.6...v1.85.7)
 
 <sup>Released on **2025-05-11**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix config import issue in the desktop version."
+      ]
+    },
+    "date": "2025-05-11",
+    "version": "1.85.8"
+  },
   {
     "children": {
       "fixes": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.85.7",
+  "version": "1.85.8",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/packages/file-loaders/package.json

@@ -26,6 +26,7 @@
   "dependencies": {
     "@langchain/community": "^0.3.41",
     "@langchain/core": "^0.3.45",
+    "@napi-rs/canvas": "^0.1.70",
     "@xmldom/xmldom": "^0.9.8",
     "concat-stream": "^2.0.0",
     "mammoth": "^1.8.0",
@@ -37,7 +38,6 @@
   "devDependencies": {
     "@types/concat-stream": "^2.0.3",
     "@types/yauzl": "^2.10.3",
-    "canvas": "^3.1.0",
     "typescript": "^5"
   },
   "peerDependencies": {

package/packages/file-loaders/test/setup.ts

@@ -1,5 +1,5 @@
 // Polyfill DOMMatrix for pdfjs-dist in Node.js environment
-import { DOMMatrix } from 'canvas';
+import { DOMMatrix } from '@napi-rs/canvas';
 
 if (typeof global.DOMMatrix === 'undefined') {
   // @ts-ignore

package/src/features/DataImporter/index.tsx

@@ -64,7 +64,6 @@ const DataImporter = memo<DataImporterProps>(({ children, onFinishImport }) => {
 
     const { type, ...res } = importResults;
 
-    console.log(res);
     if (type === 'settings') return;
 
     return Object.entries(res)

package/src/server/routers/lambda/__tests__/importer.test.ts

@@ -8,6 +8,7 @@ import { ImportResultData } from '@/types/importer';
 import { importerRouter } from '../importer';
 
 const mockGetFileContent = vi.fn();
+const mockDeleteFile = vi.fn();
 const mockImportData = vi.fn();
 const mockImportPgData = vi.fn();
 
@@ -21,6 +22,7 @@ vi.mock('@/database/repositories/dataImporter', () => ({
 vi.mock('@/server/services/file', () => ({
   FileService: vi.fn().mockImplementation(() => ({
     getFileContent: mockGetFileContent,
+    deleteFile: mockDeleteFile,
   })),
 }));
 
@@ -74,6 +76,7 @@ describe('importerRouter', () => {
       expect(result).toEqual(mockImportResult);
       expect(mockGetFileContent).toHaveBeenCalledWith('test.json');
       expect(mockImportData).toHaveBeenCalledWith(JSON.parse(mockFileContent));
+      expect(mockDeleteFile).toHaveBeenCalledWith('test.json');
     });
 
     it('should handle PG data import', async () => {

package/src/server/routers/lambda/importer.ts

@@ -39,11 +39,19 @@ export const importerRouter = router({
         });
       }
 
+      let result: ImportResultData;
       if ('schemaHash' in data) {
-        return ctx.dataImporterService.importPgData(data as unknown as ImportPgDataStructure);
+        result = await ctx.dataImporterService.importPgData(
+          data as unknown as ImportPgDataStructure,
+        );
+      } else {
+        result = await ctx.dataImporterService.importData(data);
       }
 
-      return ctx.dataImporterService.importData(data);
+      // clean file after upload
+      await ctx.fileService.deleteFile(input.pathname);
+
+      return result;
     }),
 
   importByPost: importProcedure

package/src/services/__tests__/upload.test.ts

@@ -69,7 +69,7 @@ describe('UploadService', () => {
         }
       });
 
-      const result = await uploadService.uploadWithProgress(mockFile, { onProgress });
+      const result = await uploadService.uploadToServerS3(mockFile, { onProgress });
 
       expect(result).toEqual({
         date: '1',
@@ -91,9 +91,7 @@ describe('UploadService', () => {
         }
       });
 
-      await expect(uploadService.uploadWithProgress(mockFile, {})).rejects.toBe(
-        UPLOAD_NETWORK_ERROR,
-      );
+      await expect(uploadService.uploadToServerS3(mockFile, {})).rejects.toBe(UPLOAD_NETWORK_ERROR);
     });
 
     it('should handle upload error', async () => {
@@ -109,7 +107,7 @@ describe('UploadService', () => {
         }
       });
 
-      await expect(uploadService.uploadWithProgress(mockFile, {})).rejects.toBe('Bad Request');
+      await expect(uploadService.uploadToServerS3(mockFile, {})).rejects.toBe('Bad Request');
     });
   });
 
@@ -125,7 +123,7 @@ describe('UploadService', () => {
 
       (clientS3Storage.putObject as any).mockResolvedValue(undefined);
 
-      const result = await uploadService.uploadToClientS3(hash, mockFile);
+      const result = await uploadService['uploadToClientS3'](hash, mockFile);
 
       expect(clientS3Storage.putObject).toHaveBeenCalledWith(hash, mockFile);
       expect(result).toEqual(expectedResult);

package/src/services/import/server.ts

@@ -1,6 +1,7 @@
 import { DefaultErrorShape } from '@trpc/server/unstable-core-do-not-import';
 
-import { edgeClient, lambdaClient } from '@/libs/trpc/client';
+import { lambdaClient } from '@/libs/trpc/client';
+import { uploadService } from '@/services/upload';
 import { useUserStore } from '@/store/user';
 import { ImportPgDataStructure } from '@/types/export';
 import { ImportStage, OnImportCallbacks } from '@/types/importer';
@@ -48,30 +49,7 @@ export class ServerService implements IImportService {
       return;
     }
 
-    // if the data is too large, upload it to S3 and upload by file
-    const filename = `${uuid()}.json`;
-
-    const pathname = `import_config/${filename}`;
-
-    const url = await edgeClient.upload.createS3PreSignedUrl.mutate({ pathname });
-
-    try {
-      callbacks?.onStageChange?.(ImportStage.Uploading);
-      await this.uploadWithProgress(url, data, callbacks?.onFileUploading);
-    } catch {
-      throw new Error('Upload Error');
-    }
-
-    callbacks?.onStageChange?.(ImportStage.Importing);
-    const time = Date.now();
-    try {
-      const result = await lambdaClient.importer.importByFile.mutate({ pathname });
-      const duration = Date.now() - time;
-      callbacks?.onStageChange?.(ImportStage.Success);
-      callbacks?.onSuccess?.(result.results, duration);
-    } catch (e) {
-      handleError(e);
-    }
+    await this.uploadData(data, { callbacks, handleError });
   };
 
   importPgData: IImportService['importPgData'] = async (
@@ -115,16 +93,28 @@ export class ServerService implements IImportService {
       return;
     }
 
+    await this.uploadData(data, { callbacks, handleError });
+  };
+
+  private uploadData = async (
+    data: object,
+    { callbacks, handleError }: { callbacks?: OnImportCallbacks; handleError: (e: unknown) => any },
+  ) => {
     // if the data is too large, upload it to S3 and upload by file
     const filename = `${uuid()}.json`;
 
-    const pathname = `import_config/${filename}`;
-
-    const url = await edgeClient.upload.createS3PreSignedUrl.mutate({ pathname });
-
+    let pathname;
     try {
       callbacks?.onStageChange?.(ImportStage.Uploading);
-      await this.uploadWithProgress(url, data, callbacks?.onFileUploading);
+      const result = await uploadService.uploadDataToS3(data, {
+        filename,
+        onProgress: (status, state) => {
+          callbacks?.onFileUploading?.(state);
+        },
+        pathname: `import_config/${filename}`,
+      });
+      pathname = result.data.path;
+      console.log(pathname);
     } catch {
       throw new Error('Upload Error');
     }
@@ -140,45 +130,4 @@ export class ServerService implements IImportService {
       handleError(e);
     }
   };
-
-  private uploadWithProgress = async (
-    url: string,
-    data: object,
-    onProgress: OnImportCallbacks['onFileUploading'],
-  ) => {
-    const xhr = new XMLHttpRequest();
-
-    let startTime = Date.now();
-    xhr.upload.addEventListener('progress', (event) => {
-      if (event.lengthComputable) {
-        const progress = Number(((event.loaded / event.total) * 100).toFixed(1));
-
-        const speedInByte = event.loaded / ((Date.now() - startTime) / 1000);
-
-        onProgress?.({
-          // if the progress is 100, it means the file is uploaded
-          // but the server is still processing it
-          // so make it as 99.5 and let users think it's still uploading
-          progress: progress === 100 ? 99.5 : progress,
-          restTime: (event.total - event.loaded) / speedInByte,
-          speed: speedInByte / 1024,
-        });
-      }
-    });
-
-    xhr.open('PUT', url);
-    xhr.setRequestHeader('Content-Type', 'application/json');
-
-    return new Promise((resolve, reject) => {
-      xhr.addEventListener('load', () => {
-        if (xhr.status >= 200 && xhr.status < 300) {
-          resolve(xhr.response);
-        } else {
-          reject(xhr.statusText);
-        }
-      });
-      xhr.addEventListener('error', () => reject(xhr.statusText));
-      xhr.send(JSON.stringify(data));
-    });
-  };
 }

package/src/services/ragEval.ts

@@ -40,7 +40,7 @@ class RAGEvalService {
   };
 
   importDatasetRecords = async (datasetId: number, file: File): Promise<void> => {
-    const { path } = await uploadService.uploadWithProgress(file, { directory: 'ragEval' });
+    const { path } = await uploadService.uploadToServerS3(file, { directory: 'ragEval' });
 
     await lambdaClient.ragEval.importDatasetRecords.mutate({ datasetId, pathname: path });
   };

package/src/services/upload.ts

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { sha256 } from 'js-sha256';
 
 import { fileEnv } from '@/config/file';
-import { isServerMode } from '@/const/version';
+import { isDesktop, isServerMode } from '@/const/version';
 import { parseDataUri } from '@/libs/agent-runtime/utils/uriParser';
 import { edgeClient } from '@/libs/trpc/client';
 import { API_ENDPOINTS } from '@/services/_url';
@@ -16,7 +16,10 @@ export const UPLOAD_NETWORK_ERROR = 'NetWorkError';
 interface UploadFileToS3Options {
   directory?: string;
   filename?: string;
+  onNotSupported?: () => void;
   onProgress?: (status: FileUploadStatus, state: FileUploadState) => void;
+  pathname?: string;
+  skipCheckFileType?: boolean;
 }
 
 class UploadService {
@@ -25,20 +28,43 @@ class UploadService {
    */
   uploadFileToS3 = async (
     file: File,
-    options: UploadFileToS3Options = {},
-  ): Promise<FileMetadata> => {
-    const { directory, onProgress } = options;
+    { onProgress, directory, skipCheckFileType, onNotSupported, pathname }: UploadFileToS3Options,
+  ): Promise<{ data: FileMetadata; success: boolean }> => {
+    const { getElectronStoreState } = await import('@/store/electron');
+    const { electronSyncSelectors } = await import('@/store/electron/selectors');
+    // only if not enable sync
+    const state = getElectronStoreState();
+    const isSyncActive = electronSyncSelectors.isSyncActive(state);
+
+    // 桌面端上传逻辑（并且没开启 sync 同步）
+    if (isDesktop && !isSyncActive) {
+      const data = await this.uploadToDesktopS3(file);
+      return { data, success: true };
+    }
 
+    // 服务端上传逻辑
     if (isServerMode) {
-      return this.uploadWithProgress(file, { directory, onProgress });
-    } else {
-      const fileArrayBuffer = await file.arrayBuffer();
+      // if is server mode, upload to server s3,
 
-      // 1. check file hash
-      const hash = sha256(fileArrayBuffer);
+      const data = await this.uploadToServerS3(file, { directory, onProgress, pathname });
+      return { data, success: true };
+    }
 
-      return this.uploadToClientS3(hash, file);
+    // upload to client s3
+    // 客户端上传逻辑
+    if (!skipCheckFileType && !file.type.startsWith('image')) {
+      onNotSupported?.();
+      return { data: undefined as unknown as FileMetadata, success: false };
     }
+
+    const fileArrayBuffer = await file.arrayBuffer();
+
+    // 1. check file hash
+    const hash = sha256(fileArrayBuffer);
+    // Upload to the indexeddb in the browser
+    const data = await this.uploadToClientS3(hash, file);
+
+    return { data, success: true };
   };
 
   uploadBase64ToS3 = async (
@@ -79,7 +105,7 @@ class UploadService {
     const file = new File([blob], fileName, { type: mimeType });
 
     // 使用统一的上传方法
-    const metadata = await this.uploadFileToS3(file, options);
+    const { data: metadata } = await this.uploadFileToS3(file, options);
     const hash = sha256(await file.arrayBuffer());
 
     return {
@@ -90,19 +116,27 @@ class UploadService {
     };
   };
 
-  uploadWithProgress = async (
+  uploadDataToS3 = async (data: object, options: UploadFileToS3Options = {}) => {
+    const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
+    const file = new File([blob], options.filename || 'data.json', { type: 'application/json' });
+    return await this.uploadFileToS3(file, options);
+  };
+
+  uploadToServerS3 = async (
     file: File,
     {
       onProgress,
       directory,
+      pathname,
     }: {
       directory?: string;
       onProgress?: (status: FileUploadStatus, state: FileUploadState) => void;
+      pathname?: string;
     },
   ): Promise<FileMetadata> => {
     const xhr = new XMLHttpRequest();
 
-    const { preSignUrl, ...result } = await this.getSignedUploadUrl(file, directory);
+    const { preSignUrl, ...result } = await this.getSignedUploadUrl(file, { directory, pathname });
     let startTime = Date.now();
     xhr.upload.addEventListener('progress', (event) => {
       if (event.lengthComputable) {
@@ -148,7 +182,7 @@ class UploadService {
     return result;
   };
 
-  uploadToDesktop = async (file: File) => {
+  private uploadToDesktopS3 = async (file: File) => {
     const fileArrayBuffer = await file.arrayBuffer();
     const hash = sha256(fileArrayBuffer);
 
@@ -157,7 +191,7 @@ class UploadService {
     return metadata;
   };
 
-  uploadToClientS3 = async (hash: string, file: File): Promise<FileMetadata> => {
+  private uploadToClientS3 = async (hash: string, file: File): Promise<FileMetadata> => {
     await clientS3Storage.putObject(hash, file);
 
     return {
@@ -183,7 +217,7 @@ class UploadService {
 
   private getSignedUploadUrl = async (
     file: File,
-    directory?: string,
+    options: { directory?: string; pathname?: string } = {},
   ): Promise<
     FileMetadata & {
       preSignUrl: string;
@@ -193,8 +227,8 @@ class UploadService {
 
     // 精确到以 h 为单位的 path
     const date = (Date.now() / 1000 / 60 / 60).toFixed(0);
-    const dirname = `${directory || fileEnv.NEXT_PUBLIC_S3_FILE_PATH}/${date}`;
-    const pathname = `${dirname}/${filename}`;
+    const dirname = `${options.directory || fileEnv.NEXT_PUBLIC_S3_FILE_PATH}/${date}`;
+    const pathname = options.pathname ?? `${dirname}/${filename}`;
 
     const preSignUrl = await edgeClient.upload.createS3PreSignedUrl.mutate({ pathname });
 

package/src/store/chat/slices/builtinTool/actions/dalle.test.ts

@@ -41,6 +41,7 @@ describe('chatToolSlice - dalle', () => {
       vi.spyOn(uploadService, 'getImageFileByUrlWithCORS').mockResolvedValue(
         new File(['1'], 'file.png', { type: 'image/png' }),
       );
+      // @ts-ignore
       vi.spyOn(uploadService, 'uploadToClientS3').mockResolvedValue({} as any);
       vi.spyOn(ClientService.prototype, 'createFile').mockResolvedValue({
         id: mockId,
@@ -56,6 +57,7 @@ describe('chatToolSlice - dalle', () => {
       });
       // For each prompt, loading is toggled on and then off
       expect(imageGenerationService.generateImage).toHaveBeenCalledTimes(prompts.length);
+      // @ts-ignore
       expect(uploadService.uploadToClientS3).toHaveBeenCalledTimes(prompts.length);
       expect(result.current.toggleDallEImageLoading).toHaveBeenCalledTimes(prompts.length * 2);
     });

package/src/store/file/slices/upload/action.ts

@@ -4,11 +4,8 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { message } from '@/components/AntdStaticMethods';
 import { LOBE_CHAT_CLOUD } from '@/const/branding';
-import { isDesktop, isServerMode } from '@/const/version';
 import { fileService } from '@/services/file';
 import { uploadService } from '@/services/upload';
-import { getElectronStoreState } from '@/store/electron';
-import { electronSyncSelectors } from '@/store/electron/selectors';
 import { FileMetadata, UploadFileItem } from '@/types/files';
 
 import { FileStore } from '../../store';
@@ -96,25 +93,8 @@ export const createFileUploadSlice: StateCreator<
     }
     // 2. if file don't exist, need upload files
     else {
-      // only if not enable sync
-      const state = getElectronStoreState();
-      const isSyncActive = electronSyncSelectors.isSyncActive(state);
-
-      if (isDesktop && !isSyncActive) {
-        metadata = await uploadService.uploadToDesktop(file);
-      } else if (isServerMode) {
-        // if is server mode, upload to server s3, or upload to client s3
-        metadata = await uploadService.uploadWithProgress(file, {
-          onProgress: (status, upload) => {
-            onStatusUpdate?.({
-              id: file.name,
-              type: 'updateFile',
-              value: { status: status === 'success' ? 'processing' : status, uploadState: upload },
-            });
-          },
-        });
-      } else {
-        if (!skipCheckFileType && !file.type.startsWith('image')) {
+      const { data, success } = await uploadService.uploadFileToS3(file, {
+        onNotSupported: () => {
           onStatusUpdate?.({ id: file.name, type: 'removeFile' });
           message.info({
             content: t('upload.fileOnlySupportInServerMode', {
@@ -124,12 +104,19 @@ export const createFileUploadSlice: StateCreator<
             }),
             duration: 5,
           });
-          return;
-        }
+        },
+        onProgress: (status, upload) => {
+          onStatusUpdate?.({
+            id: file.name,
+            type: 'updateFile',
+            value: { status: status === 'success' ? 'processing' : status, uploadState: upload },
+          });
+        },
+        skipCheckFileType,
+      });
+      if (!success) return;
 
-        // Upload to the indexeddb in the browser
-        metadata = await uploadService.uploadToClientS3(hash, file);
-      }
+      metadata = data;
     }
 
     // 3. use more powerful file type detector to get file type