@lobehub/chat 1.36.38 → 1.36.40

package/locales/zh-CN/common.json

@@ -10,7 +10,9 @@
     }
   },
   "appLoading": {
+    "appIdle": "准备启动",
     "appInitializing": "应用启动中...",
+    "failed": "很抱歉，应用初始化失败，请查看详情进行排查",
     "finished": "数据库初始化完成",
     "goToChat": "对话页面加载中...",
     "initAuth": "鉴权服务初始化...",
@@ -19,7 +21,8 @@
     "loadingDependencies": "初始化依赖...",
     "loadingWasm": "加载 WASM 模块...",
     "migrating": "执行数据表迁移...",
-    "ready": "数据库已就绪"
+    "ready": "数据库已就绪",
+    "showDetail": "查看详情"
   },
   "autoGenerate": "自动补全",
   "autoGenerateTooltip": "基于提示词自动补全助手描述",
@@ -36,12 +39,13 @@
       "title": "初始化 PGlite 数据库"
     },
     "error": {
-      "desc": "非常抱歉，Pglite 数据库初始化过程发生异常。请点击 「重试」按钮。<br><br> 如仍然出错，请 <1>提交问题</1> ，我们将会第一时间帮你排查",
+      "desc": "非常抱歉，Pglite 数据库初始化过程发生异常。请点击按钮重试。如多次重试后仍重复出错，请 <1>提交问题</1> ，我们将会第一时间帮你排查",
+      "detail": "错误原因：[{{type}}] {{message}}，明细如下：",
       "retry": "重试",
-      "title": "数据库升级失败"
+      "title": "数据库初始化失败"
     },
     "initing": {
-      "error": "发生错误，请重试",
+      "error": "数据库初始化出错，点击查看详情",
       "idle": "等待初始化...",
       "initializing": "正在初始化...",
       "loadingDependencies": "加载依赖中...",

package/locales/zh-TW/common.json

@@ -10,7 +10,9 @@
     }
   },
   "appLoading": {
+    "appIdle": "準備啟動",
     "appInitializing": "應用啟動中...",
+    "failed": "很抱歉，應用初始化失敗，請查看詳情進行排查",
     "finished": "資料庫初始化完成",
     "goToChat": "對話頁面加載中...",
     "initAuth": "鑑權服務初始化...",
@@ -19,7 +21,8 @@
     "loadingDependencies": "初始化依賴...",
     "loadingWasm": "加載 WASM 模組...",
     "migrating": "執行資料表遷移...",
-    "ready": "資料庫已就緒"
+    "ready": "資料庫已就緒",
+    "showDetail": "查看詳情"
   },
   "autoGenerate": "自動生成",
   "autoGenerateTooltip": "基於提示詞自動生成助手描述",
@@ -36,9 +39,10 @@
       "title": "初始化 PGlite 數據庫"
     },
     "error": {
-      "desc": "非常抱歉，Pglite 數據庫初始化過程發生異常。請點擊 「重試」按鈕。<br><br> 如仍然出錯，請 <1>提交問題</1> ，我們將會第一時間幫你排查",
+      "desc": "非常抱歉，Pglite 資料庫初始化過程發生異常。請點擊按鈕重試。如多次重試後仍重複出錯，請 <1>提交問題</1> ，我們將會第一時間幫你排查",
+      "detail": "錯誤原因：[{{type}}] {{message}}，明細如下：",
       "retry": "重試",
-      "title": "數據庫升級失敗"
+      "title": "資料庫初始化失敗"
     },
     "initing": {
       "error": "發生錯誤，請重試",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.36.38",
+  "version": "1.36.40",
   "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",
@@ -162,7 +162,6 @@
     "i18next-resources-to-backend": "^1.2.1",
     "idb-keyval": "^6.2.1",
     "immer": "^10.1.1",
-    "ip": "^2.0.1",
     "jose": "^5.9.4",
     "js-sha256": "^0.11.0",
     "jsonl-parse-stringify": "^1.0.3",

package/src/app/(main)/(mobile)/me/(home)/page.tsx

@@ -17,8 +17,8 @@ export const generateMetadata = async () => {
   });
 };
 
