@lobehub/chat 0.150.8 → 0.150.10

package/src/store/user/slices/settings/selectors/sync.ts

@@ -0,0 +1,14 @@
+import { UserStore } from '../../../store';
+import { currentSettings } from './settings';
+
+const webrtcConfig = (s: UserStore) => currentSettings(s).sync.webrtc;
+const webrtcChannelName = (s: UserStore) => webrtcConfig(s).channelName;
+const enableWebRTC = (s: UserStore) => webrtcConfig(s).enabled;
+const deviceName = (s: UserStore) => currentSettings(s).sync.deviceName;
+
+export const syncSettingsSelectors = {
+  deviceName,
+  enableWebRTC,
+  webrtcChannelName,
+  webrtcConfig,
+};

package/src/store/user/store.ts

@@ -0,0 +1,33 @@
+import { devtools, 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 { type UserState, initialState } from './initialState';
+import { type CommonAction, createCommonSlice } from './slices/common/action';
+import { type PreferenceAction, createPreferenceSlice } from './slices/preference/action';
+import { type SettingsAction, createSettingsSlice } from './slices/settings/actions';
+
+//  ===============  聚合 createStoreFn ============ //
+
+export type UserStore = CommonAction & UserState & SettingsAction & PreferenceAction;
+
+const createStore: StateCreator<UserStore, [['zustand/devtools', never]]> = (...parameters) => ({
+  ...initialState,
+  ...createCommonSlice(...parameters),
+  ...createSettingsSlice(...parameters),
+  ...createPreferenceSlice(...parameters),
+});
+
+//  ===============  实装 useStore ============ //
+
+export const useUserStore = createWithEqualityFn<UserStore>()(
+  subscribeWithSelector(
+    devtools(createStore, {
+      name: 'LobeChat_User' + (isDev ? '_DEV' : ''),
+    }),
+  ),
+  shallow,
+);

package/src/tools/dalle/Render/ToolBar.tsx

@@ -5,8 +5,8 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
 import { chatToolSelectors } from '@/store/chat/selectors';
-import { useGlobalStore } from '@/store/global';
-import { settingsSelectors } from '@/store/global/selectors';
+import { useUserStore } from '@/store/user';
+import { settingsSelectors } from '@/store/user/selectors';
 import { DallEImageItem } from '@/types/tool/dalle';
 
 interface ToolBarProps {
@@ -19,7 +19,7 @@ const ToolBar = memo<ToolBarProps>(({ content, messageId }) => {
   const generateImageFromPrompts = useChatStore((s) => s.generateImageFromPrompts);
   const isLoading = useChatStore(chatToolSelectors.isGeneratingDallEImage);
 
-  const [isAutoGenerate, setSettings] = useGlobalStore((s) => [
+  const [isAutoGenerate, setSettings] = useUserStore((s) => [
     settingsSelectors.isDalleAutoGenerating(s),
     s.setSettings,
   ]);

package/src/utils/localStorage.ts

@@ -1,6 +1,8 @@
 const PREV_KEY = 'LOBE_GLOBAL';
 
-type StorageKey = 'LOBE_PREFERENCE';
+// LOBE_PREFERENCE for userStore
+// LOBE_GLOBAL_PREFERENCE for globalStore
+type StorageKey = 'LOBE_PREFERENCE' | 'LOBE_GLOBAL_PREFERENCE';
 
 export class AsyncLocalStorage<State> {
   private storageKey: StorageKey;

package/src/store/featureFlags/Provider.tsx

@@ -1,18 +0,0 @@
-'use client';
-
-import { ReactNode, memo } from 'react';
-
-import { IFeatureFlags } from '@/config/featureFlags';
-
-import { Provider, createFeatureFlagsStore } from './store';
-
-interface GlobalStoreProviderProps {
-  children: ReactNode;
-  featureFlags?: Partial<IFeatureFlags>;
-}
-
-export const FeatureFlagStoreProvider = memo<GlobalStoreProviderProps>(
-  ({ children, featureFlags }) => (
-    <Provider createStore={() => createFeatureFlagsStore(featureFlags)}>{children}</Provider>
-  ),
-);

package/src/store/featureFlags/index.ts

@@ -1,3 +0,0 @@
-export { FeatureFlagStoreProvider } from './Provider';
-export { featureFlagsSelectors } from './selectors';
-export { useFeatureFlagStore } from './store';

package/src/store/featureFlags/selectors.ts

@@ -1,5 +0,0 @@
-import { mapFeatureFlagsEnvToState } from '@/config/featureFlags';
-
-import { FeatureFlagStore } from './store';
-
-export const featureFlagsSelectors = (s: FeatureFlagStore) => mapFeatureFlagsEnvToState(s);

package/src/store/featureFlags/store.ts

@@ -1,42 +0,0 @@
-import { StoreApi } from 'zustand';
-import { createContext } from 'zustand-utils';
-import { devtools } from 'zustand/middleware';
-import { shallow } from 'zustand/shallow';
-import { createWithEqualityFn } from 'zustand/traditional';
-import { StateCreator } from 'zustand/vanilla';
-
-import { DEFAULT_FEATURE_FLAGS, IFeatureFlags } from '@/config/featureFlags';
-import { isDev } from '@/utils/env';
-import { StoreApiWithSelector } from '@/utils/zustand';
-
-//  ===============  聚合 createStoreFn ============ //
-
-export type FeatureFlagStore = IFeatureFlags;
-
-const createStore: (
-  initState: Partial<FeatureFlagStore>,
-) => StateCreator<FeatureFlagStore, [['zustand/devtools', never]]> = (runtimeState) => () => ({
-  ...DEFAULT_FEATURE_FLAGS,
-  ...runtimeState,
-});
-
-//  ===============  实装 useStore ============ //
-
-let store: StoreApi<FeatureFlagStore>;
-
-export const createFeatureFlagsStore = (initState?: Partial<FeatureFlagStore>) => {
-  // make sure there is only one store
-  if (!store) {
-    store = createWithEqualityFn<FeatureFlagStore>()(
-      devtools(createStore(initState || {}), {
-        name: 'LobeChat_FeatureFlags' + (isDev ? '_DEV' : ''),
-      }),
-      shallow,
-    );
-  }
-
-  return store;
-};
-
-export const { useStore: useFeatureFlagStore, Provider } =
-  createContext<StoreApiWithSelector<FeatureFlagStore>>();

package/src/store/global/slices/common/initialState.ts

@@ -1,42 +0,0 @@
-import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
-
-import { PeerSyncStatus, SyncAwarenessState } from '@/types/sync';
-
-export enum SidebarTabKey {
-  Chat = 'chat',
-  Market = 'market',
-  Setting = 'settings',
-}
-
-export enum SettingsTabs {
-  About = 'about',
-  Agent = 'agent',
-  Common = 'common',
-  LLM = 'llm',
-  Sync = 'sync',
-  TTS = 'tts',
-}
-
-export interface Guide {
-  // Topic 引导
-  topic?: boolean;
-}
-
-export interface GlobalCommonState {
-  hasNewVersion?: boolean;
-  isMobile?: boolean;
-  latestVersion?: string;
-  router?: AppRouterInstance;
-  sidebarKey: SidebarTabKey;
-  syncAwareness: SyncAwarenessState[];
-  syncEnabled: boolean;
-  syncStatus: PeerSyncStatus;
-}
-
-export const initialCommonState: GlobalCommonState = {
-  isMobile: false,
-  sidebarKey: SidebarTabKey.Chat,
-  syncAwareness: [],
-  syncEnabled: false,
-  syncStatus: PeerSyncStatus.Disabled,
-};

package/src/store/global/slices/common/selectors.ts

@@ -1,8 +0,0 @@
-import { GlobalStore } from '@/store/global';
-
-export const commonSelectors = {
-  enabledOAuthSSO: (s: GlobalStore) => s.serverConfig.enabledOAuthSSO,
-  enabledTelemetryChat: (s: GlobalStore) => s.serverConfig.telemetry.langfuse || false,
-  userAvatar: (s: GlobalStore) => s.avatar || '',
-  userId: (s: GlobalStore) => s.userId,
-};

package/src/store/global/slices/preference/initialState.ts

@@ -1,51 +0,0 @@
-import { SessionDefaultGroup, SessionGroupId } from '@/types/session';
-import { AsyncLocalStorage } from '@/utils/localStorage';
-
-export interface Guide {
-  // Topic 引导
-  topic?: boolean;
-}
-
-export interface GlobalPreference {
-  // which sessionGroup should expand
-  expandSessionGroupKeys: SessionGroupId[];
-  guide?: Guide;
-  hideSyncAlert?: boolean;
-  inputHeight: number;
-  mobileShowTopic?: boolean;
-
-  sessionsWidth: number;
-  showChatSideBar?: boolean;
-  showSessionPanel?: boolean;
-  showSystemRole?: boolean;
-  telemetry: boolean | null;
-
-  /**
-   * whether to use cmd + enter to send message
-   */
-  useCmdEnterToSend?: boolean;
-}
-
-export interface GlobalPreferenceState {
-  /**
-   * the user preference, which only store in local storage
-   */
-  preference: GlobalPreference;
-  preferenceStorage: AsyncLocalStorage<GlobalPreference>;
-}
-
-export const initialPreferenceState: GlobalPreferenceState = {
-  preference: {
-    expandSessionGroupKeys: [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default],
-    guide: {},
-    inputHeight: 200,
-    mobileShowTopic: false,
-    sessionsWidth: 320,
-    showChatSideBar: true,
-    showSessionPanel: true,
-    showSystemRole: false,
-    telemetry: null,
-    useCmdEnterToSend: false,
-  },
-  preferenceStorage: new AsyncLocalStorage('LOBE_PREFERENCE'),
-};

package/src/store/global/slices/preference/selectors.ts

@@ -1,18 +0,0 @@
-import { GlobalStore } from '@/store/global';
-import { SessionDefaultGroup } from '@/types/session';
-
-const sessionGroupKeys = (s: GlobalStore): string[] =>
-  s.preference.expandSessionGroupKeys || [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default];
-
-const useCmdEnterToSend = (s: GlobalStore): boolean => s.preference.useCmdEnterToSend || false;
-
-const userAllowTrace = (s: GlobalStore) => s.preference.telemetry;
-
-const hideSyncAlert = (s: GlobalStore) => s.preference.hideSyncAlert;
-
-export const preferenceSelectors = {
-  hideSyncAlert,
-  sessionGroupKeys,
-  useCmdEnterToSend,
-  userAllowTrace,
-};

package/src/store/global/slices/settings/selectors/sync.ts

@@ -1,14 +0,0 @@
-import { GlobalStore } from '../../../store';
-import { currentSettings } from './settings';
-
-const webrtcConfig = (s: GlobalStore) => currentSettings(s).sync.webrtc;
-const webrtcChannelName = (s: GlobalStore) => webrtcConfig(s).channelName;
-const enableWebRTC = (s: GlobalStore) => webrtcConfig(s).enabled;
-const deviceName = (s: GlobalStore) => currentSettings(s).sync.deviceName;
-
-export const syncSettingsSelectors = {
-  deviceName,
-  enableWebRTC,
-  webrtcChannelName,
-  webrtcConfig,
-};