@lobehub/chat 0.161.21 → 0.161.23

package/src/migrations/FromV6ToV7/types/v7.ts

@@ -0,0 +1,71 @@
+
+
+interface OpenAICompatibleKeyVault {
+  apiKey?: string;
+  baseURL?: string;
+}
+interface AzureOpenAIKeyVault {
+  apiKey?: string;
+  apiVersion?: string;
+  endpoint?: string;
+}
+
+export interface AWSBedrockKeyVault {
+  accessKeyId?: string;
+  region?: string;
+  secretAccessKey?: string;
+}
+
+export interface V7KeyVaults {
+  anthropic: OpenAICompatibleKeyVault;
+  azure: AzureOpenAIKeyVault;
+  bedrock: AWSBedrockKeyVault;
+  deepseek: OpenAICompatibleKeyVault;
+  google: OpenAICompatibleKeyVault;
+  groq: OpenAICompatibleKeyVault;
+  minimax: OpenAICompatibleKeyVault;
+  mistral: OpenAICompatibleKeyVault;
+  moonshot: OpenAICompatibleKeyVault;
+  ollama: OpenAICompatibleKeyVault;
+  openai: OpenAICompatibleKeyVault;
+  openrouter: OpenAICompatibleKeyVault;
+  password: string;
+  perplexity: OpenAICompatibleKeyVault;
+  togetherai: OpenAICompatibleKeyVault;
+  zeroone: OpenAICompatibleKeyVault;
+  zhipu: OpenAICompatibleKeyVault;
+}
+
+interface V7ProviderConfig {
+  autoFetchModelLists?: boolean;
+  customModelCards?: any[];
+  enabled: boolean;
+  enabledModels?: string[] | null;
+  fetchOnClient?: boolean;
+  latestFetchTime?: number;
+  remoteModelCards?: any[];
+}
+
+export type V7ModelProviderConfig = Record<string, V7ProviderConfig>;
+
+export interface V7GeneralSettings {
+  fontSize: number;
+  language: string;
+  neutralColor?: string;
+  primaryColor?: string;
+  themeMode: string;
+}
+
+export interface V7Settings {
+  defaultAgent: any;
+  general: V7GeneralSettings;
+  keyVaults: V7KeyVaults;
+  languageModel?: V7ModelProviderConfig;
+  sync: any;
+  tool: any;
+  tts: any;
+}
+
+export interface V7ConfigState {
+  settings?: V7Settings;
+}

package/src/migrations/index.ts

@@ -7,18 +7,24 @@ import { MigrationV1ToV2 } from './FromV1ToV2';
 import { MigrationV3ToV4 } from './FromV3ToV4';
 import { MigrationV4ToV5 } from './FromV4ToV5';
 import { MigrationV5ToV6 } from './FromV5ToV6';
+import { MigrationV6ToV7 } from './FromV6ToV7';
 
 // Current latest version
