@lobehub/chat 1.51.16 → 1.52.1

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

@@ -1,7 +1,7 @@
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { edgeClient } from '@/libs/trpc/client';
-import { GlobalServerConfig } from '@/types/serverConfig';
+import { GlobalRuntimeConfig } from '@/types/serverConfig';
 
 import { globalService } from '../global';
 
@@ -77,14 +77,17 @@ describe('GlobalService', () => {
   describe('ServerConfig', () => {
     it('should return the serverConfig when fetch is successful', async () => {
       // Arrange
-      const mockConfig = { enabledOAuthSSO: true } as GlobalServerConfig;
+      const mockConfig = {
+        serverConfig: { enabledOAuthSSO: true },
+        serverFeatureFlags: {},
+      } as GlobalRuntimeConfig;
       vi.spyOn(edgeClient.config.getGlobalConfig, 'query').mockResolvedValue(mockConfig);
 
       // Act
       const config = await globalService.getGlobalConfig();
 
       // Assert
-      expect(config).toEqual({ enabledOAuthSSO: true });
+      expect(config).toEqual(mockConfig);
     });
 
     it('should return the defaultAgentConfig when fetch is successful', async () => {

package/src/services/chat.ts

@@ -3,6 +3,7 @@ import { produce } from 'immer';
 import { merge } from 'lodash-es';
 
 import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
+import { enableAuth } from '@/const/auth';
 import { INBOX_GUIDE_SYSTEMROLE } from '@/const/guide';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
@@ -515,7 +516,7 @@ class ChatService {
      * if enable login and not signed in, return unauthorized error
      */
     const userStore = useUserStore.getState();
-    if (userStore.enableAuth() && !userStore.isSignedIn) {
+    if (enableAuth && !userStore.isSignedIn) {
       throw AgentRuntimeError.createError(ChatErrorType.InvalidAccessCode);
     }
 

package/src/services/global.ts

@@ -2,7 +2,7 @@ import { DeepPartial } from 'utility-types';
 
 import { edgeClient } from '@/libs/trpc/client';
 import { LobeAgentConfig } from '@/types/agent';
-import { GlobalServerConfig } from '@/types/serverConfig';
+import { GlobalRuntimeConfig } from '@/types/serverConfig';
 
 const VERSION_URL = 'https://registry.npmmirror.com/@lobehub/chat/latest';
 
@@ -17,7 +17,7 @@ class GlobalService {
     return data['version'];
   };
 
-  getGlobalConfig = async (): Promise<GlobalServerConfig> => {
+  getGlobalConfig = async (): Promise<GlobalRuntimeConfig> => {
     return edgeClient.config.getGlobalConfig.query();
   };
 

package/src/store/serverConfig/action.ts

@@ -0,0 +1,36 @@
+import { SWRResponse } from 'swr';
+import { StateCreator } from 'zustand/vanilla';
+
+import { useOnlyFetchOnceSWR } from '@/libs/swr';
+import { globalService } from '@/services/global';
+import { GlobalRuntimeConfig } from '@/types/serverConfig';
+
+import type { ServerConfigStore } from './store';
+
+const FETCH_SERVER_CONFIG_KEY = 'FETCH_SERVER_CONFIG';
+export interface ServerConfigAction {
+  useInitServerConfig: () => SWRResponse<GlobalRuntimeConfig>;
+}
+
+export const createServerConfigSlice: StateCreator<
+  ServerConfigStore,
+  [['zustand/devtools', never]],
+  [],
+  ServerConfigAction
+> = (set) => ({
+  useInitServerConfig: () => {
+    return useOnlyFetchOnceSWR<GlobalRuntimeConfig>(
+      FETCH_SERVER_CONFIG_KEY,
+      () => globalService.getGlobalConfig(),
+      {
+        onSuccess: (data) => {
+          set(
+            { featureFlags: data.serverFeatureFlags, serverConfig: data.serverConfig },
+            false,
+            'initServerConfig',
+          );
+        },
+      },
+    );
+  },
+});

package/src/store/serverConfig/index.ts

@@ -1,3 +1,2 @@
-export { ServerConfigStoreProvider } from './Provider';
 export { featureFlagsSelectors } from './selectors';
 export { useServerConfigStore } from './store';

package/src/store/serverConfig/store.test.ts

@@ -21,7 +21,7 @@ describe('createServerConfigStore', () => {
   it('should initialize store with default state', () => {
     const store = createServerConfigStore();
 
-    expect(store.getState()).toEqual({
+    expect(store.getState()).toMatchObject({
       featureFlags: DEFAULT_FEATURE_FLAGS,
       serverConfig: { telemetry: {}, aiProvider: {} },
     });

package/src/store/serverConfig/store.ts

@@ -10,26 +10,33 @@ import { GlobalServerConfig } from '@/types/serverConfig';
 import { merge } from '@/utils/merge';
 import { StoreApiWithSelector } from '@/utils/zustand';
 
-const initialState: ServerConfigStore = {
+import { ServerConfigAction, createServerConfigSlice } from './action';
+
+interface ServerConfigState {
+  featureFlags: IFeatureFlags;
+  isMobile?: boolean;
+  serverConfig: GlobalServerConfig;
+}
+
+const initialState: ServerConfigState = {
   featureFlags: DEFAULT_FEATURE_FLAGS,
   serverConfig: { aiProvider: {}, telemetry: {} },
 };
 
 //  ===============  聚合 createStoreFn ============ //
 
-export interface ServerConfigStore {
-  featureFlags: IFeatureFlags;
-  isMobile?: boolean;
-  serverConfig: GlobalServerConfig;
-}
+export interface ServerConfigStore extends ServerConfigState, ServerConfigAction {}
 
 type CreateStore = (
   initState: Partial<ServerConfigStore>,
 ) => StateCreator<ServerConfigStore, [['zustand/devtools', never]]>;
 
-const createStore: CreateStore = (runtimeState) => () => ({
-  ...merge(initialState, runtimeState),
-});
+const createStore: CreateStore =
+  (runtimeState) =>
+  (...params) => ({
+    ...merge(initialState, runtimeState),
+    ...createServerConfigSlice(...params),
+  });
 
 //  ===============  实装 useStore ============ //
 

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

@@ -89,7 +89,7 @@ describe('createAuthSlice', () => {
     });
 
     it('should call next-auth signOut when NextAuth is enabled', async () => {
-      useUserStore.setState({ enabledNextAuth: true });
+      enableNextAuth = true;
 
       const { result } = renderHook(() => useUserStore());
 
@@ -100,6 +100,7 @@ describe('createAuthSlice', () => {
       const { signOut } = await import('next-auth/react');
 
       expect(signOut).toHaveBeenCalled();
+      enableNextAuth = false;
     });
 
     it('should not call next-auth signOut when NextAuth is disabled', async () => {
@@ -143,7 +144,7 @@ describe('createAuthSlice', () => {
     });
 
     it('should call next-auth signIn when NextAuth is enabled', async () => {
-      useUserStore.setState({ enabledNextAuth: true });
+      enableNextAuth = true;
 
       const { result } = renderHook(() => useUserStore());
 
@@ -154,6 +155,7 @@ describe('createAuthSlice', () => {
       const { signIn } = await import('next-auth/react');
 
       expect(signIn).toHaveBeenCalled();
+      enableNextAuth = false;
     });
     it('should not call next-auth signIn when NextAuth is disabled', async () => {
       const { result } = renderHook(() => useUserStore());

package/src/store/user/slices/auth/action.ts

@@ -1,6 +1,6 @@
 import { StateCreator } from 'zustand/vanilla';
 
-import { enableClerk } from '@/const/auth';
+import { enableAuth, enableClerk, enableNextAuth } from '@/const/auth';
 
 import { UserStore } from '../../store';
 
@@ -23,7 +23,7 @@ export const createAuthSlice: StateCreator<
   UserAuthAction
 > = (set, get) => ({
   enableAuth: () => {
-    return enableClerk || get()?.enabledNextAuth || false;
+    return enableAuth;
   },
   logout: async () => {
     if (enableClerk) {
@@ -32,7 +32,6 @@ export const createAuthSlice: StateCreator<
       return;
     }
 
-    const enableNextAuth = get().enabledNextAuth;
     if (enableNextAuth) {
       const { signOut } = await import('next-auth/react');
       signOut();
@@ -50,7 +49,6 @@ export const createAuthSlice: StateCreator<
       return;
     }
 
-    const enableNextAuth = get().enabledNextAuth;
     if (enableNextAuth) {
       const { signIn } = await import('next-auth/react');
       // Check if only one provider is available

package/src/store/user/slices/auth/initialState.ts

@@ -16,7 +16,6 @@ export interface UserAuthState {
   clerkSignIn?: (props?: SignInProps) => void;
   clerkSignOut?: SignOut;
   clerkUser?: UserResource;
-  enabledNextAuth?: boolean;
   isLoaded?: boolean;
 
   isSignedIn?: boolean;

package/src/store/user/slices/auth/selectors.ts

@@ -1,6 +1,6 @@
 import { t } from 'i18next';
 
-import { enableClerk } from '@/const/auth';
+import { enableAuth, enableClerk, enableNextAuth } from '@/const/auth';
 import { BRANDING_NAME } from '@/const/branding';
 import { UserStore } from '@/store/user';
 import { LobeUser } from '@/types/user';
@@ -8,7 +8,7 @@ import { LobeUser } from '@/types/user';
 const DEFAULT_USERNAME = BRANDING_NAME;
 
 const nickName = (s: UserStore) => {
-  if (!s.enableAuth()) return t('userPanel.defaultNickname', { ns: 'common' });
+  if (!enableAuth) return t('userPanel.defaultNickname', { ns: 'common' });
 
   if (s.isSignedIn) return s.user?.fullName || s.user?.username;
 
@@ -16,7 +16,7 @@ const nickName = (s: UserStore) => {
 };
 
 const username = (s: UserStore) => {
-  if (!s.enableAuth()) return DEFAULT_USERNAME;
+  if (!enableAuth) return DEFAULT_USERNAME;
 
   if (s.isSignedIn) return s.user?.username;
 
@@ -36,17 +36,15 @@ export const userProfileSelectors = {
  */
 const isLogin = (s: UserStore) => {
   // 如果没有开启鉴权，说明不需要登录，默认是登录态
-  if (!s.enableAuth()) return true;
+  if (!enableAuth) return true;
 
   return s.isSignedIn;
 };
 
 export const authSelectors = {
-  enabledAuth: (s: UserStore): boolean => s.enableAuth(),
-  enabledNextAuth: (s: UserStore): boolean => !!s.enabledNextAuth,
   isLoaded: (s: UserStore) => s.isLoaded,
   isLogin,
   isLoginWithAuth: (s: UserStore) => s.isSignedIn,
   isLoginWithClerk: (s: UserStore): boolean => (s.isSignedIn && enableClerk) || false,
-  isLoginWithNextAuth: (s: UserStore): boolean => (s.isSignedIn && !!s.enabledNextAuth) || false,
+  isLoginWithNextAuth: (s: UserStore): boolean => (s.isSignedIn && !!enableNextAuth) || false,
 };

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

@@ -99,7 +99,6 @@ export const createCommonSlice: StateCreator<
             set(
               {
                 defaultSettings,
-                enabledNextAuth: serverConfig.enabledOAuthSSO,
                 isOnboard: data.isOnboard,
                 isShowPWAGuide: data.canEnablePWAGuide,
                 isUserCanEnableTrace: data.canEnableTrace,

package/src/types/serverConfig.ts

@@ -1,5 +1,6 @@
 import { DeepPartial } from 'utility-types';
 
+import { IFeatureFlags } from '@/config/featureFlags';
 import { ChatModelCard } from '@/types/llm';
 import {
   GlobalLLMProviderKey,
@@ -38,3 +39,8 @@ export interface GlobalServerConfig {
     langfuse?: boolean;
   };
 }
+
+export interface GlobalRuntimeConfig {
+  serverConfig: GlobalServerConfig;
+  serverFeatureFlags: IFeatureFlags;
+}