@lobehub/chat 1.85.2 → 1.85.4

package/CHANGELOG.md

@@ -2,6 +2,64 @@
 
 # Changelog
 
+### [Version 1.85.4](https://github.com/lobehub/lobe-chat/compare/v1.85.3...v1.85.4)
+
+<sup>Released on **2025-05-10**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix nothing return when reset the client db.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix nothing return when reset the client db, closes [#7738](https://github.com/lobehub/lobe-chat/issues/7738) ([90efb13](https://github.com/lobehub/lobe-chat/commit/90efb13))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.85.3](https://github.com/lobehub/lobe-chat/compare/v1.85.2...v1.85.3)
+
+<sup>Released on **2025-05-10**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Remove mcp client cache.
+
+#### 💄 Styles
+
+- **misc**: Improve pdf and xlsx file content parser.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Remove mcp client cache, closes [#7776](https://github.com/lobehub/lobe-chat/issues/7776) ([0582134](https://github.com/lobehub/lobe-chat/commit/0582134))
+
+#### Styles
+
+- **misc**: Improve pdf and xlsx file content parser, closes [#7783](https://github.com/lobehub/lobe-chat/issues/7783) ([0376870](https://github.com/lobehub/lobe-chat/commit/0376870))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.85.2](https://github.com/lobehub/lobe-chat/compare/v1.85.1...v1.85.2)
 
 <sup>Released on **2025-05-10**</sup>

package/changelog/v1.json

@@ -1,4 +1,25 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix nothing return when reset the client db."
+      ]
+    },
+    "date": "2025-05-10",
+    "version": "1.85.4"
+  },
+  {
+    "children": {
+      "fixes": [
+        "Remove mcp client cache."
+      ],
+      "improvements": [
+        "Improve pdf and xlsx file content parser."
+      ]
+    },
+    "date": "2025-05-10",
+    "version": "1.85.3"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.85.2",
+  "version": "1.85.4",
   "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/src/loaders/excel/__snapshots__/index.test.ts.snap

@@ -1,8 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`ExcelLoader > should aggregate content correctly (joining sheets) > aggregated_content 1`] = `
-"## Sheet: 表1
-
+"<sheet name="表1" index="0">
 | __EMPTY | 类别 A | 类别 B | __EMPTY_1 | __EMPTY_2 |
 | --- | --- | --- | --- | --- |
 | 项目 1 | 5 | 7 |  |  |
@@ -10,18 +9,17 @@ exports[`ExcelLoader > should aggregate content correctly (joining sheets) > agg
 | 项目 3 | 9 | 15 |  |  |
 | 项目 4 | 7 | 12 |  |  |
 | 项目 5 | 16 | 21 |  |  |
+</sheet>
 
----
-
-## Sheet: 表2 - 表格 2
-
+<sheet name="表2 - 表格 2" index="1">
 | __EMPTY | 类别 A | 类别 B | __EMPTY_1 | __EMPTY_2 |
 | --- | --- | --- | --- | --- |
 | 项目 1 | 5 | 7 |  |  |
 | 项目 2 | 10 | 8 |  |  |
 | 项目 3 | 9 | 15 |  |  |
 | 项目 4 | 7 | 12 |  |  |
-| 项目 5 | 16 | 21 |  |  |"
+| 项目 5 | 16 | 21 |  |  |
+</sheet>"
 `;
 
 exports[`ExcelLoader > should load pages correctly from an Excel file (one page per sheet) 1`] = `

package/packages/file-loaders/src/loaders/excel/index.ts

@@ -3,6 +3,7 @@ import { readFile } from 'node:fs/promises';
 import * as xlsx from 'xlsx';
 
 import type { DocumentPage, FileLoaderInterface } from '../../types';
+import { promptTemplate } from './prompt';
 
 const log = debug('file-loaders:excel');
 