-export const CURRENT_CONFIG_VERSION = 6;
+export const CURRENT_CONFIG_VERSION = 7;
 
 // Version migrations module
 const ConfigMigrations = [
+  /**
+   * 2024.05.27
+   *
+   * apiKey in languageModel change to keyVaults
+   */
+  MigrationV6ToV7,
   /**
    * 2024.05.24
    *
    * some config in agentConfig change to chatConfig
-   */
-  MigrationV5ToV6,
+   */ MigrationV5ToV6,
   /**
    * 2024.05.11
    *

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

@@ -676,10 +676,10 @@ describe('AgentRuntimeOnClient', () => {
         // Mock the global store to return the user's OpenAI API key and endpoint
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               openai: {
                 apiKey: 'user-openai-key',
-                endpoint: 'user-openai-endpoint',
+                baseURL: 'user-openai-endpoint',
               },
             },
           },
@@ -693,7 +693,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Azure provider: with apiKey, apiVersion, endpoint', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               azure: {
                 apiKey: 'user-azure-key',
                 endpoint: 'user-azure-endpoint',
@@ -710,7 +710,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Google provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               google: {
                 apiKey: 'user-google-key',
               },
@@ -725,7 +725,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Moonshot AI provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               moonshot: {
                 apiKey: 'user-moonshot-key',
               },
@@ -740,7 +740,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Bedrock provider: with accessKeyId, region, secretAccessKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               bedrock: {
                 accessKeyId: 'user-bedrock-access-key',
                 region: 'user-bedrock-region',
@@ -757,9 +757,9 @@ describe('AgentRuntimeOnClient', () => {
       it('Ollama provider: with endpoint', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               ollama: {
-                endpoint: 'http://127.0.0.1:1234',
+                baseURL: 'http://127.0.0.1:1234',
               },
             },
           },
@@ -772,7 +772,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Perplexity provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               perplexity: {
                 apiKey: 'user-perplexity-key',
               },
@@ -787,7 +787,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Anthropic provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               anthropic: {
                 apiKey: 'user-anthropic-key',
               },
@@ -802,7 +802,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Mistral provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               mistral: {
                 apiKey: 'user-mistral-key',
               },
@@ -817,7 +817,7 @@ describe('AgentRuntimeOnClient', () => {
       it('OpenRouter provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               openrouter: {
                 apiKey: 'user-openrouter-key',
               },
@@ -832,7 +832,7 @@ describe('AgentRuntimeOnClient', () => {
       it('TogetherAI provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               togetherai: {
                 apiKey: 'user-togetherai-key',
               },
@@ -847,7 +847,7 @@ describe('AgentRuntimeOnClient', () => {
       it('ZeroOneAI provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               zeroone: {
                 apiKey: 'user-zeroone-key',
               },
@@ -862,7 +862,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Groq provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               groq: {
                 apiKey: 'user-groq-key',
               },
@@ -877,7 +877,7 @@ describe('AgentRuntimeOnClient', () => {
       it('DeepSeek provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               deepseek: {
                 apiKey: 'user-deepseek-key',
               },
@@ -888,7 +888,7 @@ describe('AgentRuntimeOnClient', () => {
         expect(runtime).toBeInstanceOf(AgentRuntime);
         expect(runtime['_runtime']).toBeInstanceOf(LobeDeepSeekAI);
       });
-      
+
       /**
        * Should not have a unknown provider in client, but has
        * similar cases in server side
@@ -896,7 +896,7 @@ describe('AgentRuntimeOnClient', () => {
       it('Unknown provider: with apiKey', async () => {
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               unknown: {
                 apiKey: 'user-unknown-key',
                 endpoint: 'user-unknown-endpoint',
@@ -924,7 +924,7 @@ describe('AgentRuntimeOnClient', () => {
         }));
         merge(initialSettingsState, {
           settings: {
-            languageModel: {
+            keyVaults: {
               zhipu: {
                 apiKey: 'zhipu.user-key',
               },

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

@@ -2,8 +2,8 @@ import { DeepPartial } from 'utility-types';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LOBE_URL_IMPORT_NAME } from '@/const/url';
-import { GlobalSettings } from '@/types/settings';
 import { ShareGPTConversation } from '@/types/share';
+import { UserSettings } from '@/types/user/settings';
 import { parseMarkdown } from '@/utils/parseMarkdown';
 
 import { SHARE_GPT_URL, shareService } from '../share';
@@ -91,8 +91,8 @@ describe('ShareGPTService', () => {
 describe('ShareViaUrl', () => {
   describe('createShareSettingsUrl', () => {
     it('should create a share settings URL with the provided settings', () => {
-      const settings: DeepPartial<GlobalSettings> = {
-        languageModel: {
+      const settings: DeepPartial<UserSettings> = {
+        keyVaults: {
           openai: {
             apiKey: 'user-key',
           },
@@ -100,7 +100,7 @@ describe('ShareViaUrl', () => {
       };
       const url = shareService.createShareSettingsUrl(settings);
       expect(url).toBe(
-        `/?${LOBE_URL_IMPORT_NAME}=%7B%22languageModel%22:%7B%22openai%22:%7B%22apiKey%22:%22user-key%22%7D%7D%7D`,
+        `/?${LOBE_URL_IMPORT_NAME}=%7B%22keyVaults%22:%7B%22openai%22:%7B%22apiKey%22:%22user-key%22%7D%7D%7D`,
       );
     });
   });

package/src/services/_auth.test.ts

@@ -3,7 +3,11 @@ import { describe, expect, it, vi } from 'vitest';
 
 import { ModelProvider } from '@/libs/agent-runtime';
 import { useUserStore } from '@/store/user';
-import { GlobalLLMConfig, GlobalLLMProviderKey } from '@/types/settings';
+import {
+  GlobalLLMProviderKey,
+  UserKeyVaults,
+  UserModelProviderConfig,
+} from '@/types/user/settings';
 
 import { getProviderAuthPayload } from './_auth';
 
@@ -21,10 +25,10 @@ vi.mock('zustand/traditional');
 
 const setModelProviderConfig = <T extends GlobalLLMProviderKey>(
   provider: T,
-  config: Partial<GlobalLLMConfig[T]>,
+  config: Partial<UserKeyVaults[T]>,
 ) => {
   useUserStore.setState({
-    settings: { languageModel: { [provider]: config } },
+    settings: { keyVaults: { [provider]: config } },
   });
 };
 
@@ -135,7 +139,7 @@ describe('getProviderAuthPayload', () => {
     // 假设的 Ollama 配置
     const mockOllamaProxyUrl = 'ollama-proxy-url';
     act(() => {
-      setModelProviderConfig('ollama', { endpoint: mockOllamaProxyUrl });
+      setModelProviderConfig('ollama', { baseURL: mockOllamaProxyUrl });
     });
 
     const payload = getProviderAuthPayload(ModelProvider.Ollama);
@@ -148,6 +152,7 @@ describe('getProviderAuthPayload', () => {
     // 假设的 OpenAI 配置
     const mockOpenAIConfig = {
       apiKey: 'openai-api-key',
+      baseURL: 'openai-baseURL',
       endpoint: 'openai-endpoint',
       useAzure: true,
       azureApiVersion: 'openai-azure-api-version',
@@ -159,7 +164,7 @@ describe('getProviderAuthPayload', () => {
     const payload = getProviderAuthPayload(ModelProvider.OpenAI);
     expect(payload).toEqual({
       apiKey: mockOpenAIConfig.apiKey,
-      endpoint: mockOpenAIConfig.endpoint,
+      endpoint: mockOpenAIConfig.baseURL,
     });
   });
 

package/src/services/_auth.ts

@@ -1,15 +1,17 @@
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { useUserStore } from '@/store/user';
-import { modelConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import { keyVaultsConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import { GlobalLLMProviderKey } from '@/types/user/settings';
 import { createJWT } from '@/utils/jwt';
 
 export const getProviderAuthPayload = (provider: string) => {
   switch (provider) {
     case ModelProvider.Bedrock: {
-      const { accessKeyId, region, secretAccessKey } = modelConfigSelectors.bedrockConfig(
+      const { accessKeyId, region, secretAccessKey } = keyVaultsConfigSelectors.bedrockConfig(
         useUserStore.getState(),
       );
+
       const awsSecretAccessKey = secretAccessKey;
       const awsAccessKeyId = accessKeyId;
 
@@ -19,7 +21,7 @@ export const getProviderAuthPayload = (provider: string) => {
     }
 
     case ModelProvider.Azure: {
-      const azure = modelConfigSelectors.azureConfig(useUserStore.getState());
+      const azure = keyVaultsConfigSelectors.azureConfig(useUserStore.getState());
 
       return {
         apiKey: azure.apiKey,
@@ -29,15 +31,17 @@ export const getProviderAuthPayload = (provider: string) => {
     }
 
     case ModelProvider.Ollama: {
-      const config = modelConfigSelectors.ollamaConfig(useUserStore.getState());
+      const config = keyVaultsConfigSelectors.ollamaConfig(useUserStore.getState());
 
-      return { endpoint: config?.endpoint };
+      return { endpoint: config?.baseURL };
     }
 
     default: {
-      const config = settingsSelectors.providerConfig(provider)(useUserStore.getState());
+      const config = keyVaultsConfigSelectors.getVaultByProvider(provider as GlobalLLMProviderKey)(
+        useUserStore.getState(),
+      );
 
-      return { apiKey: config?.apiKey, endpoint: config?.endpoint };
+      return { apiKey: config?.apiKey, endpoint: config?.baseURL };
     }
   }
 };

package/src/services/_header.ts

@@ -1,6 +1,9 @@
 import { LOBE_CHAT_ACCESS_CODE, OPENAI_API_KEY_HEADER_KEY, OPENAI_END_POINT } from '@/const/fetch';
 import { useUserStore } from '@/store/user';
-import { modelConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import {
+  keyVaultsConfigSelectors,
+  settingsSelectors,
+} from '@/store/user/selectors';
 
 /**
  * TODO: Need to be removed after tts refactor
@@ -8,13 +11,13 @@ import { modelConfigSelectors, settingsSelectors } from '@/store/user/selectors'
  */
 // eslint-disable-next-line no-undef
 export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
-  const openAIConfig = modelConfigSelectors.openAIConfig(useUserStore.getState());
+  const openAIConfig = keyVaultsConfigSelectors.openAIConfig(useUserStore.getState());
 
   // eslint-disable-next-line no-undef
   return {
     ...header,
     [LOBE_CHAT_ACCESS_CODE]: settingsSelectors.password(useUserStore.getState()),
     [OPENAI_API_KEY_HEADER_KEY]: openAIConfig.apiKey || '',
-    [OPENAI_END_POINT]: openAIConfig.endpoint || '',
+    [OPENAI_END_POINT]: openAIConfig.baseURL || '',
   };
 };

