@lobehub/chat 0.135.0 → 0.135.1

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.135.1](https://github.com/lobehub/lobe-chat/compare/v0.135.0...v0.135.1)
+
+<sup>Released on **2024-03-14**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the db model.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the db model, closes [#1567](https://github.com/lobehub/lobe-chat/issues/1567) ([3d56dd6](https://github.com/lobehub/lobe-chat/commit/3d56dd6))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.135.0](https://github.com/lobehub/lobe-chat/compare/v0.134.1...v0.135.0)
 
 <sup>Released on **2024-03-14**</sup>

package/README.md

@@ -216,14 +216,14 @@ In addition, these plugins are not limited to news aggregation, but can also ext
 
 <!-- PLUGIN LIST -->
 
-| Recent Submits                                                                                                    | Description                                                                                                                                                                                                                     |
-| ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Charts & Diagrams](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **pyxl** on **2024-02-05**</sup> | Mermaid Diagrams, Schemes for Presentations, Analysis, research websites, pie charts.<br/>`chart` `diagram`                                                                                                                     |
-| [Social Search](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **say-apps** on **2024-02-02**</sup> | The Social Search provides access to tweets, users, followers, images, media and more.<br/>`social` `twitter` `x` `search`                                                                                                      |
-| [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup> | Get realtime crypto price, BTC, ETH, BNB, and the latest insights.The latest coin news and airdrop opportunities.<br/>`crypto` `btc` `eth` `bnb`                                                                                |
-| [Bilibili](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>       | Dive into Bilibili's vast content with features like keyword video search, replay access, interactive danmaku, trending video recommendations, and hot-search insights, all at your fingertips.<br/>`video` `bilibili` `search` |
-
-> 📊 Total plugins: [<kbd>**58**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
+| Recent Submits                                                                                                    | Description                                                                                                                                      |
+| ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [Calendar Assistant](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **cc** on **2024-03-13**</sup>  | A plugin to manage your calendar events # will auto generate i18n in workflow<br/>`calendar` `schedule` `will-auto-generate-i-18-n-in-workflow`  |
+| [Charts & Diagrams](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **pyxl** on **2024-02-05**</sup> | Mermaid Diagrams, Schemes for Presentations, Analysis, research websites, pie charts.<br/>`chart` `diagram`                                      |
+| [Social Search](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **say-apps** on **2024-02-02**</sup> | The Social Search provides access to tweets, users, followers, images, media and more.<br/>`social` `twitter` `x` `search`                       |
+| [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup> | Get realtime crypto price, BTC, ETH, BNB, and the latest insights.The latest coin news and airdrop opportunities.<br/>`crypto` `btc` `eth` `bnb` |
+
+> 📊 Total plugins: [<kbd>**59**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
 
  <!-- PLUGIN LIST -->
 

package/README.zh-CN.md

@@ -208,14 +208,14 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
 
 <!-- PLUGIN LIST -->
 
-| 最近新增                                                                                                          | 插件描述                                                                                                                                      |
-| ----------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| [图表和图示](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **pyxl** on **2024-02-05**</sup>        | 美人鱼图表，演示文稿方案，分析，研究网站，饼图。<br/>`图表` `图示`                                                                            |
-| [社交搜索](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **say-apps** on **2024-02-02**</sup>      | 社交搜索提供访问推文、用户、关注者、图片、媒体等功能。<br/>`社交` `推特` `x` `搜索`                                                           |
-| [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup> | 获取实时加密货币价格，BTC，ETH，BNB 和最新见解。最新的币新闻和空投机会。<br/>`加密货币` `btc` `eth` `bnb`                                     |
-| [哔哩哔哩](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>       | 通过关键词视频搜索、回放访问、互动弹幕、热门视频推荐和热搜洞察等功能，深入体验哔哩哔哩丰富的内容，尽在您的指尖。<br/>`视频` `哔哩哔哩` `搜索` |
-
-> 📊 Total plugins: [<kbd>**58**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
+| 最近新增                                                                                                          | 插件描述                                                                                                       |
+| ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- |
+| [日历助手](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **cc** on **2024-03-13**</sup>            | 一个用于管理日历事件的插件 # 将自动生成工作流程中的 i18n<br/>`日历` `日程安排` `将自动生成工作流程中的-i-18-n` |
+| [图表和图示](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **pyxl** on **2024-02-05**</sup>        | 美人鱼图表，演示文稿方案，分析，研究网站，饼图。<br/>`图表` `图示`                                             |
+| [社交搜索](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **say-apps** on **2024-02-02**</sup>      | 社交搜索提供访问推文、用户、关注者、图片、媒体等功能。<br/>`社交` `推特` `x` `搜索`                            |
+| [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup> | 获取实时加密货币价格，BTC，ETH，BNB 和最新见解。最新的币新闻和空投机会。<br/>`加密货币` `btc` `eth` `bnb`      |
+
+> 📊 Total plugins: [<kbd>**59**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
 
  <!-- PLUGIN LIST -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.135.0",
+  "version": "0.135.1",
   "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",
@@ -148,7 +148,7 @@
     "uuid": "^9",
     "yaml": "^2",
     "zod": "^3",
-    "zustand": "^4.4",
+    "zustand": "^4.5.2",
     "zustand-utils": "^1.3.2"
   },
   "devDependencies": {

package/src/app/api/plugin/store/route.ts

@@ -11,7 +11,7 @@ export const GET = async (req: Request) => {
 
   let res: Response;
 
-  res = await fetch(pluginStore.getPluginIndexUrl(locale as any));
+  res = await fetch(pluginStore.getPluginIndexUrl(locale as any), { next: { revalidate: 3600 } });
 
   if (res.status === 404) {
     res = await fetch(pluginStore.getPluginIndexUrl(DEFAULT_LANG));

package/src/database/models/message.ts

@@ -26,19 +26,8 @@ class _MessageModel extends BaseModel {
   constructor() {
     super('messages', DB_MessageSchema);
   }
-  async create(data: CreateMessageParams) {
-    const id = nanoid();
-
-    const messageData: DB_Message = this.mapChatMessageToDBMessage(data as ChatMessage);
-
-    return this._add(messageData, id);
-  }
-
-  async batchCreate(messages: ChatMessage[]) {
-    const data: DB_Message[] = messages.map((m) => this.mapChatMessageToDBMessage(m));
 
-    return this._batchAdd(data);
-  }
+  // **************** Query *************** //
 
   async query({
     sessionId,
@@ -91,45 +80,79 @@ class _MessageModel extends BaseModel {
     return this.table.get(id);
   }
 
-  async delete(id: string) {
-    return this.table.delete(id);
+  async queryAll() {
+    const data: DBModel<DB_Message>[] = await this.table.orderBy('updatedAt').toArray();
+
+    return data.map((element) => this.mapToChatMessage(element));
   }
 
-  async clearTable() {
-    return this.table.clear();
+  async queryBySessionId(sessionId: string) {
+    return this.table.where('sessionId').equals(sessionId).toArray();
   }
 
-  async update(id: string, data: DeepPartial<DB_Message>) {
-    return super._update(id, data);
+  queryByTopicId = async (topicId: string) => {
+    const dbMessages = await this.table.where('topicId').equals(topicId).toArray();
+
+    return dbMessages.map((message) => this.mapToChatMessage(message));
+  };
+
+  async count() {
+    return this.table.count();
   }
 
-  async updatePluginState(id: string, key: string, value: any) {
-    const item = await this.findById(id);
+  // **************** Create *************** //
 
-    return this.update(id, { pluginState: { ...item.pluginState, [key]: value } });
+  async create(data: CreateMessageParams) {
+    const id = nanoid();
+
+    const messageData: DB_Message = this.mapChatMessageToDBMessage(data as ChatMessage);
+
+    return this._add(messageData, id);
   }
 
-  /**
-   * Batch updates multiple fields of the specified messages.
-   *
-   * @param {string[]} messageIds - The identifiers of the messages to be updated.
-   * @param {Partial<DB_Message>} updateFields - An object containing the fields to update and their new values.
-   * @returns {Promise<number>} - The number of updated messages.
-   */
-  async batchUpdate(messageIds: string[], updateFields: Partial<DB_Message>): Promise<number> {
-    // Retrieve the messages by their IDs
-    const messagesToUpdate = await this.table.where(':id').anyOf(messageIds).toArray();
+  async batchCreate(messages: ChatMessage[]) {
+    const data: DB_Message[] = messages.map((m) => this.mapChatMessageToDBMessage(m));
 
-    // Update the specified fields of each message
-    const updatedMessages = messagesToUpdate.map((message) => ({
-      ...message,
-      ...updateFields,
-    }));
+    return this._batchAdd(data);
+  }
 
-    // Use the bulkPut method to update the messages in bulk
-    await this.table.bulkPut(updatedMessages);
+  async duplicateMessages(messages: ChatMessage[]): Promise<ChatMessage[]> {
+    const duplicatedMessages = await this.createDuplicateMessages(messages);
+    // 批量添加复制后的消息到数据库
+    await this.batchCreate(duplicatedMessages);
+    return duplicatedMessages;
+  }
 
-    return updatedMessages.length;
+  async createDuplicateMessages(messages: ChatMessage[]): Promise<ChatMessage[]> {
+    // 创建一个映射来存储原始消息ID和复制消息ID之间的关系
+    const idMapping = new Map<string, string>();
+
+    // 首先复制所有消息，并为每个复制的消息生成新的ID
+    const duplicatedMessages = messages.map((originalMessage) => {
+      const newId = nanoid();
+      idMapping.set(originalMessage.id, newId);
+
+      return { ...originalMessage, id: newId };
+    });
+
+    // 更新 parentId 为复制后的新ID
+    for (const duplicatedMessage of duplicatedMessages) {
+      if (duplicatedMessage.parentId && idMapping.has(duplicatedMessage.parentId)) {
+        duplicatedMessage.parentId = idMapping.get(duplicatedMessage.parentId);
+      }
+    }
+
+    return duplicatedMessages;
+  }
+
+  // **************** Delete *************** //
+
+  async delete(id: string) {
+    return this.table.delete(id);
+  }
+
+  async clearTable() {
+    return this.table.clear();
   }
 
   /**
@@ -158,55 +181,43 @@ class _MessageModel extends BaseModel {
     return this.table.bulkDelete(messageIds);
   }
 
-  async queryAll() {
-    const data: DBModel<DB_Message>[] = await this.table.orderBy('updatedAt').toArray();
-
-    return data.map((element) => this.mapToChatMessage(element));
-  }
-
-  async count() {
-    return this.table.count();
-  }
+  // **************** Update *************** //
 
-  async queryBySessionId(sessionId: string) {
-    return this.table.where('sessionId').equals(sessionId).toArray();
+  async update(id: string, data: DeepPartial<DB_Message>) {
+    return this._update(id, data);
   }
 
-  queryByTopicId = async (topicId: string) => {
-    const dbMessages = await this.table.where('topicId').equals(topicId).toArray();
-
-    return dbMessages.map((message) => this.mapToChatMessage(message));
-  };
+  async updatePluginState(id: string, key: string, value: any) {
+    const item = await this.findById(id);
 
-  async duplicateMessages(messages: ChatMessage[]): Promise<ChatMessage[]> {
-    const duplicatedMessages = await this.createDuplicateMessages(messages);
-    // 批量添加复制后的消息到数据库
-    await this.batchCreate(duplicatedMessages);
-    return duplicatedMessages;
+    return this.update(id, { pluginState: { ...item.pluginState, [key]: value } });
   }
 
-  async createDuplicateMessages(messages: ChatMessage[]): Promise<ChatMessage[]> {
-    // 创建一个映射来存储原始消息ID和复制消息ID之间的关系
-    const idMapping = new Map<string, string>();
-
-    // 首先复制所有消息，并为每个复制的消息生成新的ID
-    const duplicatedMessages = messages.map((originalMessage) => {
-      const newId = nanoid();
-      idMapping.set(originalMessage.id, newId);
+  /**
+   * Batch updates multiple fields of the specified messages.
+   *
+   * @param {string[]} messageIds - The identifiers of the messages to be updated.
+   * @param {Partial<DB_Message>} updateFields - An object containing the fields to update and their new values.
+   * @returns {Promise<number>} - The number of updated messages.
+   */
+  async batchUpdate(messageIds: string[], updateFields: Partial<DB_Message>): Promise<number> {
+    // Retrieve the messages by their IDs
+    const messagesToUpdate = await this.table.where(':id').anyOf(messageIds).toArray();
 
-      return { ...originalMessage, id: newId };
-    });
+    // Update the specified fields of each message
+    const updatedMessages = messagesToUpdate.map((message) => ({
+      ...message,
+      ...updateFields,
+    }));
 
-    // 更新 parentId 为复制后的新ID
-    for (const duplicatedMessage of duplicatedMessages) {
-      if (duplicatedMessage.parentId && idMapping.has(duplicatedMessage.parentId)) {
-        duplicatedMessage.parentId = idMapping.get(duplicatedMessage.parentId);
-      }
-    }
+    // Use the bulkPut method to update the messages in bulk
+    await this.table.bulkPut(updatedMessages);
 
-    return duplicatedMessages;
+    return updatedMessages.length;
   }
 
+  // **************** Helper *************** //
+
   private mapChatMessageToDBMessage(message: ChatMessage): DB_Message {
     const { extra, ...messageData } = message;
 

package/src/database/models/plugin.ts

@@ -7,11 +7,14 @@ class _PluginModel extends BaseModel {
   constructor() {
     super('plugins', DB_PluginSchema);
   }
+  // **************** Query *************** //
 
   getList = async (): Promise<DB_Plugin[]> => {
     return this.table.toArray();
   };
 
+  // **************** Create *************** //
+
   create = async (plugin: DB_Plugin) => {
     const old = await this.table.get(plugin.identifier);
 
@@ -21,18 +24,20 @@ class _PluginModel extends BaseModel {
   batchCreate = async (plugins: DB_Plugin[]) => {
     return this._batchAdd(plugins);
   };
+  // **************** Delete *************** //
 
   delete(id: string) {
     return this.table.delete(id);
   }
+  clear() {
+    return this.table.clear();
+  }
+
+  // **************** Update *************** //
 
   update: (id: string, value: Partial<DB_Plugin>) => Promise<number> = async (id, value) => {
     return this.table.update(id, value);
   };
-
-  clear() {
-    return this.table.clear();
-  }
 }
 
 export const PluginModel = new _PluginModel();

package/src/database/models/session.ts

@@ -21,29 +21,7 @@ class _SessionModel extends BaseModel {
     super('sessions', DB_SessionSchema);
   }
 
-  async create(type: 'agent' | 'group', defaultValue: Partial<LobeAgentSession>, id = uuid()) {
-    const data = merge(DEFAULT_AGENT_LOBE_SESSION, { type, ...defaultValue });
-    const dataDB = this.mapToDB_Session(data);
-    return this._add(dataDB, id);
-  }
-
-  async batchCreate(sessions: LobeAgentSession[]) {
-    const DB_Sessions = await Promise.all(
-      sessions.map(async (s) => {
-        if (s.group && s.group !== SessionDefaultGroup.Default) {
-          // Check if the group exists in the SessionGroup table
-          const groupExists = await SessionGroupModel.findById(s.group);
-          // If the group does not exist, set it to default
-          if (!groupExists) {
-            s.group = SessionDefaultGroup.Default;
-          }
-        }
-        return this.mapToDB_Session(s);
-      }),
-    );
-
-    return this._batchAdd<DB_Session>(DB_Sessions, { idGenerator: uuid });
-  }
+  // **************** Query *************** //
 
   async query({
     pageSize = 9999,
@@ -103,59 +81,6 @@ class _SessionModel extends BaseModel {
     return Object.fromEntries(groupItems);
   }
 
-  async update(id: string, data: Partial<DB_Session>) {
-    return super._update(id, data);
-  }
-
-  async updatePinned(id: string, pinned: boolean) {
-    return this.update(id, { pinned: pinned ? 1 : 0 });
-  }
-
-  async updateConfig(id: string, data: DeepPartial<LobeAgentConfig>) {
-    const session = await this.findById(id);
-    if (!session) return;
-
-    const config = merge(session.config, data);
-
-    return this.update(id, { config });
-  }
-
-  /**
-   * Delete a session , also delete all messages and topic associated with it.
-   */
-  async delete(id: string) {
-    return this.db.transaction('rw', [this.table, this.db.topics, this.db.messages], async () => {
-      // Delete all topics associated with the session
-      const topics = await this.db.topics.where('sessionId').equals(id).toArray();
-      const topicIds = topics.map((topic) => topic.id);
-      if (topicIds.length > 0) {
-        await this.db.topics.bulkDelete(topicIds);
-      }
-
-      // Delete all messages associated with the session
-      const messages = await this.db.messages.where('sessionId').equals(id).toArray();
-      const messageIds = messages.map((message) => message.id);
-      if (messageIds.length > 0) {
-        await this.db.messages.bulkDelete(messageIds);
-      }
-
-      // Finally, delete the session itself
-      await this.table.delete(id);
-    });
-  }
-
-  async clearTable() {
-    return this.table.clear();
-  }
-
-  async findById(id: string): Promise<DBModel<DB_Session>> {
-    return this.table.get(id);
-  }
-
-  async isEmpty() {
-    return (await this.table.count()) === 0;
-  }
-
   /**
    * Query sessions by keyword in title, description, content, or translated content
    * @param keyword The keyword to search for
@@ -225,6 +150,50 @@ class _SessionModel extends BaseModel {
     return this.mapToAgentSessions(items);
   }
 
+  async getPinnedSessions(): Promise<LobeSessions> {
+    const items: DBModel<DB_Session>[] = await this.table
+      .where('pinned')
+      .equals(1)
+      .reverse()
+      .sortBy('updatedAt');
+
+    return this.mapToAgentSessions(items);
+  }
+
+  async findById(id: string): Promise<DBModel<DB_Session>> {
+    return this.table.get(id);
+  }
+
+  async isEmpty() {
+    return (await this.table.count()) === 0;
+  }
+
+  // **************** Create *************** //
+
+  async create(type: 'agent' | 'group', defaultValue: Partial<LobeAgentSession>, id = uuid()) {
+    const data = merge(DEFAULT_AGENT_LOBE_SESSION, { type, ...defaultValue });
+    const dataDB = this.mapToDB_Session(data);
+    return this._add(dataDB, id);
+  }
+
+  async batchCreate(sessions: LobeAgentSession[]) {
+    const DB_Sessions = await Promise.all(
+      sessions.map(async (s) => {
+        if (s.group && s.group !== SessionDefaultGroup.Default) {
+          // Check if the group exists in the SessionGroup table
+          const groupExists = await SessionGroupModel.findById(s.group);
+          // If the group does not exist, set it to default
+          if (!groupExists) {
+            s.group = SessionDefaultGroup.Default;
+          }
+        }
+        return this.mapToDB_Session(s);
+      }),
+    );
+
+    return this._batchAdd<DB_Session>(DB_Sessions, { idGenerator: uuid });
+  }
+
   async duplicate(id: string, newTitle?: string) {
     const session = await this.findById(id);
     if (!session) return;
@@ -234,16 +203,57 @@ class _SessionModel extends BaseModel {
     return this._add(newSession, uuid());
   }
 
-  async getPinnedSessions(): Promise<LobeSessions> {
-    const items: DBModel<DB_Session>[] = await this.table
-      .where('pinned')
-      .equals(1)
-      .reverse()
-      .sortBy('updatedAt');
+  // **************** Delete *************** //
 
-    return this.mapToAgentSessions(items);
+  /**
+   * Delete a session , also delete all messages and topic associated with it.
+   */
+  async delete(id: string) {
+    return this.db.transaction('rw', [this.table, this.db.topics, this.db.messages], async () => {
+      // Delete all topics associated with the session
+      const topics = await this.db.topics.where('sessionId').equals(id).toArray();
+      const topicIds = topics.map((topic) => topic.id);
+      if (topicIds.length > 0) {
+        await this.db.topics.bulkDelete(topicIds);
+      }
+
+      // Delete all messages associated with the session
+      const messages = await this.db.messages.where('sessionId').equals(id).toArray();
+      const messageIds = messages.map((message) => message.id);
+      if (messageIds.length > 0) {
+        await this.db.messages.bulkDelete(messageIds);
+      }
+
+      // Finally, delete the session itself
+      await this.table.delete(id);
+    });
+  }
+
+  async clearTable() {
+    return this.table.clear();
+  }
+
+  // **************** Update *************** //
+
+  async update(id: string, data: Partial<DB_Session>) {
+    return this._update(id, data);
+  }
+
+  async updatePinned(id: string, pinned: boolean) {
+    return this.update(id, { pinned: pinned ? 1 : 0 });
   }
 
+  async updateConfig(id: string, data: DeepPartial<LobeAgentConfig>) {
+    const session = await this.findById(id);
+    if (!session) return;
+
+    const config = merge(session.config, data);
+
+    return this.update(id, { config });
+  }
+
+  // **************** Helper *************** //
+
   private mapToDB_Session(session: LobeAgentSession): DBModel<DB_Session> {
     return {
       ...session,

package/src/database/models/sessionGroup.ts

@@ -8,32 +8,7 @@ class _SessionGroupModel extends BaseModel {
     super('sessionGroups', DB_SessionGroupSchema);
   }
 
-  async create(name: string, sort?: number, id = nanoid()) {
-    return this._add({ name, sort }, id);
-  }
-  async batchCreate(groups: SessionGroups) {
-    return this._batchAdd(groups, { idGenerator: nanoid });
-  }
-
-  async findById(id: string): Promise<DB_SessionGroup> {
-    return this.table.get(id);
-  }
-
-  async update(id: string, data: Partial<DB_SessionGroup>) {
-    return super._update(id, data);
-  }
-
-  async delete(id: string, removeGroupItem: boolean = false) {
-    this.db.sessions.toCollection().modify((session) => {
-      //  update all session associated with the sessionGroup to default
-      if (session.group === id) session.group = 'default';
-    });
-    if (!removeGroupItem) {
-      return this.table.delete(id);
-    } else {
-      return this.db.sessions.where('group').equals(id).delete();
-    }
-  }
+  // **************** Query *************** //
 
   async query(): Promise<SessionGroups> {
     const allGroups = await this.table.toArray();
@@ -60,6 +35,43 @@ class _SessionGroupModel extends BaseModel {
     });
   }
 
+  async findById(id: string): Promise<DB_SessionGroup> {
+    return this.table.get(id);
+  }
+
+  // **************** Create *************** //
+
+  async create(name: string, sort?: number, id = nanoid()) {
+    return this._add({ name, sort }, id);
+  }
+
+  async batchCreate(groups: SessionGroups) {
+    return this._batchAdd(groups, { idGenerator: nanoid });
+  }
+
+  // **************** Delete *************** //
+  async delete(id: string, removeGroupItem: boolean = false) {
+    this.db.sessions.toCollection().modify((session) => {
+      //  update all session associated with the sessionGroup to default
+      if (session.group === id) session.group = 'default';
+    });
+    if (!removeGroupItem) {
+      return this.table.delete(id);
+    } else {
+      return this.db.sessions.where('group').equals(id).delete();
+    }
+  }
+
+  async clear() {
+    this.table.clear();
+  }
+
+  // **************** Update *************** //
+
+  async update(id: string, data: Partial<DB_SessionGroup>) {
+    return super._update(id, data);
+  }
+
   async updateOrder(sortMap: { id: string; sort: number }[]) {
     return this.db.transaction('rw', this.table, async () => {
       for (const { id, sort } of sortMap) {
@@ -67,10 +79,6 @@ class _SessionGroupModel extends BaseModel {
       }
     });
   }
-
-  async clear() {
-    this.table.clear();
-  }
 }
 
 export const SessionGroupModel = new _SessionGroupModel();

package/src/database/models/topic.ts

@@ -23,19 +23,7 @@ class _TopicModel extends BaseModel {
     super('topics', DB_TopicSchema);
   }
 
-  async create({ title, favorite, sessionId, messages }: CreateTopicParams, id = nanoid()) {
-    const topic = await this._add({ favorite: favorite ? 1 : 0, sessionId, title: title }, id);
-
-    // add topicId to these messages
-    if (messages) {
-      await this.db.messages.where('id').anyOf(messages).modify({ topicId: topic.id });
-    }
-    return topic;
-  }
-
-  async batchCreate(topics: CreateTopicParams[]) {
-    return this._batchAdd(topics.map((t) => ({ ...t, favorite: t.favorite ? 1 : 0 })));
-  }
+  // **************** Query *************** //
 
   async query({ pageSize = 9999, current = 0, sessionId }: QueryTopicParams): Promise<ChatTopic[]> {
     const offset = current * pageSize;
@@ -58,90 +46,6 @@ class _TopicModel extends BaseModel {
     return pagedTopics.map((i) => this.mapToChatTopic(i));
   }
 
-  async findBySessionId(sessionId: string) {
-    return this.table.where({ sessionId }).toArray();
-  }
-
-  async findById(id: string): Promise<DBModel<DB_Topic>> {
-    return this.table.get(id);
-  }
-
-  /**
-   * Deletes a topic and all messages associated with it.
-   */
-  async delete(id: string) {
-    return this.db.transaction('rw', [this.table, this.db.messages], async () => {
-      // Delete all messages associated with the topic
-      const messages = await this.db.messages.where('topicId').equals(id).toArray();
-
-      if (messages.length > 0) {
-        const messageIds = messages.map((msg) => msg.id);
-        await this.db.messages.bulkDelete(messageIds);
-      }
-
-      await this.table.delete(id);
-    });
-  }
-
-  /**
-   * Deletes multiple topic based on the sessionId.
-   *
-   * @param {string} sessionId - The identifier of the assistant associated with the messages.
-   * @returns {Promise<void>}
-   */
-  async batchDeleteBySessionId(sessionId: string): Promise<void> {
-    // use sessionId as the filter criteria in the query.
-    const query = this.table.where('sessionId').equals(sessionId);
-
-    // Retrieve a collection of message IDs that satisfy the criteria
-    const topicIds = await query.primaryKeys();
-
-    // Use the bulkDelete method to delete all selected messages in bulk
-    return this.table.bulkDelete(topicIds);
-  }
-
-  async clearTable() {
-    return this.table.clear();
-  }
-
-  async update(id: string, data: Partial<DB_Topic>) {
-    return super._update(id, { ...data, updatedAt: Date.now() });
-  }
-
-  async toggleFavorite(id: string, newState?: boolean) {
-    const topic = await this.findById(id);
-    if (!topic) {
-      throw new Error(`Topic with id ${id} not found`);
-    }
-
-    // Toggle the 'favorite' status
-    const nextState = typeof newState !== 'undefined' ? newState : !topic.favorite;
-
-    await this.update(id, { favorite: nextState ? 1 : 0 });
-
-    return nextState;
-  }
-
-  /**
-   * Deletes multiple topics and all messages associated with them in a transaction.
-   */
-  async batchDelete(topicIds: string[]) {
-    return this.db.transaction('rw', [this.table, this.db.messages], async () => {
-      // Iterate over each topicId and delete related messages, then delete the topic itself
-      for (const topicId of topicIds) {
-        // Delete all messages associated with the topic
-        const messages = await this.db.messages.where('topicId').equals(topicId).toArray();
-        if (messages.length > 0) {
-          const messageIds = messages.map((msg) => msg.id);
-          await this.db.messages.bulkDelete(messageIds);
-        }
-
-        // Delete the topic
-        await this.table.delete(topicId);
-      }
-    });
-  }
-
   queryAll() {
     return this.table.orderBy('updatedAt').toArray();
   }
@@ -201,6 +105,29 @@ class _TopicModel extends BaseModel {
     return uniqueTopics.map((i) => ({ ...i, favorite: !!i.favorite }));
   }
 
+  async findBySessionId(sessionId: string) {
+    return this.table.where({ sessionId }).toArray();
+  }
+
+  async findById(id: string): Promise<DBModel<DB_Topic>> {
+    return this.table.get(id);
+  }
+
+  // **************** Create *************** //
+
+  async create({ title, favorite, sessionId, messages }: CreateTopicParams, id = nanoid()) {
+    const topic = await this._add({ favorite: favorite ? 1 : 0, sessionId, title: title }, id);
+
+    // add topicId to these messages
+    if (messages) {
+      await this.db.messages.where('id').anyOf(messages).modify({ topicId: topic.id });
+    }
+    return topic;
+  }
+  async batchCreate(topics: CreateTopicParams[]) {
+    return this._batchAdd(topics.map((t) => ({ ...t, favorite: t.favorite ? 1 : 0 })));
+  }
+
   async duplicateTopic(topicId: string, newTitle?: string) {
     return this.db.transaction('rw', this.db.topics, this.db.messages, async () => {
       // Step 1: get DB_Topic
@@ -226,6 +153,86 @@ class _TopicModel extends BaseModel {
     });
   }
 
+  // **************** Delete *************** //
+
+  /**
+   * Deletes a topic and all messages associated with it.
+   */
+  async delete(id: string) {
+    return this.db.transaction('rw', [this.table, this.db.messages], async () => {
+      // Delete all messages associated with the topic
+      const messages = await this.db.messages.where('topicId').equals(id).toArray();
+
+      if (messages.length > 0) {
+        const messageIds = messages.map((msg) => msg.id);
+        await this.db.messages.bulkDelete(messageIds);
+      }
+
+      await this.table.delete(id);
+    });
+  }
+
+  /**
+   * Deletes multiple topic based on the sessionId.
+   *
+   * @param {string} sessionId - The identifier of the assistant associated with the messages.
+   * @returns {Promise<void>}
+   */
+  async batchDeleteBySessionId(sessionId: string): Promise<void> {
+    // use sessionId as the filter criteria in the query.
+    const query = this.table.where('sessionId').equals(sessionId);
+
+    // Retrieve a collection of message IDs that satisfy the criteria
+    const topicIds = await query.primaryKeys();
+
+    // Use the bulkDelete method to delete all selected messages in bulk
+    return this.table.bulkDelete(topicIds);
+  }
+  /**
+   * Deletes multiple topics and all messages associated with them in a transaction.
+   */
+  async batchDelete(topicIds: string[]) {
+    return this.db.transaction('rw', [this.table, this.db.messages], async () => {
+      // Iterate over each topicId and delete related messages, then delete the topic itself
+      for (const topicId of topicIds) {
+        // Delete all messages associated with the topic
+        const messages = await this.db.messages.where('topicId').equals(topicId).toArray();
+        if (messages.length > 0) {
+          const messageIds = messages.map((msg) => msg.id);
+          await this.db.messages.bulkDelete(messageIds);
+        }
+
+        // Delete the topic
+        await this.table.delete(topicId);
+      }
+    });
+  }
+
+  async clearTable() {
+    return this.table.clear();
+  }
+
+  // **************** Update *************** //
+  async update(id: string, data: Partial<DB_Topic>) {
+    return this._update(id, data);
+  }
+
+  async toggleFavorite(id: string, newState?: boolean) {
+    const topic = await this.findById(id);
+    if (!topic) {
+      throw new Error(`Topic with id ${id} not found`);
+    }
+
+    // Toggle the 'favorite' status
+    const nextState = typeof newState !== 'undefined' ? newState : !topic.favorite;
+
+    await this.update(id, { favorite: nextState ? 1 : 0 });
+
+    return nextState;
+  }
+
+  // **************** Helper *************** //
+
   private mapToChatTopic = (dbTopic: DBModel<DB_Topic>): ChatTopic => ({
     ...dbTopic,
     favorite: !!dbTopic.favorite,

package/src/database/models/user.ts

@@ -10,6 +10,7 @@ class _UserModel extends BaseModel {
   constructor() {
     super('users', DB_UserSchema);
   }
+  // **************** Query *************** //
 
   getUser = async (): Promise<DB_User & { id: number }> => {
     const noUser = !(await this.table.count());
@@ -21,18 +22,20 @@ class _UserModel extends BaseModel {
     return list[0];
   };
 
+  // **************** Create *************** //
+
   create = async (user: DB_User) => {
     return this.table.put(user);
   };
 
-  private update = async (id: number, value: DeepPartial<DB_User>) => {
-    return this.table.update(id, value);
-  };
+  // **************** Delete *************** //
 
   clear() {
     return this.table.clear();
   }
 
+  // **************** Update *************** //
+
   async updateSettings(settings: DeepPartial<GlobalSettings>) {
     const user = await this.getUser();
 
@@ -50,6 +53,12 @@ class _UserModel extends BaseModel {
 
     return this.update(user.id, { avatar });
   }
+
+  // **************** Helper *************** //
+
+  private update = async (id: number, value: DeepPartial<DB_User>) => {
+    return this.table.update(id, value);
+  };
 }
 
 export const UserModel = new _UserModel();

package/src/libs/swr/index.ts

@@ -0,0 +1,18 @@
+import useSWR, { SWRHook } from 'swr';
+
+/**
+ * 这一类请求方法是比较「死」的请求模式，只会在第一次请求时触发。不会自动刷新，刷新需要搭配 refreshXXX 这样的方法实现，
+ * 适用于 messages、topics、sessions 等由用户在客户端交互产生的数据。
+ */
+// @ts-ignore
+export const useClientDataSWR: SWRHook = (key, fetch, config) =>
+  useSWR(key, fetch, {
+    // default is 2000ms ,it makes the user's quick switch don't work correctly.
+    // Cause issue like this: https://github.com/lobehub/lobe-chat/issues/532
+    // we need to set it to 0.
+    dedupingInterval: 0,
+    refreshWhenOffline: false,
+    revalidateOnFocus: false,
+    revalidateOnReconnect: false,
+    ...config,
+  });

package/src/store/chat/slices/message/action.test.ts

@@ -559,7 +559,7 @@ describe('chatMessage actions', () => {
       });
 
       // 确保 mutate 调用了正确的参数
-      expect(mutate).toHaveBeenCalledWith([activeId, activeTopicId]);
+      expect(mutate).toHaveBeenCalledWith(['SWR_USE_FETCH_MESSAGES', activeId, activeTopicId]);
     });
     it('should handle errors during refreshing messages', async () => {
       useChatStore.setState({ refreshMessages: realRefreshMessages });

package/src/store/chat/slices/message/action.ts

@@ -2,12 +2,13 @@
 // Disable the auto sort key eslint rule to make the code more logic and readable
 import { copyToClipboard } from '@lobehub/ui';
 import { template } from 'lodash-es';
-import useSWR, { SWRResponse, mutate } from 'swr';
+import { SWRResponse, mutate } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
 import { LOADING_FLAT, isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/const/message';
 import { TraceEventType, TraceNameMap } from '@/const/trace';
 import { CreateMessageParams } from '@/database/models/message';
+import { useClientDataSWR } from '@/libs/swr';
 import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 import { topicService } from '@/services/topic';
@@ -25,6 +26,8 @@ import { MessageDispatch, messagesReducer } from './reducer';
 
 const n = setNamespace('message');
 
+const SWR_USE_FETCH_MESSAGES = 'SWR_USE_FETCH_MESSAGES';
+
 interface SendMessageParams {
   message: string;
   files?: { id: string; url: string }[];
@@ -274,9 +277,9 @@ export const chatMessage: StateCreator<
     await get().internalUpdateMessageContent(id, content);
   },
   useFetchMessages: (sessionId, activeTopicId) =>
-    useSWR<ChatMessage[]>(
-      [sessionId, activeTopicId],
-      async ([sessionId, topicId]: [string, string | undefined]) =>
+    useClientDataSWR<ChatMessage[]>(
+      [SWR_USE_FETCH_MESSAGES, sessionId, activeTopicId],
+      async ([, sessionId, topicId]: [string, string, string | undefined]) =>
         messageService.getMessages(sessionId, topicId),
       {
         onSuccess: (messages, key) => {
@@ -289,14 +292,10 @@ export const chatMessage: StateCreator<
             }),
           );
         },
-        // default is 2000ms ,it makes the user's quick switch don't work correctly.
-        // Cause issue like this: https://github.com/lobehub/lobe-chat/issues/532
-        // we need to set it to 0.
-        dedupingInterval: 0,
       },
     ),
   refreshMessages: async () => {
-    await mutate([get().activeId, get().activeTopicId]);
+    await mutate([SWR_USE_FETCH_MESSAGES, get().activeId, get().activeTopicId]);
   },
 
   // the internal process method of the AI message

package/src/store/session/slices/session/action.ts

@@ -6,6 +6,7 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { SESSION_CHAT_URL } from '@/const/url';
+import { useClientDataSWR } from '@/libs/swr';
 import { sessionService } from '@/services/session';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
@@ -154,7 +155,7 @@ export const createSessionSlice: StateCreator<
   },
 
   useFetchSessions: () =>
-    useSWR<ChatSessionList>(FETCH_SESSIONS_KEY, sessionService.getSessionsWithGroup, {
+    useClientDataSWR<ChatSessionList>(FETCH_SESSIONS_KEY, sessionService.getSessionsWithGroup, {
       onSuccess: (data) => {
         // 由于 https://github.com/lobehub/lobe-chat/pull/541 的关系
         // 只有触发了 refreshSessions 才会更新 sessions，进而触发页面 rerender