@lobehub/chat 1.36.38 → 1.36.40

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

@@ -3,14 +3,18 @@ import { eq } from 'drizzle-orm/expressions';
 import { DeepPartial } from 'utility-types';
 
 import { LobeChatDatabase } from '@/database/type';
-import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserGuide, UserPreference } from '@/types/user';
 import { UserKeyVaults, UserSettings } from '@/types/user/settings';
 import { merge } from '@/utils/merge';
 
-import { NewUser, UserItem, userSettings, users } from '../../schemas';
+import { NewUser, UserItem, UserSettingsItem, userSettings, users } from '../../schemas';
 import { SessionModel } from './session';
 
+type DecryptUserKeyVaults = (
+  encryptKeyVaultsStr: string | null,
+  userId?: string,
+) => Promise<UserKeyVaults>;
+
 export class UserNotFoundError extends TRPCError {
   constructor() {
     super({ code: 'UNAUTHORIZED', message: 'user not found' });
@@ -26,7 +30,7 @@ export class UserModel {
     this.db = db;
   }
 
-  getUserState = async () => {
+  getUserState = async (decryptor: DecryptUserKeyVaults) => {
     const result = await this.db
       .select({
         isOnboarded: users.isOnboarded,
@@ -51,19 +55,7 @@ export class UserModel {
     const state = result[0];
 
     // Decrypt keyVaults
-    let decryptKeyVaults = {};
-    if (state.settingsKeyVaults) {
-      const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-      const { wasAuthentic, plaintext } = await gateKeeper.decrypt(state.settingsKeyVaults);
-
-      if (wasAuthentic) {
-        try {
-          decryptKeyVaults = JSON.parse(plaintext);
-        } catch (e) {
-          console.error(`Failed to parse keyVaults ,userId: ${this.userId}. Error:`, e);
-        }
-      }
-    }
+    const decryptKeyVaults = await decryptor(state.settingsKeyVaults, this.userId);
 
     const settings: DeepPartial<UserSettings> = {
       defaultAgent: state.settingsDefaultAgent || {},
@@ -94,32 +86,17 @@ export class UserModel {
     return this.db.delete(userSettings).where(eq(userSettings.id, this.userId));
   };
 
-  updateSetting = async (value: Partial<UserSettings>) => {
-    const { keyVaults, ...res } = value;
-
-    // Encrypt keyVaults
-    let encryptedKeyVaults: string | null = null;
-
-    if (keyVaults) {
-      // TODO: better to add a validation
-      const data = JSON.stringify(keyVaults);
-      const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-
-      encryptedKeyVaults = await gateKeeper.encrypt(data);
-    }
-
-    const newValue = { ...res, keyVaults: encryptedKeyVaults };
-
-    // update or create user settings
-    const settings = await this.db.query.userSettings.findFirst({
-      where: eq(users.id, this.userId),
-    });
-    if (!settings) {
-      await this.db.insert(userSettings).values({ id: this.userId, ...newValue });
-      return;
-    }
-
-    return this.db.update(userSettings).set(newValue).where(eq(userSettings.id, this.userId));
+  updateSetting = async (value: Partial<UserSettingsItem>) => {
+    return this.db
+      .insert(userSettings)
+      .values({
+        id: this.userId,
+        ...value,
+      })
+      .onConflictDoUpdate({
+        set: value,
+        target: userSettings.id,
+      });
   };
 
   updatePreference = async (value: Partial<UserPreference>) => {
@@ -175,7 +152,11 @@ export class UserModel {
     return db.query.users.findFirst({ where: eq(users.email, email) });
   };
 
-  static getUserApiKeys = async (db: LobeChatDatabase, id: string) => {
+  static getUserApiKeys = async (
+    db: LobeChatDatabase,
+    id: string,
+    decryptor: DecryptUserKeyVaults,
+  ) => {
     const result = await db
       .select({
         settingsKeyVaults: userSettings.keyVaults,
@@ -190,20 +171,6 @@ export class UserModel {
     const state = result[0];
 
     // Decrypt keyVaults
-    let decryptKeyVaults = {};
-    if (state.settingsKeyVaults) {
-      const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-      const { wasAuthentic, plaintext } = await gateKeeper.decrypt(state.settingsKeyVaults);
-
-      if (wasAuthentic) {
-        try {
-          decryptKeyVaults = JSON.parse(plaintext);
-        } catch (e) {
-          console.error(`Failed to parse keyVaults ,userId: ${id}. Error:`, e);
-        }
-      }
-    }
-
-    return decryptKeyVaults as UserKeyVaults;
+    return await decryptor(state.settingsKeyVaults, id);
   };
 }

package/src/layout/GlobalProvider/index.tsx

@@ -68,7 +68,7 @@ const GlobalLayout = async ({ children }: PropsWithChildren) => {
   // get default feature flags to use with ssr
   const serverFeatureFlags = getServerFeatureFlagsValue();
   const serverConfig = getServerGlobalConfig();
-  const isMobile = isMobileDevice();
+  const isMobile = await isMobileDevice();
   return (
     <StyleRegistry>
       <Locale antdLocale={antdLocale} defaultLang={userLocale}>

package/src/locales/default/common.ts

@@ -13,6 +13,7 @@ export default {
   appLoading: {
     appIdle: '准备启动',
     appInitializing: '应用启动中...',
+    failed: '很抱歉，应用初始化失败，请查看详情进行排查',
     finished: '数据库初始化完成',
     goToChat: '对话页面加载中...',
     initAuth: '鉴权服务初始化...',
@@ -22,6 +23,7 @@ export default {
     loadingWasm: '加载 WASM 模块...',
     migrating: '执行数据表迁移...',
     ready: '数据库已就绪',
+    showDetail: '查看详情',
   },
   autoGenerate: '自动补全',
   autoGenerateTooltip: '基于提示词自动补全助手描述',
@@ -39,12 +41,13 @@ export default {
       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/src/server/modules/KeyVaultsEncrypt/index.ts

@@ -1,4 +1,5 @@
 import { getServerDBConfig } from '@/config/db';
+import { UserKeyVaults } from '@/types/user/settings';
 
 interface DecryptionResult {
   plaintext: string;
@@ -90,4 +91,26 @@ If you don't have it, please run \`openssl rand -base64 32\` to create one.
       };
     }
   };
+
+  static getUserKeyVaults = async (
+    encryptedKeyVaults: string | null,
+    userId?: string,
+  ): Promise<UserKeyVaults> => {
+    if (!encryptedKeyVaults) return {};
+    // Decrypt keyVaults
+    let decryptKeyVaults = {};
+
+    const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
+    const { wasAuthentic, plaintext } = await gateKeeper.decrypt(encryptedKeyVaults);
+
+    if (wasAuthentic) {
+      try {
+        decryptKeyVaults = JSON.parse(plaintext);
+      } catch (e) {
+        console.error(`Failed to parse keyVaults, userId: ${userId}. Error:`, e);
+      }
+    }
+
+    return decryptKeyVaults as UserKeyVaults;
+  };
 }

package/src/server/routers/lambda/user.ts

@@ -8,8 +8,10 @@ import { MessageModel } from '@/database/server/models/message';
 import { SessionModel } from '@/database/server/models/session';
 import { UserModel, UserNotFoundError } from '@/database/server/models/user';
 import { authedProcedure, router } from '@/libs/trpc';
+import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserService } from '@/server/services/user';
 import { UserGuideSchema, UserInitializationState, UserPreference } from '@/types/user';
+import { UserSettings } from '@/types/user/settings';
 
 const userProcedure = authedProcedure.use(async (opts) => {
   return opts.next({
@@ -24,7 +26,7 @@ export const userRouter = router({
     // get or create first-time user
     while (!state) {
       try {
-        state = await ctx.userModel.getUserState();
+        state = await ctx.userModel.getUserState(KeyVaultsGateKeeper.getUserKeyVaults);
       } catch (error) {
         if (enableClerk && error instanceof UserNotFoundError) {
           const user = await currentUser();
@@ -97,7 +99,22 @@ export const userRouter = router({
   updateSettings: userProcedure
     .input(z.object({}).passthrough())
     .mutation(async ({ ctx, input }) => {
-      return ctx.userModel.updateSetting(input);
+      const { keyVaults, ...res } = input as Partial<UserSettings>;
+
+      // Encrypt keyVaults
+      let encryptedKeyVaults: string | null = null;
+
+      if (keyVaults) {
+        // TODO: better to add a validation
+        const data = JSON.stringify(keyVaults);
+        const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
+
+        encryptedKeyVaults = await gateKeeper.encrypt(data);
+      }
+
+      const nextValue = { ...res, keyVaults: encryptedKeyVaults };
+
+      return ctx.userModel.updateSetting(nextValue);
     }),
 });
 

package/src/server/services/user/index.ts

@@ -3,6 +3,7 @@ import { UserJSON } from '@clerk/backend';
 import { serverDB } from '@/database/server';
 import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
+import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 
 export class UserService {
   createUser = async (id: string, params: UserJSON) => {
@@ -84,4 +85,8 @@ export class UserService {
 
     return { message: 'user updated', success: true };
   };
+
+  getUserApiKeys = async (id: string) => {
+    return UserModel.getUserApiKeys(serverDB, id, KeyVaultsGateKeeper.getUserKeyVaults);
+  };
 }

package/src/utils/server/responsive.ts

@@ -4,12 +4,12 @@ import { UAParser } from 'ua-parser-js';
 /**
  * check mobile device in server
  */
-export const isMobileDevice = () => {
+export const isMobileDevice = async () => {
   if (typeof process === 'undefined') {
     throw new Error('[Server method] you are importing a server-only module outside of server');
   }
 
-  const { get } = headers();
+  const { get } = await headers();
   const ua = get('user-agent');
 
   // console.debug(ua);
@@ -21,15 +21,14 @@ export const isMobileDevice = () => {
 /**
  * check mobile device in server
  */
-export const gerServerDeviceInfo = () => {
+export const gerServerDeviceInfo = async () => {
   if (typeof process === 'undefined') {
     throw new Error('[Server method] you are importing a server-only module outside of server');
   }
 
-  const { get } = headers();
+  const { get } = await headers();
   const ua = get('user-agent');
 
-  // console.debug(ua);
   const parser = new UAParser(ua || '');
 
   return {