package/src/services/config.ts

@@ -8,8 +8,8 @@ import { settingsSelectors } from '@/store/user/selectors';
 import { ConfigFile } from '@/types/exportConfig';
 import { ChatMessage } from '@/types/message';
 import { LobeSessions, SessionGroupItem } from '@/types/session';
-import { GlobalSettings } from '@/types/settings';
 import { ChatTopic } from '@/types/topic';
+import { UserSettings } from '@/types/user/settings';
 import { createConfigFile, exportConfigFile } from '@/utils/config';
 
 export interface ImportResult {
@@ -35,7 +35,7 @@ class ConfigService {
   importMessages = async (messages: ChatMessage[]) => {
     return messageService.batchCreateMessages(messages);
   };
-  importSettings = async (settings: GlobalSettings) => {
+  importSettings = async (settings: UserSettings) => {
     useUserStore.getState().importAppSettings(settings);
   };
   importTopics = async (topics: ChatTopic[]) => {

package/src/services/ollama.ts

@@ -3,7 +3,7 @@ import { ListResponse, Ollama as OllamaBrowser, ProgressResponse } from 'ollama/
 import { createErrorResponse } from '@/app/api/errorResponse';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { useUserStore } from '@/store/user';
-import { modelConfigSelectors } from '@/store/user/selectors';
+import { keyVaultsConfigSelectors } from '@/store/user/selectors';
 import { ChatErrorType } from '@/types/fetch';
 import { getMessageError } from '@/utils/fetch';
 
@@ -25,9 +25,9 @@ export class OllamaService {
   }
 
   getHost = (): string => {
-    const config = modelConfigSelectors.ollamaConfig(useUserStore.getState());
+    const config = keyVaultsConfigSelectors.ollamaConfig(useUserStore.getState());
 
-    return config.endpoint || DEFAULT_BASE_URL;
+    return config.baseURL || DEFAULT_BASE_URL;
   };
 
   getOllamaClient = () => {

package/src/services/share.ts

@@ -1,8 +1,8 @@
 import { DeepPartial } from 'utility-types';
 
 import { LOBE_URL_IMPORT_NAME } from '@/const/url';
-import { GlobalSettings } from '@/types/settings';
 import { ShareGPTConversation } from '@/types/share';
+import { UserSettings } from '@/types/user/settings';
 import { withBasePath } from '@/utils/basePath';
 import { parseMarkdown } from '@/utils/parseMarkdown';
 
@@ -40,7 +40,7 @@ class ShareService {
    * @param settings - The settings object to be encoded in the URL.
    * @returns The share settings URL.
    */
-  public createShareSettingsUrl(settings: DeepPartial<GlobalSettings>) {
+  public createShareSettingsUrl(settings: DeepPartial<UserSettings>) {
     return withBasePath(`/?${LOBE_URL_IMPORT_NAME}=${encodeURI(JSON.stringify(settings))}`);
   }
 
@@ -51,7 +51,7 @@ class ShareService {
    */
   public decodeShareSettings(settings: string) {
     try {
-      return { data: JSON.parse(settings) as DeepPartial<GlobalSettings> };
+      return { data: JSON.parse(settings) as DeepPartial<UserSettings> };
     } catch (e) {
       return { message: JSON.stringify(e) };
     }

package/src/services/user/client.test.ts

@@ -2,8 +2,8 @@ import { DeepPartial } from 'utility-types';
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { UserModel } from '@/database/client/models/user';
-import { GlobalSettings } from '@/types/settings';
 import { UserPreference } from '@/types/user';
+import { UserSettings } from '@/types/user/settings';
 import { AsyncLocalStorage } from '@/utils/localStorage';
 
 import { ClientService } from './client';
@@ -19,7 +19,7 @@ vi.mock('@/database/client/models/user', () => ({
 
 const mockUser = {
   avatar: 'avatar.png',
-  settings: { themeMode: 'light' } as unknown as GlobalSettings,
+  settings: { themeMode: 'light' } as unknown as UserSettings,
   uuid: 'user-id',
 };
 
@@ -58,7 +58,7 @@ describe('ClientService', () => {
   });
 
   it('should update user settings correctly', async () => {
-    const settingsPatch: DeepPartial<GlobalSettings> = { themeMode: 'dark' };
+    const settingsPatch: DeepPartial<UserSettings> = { general: { themeMode: 'dark' } };
     (UserModel.updateSettings as Mock).mockResolvedValue(undefined);
 
     await clientService.updateUserSettings(settingsPatch);

package/src/services/user/client.ts

@@ -3,8 +3,8 @@ import { DeepPartial } from 'utility-types';
 import { MessageModel } from '@/database/client/models/message';
 import { SessionModel } from '@/database/client/models/session';
 import { UserModel } from '@/database/client/models/user';
-import { GlobalSettings } from '@/types/settings';
 import { UserInitializationState, UserPreference } from '@/types/user';
+import { UserSettings } from '@/types/user/settings';
 import { AsyncLocalStorage } from '@/utils/localStorage';
 
 import { IUserService } from './type';
@@ -28,12 +28,12 @@ export class ClientService implements IUserService {
       hasConversation: messageCount > 0 || sessionCount > 0,
       isOnboard: true,
       preference: await this.preferenceStorage.getFromLocalStorage(),
-      settings: user.settings as GlobalSettings,
+      settings: user.settings as UserSettings,
       userId: user.uuid,
     };
   }
 
-  updateUserSettings = async (patch: DeepPartial<GlobalSettings>) => {
+  updateUserSettings = async (patch: DeepPartial<UserSettings>) => {
     return UserModel.updateSettings(patch);
   };
 

package/src/services/user/type.ts

@@ -1,11 +1,11 @@
 import { DeepPartial } from 'utility-types';
 
-import { GlobalSettings } from '@/types/settings';
 import { UserInitializationState, UserPreference } from '@/types/user';
+import { UserSettings } from '@/types/user/settings';
 
 export interface IUserService {
   getUserState: () => Promise<UserInitializationState>;
   resetUserSettings: () => Promise<any>;
   updatePreference: (preference: UserPreference) => Promise<any>;
-  updateUserSettings: (patch: DeepPartial<GlobalSettings>) => Promise<any>;
+  updateUserSettings: (patch: DeepPartial<UserSettings>) => Promise<any>;
 }

package/src/store/agent/store.ts

@@ -1,10 +1,8 @@
-import { devtools } from 'zustand/middleware';
 import { shallow } from 'zustand/shallow';
 import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 
-import { isDev } from '@/utils/env';
-
+import { createDevtools } from '../middleware/createDevtools';
 import { SessionStoreState, initialState } from './initialState';
 import { AgentChatAction, createChatSlice } from './slices/chat/action';
 
@@ -19,9 +17,6 @@ const createStore: StateCreator<AgentStore, [['zustand/devtools', never]]> = (..
 
 //  ===============  implement useStore ============ //
 
-export const useAgentStore = createWithEqualityFn<AgentStore>()(
-  devtools(createStore, {
-    name: 'LobeChat_Agent' + (isDev ? '_DEV' : ''),
-  }),
-  shallow,
-);
+const devtools = createDevtools('agent');
+
+export const useAgentStore = createWithEqualityFn<AgentStore>()(devtools(createStore), shallow);

package/src/store/chat/store.ts

@@ -1,10 +1,9 @@
-import { devtools, subscribeWithSelector } from 'zustand/middleware';
+import { subscribeWithSelector } from 'zustand/middleware';
 import { shallow } from 'zustand/shallow';
 import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 
-import { isDev } from '@/utils/env';
-
+import { createDevtools } from '../middleware/createDevtools';
 import { ChatStoreState, initialState } from './initialState';
 import { ChatBuiltinToolAction, chatToolSlice } from './slices/builtinTool/action';
 import { ChatEnhanceAction, chatEnhance } from './slices/enchance/action';
@@ -37,12 +36,9 @@ const createStore: StateCreator<ChatStore, [['zustand/devtools', never]]> = (...
 });
 
 //  ===============  实装 useStore ============ //
+const devtools = createDevtools('chat');
 
 export const useChatStore = createWithEqualityFn<ChatStore>()(
-  subscribeWithSelector(
-    devtools(createStore, {
-      name: 'LobeChat_Chat' + (isDev ? '_DEV' : ''),
-    }),
-  ),
+  subscribeWithSelector(devtools(createStore)),
   shallow,
 );

package/src/store/file/store.ts

@@ -1,10 +1,8 @@
-import { devtools } from 'zustand/middleware';
 import { shallow } from 'zustand/shallow';
 import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 
-import { isDev } from '@/utils/env';
-
+import { createDevtools } from '../middleware/createDevtools';
 import { FilesStoreState, initialState } from './initialState';
 import { FileAction, createFileSlice } from './slices/images';
 import { TTSFileAction, createTTSFileSlice } from './slices/tts';
@@ -20,10 +18,6 @@ const createStore: StateCreator<FileStore, [['zustand/devtools', never]]> = (...
 });
 
 //  ===============  实装 useStore ============ //
+const devtools = createDevtools('file');
 
-export const useFileStore = createWithEqualityFn<FileStore>()(
-  devtools(createStore, {
-    name: 'LobeChat_File' + (isDev ? '_DEV' : ''),
-  }),
-  shallow,
-);
+export const useFileStore = createWithEqualityFn<FileStore>()(devtools(createStore), shallow);

package/src/store/global/store.ts

@@ -1,10 +1,9 @@
-import { devtools, subscribeWithSelector } from 'zustand/middleware';
+import { subscribeWithSelector } from 'zustand/middleware';
 import { shallow } from 'zustand/shallow';
 import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 
-import { isDev } from '@/utils/env';
-
+import { createDevtools } from '../middleware/createDevtools';
 import { type GlobalStoreAction, globalActionSlice } from './action';
 import { type GlobalState, initialState } from './initialState';
 
@@ -19,11 +18,9 @@ const createStore: StateCreator<GlobalStore, [['zustand/devtools', never]]> = (.
 
 //  ===============  实装 useStore ============ //
 
+const devtools = createDevtools('global');
+
 export const useGlobalStore = createWithEqualityFn<GlobalStore>()(
-  subscribeWithSelector(
-    devtools(createStore, {
-      name: 'LobeChat_Global' + (isDev ? '_DEV' : ''),
-    }),
-  ),
+  subscribeWithSelector(devtools(createStore)),
   shallow,
 );