@@ -135,13 +136,7 @@ export class ExcelLoader implements FileLoaderInterface {
    */
   async aggregateContent(pages: DocumentPage[]): Promise<string> {
     log('Aggregating content from', pages.length, 'Excel pages');
-    const result = pages
-      .map((page) => {
-        const sheetName = page.metadata.sheetName;
-        const header = sheetName ? `## Sheet: ${sheetName}\n\n` : '';
-        return header + page.pageContent;
-      })
-      .join('\n\n---\n\n'); // Separator between sheets
+    const result = promptTemplate(pages);
 
     log('Excel content aggregated successfully, length:', result.length);
     return result;

package/packages/file-loaders/src/loaders/excel/prompt.ts

@@ -0,0 +1,18 @@
+import type { DocumentPage } from '../../types';
+
+export const promptTemplate = (pages: DocumentPage[]) => {
+  return (
+    pages
+      .map((page, index) => {
+        const sheetName = page.metadata.sheetName;
+
+        const sheetIndex = page.metadata?.pageNumber || index;
+
+        return `<sheet name="${sheetName}" index="${sheetIndex}">
+${page.pageContent}
+</sheet>`;
+      })
+      // Separator between sheets
+      .join('\n\n')
+  );
+};

package/packages/file-loaders/src/loaders/pdf/__snapshots__/index.test.ts.snap

@@ -1,7 +1,8 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`PdfLoader > should aggregate content correctly 1`] = `
-"简单报告
+"<page pageNumber="1">
+简单报告
 副标题
 轻点或点按此占位符⽂本并开始键⼊即可开始。你可以在 Mac、iPad、iPhone 或
 iCloud.com 上查看和编辑此⽂稿。
@@ -24,10 +25,13 @@ Pages ⽂稿可⽤于⽂字处理和⻚⾯布局。此“简单报告”模板
 ⽂本添加你⾃⼰的内容。”
 ⻚脚 
 1
+</page>
 
+<page pageNumber="2">
 这是第⼆⻚的内容
 ⻚脚 
-2"
+2
+</page>"
 `;
 
 exports[`PdfLoader > should attach document metadata correctly 1`] = `

package/packages/file-loaders/src/loaders/pdf/index.ts

@@ -7,6 +7,7 @@ import * as _pdfjsWorker from 'pdfjs-dist/legacy/build/pdf.worker.mjs';
 import type { TextContent } from 'pdfjs-dist/types/src/display/api';
 
 import type { DocumentPage, FileLoaderInterface } from '../../types';
+import { promptTemplate } from './prompt';
 
 const log = debug('file-loaders:pdf');
 
@@ -132,7 +133,7 @@ export class PdfLoader implements FileLoaderInterface {
       `Found ${validPages.length} valid pages for aggregation (${pages.length - validPages.length} pages with errors filtered out)`,
     );
 
-    const result = validPages.map((page) => page.pageContent).join('\n\n');
+    const result = promptTemplate(validPages);
     log('PDF content aggregated successfully, length:', result.length);
     return result;
   }

package/packages/file-loaders/src/loaders/pdf/prompt.ts

@@ -0,0 +1,13 @@
+import type { DocumentPage } from '../../types';
+
+export const promptTemplate = (pages: DocumentPage[]) => {
+  return pages
+    .map((page, index) => {
+      const pageNumber = page.metadata?.pageNumber || index;
+
+      return `<page pageNumber="${pageNumber}">
+${page.pageContent}
+</page>`;
+    })
+    .join('\n\n');
+};

package/packages/file-loaders/test/__snapshots__/loaders.test.ts.snap

@@ -2,7 +2,9 @@
 
 exports[`loadFile Integration Tests > PDF Handling > should load content from a pdf file using filePath 1`] = `
 {
-  "content": "123",
+  "content": "<page pageNumber="1">
+123
+</page>",
   "fileType": "pdf",
   "filename": "test.pdf",
   "metadata": {

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

@@ -44,7 +44,7 @@ describe('loadFile Integration Tests', () => {
       // Pass filePath directly to loadFile
       const docs = await loadFile(filePath);
 
-      expect(docs.content).toEqual('123');
+      expect(docs.content).toContain('123');
       expect(docs.source).toEqual(filePath);
 
       // @ts-expect-error

package/src/database/client/db.ts

@@ -313,16 +313,33 @@ export class DatabaseManager {
   }
 
   async resetDatabase(): Promise<void> {
-    // 删除 IndexedDB 数据库
+    // 1. 关闭现有的 PGlite 连接（如果存在）
+    if (this.dbInstance) {
+      try {
+        // @ts-ignore
+        await (this.dbInstance.session as any).client.close();
+        console.log('PGlite instance closed successfully.');
+      } catch (e) {
+        console.error('Error closing PGlite instance:', e);
+        // 即使关闭失败，也尝试继续删除，IndexedDB 的 onblocked 或 onerror 会处理后续问题
+      }
+    }
+
+    // 2. 重置数据库实例和初始化状态
+    this.dbInstance = null;
+    this.initPromise = null;
+    this.isLocalDBSchemaSynced = false; // 重置同步状态
+
+    // 3. 删除 IndexedDB 数据库
     return new Promise<void>((resolve, reject) => {
       // 检查 IndexedDB 是否可用
       if (typeof indexedDB === 'undefined') {
         console.warn('IndexedDB is not available, cannot delete database');
-        resolve();
+        resolve(); // 在此环境下无法删除，直接解决
         return;
       }
 
-      const dbName = `/pglite/${DB_NAME}`;
+      const dbName = `/pglite/${DB_NAME}`; // PGlite IdbFs 使用的路径
       const request = indexedDB.deleteDatabase(dbName);
 
       request.onsuccess = () => {
@@ -338,8 +355,26 @@ export class DatabaseManager {
 
       // eslint-disable-next-line unicorn/prefer-add-event-listener
       request.onerror = (event) => {
-        console.error('❌ Error resetting database:', event);
-        reject(new Error(`Failed to reset database '${dbName}'`));
+        const error = (event.target as IDBOpenDBRequest)?.error;
+        console.error(`❌ Error resetting database '${dbName}':`, error);
+        reject(
+          new Error(
+            `Failed to reset database '${dbName}'. Error: ${error?.message || 'Unknown error'}`,
+          ),
+        );
+      };
+
+      request.onblocked = (event) => {
+        // 当其他打开的连接阻止数据库删除时，会触发此事件
+        console.warn(
+          `Deletion of database '${dbName}' is blocked. This usually means other connections (e.g., in other tabs) are still open. Event:`,
+          event,
+        );
+        reject(
+          new Error(
+            `Failed to reset database '${dbName}' because it is blocked by other open connections. Please close other tabs or applications using this database and try again.`,
+          ),
+        );
       };
     });
   }

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

@@ -0,0 +1,160 @@
+import { TRPCError } from '@trpc/server';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { DataImporterRepos } from '@/database/repositories/dataImporter';
+import { FileService } from '@/server/services/file';
+import { ImportResultData } from '@/types/importer';
+
+import { importerRouter } from '../importer';
+
+const mockGetFileContent = vi.fn();
+const mockImportData = vi.fn();
+const mockImportPgData = vi.fn();
+
+vi.mock('@/database/repositories/dataImporter', () => ({
+  DataImporterRepos: vi.fn().mockImplementation(() => ({
+    importData: mockImportData,
+    importPgData: mockImportPgData,
+  })),
+}));
+
+vi.mock('@/server/services/file', () => ({
+  FileService: vi.fn().mockImplementation(() => ({
+    getFileContent: mockGetFileContent,
+  })),
+}));
+
+describe('importerRouter', () => {
+  const mockFileContent = JSON.stringify({
+    version: 1,
+    messages: [],
+  });
+
+  const mockPgData = {
+    data: {},
+    mode: 'pglite' as const,
+    schemaHash: 'hash',
+  };
+
+  const mockImportResult: ImportResultData = {
+    success: true,
+    results: { messages: { added: 1, errors: 0, skips: 0 } },
+  };
+
+  const mockImportErrorResult: ImportResultData = {
+    success: false,
+    error: {
+      message: 'Import failed',
+      details: 'Error details',
+    },
+    results: {},
+  };
+
+  beforeEach(() => {
+    mockGetFileContent.mockResolvedValue(mockFileContent);
+    mockImportData.mockResolvedValue(mockImportResult);
+    mockImportPgData.mockResolvedValue(mockImportResult);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  const ctx = {
+    userId: 'user-1',
+    serverDB: {} as any,
+  };
+
+  describe('importByFile', () => {
+    it('should successfully import file data', async () => {
+      const caller = importerRouter.createCaller(ctx);
+
+      const result = await caller.importByFile({ pathname: 'test.json' });
+
+      expect(result).toEqual(mockImportResult);
+      expect(mockGetFileContent).toHaveBeenCalledWith('test.json');
+      expect(mockImportData).toHaveBeenCalledWith(JSON.parse(mockFileContent));
+    });
+
+    it('should handle PG data import', async () => {
+      mockGetFileContent.mockResolvedValue(JSON.stringify(mockPgData));
+
+      const caller = importerRouter.createCaller(ctx);
+
+      const result = await caller.importByFile({ pathname: 'test.json' });
+
+      expect(result).toEqual(mockImportResult);
+      expect(mockImportPgData).toHaveBeenCalledWith(mockPgData);
+    });
+
+    it('should throw error when file read fails', async () => {
+      mockGetFileContent.mockRejectedValue(new Error('File read error'));
+
+      const caller = importerRouter.createCaller(ctx);
+
+      await expect(caller.importByFile({ pathname: 'test.json' })).rejects.toThrow(TRPCError);
+    });
+
+    it('should throw error for invalid JSON', async () => {
+      mockGetFileContent.mockResolvedValue('invalid json');
+
+      const caller = importerRouter.createCaller(ctx);
+
+      await expect(caller.importByFile({ pathname: 'test.json' })).rejects.toThrow(TRPCError);
+    });
+  });
+
+  describe('importByPost', () => {
+    it('should successfully import posted data', async () => {
+      const caller = importerRouter.createCaller(ctx);
+
+      const postData = {
+        data: {
+          version: 1,
+          messages: [],
+        },
+      };
+
+      const result = await caller.importByPost(postData);
+
+      expect(result).toEqual(mockImportResult);
+      expect(mockImportData).toHaveBeenCalledWith(postData.data);
+    });
+
+    it('should handle import failure', async () => {
+      mockImportData.mockResolvedValue(mockImportErrorResult);
+
+      const caller = importerRouter.createCaller(ctx);
+
+      const result = await caller.importByPost({
+        data: {
+          version: 1,
+          messages: [],
+        },
+      });
+
+      expect(result).toEqual(mockImportErrorResult);
+    });
+  });
+
+  describe('importPgByPost', () => {
+    it('should successfully import PG data', async () => {
+      const caller = importerRouter.createCaller(ctx);
+
+      const result = await caller.importPgByPost(mockPgData);
+
+      expect(result).toEqual(mockImportResult);
+      expect(mockImportPgData).toHaveBeenCalledWith(mockPgData);
+    });
+
+    it('should handle import failure', async () => {
+      mockImportPgData.mockResolvedValue(mockImportErrorResult);
+
+      const caller = importerRouter.createCaller(ctx);
+
+      const result = await caller.importPgByPost(mockPgData);
+
+      expect(result).toEqual(mockImportErrorResult);
+    });
+  });
+});

package/src/server/services/mcp/index.ts

@@ -9,12 +9,7 @@ import { safeParseJSON } from '@/utils/safeParseJSON';
 
 const log = debug('lobe-mcp:service');
 
-// Removed MCPConnection interface as it's no longer needed
-
 class MCPService {
-  // Store instances of the custom MCPClient, keyed by serialized MCPClientParams
-  private clients: Map<string, MCPClient> = new Map();
-
   // --- MCP Interaction ---
 
   // listTools now accepts MCPClientParams
@@ -97,15 +92,6 @@ class MCPService {
 
   // Private method to get or initialize a client based on parameters
   private async getClient(params: MCPClientParams): Promise<MCPClient> {
-    const key = this.serializeParams(params); // Use custom serialization
-    log(`Attempting to get client for key: ${key} (params: %O)`, params);
-
-    if (this.clients.has(key)) {
-      log(`Returning cached client for key: ${key}`);
-      return this.clients.get(key)!;
-    }
-
-    log(`No cached client found for key: ${key}. Initializing new client.`);
     try {
       // Ensure stdio is only attempted in desktop/server environments within the client itself
       // or add a check here if MCPClient doesn't handle it.
@@ -120,11 +106,10 @@ class MCPService {
           log(`New client initializing... ${progress.progress}/${progress.total}`);
         },
       }); // Initialization logic should be within MCPClient
-      this.clients.set(key, client);
-      log(`New client initialized and cached for key: ${key}`);
+      log(`New client initialized`);
       return client;
     } catch (error) {
-      console.error(`Failed to initialize MCP client for key ${key}:`, error);
+      console.error(`Failed to initialize MCP client`, error);
       // Do not cache failed initializations
       throw new TRPCError({
         cause: error,
@@ -134,24 +119,6 @@ class MCPService {
     }
   }
 
-  // Custom serialization function to ensure consistent keys
-  private serializeParams(params: MCPClientParams): string {
-    const sortedKeys = Object.keys(params).sort();
-    const sortedParams: Record<string, any> = {};
-
-    for (const key of sortedKeys) {
-      const value = (params as any)[key];
-      // Sort the 'args' array if it exists
-      if (key === 'args' && Array.isArray(value)) {
-        sortedParams[key] = JSON.stringify(key);
-      } else {
-        sortedParams[key] = value;
-      }
-    }
-
-    return JSON.stringify(sortedParams);
-  }
-
   async getStreamableMcpServerManifest(
     identifier: string,
     url: string,