@lobehub/chat 0.161.6 → 0.161.8

package/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 # Changelog
 
+### [Version 0.161.8](https://github.com/lobehub/lobe-chat/compare/v0.161.7...v0.161.8)
+
+<sup>Released on **2024-05-22**</sup>
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.161.7](https://github.com/lobehub/lobe-chat/compare/v0.161.6...v0.161.7)
+
+<sup>Released on **2024-05-22**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor to serverDB ENV.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor to serverDB ENV, closes [#2612](https://github.com/lobehub/lobe-chat/issues/2612) ([fa1409e](https://github.com/lobehub/lobe-chat/commit/fa1409e))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.161.6](https://github.com/lobehub/lobe-chat/compare/v0.161.5...v0.161.6)
 
 <sup>Released on **2024-05-22**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.161.6",
+  "version": "0.161.8",
   "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/@session/default.tsx

@@ -1,9 +1,13 @@
+import { Suspense, lazy } from 'react';
+
 import ServerLayout from '@/components/server/ServerLayout';
 
 import Desktop from './_layout/Desktop';
 import Mobile from './_layout/Mobile';
 import SessionHydration from './features/SessionHydration';
-import SessionListContent from './features/SessionListContent';
+import SkeletonList from './features/SkeletonList';
+
+const SessionListContent = lazy(() => import('./features/SessionListContent'));
 
 const Layout = ServerLayout({ Desktop, Mobile });
 
@@ -11,7 +15,9 @@ const Session = () => {
   return (
     <>
       <Layout>
-        <SessionListContent />
+        <Suspense fallback={<SkeletonList />}>
+          <SessionListContent />
+        </Suspense>
       </Layout>
       <SessionHydration />
     </>

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

@@ -12,7 +12,7 @@ import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 import { LobeAgentSession } from '@/types/session';
 
-import SkeletonList from '../SkeletonList';
+import SkeletonList from '../../SkeletonList';
 import AddButton from './AddButton';
 import SessionItem from './Item';
 

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

@@ -2,8 +2,8 @@ import { memo } from 'react';
 
 import { useSessionStore } from '@/store/session';
 
+import SkeletonList from '../SkeletonList';
 import SessionList from './List';
-import SkeletonList from './SkeletonList';
 
 const SearchMode = memo(() => {
   const [sessionSearchKeywords, useSearchSessions] = useSessionStore((s) => [

package/src/app/(main)/chat/@session/features/{SessionListContent/SkeletonList.tsx → SkeletonList.tsx}

@@ -1,3 +1,5 @@
+'use client';
+
 import { Skeleton } from 'antd';
 import { createStyles } from 'antd-style';
 import { memo } from 'react';

package/src/config/__tests__/client.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest';
 
-import { getClientConfig } from '../client';
+import { getDebugConfig } from '../debug';
 
 // 测试前重置 process.env
 vi.stubGlobal('process', {
@@ -17,7 +17,7 @@ describe('getClientConfig', () => {
     process.env.NEXT_PUBLIC_I18N_DEBUG_BROWSER = '1';
     process.env.NEXT_PUBLIC_I18N_DEBUG_SERVER = '1';
 
-    const config = getClientConfig();
+    const config = getDebugConfig();
     expect(config.I18N_DEBUG).toBe(true);
     expect(config.I18N_DEBUG_BROWSER).toBe(true);
     expect(config.I18N_DEBUG_SERVER).toBe(true);
@@ -31,7 +31,7 @@ describe('getClientConfig', () => {
     process.env.NEXT_PUBLIC_I18N_DEBUG_BROWSER = '0';
     process.env.NEXT_PUBLIC_I18N_DEBUG_SERVER = '0';
 
-    const config = getClientConfig();
+    const config = getDebugConfig();
 
     expect(config.I18N_DEBUG).toBe(false);
     expect(config.I18N_DEBUG_BROWSER).toBe(false);

package/src/config/db.ts

@@ -0,0 +1,16 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix , typescript-sort-keys/interface */
+import { createEnv } from '@t3-oss/env-nextjs';
+import { z } from 'zod';
+
+export const getServerDBConfig = () => {
+  return createEnv({
+    client: {
+      NEXT_PUBLIC_ENABLED_SERVER_SERVICE: z.boolean(),
+    },
+    runtimeEnv: {
+      NEXT_PUBLIC_ENABLED_SERVER_SERVICE: process.env.NEXT_PUBLIC_SERVICE_MODE === 'server',
+    },
+  });
+};
+
+export const serverDBEnv = getServerDBConfig();

package/src/config/{client.ts → debug.ts}

@@ -1,32 +1,22 @@
-/**
- * the client config is only used in Vercel deployment
- */
-
-/* eslint-disable sort-keys-fix/sort-keys-fix , typescript-sort-keys/interface */
-
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace NodeJS {
     interface ProcessEnv {
+      NEXT_PUBLIC_DEVELOPER_DEBUG: string;
       NEXT_PUBLIC_I18N_DEBUG: string;
       NEXT_PUBLIC_I18N_DEBUG_BROWSER: string;
-      NEXT_PUBLIC_I18N_DEBUG_SERVER: string;
-
-      NEXT_PUBLIC_DEVELOPER_DEBUG: string;
 
-      NEXT_PUBLIC_SERVICE_MODE?: 'server' | 'browser';
+      NEXT_PUBLIC_I18N_DEBUG_SERVER: string;
     }
   }
 }
 
-export const getClientConfig = () => ({
-  ENABLED_SERVER_SERVICE: process.env.NEXT_PUBLIC_SERVICE_MODE === 'server',
+export const getDebugConfig = () => ({
+  // developer debug mode
+  DEBUG_MODE: process.env.NEXT_PUBLIC_DEVELOPER_DEBUG === '1',
 
   // i18n debug mode
   I18N_DEBUG: process.env.NEXT_PUBLIC_I18N_DEBUG === '1',
   I18N_DEBUG_BROWSER: process.env.NEXT_PUBLIC_I18N_DEBUG_BROWSER === '1',
   I18N_DEBUG_SERVER: process.env.NEXT_PUBLIC_I18N_DEBUG_SERVER === '1',
-
-  // developer debug mode
-  DEBUG_MODE: process.env.NEXT_PUBLIC_DEVELOPER_DEBUG === '1',
 });

package/src/const/version.ts

@@ -1,6 +1,6 @@
 import pkg from '@/../package.json';
-import { getClientConfig } from '@/config/client';
+import { getServerDBConfig } from '@/config/db';
 
 export const CURRENT_VERSION = pkg.version;
 
-export const isServerMode = getClientConfig().ENABLED_SERVER_SERVICE;
+export const isServerMode = getServerDBConfig().NEXT_PUBLIC_ENABLED_SERVER_SERVICE;

package/src/layout/GlobalProvider/index.tsx

@@ -2,7 +2,7 @@ import dynamic from 'next/dynamic';
 import { cookies } from 'next/headers';
 import { FC, ReactNode } from 'react';
 
-import { getClientConfig } from '@/config/client';
+import { getDebugConfig } from '@/config/debug';
 import { getServerFeatureFlagsValue } from '@/config/featureFlags';
 import { LOBE_LOCALE_COOKIE } from '@/const/locale';
 import {
@@ -26,7 +26,7 @@ let DebugUI: FC = () => null;
 // refs: https://webpack.js.org/plugins/internal-plugins/#constplugin
 if (process.env.NODE_ENV === 'development') {
   // eslint-disable-next-line unicorn/no-lonely-if
-  if (getClientConfig().DEBUG_MODE) {
+  if (getDebugConfig().DEBUG_MODE) {
     DebugUI = dynamic(() => import('@/features/DebugUI'), { ssr: false }) as FC;
   }
 }

package/src/locales/create.ts

@@ -4,13 +4,13 @@ import resourcesToBackend from 'i18next-resources-to-backend';
 import { initReactI18next } from 'react-i18next';
 import { isRtlLang } from 'rtl-detect';
 
-import { getClientConfig } from '@/config/client';
+import { getDebugConfig } from '@/config/debug';
 import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
 import { COOKIE_CACHE_DAYS } from '@/const/settings';
 import { normalizeLocale } from '@/locales/resources';
 import { isDev, isOnServerSide } from '@/utils/env';
 
-const { I18N_DEBUG, I18N_DEBUG_BROWSER, I18N_DEBUG_SERVER } = getClientConfig();
+const { I18N_DEBUG, I18N_DEBUG_BROWSER, I18N_DEBUG_SERVER } = getDebugConfig();
 const debugMode = I18N_DEBUG ?? isOnServerSide ? I18N_DEBUG_SERVER : I18N_DEBUG_BROWSER;
 
 export const createI18nNext = (lang?: string) => {

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

@@ -194,6 +194,10 @@ export const createSessionSlice: StateCreator<
 
   useFetchSessions: () =>
     useClientDataSWR<ChatSessionList>(FETCH_SESSIONS_KEY, sessionService.getGroupedSessions, {
+      fallbackData: {
+        sessionGroups: [],
+        sessions: [],
+      },
       onSuccess: (data) => {
         if (
           get().isSessionsFirstFetchFinished &&
@@ -209,6 +213,7 @@ export const createSessionSlice: StateCreator<
         );
         set({ isSessionsFirstFetchFinished: true }, false, n('useFetchSessions/onSuccess', data));
       },
+      suspense: true,
     }),
   useSearchSessions: (keyword) =>
     useSWR<LobeSessions>(

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

@@ -1,4 +1,4 @@
-import { CustomSessionGroup, LobeAgentSession, LobeSessionGroups } from '@/types/session';
+import { LobeAgentSession } from '@/types/session';
 
 export interface SessionState {
   /**
@@ -6,13 +6,11 @@ export interface SessionState {
    * @description 当前正在编辑或查看的会话
    */
   activeId: string;
-  customSessionGroups: CustomSessionGroup[];
   defaultSessions: LobeAgentSession[];
   isSearching: boolean;
   isSessionsFirstFetchFinished: boolean;
   pinnedSessions: LobeAgentSession[];
   searchKeywords: string;
-  sessionGroups: LobeSessionGroups;
   sessionSearchKeywords?: string;
   /**
    * it means defaultSessions
@@ -22,12 +20,10 @@ export interface SessionState {
 
 export const initialSessionState: SessionState = {
   activeId: 'inbox',
-  customSessionGroups: [],
   defaultSessions: [],
   isSearching: false,
   isSessionsFirstFetchFinished: false,
   pinnedSessions: [],
   searchKeywords: '',
-  sessionGroups: [],
   sessions: [],
 };

package/src/store/session/slices/sessionGroup/initialState.ts

@@ -1,5 +1,12 @@
+import { CustomSessionGroup, LobeSessionGroups } from '@/types/session';
+
 export interface SessionGroupState {
   activeGroupId?: string;
+  customSessionGroups: CustomSessionGroup[];
+  sessionGroups: LobeSessionGroups;
 }
 
-export const initSessionGroupState: SessionGroupState = {};
+export const initSessionGroupState: SessionGroupState = {
+  customSessionGroups: [],
+  sessionGroups: [],
+};