@lobehub/chat 1.36.30 → 1.36.31

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.36.31](https://github.com/lobehub/lobe-chat/compare/v1.36.30...v1.36.31)
+
+<sup>Released on **2024-12-17**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the data fetch with clientDB init check.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the data fetch with clientDB init check, closes [#5049](https://github.com/lobehub/lobe-chat/issues/5049) ([e6d2e09](https://github.com/lobehub/lobe-chat/commit/e6d2e09))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.36.30](https://github.com/lobehub/lobe-chat/compare/v1.36.29...v1.36.30)
 
 <sup>Released on **2024-12-16**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Refactor the data fetch with clientDB init check."
+      ]
+    },
+    "date": "2024-12-17",
+    "version": "1.36.31"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.36.30",
+  "version": "1.36.31",
   "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/src/app/(main)/chat/(workspace)/@conversation/features/ChatList/Content.tsx

@@ -3,9 +3,9 @@
 import React, { memo, useCallback } from 'react';
 
 import { SkeletonList, VirtualizedList } from '@/features/Conversation';
+import { useFetchMessages } from '@/hooks/useFetchMessages';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
-import { useSessionStore } from '@/store/session';
 
 import MainChatItem from './ChatItem';
 import Welcome from './WelcomeChatItem';
@@ -15,15 +15,9 @@ interface ListProps {
 }
 
 const Content = memo<ListProps>(({ mobile }) => {
-  const [activeTopicId, useFetchMessages, isCurrentChatLoaded] = useChatStore((s) => [
-    s.activeTopicId,
-    s.useFetchMessages,
-    chatSelectors.isCurrentChatLoaded(s),
-  ]);
-
-  const [sessionId] = useSessionStore((s) => [s.activeId]);
-  useFetchMessages(sessionId, activeTopicId);
+  const [isCurrentChatLoaded] = useChatStore((s) => [chatSelectors.isCurrentChatLoaded(s)]);
 
+  useFetchMessages();
   const data = useChatStore(chatSelectors.mainDisplayChatIDs);
 
   const itemContent = useCallback(

package/src/app/(main)/chat/(workspace)/@conversation/features/ThreadHydration.tsx

@@ -4,6 +4,7 @@ import { useQueryState } from 'nuqs';
 import { memo, useEffect, useLayoutEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
+import { useFetchThreads } from '@/hooks/useFetchThreads';
 import { useChatStore } from '@/store/chat';
 
 // sync outside state to useChatStore
@@ -34,10 +35,7 @@ const ThreadHydration = memo(() => {
     }
   }, [portalThread]);
 
-  const [activeTopicId, useFetchThreads] = useChatStore((s) => [
-    s.activeTopicId,
-    s.useFetchThreads,
-  ]);
+  const activeTopicId = useChatStore((s) => s.activeTopicId);
 
   useFetchThreads(activeTopicId);
 

package/src/app/(main)/chat/@session/features/SessionListContent/DefaultMode.tsx

@@ -3,12 +3,11 @@ import isEqual from 'fast-deep-equal';
 import { memo, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useFetchSessions } from '@/hooks/useFetchSessions';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
-import { useUserStore } from '@/store/user';
-import { authSelectors } from '@/store/user/selectors';
 import { SessionDefaultGroup } from '@/types/session';
 
 import Actions from '../SessionListContent/CollapseGroup/Actions';
@@ -25,9 +24,7 @@ const DefaultMode = memo(() => {
   const [renameGroupModalOpen, setRenameGroupModalOpen] = useState(false);
   const [configGroupModalOpen, setConfigGroupModalOpen] = useState(false);
 
-  const isLogin = useUserStore(authSelectors.isLogin);
-  const [useFetchSessions] = useSessionStore((s) => [s.useFetchSessions]);
-  useFetchSessions(isLogin);
+  useFetchSessions();
 
   const defaultSessions = useSessionStore(sessionSelectors.defaultSessions, isEqual);
   const customSessionGroups = useSessionStore(sessionSelectors.customSessionGroups, isEqual);

package/src/app/(main)/discover/(detail)/plugin/[slug]/features/InstallPlugin.tsx

@@ -5,6 +5,7 @@ import { createStyles } from 'antd-style';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useFetchInstalledPlugins } from '@/hooks/useFetchInstalledPlugins';
 import { useToolStore } from '@/store/tool';
 import { pluginSelectors, pluginStoreSelectors } from '@/store/tool/selectors';
 
@@ -21,21 +22,15 @@ const InstallPlugin = memo<{ identifier: string }>(({ identifier }) => {
   const { t } = useTranslation(['discover', 'plugin']);
   const [loading, setLoading] = useState(false);
   const { modal } = App.useApp();
-  const [
-    useFetchPluginStore,
-    useFetchInstalledPlugins,
-    installed,
-    installing,
-    installPlugin,
-    unInstallPlugin,
-  ] = useToolStore((s) => [
-    s.useFetchPluginStore,
-    s.useFetchInstalledPlugins,
-    pluginSelectors.isPluginInstalled(identifier)(s),
-    pluginStoreSelectors.isPluginInstallLoading(identifier)(s),
-    s.installPlugin,
-    s.uninstallPlugin,
-  ]);
+  const [useFetchPluginStore, installed, installing, installPlugin, unInstallPlugin] = useToolStore(
+    (s) => [
+      s.useFetchPluginStore,
+      pluginSelectors.isPluginInstalled(identifier)(s),
+      pluginStoreSelectors.isPluginInstallLoading(identifier)(s),
+      s.installPlugin,
+      s.uninstallPlugin,
+    ],
+  );
 
   const { isLoading } = useFetchPluginStore();
   const { isLoading: installedPluginLoading } = useFetchInstalledPlugins();

package/src/database/server/models/plugin.ts

@@ -19,6 +19,10 @@ export class PluginModel {
     const [result] = await this.db
       .insert(installedPlugins)
       .values({ ...params, createdAt: new Date(), updatedAt: new Date(), userId: this.userId })
+      .onConflictDoUpdate({
+        set: { ...params, updatedAt: new Date() },
+        target: [installedPlugins.identifier, installedPlugins.userId],
+      })
       .returning();
 
     return result;

package/src/database/server/models/session.ts

@@ -229,6 +229,8 @@ export class SessionModel {
   }
 
   async updateConfig(id: string, data: Partial<AgentItem>) {
+    if (Object.keys(data).length === 0) return;
+
     return this.db
       .update(agents)
       .set(data)

package/src/features/AgentSetting/AgentPlugin/index.tsx

@@ -11,6 +11,7 @@ import { Center, Flexbox } from 'react-layout-kit';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import PluginStore from '@/features/PluginStore';
 import PluginTag from '@/features/PluginStore/PluginItem/PluginTag';
+import { useFetchInstalledPlugins } from '@/hooks/useFetchInstalledPlugins';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { pluginHelpers, useToolStore } from '@/store/tool';
 import { toolSelectors } from '@/store/tool/selectors';
@@ -33,7 +34,6 @@ const AgentPlugin = memo(() => {
 
   const { showDalle } = useServerConfigStore(featureFlagsSelectors);
   const installedPlugins = useToolStore(toolSelectors.metaList(showDalle), isEqual);
-  const useFetchInstalledPlugins = useToolStore((s) => s.useFetchInstalledPlugins);
 
   const { isLoading } = useFetchInstalledPlugins();
 

package/src/features/ChatInput/ActionBar/Tools/Dropdown.tsx

@@ -10,6 +10,8 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useWorkspaceModal } from '@/app/(main)/chat/(workspace)/features/useWorkspaceModal';
 import PluginStore from '@/features/PluginStore';
+import { useCheckPluginsIsInstalled } from '@/hooks/useCheckPluginsIsInstalled';
+import { useFetchInstalledPlugins } from '@/hooks/useFetchInstalledPlugins';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
@@ -109,13 +111,11 @@ const DropdownMenu = memo<PropsWithChildren>(({ children }) => {
 
   const plugins = useAgentStore((s) => agentSelectors.currentAgentPlugins(s));
 
-  const [useFetchPluginStore, useFetchInstalledPlugins, checkPluginsIsInstalled] = useToolStore(
-    (s) => [s.useFetchPluginStore, s.useFetchInstalledPlugins, s.useCheckPluginsIsInstalled],
-  );
+  const [useFetchPluginStore] = useToolStore((s) => [s.useFetchPluginStore]);
 
   useFetchPluginStore();
   useFetchInstalledPlugins();
-  checkPluginsIsInstalled(plugins);
+  useCheckPluginsIsInstalled(plugins);
 
   return (
     <>

package/src/features/Portal/Thread/Chat/ChatList.tsx

@@ -2,6 +2,7 @@ import React, { memo, useCallback } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { SkeletonList, VirtualizedList } from '@/features/Conversation';
+import { useFetchThreads } from '@/hooks/useFetchThreads';
 import { useChatStore } from '@/store/chat';
 import { threadSelectors } from '@/store/chat/selectors';
 
@@ -15,8 +16,6 @@ const ChatList = memo(({ mobile }: ChatListProps) => {
   const data = useChatStore(threadSelectors.portalDisplayChatIDs);
   const isInit = useChatStore((s) => s.threadsInit);
 
-  const useFetchThreads = useChatStore((s) => s.useFetchThreads);
-
   useFetchThreads();
 
   const itemContent = useCallback(

package/src/hooks/useCheckPluginsIsInstalled.ts

@@ -0,0 +1,10 @@
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+import { useToolStore } from '@/store/tool';
+
+export const useCheckPluginsIsInstalled = (plugins: string[]) => {
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
+  const checkPluginsIsInstalled = useToolStore((s) => s.useCheckPluginsIsInstalled);
+
+  checkPluginsIsInstalled(isPgliteInited, plugins);
+};

package/src/hooks/useFetchInstalledPlugins.ts

@@ -0,0 +1,10 @@
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+import { useToolStore } from '@/store/tool';
+
+export const useFetchInstalledPlugins = () => {
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
+  const [useFetchInstalledPlugins] = useToolStore((s) => [s.useFetchInstalledPlugins]);
+
+  return useFetchInstalledPlugins(isPgliteInited);
+};

package/src/hooks/useFetchMessages.ts

@@ -0,0 +1,15 @@
+import { useChatStore } from '@/store/chat';
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+import { useSessionStore } from '@/store/session';
+
+export const useFetchMessages = () => {
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
+  const [sessionId] = useSessionStore((s) => [s.activeId]);
+  const [activeTopicId, useFetchMessages] = useChatStore((s) => [
+    s.activeTopicId,
+    s.useFetchMessages,
+  ]);
+
+  useFetchMessages(isPgliteInited, sessionId, activeTopicId);
+};

package/src/hooks/useFetchSessions.ts

@@ -0,0 +1,13 @@
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+import { useSessionStore } from '@/store/session';
+import { useUserStore } from '@/store/user';
+import { authSelectors } from '@/store/user/slices/auth/selectors';
+
+export const useFetchSessions = () => {
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
+  const isLogin = useUserStore(authSelectors.isLogin);
+  const useFetchSessions = useSessionStore((s) => s.useFetchSessions);
+
+  useFetchSessions(isPgliteInited, isLogin);
+};

package/src/hooks/useFetchThreads.ts

@@ -0,0 +1,11 @@
+import { useChatStore } from '@/store/chat';
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
+
+export const useFetchThreads = (activeTopicId?: string) => {
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
+
+  const [useFetchThreads] = useChatStore((s) => [s.useFetchThreads]);
+
+  useFetchThreads(isPgliteInited, activeTopicId);
+};

package/src/hooks/useFetchTopics.ts

@@ -1,4 +1,7 @@
+import { useFetchThreads } from '@/hooks/useFetchThreads';
 import { useChatStore } from '@/store/chat';
+import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 
 /**
@@ -6,12 +9,9 @@ import { useSessionStore } from '@/store/session';
  */
 export const useFetchTopics = () => {
   const [sessionId] = useSessionStore((s) => [s.activeId]);
-  const [activeTopicId, useFetchTopics, useFetchThreads] = useChatStore((s) => [
-    s.activeTopicId,
-    s.useFetchTopics,
-    s.useFetchThreads,
-  ]);
-  useFetchTopics(sessionId);
+  const [activeTopicId, useFetchTopics] = useChatStore((s) => [s.activeTopicId, s.useFetchTopics]);
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
 
+  useFetchTopics(isPgliteInited, sessionId);
   useFetchThreads(activeTopicId);
 };

package/src/layout/GlobalProvider/StoreInitialization.tsx

@@ -10,6 +10,7 @@ import { useIsMobile } from '@/hooks/useIsMobile';
 import { useEnabledDataSync } from '@/hooks/useSyncData';
 import { useAgentStore } from '@/store/agent';
 import { useGlobalStore } from '@/store/global';
+import { systemStatusSelectors } from '@/store/global/selectors';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
@@ -50,7 +51,8 @@ const StoreInitialization = memo(() => {
    * But during initialization, the value of `enableAuth` might be incorrect cause of the async fetch.
    * So we need to use `isSignedIn` only to determine whether request for the default agent config and user state.
    */
-  const isLoginOnInit = enableNextAuth ? isSignedIn : isLogin;
+  const isPgliteInited = useGlobalStore(systemStatusSelectors.isPgliteInited);
+  const isLoginOnInit = isPgliteInited && (enableNextAuth ? isSignedIn : isLogin);
 
   // init inbox agent and default agent config
   useInitAgentStore(isLoginOnInit, serverConfig.defaultAgent?.config);

package/src/services/user/client.ts

@@ -42,8 +42,8 @@ export class ClientService implements IUserService {
     return UserModel.resetSettings();
   };
 
-  updateAvatar(avatar: string) {
-    return UserModel.updateAvatar(avatar);
+  async updateAvatar(avatar: string) {
+    await UserModel.updateAvatar(avatar);
   }
 
   async updatePreference(preference: Partial<UserPreference>) {

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

@@ -3,7 +3,6 @@ import { mutate } from 'swr';
 import { describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';
-import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { globalService } from '@/services/global';
 import { sessionService } from '@/services/session';
 import { useAgentStore } from '@/store/agent';
@@ -24,7 +23,9 @@ describe('AgentSlice', () => {
     it('should call togglePlugin with the provided id and false', async () => {
       const { result } = renderHook(() => useAgentStore());
       const pluginId = 'plugin-id';
-      const togglePluginMock = vi.spyOn(result.current, 'togglePlugin');
+      const togglePluginMock = vi
+        .spyOn(result.current, 'togglePlugin')
+        .mockResolvedValue(undefined);
 
       await act(async () => {
         await result.current.removePlugin(pluginId);
@@ -39,8 +40,9 @@ describe('AgentSlice', () => {
     it('should add plugin id to plugins array if not present and open is true or undefined', async () => {
       const { result } = renderHook(() => useAgentStore());
       const pluginId = 'plugin-id';
-      const updateAgentConfigMock = vi.spyOn(result.current, 'updateAgentConfig');
-
+      const updateAgentConfigMock = vi
+        .spyOn(result.current, 'updateAgentConfig')
+        .mockResolvedValue(undefined);
       // 模拟当前配置不包含插件 ID
       vi.spyOn(agentSelectors, 'currentAgentConfig').mockReturnValue({ plugins: [] } as any);
 
@@ -57,8 +59,9 @@ describe('AgentSlice', () => {
     it('should remove plugin id from plugins array if present and open is false', async () => {
       const { result } = renderHook(() => useAgentStore());
       const pluginId = 'plugin-id';
-      const updateAgentConfigMock = vi.spyOn(result.current, 'updateAgentConfig');
-
+      const updateAgentConfigMock = vi
+        .spyOn(result.current, 'updateAgentConfig')
+        .mockResolvedValue(undefined);
       // 模拟当前配置包含插件 ID
       vi.spyOn(agentSelectors, 'currentAgentConfig').mockReturnValue({
         plugins: [pluginId],
@@ -75,7 +78,9 @@ describe('AgentSlice', () => {
     it('should not modify plugins array if plugin id is not present and open is false', async () => {
       const { result } = renderHook(() => useAgentStore());
       const pluginId = 'plugin-id';
-      const updateAgentConfigMock = vi.spyOn(result.current, 'updateAgentConfig');
+      const updateAgentConfigMock = vi
+        .spyOn(result.current, 'updateAgentConfig')
+        .mockResolvedValue(undefined);
 
       // 模拟当前配置不包含插件 ID
       vi.spyOn(agentSelectors, 'currentAgentConfig').mockReturnValue({ plugins: [] } as any);
@@ -93,7 +98,9 @@ describe('AgentSlice', () => {
     it('should update global config if current session is inbox session', async () => {
       const { result } = renderHook(() => useAgentStore());
       const config = { model: 'gpt-3.5-turbo' };
-      const updateSessionConfigMock = vi.spyOn(sessionService, 'updateSessionConfig');
+      const updateSessionConfigMock = vi
+        .spyOn(sessionService, 'updateSessionConfig')
+        .mockResolvedValue(undefined);
       const refreshMock = vi.spyOn(result.current, 'internal_refreshAgentConfig');
 
       await act(async () => {
@@ -113,7 +120,9 @@ describe('AgentSlice', () => {
     it('should update session config if current session is not inbox session', async () => {
       const { result } = renderHook(() => useAgentStore());
       const config = { model: 'gpt-3.5-turbo' };
-      const updateSessionConfigMock = vi.spyOn(sessionService, 'updateSessionConfig');
+      const updateSessionConfigMock = vi
+        .spyOn(sessionService, 'updateSessionConfig')
+        .mockResolvedValue(undefined);
       const refreshMock = vi.spyOn(result.current, 'internal_refreshAgentConfig');
 
       // 模拟当前会话不是收件箱会话
@@ -247,7 +256,9 @@ describe('AgentSlice', () => {
     it('should call sessionService.updateSessionConfig', async () => {
       const { result } = renderHook(() => useAgentStore());
 
-      const updateSessionConfigMock = vi.spyOn(sessionService, 'updateSessionConfig');
+      const updateSessionConfigMock = vi
+        .spyOn(sessionService, 'updateSessionConfig')
+        .mockResolvedValue(undefined);
 
       await act(async () => {
         await result.current.internal_updateAgentConfig('test-session-id', { foo: 'bar' } as any);

package/src/store/chat/slices/aiChat/actions/__tests__/generateAIChat.test.ts

@@ -5,6 +5,7 @@ import { LOADING_FLAT } from '@/const/message';
 import { DEFAULT_AGENT_CHAT_CONFIG, DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
+import { sessionService } from '@/services/session';
 import { topicService } from '@/services/topic';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
@@ -51,6 +52,15 @@ vi.mock('@/services/chat', async (importOriginal) => {
     },
   };
 });
+vi.mock('@/services/session', async (importOriginal) => {
+  const module = await importOriginal();
+
+  return {
+    sessionService: {
+      updateSession: vi.fn(),
+    },
+  };
+});
 
 const realCoreProcessMessage = useChatStore.getState().internal_coreProcessMessage;
 

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

@@ -72,7 +72,6 @@ export const chatToolSlice: StateCreator<
 
       const data = await useFileStore.getState().uploadWithProgress({
         file: imageFile,
-        onStatusUpdate: () => {},
       });
 
       if (!data) return;

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

@@ -466,7 +466,9 @@ describe('chatMessage actions', () => {
       // 设置模拟返回值
       (messageService.getMessages as Mock).mockResolvedValue(messages);
 
-      const { result } = renderHook(() => useChatStore().useFetchMessages(sessionId, topicId));
+      const { result } = renderHook(() =>
+        useChatStore().useFetchMessages(true, sessionId, topicId),
+      );
 
       // 等待异步操作完成
       await waitFor(() => {

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

@@ -47,7 +47,11 @@ export interface ChatMessageAction {
   modifyMessageContent: (id: string, content: string) => Promise<void>;
   toggleMessageEditing: (id: string, editing: boolean) => void;
   // query
-  useFetchMessages: (sessionId: string, topicId?: string) => SWRResponse<ChatMessage[]>;
+  useFetchMessages: (
+    enable: boolean,
+    sessionId: string,
+    topicId?: string,
+  ) => SWRResponse<ChatMessage[]>;
   copyMessage: (id: string, content: string) => Promise<void>;
   refreshMessages: () => Promise<void>;
 
@@ -220,9 +224,9 @@ export const chatMessage: StateCreator<
 
     await get().internal_updateMessageContent(id, content);
   },
-  useFetchMessages: (sessionId, activeTopicId) =>
+  useFetchMessages: (enable, sessionId, activeTopicId) =>
     useClientDataSWR<ChatMessage[]>(
-      [SWR_USE_FETCH_MESSAGES, sessionId, activeTopicId],
+      enable ? [SWR_USE_FETCH_MESSAGES, sessionId, activeTopicId] : null,
       async ([, sessionId, topicId]: [string, string, string | undefined]) =>
         messageService.getMessages(sessionId, topicId),
       {

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

@@ -44,7 +44,7 @@ export interface ChatThreadAction {
   openThreadCreator: (messageId: string) => void;
   openThreadInPortal: (threadId: string, sourceMessageId: string) => void;
   closeThreadPortal: () => void;
-  useFetchThreads: (topicId?: string) => SWRResponse<ThreadItem[]>;
+  useFetchThreads: (enable: boolean, topicId?: string) => SWRResponse<ThreadItem[]>;
   summaryThreadTitle: (threadId: string, messages: ChatMessage[]) => Promise<void>;
   updateThreadTitle: (id: string, title: string) => Promise<void>;
   removeThread: (id: string) => Promise<void>;
@@ -209,9 +209,9 @@ export const chatThreadMessage: StateCreator<
     return data;
   },
 
-  useFetchThreads: (topicId) =>
+  useFetchThreads: (enable, topicId) =>
     useClientDataSWR<ThreadItem[]>(
-      !!topicId && isServerMode ? [SWR_USE_FETCH_THREADS, topicId] : null,
+      enable && !!topicId && isServerMode ? [SWR_USE_FETCH_THREADS, topicId] : null,
       async ([, topicId]: [string, string]) => threadService.getThreads(topicId),
       {
         suspense: true,

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

@@ -232,7 +232,7 @@ describe('topic action', () => {
       (topicService.getTopics as Mock).mockResolvedValue(topics);
 
       // Use the hook with the session id
-      const { result } = renderHook(() => useChatStore().useFetchTopics(sessionId));
+      const { result } = renderHook(() => useChatStore().useFetchTopics(true, sessionId));
 
       // Wait for the hook to resolve and update the state
       await waitFor(() => {

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

@@ -48,7 +48,7 @@ export interface ChatTopicAction {
   summaryTopicTitle: (topicId: string, messages: ChatMessage[]) => Promise<void>;
   switchTopic: (id?: string, skipRefreshMessage?: boolean) => Promise<void>;
   updateTopicTitle: (id: string, title: string) => Promise<void>;
-  useFetchTopics: (sessionId: string) => SWRResponse<ChatTopic[]>;
+  useFetchTopics: (enable: boolean, sessionId: string) => SWRResponse<ChatTopic[]>;
   useSearchTopics: (keywords?: string, sessionId?: string) => SWRResponse<ChatTopic[]>;
 
   internal_updateTopicTitleInSummary: (id: string, title: string) => void;
@@ -190,9 +190,9 @@ export const chatTopic: StateCreator<
   },
 
   // query
-  useFetchTopics: (sessionId) =>
+  useFetchTopics: (enable, sessionId) =>
     useClientDataSWR<ChatTopic[]>(
-      [SWR_USE_FETCH_TOPIC, sessionId],
+      enable ? [SWR_USE_FETCH_TOPIC, sessionId] : null,
       async ([, sessionId]: [string, string]) => topicService.getTopics({ sessionId }),
       {
         suspense: true,

package/src/store/global/selectors.ts

@@ -24,12 +24,18 @@ const threadInputHeight = (s: GlobalStore) => s.status.threadInputHeight;
 
 const isPgliteNotEnabled = () => false;
 
+const isPgliteNotInited = () => false;
+
+const isPgliteInited = (): boolean => true;
+
 export const systemStatusSelectors = {
   filePanelWidth,
   hidePWAInstaller,
   inZenMode,
   inputHeight,
+  isPgliteInited,
   isPgliteNotEnabled,
+  isPgliteNotInited,
   mobileShowPortal,
   mobileShowTopic,
   sessionGroupKeys,

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

@@ -73,7 +73,10 @@ export interface SessionAction {
 
   updateSearchKeywords: (keywords: string) => void;
 
-  useFetchSessions: (isLogin: boolean | undefined) => SWRResponse<ChatSessionList>;
+  useFetchSessions: (
+    enabled: boolean,
+    isLogin: boolean | undefined,
+  ) => SWRResponse<ChatSessionList>;
   useSearchSessions: (keyword?: string) => SWRResponse<any>;
 
   internal_dispatchSessions: (payload: SessionDispatch) => void;
@@ -197,9 +200,9 @@ export const createSessionSlice: StateCreator<
     await refreshSessions();
   },
 
-  useFetchSessions: (isLogin) =>
+  useFetchSessions: (enabled, isLogin) =>
     useClientDataSWR<ChatSessionList>(
-      [FETCH_SESSIONS_KEY, isLogin],
+      enabled ? [FETCH_SESSIONS_KEY, isLogin] : null,
       () => sessionService.getGroupedSessions(),
       {
         fallbackData: {

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

@@ -40,7 +40,9 @@ describe('createSessionGroupSlice', () => {
 
   describe('clearSessionGroups', () => {
     it('should clear session groups and refresh sessions', async () => {
-      vi.spyOn(sessionService, 'removeSessionGroups');
+      const spyOn = vi
+        .spyOn(sessionService, 'removeSessionGroups')
+        .mockResolvedValueOnce(undefined);
       const spyOnRefreshSessions = vi.spyOn(useSessionStore.getState(), 'refreshSessions');
 
       const { result } = renderHook(() => useSessionStore());
@@ -49,7 +51,7 @@ describe('createSessionGroupSlice', () => {
         await result.current.clearSessionGroups();
       });
 
-      expect(sessionService.removeSessionGroups).toHaveBeenCalled();
+      expect(spyOn).toHaveBeenCalled();
       expect(spyOnRefreshSessions).toHaveBeenCalled();
     });
   });
@@ -57,7 +59,7 @@ describe('createSessionGroupSlice', () => {
   describe('removeSessionGroup', () => {
     it('should remove a session group and refresh sessions', async () => {
       const mockId = 'mock-id';
-      vi.spyOn(sessionService, 'removeSessionGroup');
+      vi.spyOn(sessionService, 'removeSessionGroup').mockResolvedValueOnce(undefined);
       const spyOnRefreshSessions = vi.spyOn(useSessionStore.getState(), 'refreshSessions');
 
       const { result } = renderHook(() => useSessionStore());
@@ -75,7 +77,7 @@ describe('createSessionGroupSlice', () => {
     it('should update a session group id and refresh sessions', async () => {
       const mockSessionId = 'session-id';
       const mockGroupId = 'group-id';
-      vi.spyOn(sessionService, 'updateSession');
+      vi.spyOn(sessionService, 'updateSession').mockResolvedValueOnce(undefined);
       const spyOnRefreshSessions = vi.spyOn(useSessionStore.getState(), 'refreshSessions');
 
       const { result } = renderHook(() => useSessionStore());
@@ -96,7 +98,7 @@ describe('createSessionGroupSlice', () => {
       const mockId = 'mock-id';
       const mockName = 'New Name';
       const spyOnRefreshSessions = vi.spyOn(useSessionStore.getState(), 'refreshSessions');
-      vi.spyOn(sessionService, 'updateSessionGroup');
+      vi.spyOn(sessionService, 'updateSessionGroup').mockResolvedValueOnce(undefined);
 
       const { result } = renderHook(() => useSessionStore());
 
@@ -115,7 +117,7 @@ describe('createSessionGroupSlice', () => {
         { id: 'id1', sort: 0 },
         { id: 'id2', sort: 1 },
       ];
-      vi.spyOn(sessionService, 'updateSessionGroupOrder');
+      vi.spyOn(sessionService, 'updateSessionGroupOrder').mockResolvedValueOnce(undefined);
       const spyOnRefreshSessions = vi.spyOn(useSessionStore.getState(), 'refreshSessions');
 
       const { result } = renderHook(() => useSessionStore());

package/src/store/tool/slices/plugin/action.ts

@@ -1,8 +1,9 @@
 import { Schema, ValidationResult } from '@cfworker/json-schema';
-import useSWR, { SWRResponse } from 'swr';
+import { SWRResponse } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
 import { MESSAGE_CANCEL_FLAT } from '@/const/message';
+import { useClientDataSWR } from '@/libs/swr';
 import { pluginService } from '@/services/plugin';
 import { merge } from '@/utils/merge';
 
@@ -17,7 +18,7 @@ export interface PluginAction {
   checkPluginsIsInstalled: (plugins: string[]) => Promise<void>;
   removeAllPlugins: () => Promise<void>;
   updatePluginSettings: <T>(id: string, settings: Partial<T>) => Promise<void>;
-  useCheckPluginsIsInstalled: (plugins: string[]) => SWRResponse;
+  useCheckPluginsIsInstalled: (enable: boolean, plugins: string[]) => SWRResponse;
   validatePluginSettings: (identifier: string) => Promise<ValidationResult | undefined>;
 }
 
@@ -59,7 +60,8 @@ export const createPluginSlice: StateCreator<
 
     await get().refreshPlugins();
   },
-  useCheckPluginsIsInstalled: (plugins) => useSWR(plugins, get().checkPluginsIsInstalled),
+  useCheckPluginsIsInstalled: (enable, plugins) =>
+    useClientDataSWR(enable ? plugins : null, get().checkPluginsIsInstalled),
   validatePluginSettings: async (identifier) => {
     const manifest = pluginSelectors.getToolManifestById(identifier)(get());
     if (!manifest || !manifest.settings) return;

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

@@ -27,7 +27,7 @@ export interface PluginStoreAction {
   uninstallPlugin: (identifier: string) => Promise<void>;
 
   updateInstallLoadingState: (key: string, value: boolean | undefined) => void;
-  useFetchInstalledPlugins: () => SWRResponse<LobeTool[]>;
+  useFetchInstalledPlugins: (enabled: boolean) => SWRResponse<LobeTool[]>;
   useFetchPluginStore: () => SWRResponse<LobeChatPluginMeta[]>;
 }
 
@@ -90,8 +90,9 @@ export const createPluginStoreSlice: StateCreator<
       n('updateInstallLoadingState'),
     );
   },
-  useFetchInstalledPlugins: () =>
-    useSWR<LobeTool[]>(INSTALLED_PLUGINS, pluginService.getInstalledPlugins, {
+
+  useFetchInstalledPlugins: (enabled: boolean) =>
+    useSWR<LobeTool[]>(enabled ? INSTALLED_PLUGINS : null, pluginService.getInstalledPlugins, {
       fallbackData: [],
       onSuccess: (data) => {
         set(

package/src/store/user/slices/common/action.test.ts

@@ -37,7 +37,9 @@ describe('createCommonSlice', () => {
       const avatar = 'new-avatar';
 
       const spyOn = vi.spyOn(result.current, 'refreshUserState');
-      const updateAvatarSpy = vi.spyOn(ClientService.prototype, 'updateAvatar');
+      const updateAvatarSpy = vi
+        .spyOn(ClientService.prototype, 'updateAvatar')
+        .mockResolvedValue(undefined);
 
       await act(async () => {
         await result.current.updateAvatar(avatar);