-const Page = () => {
-  const mobile = isMobileDevice();
+const Page = async () => {
+  const mobile = await isMobileDevice();
 
   if (!mobile) return redirect('/chat');
 

package/src/app/(main)/(mobile)/me/data/page.tsx

@@ -14,8 +14,8 @@ export const generateMetadata = async () => {
   });
 };
 
-const Page = () => {
-  const mobile = isMobileDevice();
+const Page = async () => {
+  const mobile = await isMobileDevice();
 
   if (!mobile) return redirect('/chat');
 

package/src/app/(main)/(mobile)/me/profile/page.tsx

@@ -15,8 +15,8 @@ export const generateMetadata = async () => {
   });
 };
 
-const Page = () => {
-  const mobile = isMobileDevice();
+const Page = async () => {
+  const mobile = await isMobileDevice();
 
   if (!mobile) return redirect('/profile');
 

package/src/app/(main)/(mobile)/me/settings/page.tsx

@@ -15,8 +15,8 @@ export const generateMetadata = async () => {
   });
 };
 
-const Page = () => {
-  const mobile = isMobileDevice();
+const Page = async () => {
+  const mobile = await isMobileDevice();
 
   if (!mobile) return redirect('/settings/common');
 

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

@@ -6,14 +6,14 @@ import ChatList from './features/ChatList';
 import ThreadHydration from './features/ThreadHydration';
 import ZenModeToast from './features/ZenModeToast';
 
-const ChatConversation = () => {
-  const mobile = isMobileDevice();
+const ChatConversation = async () => {
+  const mobile = await isMobileDevice();
 
   return (
     <>
       <ZenModeToast />
       <ChatList mobile={mobile} />
-      <ChatInput />
+      <ChatInput mobile={mobile} />
       <ChatHydration />
       <ThreadHydration />
     </>

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

@@ -1,10 +1,8 @@
 import MobileChatInput from '@/features/ChatInput/Mobile';
-import { isMobileDevice } from '@/utils/server/responsive';
 
 import DesktopChatInput from './Desktop';
 
-const ChatInput = () => {
-  const mobile = isMobileDevice();
+const ChatInput = ({ mobile }: { mobile: boolean }) => {
   const Input = mobile ? MobileChatInput : DesktopChatInput;
 
   return <Input />;

package/src/app/(main)/chat/(workspace)/@portal/default.tsx

@@ -8,8 +8,8 @@ import Mobile from './_layout/Mobile';
 
 const PortalBody = lazy(() => import('@/features/Portal/router'));
 
-const Inspector = () => {
-  const mobile = isMobileDevice();
+const Inspector = async () => {
+  const mobile = await isMobileDevice();
 
   const Layout = mobile ? Mobile : Desktop;
 

package/src/app/(main)/chat/(workspace)/@topic/default.tsx

@@ -10,8 +10,8 @@ import SystemRole from './features/SystemRole';
 
 const TopicContent = lazy(() => import('./features/TopicListContent'));
 
-const Topic = () => {
-  const mobile = isMobileDevice();
+const Topic = async () => {
+  const mobile = await isMobileDevice();
 
   const Layout = mobile ? Mobile : Desktop;
 

package/src/app/(main)/chat/(workspace)/page.tsx

@@ -18,7 +18,7 @@ export const generateMetadata = async () => {
 };
 
 const Page = async () => {
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
   const { t } = await translation('metadata');
   const ld = ldModule.generate({
     description: t('chat.title', { appName: BRANDING_NAME }),

package/src/app/(main)/discover/(detail)/assistant/[slug]/page.tsx

@@ -62,7 +62,7 @@ const Page = async (props: DiscoverPageProps) => {
 
   const { slug: identifier } = params;
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const data = await discoverService.getAssistantById(locale, identifier);

package/src/app/(main)/discover/(detail)/model/[...slugs]/page.tsx

@@ -72,7 +72,7 @@ const Page = async (props: Props) => {
   const identifier = decodeURIComponent(slugs.join('/'));
   const { t, locale } = await translation('metadata', searchParams?.hl);
   const { t: td } = await translation('models', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const data = await discoverService.getModelById(locale, identifier);

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

@@ -64,7 +64,7 @@ const Page = async (props: DiscoverPageProps) => {
 
   const { slug: identifier } = params;
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const data = await discoverService.getPluginById(locale, identifier, true);

package/src/app/(main)/discover/(detail)/provider/[slug]/page.tsx

@@ -62,7 +62,7 @@ const Page = async (props: DiscoverPageProps) => {
   const { slug: identifier } = params;
   const { t, locale } = await translation('metadata', searchParams?.hl);
   const { t: td } = await translation('models', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const data = await discoverService.getProviderById(locale, identifier);

package/src/app/(main)/discover/(list)/assistants/[slug]/page.tsx

@@ -32,7 +32,7 @@ const Page = async (props: DiscoverPageProps<AssistantCategory>) => {
 
   const { t, locale } = await translation('metadata', searchParams?.hl);
   const { t: td } = await translation('discover', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const items = await discoverService.getAssistantCategory(locale, params.slug);

package/src/app/(main)/discover/(list)/assistants/page.tsx

@@ -25,7 +25,7 @@ export const generateMetadata = async (props: Props) => {
 const Page = async (props: Props) => {
   const searchParams = await props.searchParams;
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const items = await discoverService.getAssistantList(locale);

package/src/app/(main)/discover/(list)/models/[slug]/page.tsx

@@ -35,7 +35,7 @@ const Page = async (props: DiscoverPageProps) => {
   const searchParams = await props.searchParams;
 
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const list = await discoverService.getProviderList(locale);

package/src/app/(main)/discover/(list)/models/page.tsx

@@ -29,7 +29,7 @@ const Page = async (props: Props) => {
   const searchParams = await props.searchParams;
 
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const items = await discoverService.getModelList(locale);

package/src/app/(main)/discover/(list)/plugins/[slug]/page.tsx

@@ -32,7 +32,7 @@ const Page = async (props: DiscoverPageProps<PluginCategory>) => {
 
   const { t, locale } = await translation('metadata', searchParams?.hl);
   const { t: td } = await translation('discover', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const items = await discoverService.getPluginCategory(locale, params.slug);

package/src/app/(main)/discover/(list)/plugins/page.tsx

@@ -26,7 +26,7 @@ export const generateMetadata = async (props: Props) => {
 const Page = async (props: Props) => {
   const searchParams = await props.searchParams;
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const items = await discoverService.getPluginList(locale);

package/src/app/(main)/discover/(list)/providers/page.tsx

@@ -26,7 +26,7 @@ export const generateMetadata = async (props: Props) => {
 const Page = async (props: Props) => {
   const searchParams = await props.searchParams;
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const discoverService = new DiscoverService();
   const items = await discoverService.getProviderList(locale);

package/src/app/(main)/discover/search/page.tsx

@@ -56,7 +56,7 @@ const Page = async (props: Props) => {
   const keywords = decodeURIComponent(q);
 
   const { t, locale } = await translation('metadata', searchParams?.hl);
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   const ld = ldModule.generate({
     description: t('discover.description'),

package/src/app/(main)/profile/[[...slugs]]/page.tsx

@@ -13,8 +13,9 @@ export const generateMetadata = async () => {
   });
 };
 
-const Page = () => {
-  const mobile = isMobileDevice();
+const Page = async () => {
+  const mobile = await isMobileDevice();
+
   return <Client mobile={mobile} />;
 };
 

package/src/app/(main)/profile/layout.tsx

@@ -6,10 +6,11 @@ import { isMobileDevice } from '@/utils/server/responsive';
 
 import MobileLayout from './_layout/Mobile';
 
-const Layout = ({ children }: PropsWithChildren) => {
+const Layout = async ({ children }: PropsWithChildren) => {
   if (!enableClerk) return notFound();
 
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
+
   if (mobile) return <MobileLayout>{children}</MobileLayout>;
 
   return children;

package/src/app/(main)/profile/loading.tsx

@@ -3,8 +3,8 @@ import { Flexbox } from 'react-layout-kit';
 import SkeletonLoading from '@/components/SkeletonLoading';
 import { isMobileDevice } from '@/utils/server/responsive';
 
-const Loading = () => {
-  const mobile = isMobileDevice();
+const Loading = async () => {
+  const mobile = await isMobileDevice();
   if (mobile) return <SkeletonLoading paragraph={{ rows: 8 }} />;
   return (
     <Flexbox horizontal style={{ position: 'relative' }} width={'100%'}>

package/src/app/(main)/settings/about/page.tsx

@@ -13,8 +13,8 @@ export const generateMetadata = async () => {
   });
 };
 
-export default () => {
-  const isMobile = isMobileDevice();
+export default async () => {
+  const isMobile = await isMobileDevice();
 
   return <Page mobile={isMobile} />;
 };

package/src/app/(main)/settings/sync/page.tsx

@@ -15,12 +15,12 @@ export const generateMetadata = async () => {
     url: '/settings/sync',
   });
 };
-export default () => {
+export default async () => {
   const enableWebrtc = serverFeatureFlags().enableWebrtc;
   if (!enableWebrtc) return notFound();
 
-  const isMobile = isMobileDevice();
-  const { os, browser } = gerServerDeviceInfo();
+  const isMobile = await isMobileDevice();
+  const { os, browser } = await gerServerDeviceInfo();
 
   return <Page browser={browser} mobile={isMobile} os={os} />;
 };

package/src/app/@modal/(.)settings/modal/page.tsx

@@ -7,9 +7,9 @@ import SettingsModal from './index';
  * @refs: https://github.com/lobehub/lobe-chat/discussions/2295#discussioncomment-9290942
  */
 
-const Page = () => {
-  const isMobile = isMobileDevice();
-  const { os, browser } = gerServerDeviceInfo();
+const Page = async () => {
+  const isMobile = await isMobileDevice();
+  const { os, browser } = await gerServerDeviceInfo();
 
   return <SettingsModal browser={browser} mobile={isMobile} os={os} />;
 };

package/src/app/layout.tsx

@@ -25,7 +25,7 @@ const RootLayout = async ({ children, modal }: RootLayoutProps) => {
   const locale = lang?.value || DEFAULT_LANG;
 
   const direction = isRtlLang(locale) ? 'rtl' : 'ltr';
-  const mobile = isMobileDevice();
+  const mobile = await isMobileDevice();
 
   return (
     <html dir={direction} lang={locale} suppressHydrationWarning>
@@ -49,7 +49,7 @@ export default RootLayout;
 export { generateMetadata } from './metadata';
 
 export const generateViewport = async (): ResolvingViewport => {
-  const isMobile = isMobileDevice();
+  const isMobile = await isMobileDevice();
 
   const dynamicScale = isMobile ? { maximumScale: 1, userScalable: false } : {};
 

package/src/components/server/ServerLayout.tsx

@@ -9,8 +9,8 @@ interface ServerLayoutProps<T> {
 
 const ServerLayout =
   <T extends PropsWithChildren>({ Desktop, Mobile }: ServerLayoutProps<T>): FC<T> =>
-  (props: T) => {
-    const mobile = isMobileDevice();
+  async (props: T) => {
+    const mobile = await isMobileDevice();
     return mobile ? <Mobile {...props} /> : <Desktop {...props} />;
   };
 

package/src/database/schemas/user.ts

@@ -46,6 +46,7 @@ export const userSettings = pgTable('user_settings', {
   defaultAgent: jsonb('default_agent'),
   tool: jsonb('tool'),
 });
+export type UserSettingsItem = typeof userSettings.$inferSelect;
 
 export const installedPlugins = pgTable(
   'user_installed_plugins',

package/src/database/server/models/__tests__/user.test.ts

@@ -7,7 +7,7 @@ import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserGuide, UserPreference } from '@/types/user';
 import { UserSettings } from '@/types/user/settings';
 
-import { userSettings, users } from '../../../schemas';
+import { UserSettingsItem, userSettings, users } from '../../../schemas';
 import { SessionModel } from '../session';
 import { UserModel } from '../user';
 
@@ -101,7 +101,7 @@ describe('UserModel', () => {
         keyVaults: encryptedKeyVaults,
       });
 
-      const state = await userModel.getUserState();
+      const state = await userModel.getUserState(KeyVaultsGateKeeper.getUserKeyVaults);
 
       expect(state.userId).toBe(userId);
       expect(state.preference).toEqual(preference);
@@ -111,7 +111,9 @@ describe('UserModel', () => {
     it('should throw an error if user not found', async () => {
       const userModel = new UserModel(serverDB, 'invalid-user-id');
 
-      await expect(userModel.getUserState()).rejects.toThrow('user not found');
+      await expect(userModel.getUserState(KeyVaultsGateKeeper.getUserKeyVaults)).rejects.toThrow(
+        'user not found',
+      );
     });
   });
 
@@ -144,11 +146,10 @@ describe('UserModel', () => {
   });
 
   describe('updateSetting', () => {
-    it('should update user settings with encrypted keyVaults', async () => {
+    it('should update user settings with new item', async () => {
       const settings = {
         general: { language: 'en-US' },
-        keyVaults: { openai: { apiKey: 'secret' } },
-      } as UserSettings;
+      } as UserSettingsItem;
       await serverDB.insert(users).values({ id: userId });
 
       await userModel.updateSetting(settings);
@@ -157,23 +158,18 @@ describe('UserModel', () => {
         where: eq(users.id, userId),
       });
       expect(updatedSettings?.general).toEqual(settings.general);
-      expect(updatedSettings?.keyVaults).not.toBe(JSON.stringify(settings.keyVaults));
-
-      const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-      const { plaintext } = await gateKeeper.decrypt(updatedSettings!.keyVaults!);
-      expect(JSON.parse(plaintext)).toEqual(settings.keyVaults);
     });
 
-    it('should update user settings with encrypted keyVaults', async () => {
+    it('should update user settings with exist item', async () => {
       const settings = {
         general: { language: 'en-US' },
-      } as UserSettings;
+      } as UserSettingsItem;
       await serverDB.insert(users).values({ id: userId });
       await serverDB.insert(userSettings).values({ ...settings, keyVaults: '', id: userId });
 
       const newSettings = {
         general: { fontSize: 16, language: 'zh-CN', themeMode: 'dark' },
-      } as UserSettings;
+      } as UserSettingsItem;
       await userModel.updateSetting(newSettings);
 
       const updatedSettings = await serverDB.query.userSettings.findFirst({
@@ -229,14 +225,18 @@ describe('UserModel', () => {
         keyVaults: encryptedKeyVaults,
       });
 
-      const result = await UserModel.getUserApiKeys(serverDB, userId);
+      const result = await UserModel.getUserApiKeys(
+        serverDB,
+        userId,
+        KeyVaultsGateKeeper.getUserKeyVaults,
+      );
       expect(result).toEqual(keyVaults);
     });
 
     it('should throw error when user not found', async () => {
-      await expect(UserModel.getUserApiKeys(serverDB, 'non-existent-id')).rejects.toThrow(
-        'user not found',
-      );
+      await expect(
+        UserModel.getUserApiKeys(serverDB, 'non-existent-id', KeyVaultsGateKeeper.getUserKeyVaults),
+      ).rejects.toThrow('user not found');
     });
 
     it('should handle decrypt failure and return empty object', async () => {
@@ -249,7 +249,11 @@ describe('UserModel', () => {
         keyVaults: invalidEncryptedData,
       });
 
-      const result = await UserModel.getUserApiKeys(serverDB, userId);
+      const result = await UserModel.getUserApiKeys(
+        serverDB,
+        userId,
+        KeyVaultsGateKeeper.getUserKeyVaults,
+      );
       expect(result).toEqual({});
     });
   });

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

@@ -301,7 +301,9 @@ export class SessionModel {
     try {
       // @ts-expect-error
       return results.map((item) => item.agentsToSessions[0].session);
-    } catch {}
+    } catch (e) {
+      console.error('findSessionsByKeywords error:', e);
+    }
     return [];
   };
 }