@lobehub/chat 1.79.8 → 1.79.10

package/src/libs/trpc/mock.ts

@@ -0,0 +1,7 @@
+/**
+ * This file contains the root router of your tRPC-backend
+ */
+import { createCallerFactory } from '@/libs/trpc/lambda';
+import { lambdaRouter } from '@/server/routers/lambda';
+
+export const createCaller = createCallerFactory(lambdaRouter);

package/src/locales/default/oauth.ts

@@ -4,7 +4,8 @@ const oauth = {
       accept: '授权',
       deny: '拒绝',
     },
-    description: '应用 {clientId} 请求访问您的 LobeChat 账户',
+    description: '应用 {{clientName}} 申请您的账户授权',
+
     error: {
       sessionInvalid: {
         message: '授权会话已过期或无效，请重新发起授权流程。',
@@ -16,16 +17,17 @@ const oauth = {
         title: '不支持的交互类型',
       },
     },
-    permissionsTitle: '应用请求以下权限：',
+    permissionsTitle: '请求以下权限：',
+    redirectUri: '授权成功后将重定向到',
     scope: {
       'email': '访问您的电子邮件地址',
-      'offline_access': '在您离线时继续访问您的数据',
+      'offline_access': '允许客户端访问您的数据',
       'openid': '使用您的 LobeChat 账户进行身份验证',
       'profile': '访问您的基本资料信息（名称、头像等）',
-      'sync:read': '读取您的同步数据',
-      'sync:write': '写入并更新您的同步数据',
+      'sync-read': '读取您的同步数据',
+      'sync-write': '写入并更新您的同步数据',
     },
-    title: '授权请求',
+    title: '授权 {{clientName}}',
   },
   failed: {
     backToHome: '返回首页',

package/src/server/routers/edge/appStatus.ts

@@ -1,3 +1,3 @@
-import { router } from '@/libs/trpc';
+import { router } from '@/libs/trpc/edge';
 
 export const appStatusRouter = router({});

package/src/server/routers/edge/config/index.test.ts

@@ -4,9 +4,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 /**
  * This file contains the root router of your tRPC-backend
  */
-import { createCallerFactory } from '@/libs/trpc';
-import { AuthContext, createContextInner } from '@/server/context';
-import { GlobalServerConfig } from '@/types/serverConfig';
+import { createCallerFactory } from '@/libs/trpc/edge';
+import { AuthContext, createContextInner } from '@/libs/trpc/edge/context';
 
 import { configRouter } from './index';
 

package/src/server/routers/edge/config/index.ts

@@ -1,5 +1,5 @@
 import { getServerFeatureFlagsValue } from '@/config/featureFlags';
-import { publicProcedure, router } from '@/libs/trpc';
+import { publicProcedure, router } from '@/libs/trpc/edge';
 import { getServerDefaultAgentConfig, getServerGlobalConfig } from '@/server/globalConfig';
 import { GlobalRuntimeConfig } from '@/types/serverConfig';
 

package/src/server/routers/edge/index.ts

@@ -1,7 +1,7 @@
 /**
  * This file contains the edge router of Lobe Chat tRPC-backend
  */
-import { publicProcedure, router } from '@/libs/trpc';
+import { publicProcedure, router } from '@/libs/trpc/edge';
 
 import { appStatusRouter } from './appStatus';
 import { configRouter } from './config';

package/src/server/routers/edge/upload.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { passwordProcedure, router } from '@/libs/trpc';
+import { passwordProcedure, router } from '@/libs/trpc/edge';
 import { S3 } from '@/server/modules/S3';
 
 export const uploadRouter = router({

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

@@ -2,8 +2,8 @@ import { z } from 'zod';
 
 import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { insertSessionGroupSchema } from '@/database/schemas';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { SessionGroupItem } from '@/types/session';
 
 const sessionProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -8,8 +8,8 @@ import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
 import { SessionModel } from '@/database/models/session';
 import { UserModel } from '@/database/models/user';
 import { pino } from '@/libs/logger';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { AgentService } from '@/server/services/agent';
 import { KnowledgeItem, KnowledgeType } from '@/types/knowledgeBase';
 

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

@@ -3,8 +3,8 @@ import { z } from 'zod';
 import { AiModelModel } from '@/database/models/aiModel';
 import { UserModel } from '@/database/models/user';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import {

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

@@ -3,8 +3,8 @@ import { z } from 'zod';
 import { AiProviderModel } from '@/database/models/aiProvider';
 import { UserModel } from '@/database/models/user';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import {

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

@@ -9,9 +9,8 @@ import { EmbeddingModel } from '@/database/models/embedding';
 import { FileModel } from '@/database/models/file';
 import { MessageModel } from '@/database/models/message';
 import { knowledgeBaseFiles } from '@/database/schemas';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
-import { keyVaults } from '@/libs/trpc/middleware/keyVaults';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { keyVaults, serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { getServerDefaultFilesConfig } from '@/server/globalConfig';
 import { initAgentRuntimeWithUserPayload } from '@/server/modules/AgentRuntime';
 import { ChunkService } from '@/server/services/chunk';

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

@@ -1,7 +1,7 @@
 import { DrizzleMigrationModel } from '@/database/models/drizzleMigration';
 import { DataExporterRepos } from '@/database/repositories/dataExporter';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { ExportDatabaseData } from '@/types/export';
 
 const exportProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -5,8 +5,8 @@ import { serverDBEnv } from '@/config/db';
 import { AsyncTaskModel } from '@/database/models/asyncTask';
 import { ChunkModel } from '@/database/models/chunk';
 import { FileModel } from '@/database/models/file';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { FileService } from '@/server/services/file';
 import { AsyncTaskStatus, AsyncTaskType } from '@/types/asyncTask';
 import { FileListItem, QueryFileListSchema, UploadFileSchema } from '@/types/files';

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

@@ -2,8 +2,8 @@ import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
 import { DataImporterRepos } from '@/database/repositories/dataImporter';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { FileService } from '@/server/services/file';
 import { ImportPgDataStructure } from '@/types/export';
 import { ImportResultData, ImporterEntryData } from '@/types/importer';

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

@@ -1,7 +1,7 @@
 /**
  * This file contains the root router of Lobe Chat tRPC-backend
  */
-import { publicProcedure, router } from '@/libs/trpc';
+import { publicProcedure, router } from '@/libs/trpc/lambda';
 
 import { agentRouter } from './agent';
 import { aiModelRouter } from './aiModel';

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

@@ -2,8 +2,8 @@ import { z } from 'zod';
 
 import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
 import { insertKnowledgeBasesSchema } from '@/database/schemas';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { KnowledgeBaseItem } from '@/types/knowledgeBase';
 
 const knowledgeBaseProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -3,8 +3,8 @@ import { z } from 'zod';
 import { MessageModel } from '@/database/models/message';
 import { updateMessagePluginSchema } from '@/database/schemas';
 import { getServerDB } from '@/database/server';
-import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { FileService } from '@/server/services/file';
 import { ChatMessage } from '@/types/message';
 import { BatchTaskResult } from '@/types/service';

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

@@ -2,8 +2,8 @@ import { z } from 'zod';
 
 import { PluginModel } from '@/database/models/plugin';
 import { getServerDB } from '@/database/server';
-import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { LobeTool } from '@/types/tool';
 
 const pluginProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -13,9 +13,8 @@ import {
   EvalEvaluationModel,
   EvaluationRecordModel,
 } from '@/database/server/models/ragEval';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
-import { keyVaults } from '@/libs/trpc/middleware/keyVaults';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { keyVaults, serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { createAsyncServerClient } from '@/server/routers/async';
 import { FileService } from '@/server/services/file';
 import {

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

@@ -4,8 +4,8 @@ import { SessionModel } from '@/database/models/session';
 import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { insertAgentSchema, insertSessionSchema } from '@/database/schemas';
 import { getServerDB } from '@/database/server';
-import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { AgentChatConfigSchema } from '@/types/agent';
 import { LobeMetaDataSchema } from '@/types/meta';
 import { BatchTaskResult } from '@/types/service';

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

@@ -2,8 +2,8 @@ import { z } from 'zod';
 
 import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { insertSessionGroupSchema } from '@/database/schemas';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { SessionGroupItem } from '@/types/session';
 
 const sessionProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -3,8 +3,8 @@ import { z } from 'zod';
 import { MessageModel } from '@/database/models/message';
 import { ThreadModel } from '@/database/models/thread';
 import { insertThreadSchema } from '@/database/schemas';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { ThreadItem, createThreadSchema } from '@/types/topic/thread';
 
 const threadProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -2,8 +2,8 @@ import { z } from 'zod';
 
 import { TopicModel } from '@/database/models/topic';
 import { getServerDB } from '@/database/server';
-import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { BatchTaskResult } from '@/types/service';
 
 const topicProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {

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

@@ -7,8 +7,8 @@ import { SessionModel } from '@/database/models/session';
 import { UserModel, UserNotFoundError } from '@/database/models/user';
 import { ClerkAuth } from '@/libs/clerk-auth';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
-import { authedProcedure, router } from '@/libs/trpc';
-import { serverDatabase } from '@/libs/trpc/lambda';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserService } from '@/server/services/user';
 import {

package/src/server/routers/tools/__tests__/search.test.ts

@@ -6,8 +6,8 @@ import { isServerMode } from '@/const/version';
 /**
  * This file contains the root router of your tRPC-backend
  */
-import { createCallerFactory } from '@/libs/trpc';
-import { AuthContext, createContextInner } from '@/server/context';
+import { createCallerFactory } from '@/libs/trpc/lambda';
+import { AuthContext, createContextInner } from '@/libs/trpc/lambda/context';
 import { SearXNGClient } from '@/server/modules/SearXNG';
 
 import { searchRouter } from '../search';

package/src/server/routers/tools/index.ts

@@ -1,4 +1,4 @@
-import { publicProcedure, router } from '@/libs/trpc';
+import { publicProcedure, router } from '@/libs/trpc/lambda';
 
 import { searchRouter } from './search';
 

package/src/server/routers/tools/search.ts

@@ -5,10 +5,12 @@ import { z } from 'zod';
 
 import { toolsEnv } from '@/config/tools';
 import { isServerMode } from '@/const/version';
-import { authedProcedure, passwordProcedure, router } from '@/libs/trpc';
+import { passwordProcedure } from '@/libs/trpc/edge';
+import { authedProcedure, router } from '@/libs/trpc/lambda';
 import { SearXNGClient } from '@/server/modules/SearXNG';
 import { SEARCH_SEARXNG_NOT_CONFIG } from '@/types/tool/search';
 
+// TODO: password procedure 未来的处理方式可能要思考下
 const searchProcedure = isServerMode ? authedProcedure : passwordProcedure;
 
 export const searchRouter = router({

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

@@ -1,8 +1,12 @@
+import debug from 'debug';
+
 import { createContextForInteractionDetails } from '@/libs/oidc-provider/http-adapter';
 import { OIDCProvider } from '@/libs/oidc-provider/provider';
 
 import { getOIDCProvider } from './oidcProvider';
 
+const log = debug('lobe-oidc:service');
+
 export class OIDCService {
   private provider: OIDCProvider;
 
@@ -22,7 +26,38 @@ export class OIDCService {
 
   async getInteractionResult(uid: string, result: any) {
     const { req, res } = await createContextForInteractionDetails(uid);
-    return this.provider.interactionResult(req, res, result, { mergeWithLastSubmission: true });
+    return this.provider.interactionResult(req, res, result);
+  }
+
+  async finishInteraction(uid: string, result: any) {
+    const { req, res } = await createContextForInteractionDetails(uid);
+    return this.provider.interactionFinished(req, res, result, { mergeWithLastSubmission: true });
+  }
+
+  async findOrCreateGrants(accountId: string, clientId: string, existingGrantId?: string) {
+    // 2. 查找或创建 Grant 对象
+    let grant;
+    if (existingGrantId) {
+      // 如果之前的交互步骤已经关联了 Grant
+      grant = await this.provider.Grant.find(existingGrantId);
+      log('Found existing grantId: %s', existingGrantId);
+    }
+
+    if (!grant) {
+      // 如果没有找到或没有 existingGrantId，则创建新的
+      grant = new this.provider.Grant({
+        accountId: accountId,
+        clientId: clientId,
+      });
+      log('Created new Grant for account %s and client %s', accountId, clientId);
+    }
+
+    return grant;
+  }
+
+  async getClientMetadata(clientId: string) {
+    const client = await this.provider.Client.find(clientId);
+    return client?.metadata();
   }
 }
 

package/src/server/services/oidc/oidcProvider.ts

@@ -1,4 +1,3 @@
-import { appEnv } from '@/config/app';
 import { getDBInstance } from '@/database/core/web-server';
 import { oidcEnv } from '@/envs/oidc';
 import { OIDCProvider, createOIDCProvider } from '@/libs/oidc-provider/provider';
@@ -18,9 +17,8 @@ export const getOIDCProvider = async (): Promise<OIDCProvider> => {
       throw new Error('OIDC is not enabled. Set ENABLE_OIDC=1 to enable it.');
     }
 
-    const baseUrl = appEnv.APP_URL!;
     const db = getDBInstance();
-    provider = await createOIDCProvider(db, baseUrl);
+    provider = await createOIDCProvider(db);
   }
 
   return provider;

package/src/services/chat.ts

@@ -180,6 +180,7 @@ class ChatService {
     )(getAiInfraStoreState());
 
     const useModelSearch = isModelHasBuiltinSearch && chatConfig.useModelBuiltinSearch;
+
     const useApplicationBuiltinSearchTool = enabledSearch && !useModelSearch;
 
     const pluginIds = [...(enabledPlugins || [])];

package/src/store/agent/slices/chat/selectors/__snapshots__/agent.test.ts.snap

@@ -12,7 +12,7 @@ exports[`agentSelectors > defaultAgentConfig > should merge DEFAULT_AGENT_CONFIG
     "historyCount": 8,
     "reasoningBudgetToken": 1024,
     "searchFCModel": {
-      "model": "gpt-4o-mini",
+      "model": "gpt-4.1-mini",
       "provider": "openai",
     },
     "searchMode": "off",

package/src/store/user/slices/modelList/selectors/modelProvider.test.ts

@@ -50,6 +50,7 @@ describe('modelProviderSelectors', () => {
 
       const result = modelProviderSelectors.getDefaultEnabledModelsById('openai')(s);
       expect(result).toEqual([
+        'gpt-4.1-mini',
         'o1-mini',
         'o1-2024-12-17',
         'o1-preview',

package/src/store/user/slices/settings/selectors/__snapshots__/settings.test.ts.snap

@@ -51,30 +51,30 @@ exports[`settingsSelectors > currentSettings > should merge DEFAULT_SETTINGS and
 exports[`settingsSelectors > currentSystemAgent > should merge DEFAULT_SYSTEM_AGENT_CONFIG and s.settings.systemAgent correctly 1`] = `
 {
   "agentMeta": {
-    "model": "gpt-4o-mini",
+    "model": "gpt-4.1-mini",
     "provider": "openai",
   },
   "enableAutoReply": true,
   "historyCompress": {
-    "model": "gpt-4o-mini",
+    "model": "gpt-4.1-mini",
     "provider": "openai",
   },
   "queryRewrite": {
     "enabled": true,
-    "model": "gpt-4o-mini",
+    "model": "gpt-4.1-mini",
     "provider": "openai",
   },
   "replyMessage": "Custom auto reply",
   "thread": {
-    "model": "gpt-4o-mini",
+    "model": "gpt-4.1-mini",
     "provider": "openai",
   },
   "topic": {
-    "model": "gpt-4o-mini",
+    "model": "gpt-4.1-mini",
     "provider": "openai",
   },
   "translation": {
-    "model": "gpt-4o-mini",
+    "model": "gpt-4.1-mini",
     "provider": "openai",
   },
 }
@@ -111,7 +111,7 @@ exports[`settingsSelectors > defaultAgent > should merge DEFAULT_AGENT and s.set
       "historyCount": 8,
       "reasoningBudgetToken": 1024,
       "searchFCModel": {
-        "model": "gpt-4o-mini",
+        "model": "gpt-4.1-mini",
         "provider": "openai",
       },
       "searchMode": "off",
@@ -154,7 +154,7 @@ exports[`settingsSelectors > defaultAgentConfig > should merge DEFAULT_AGENT_CON
     "historyCount": 8,
     "reasoningBudgetToken": 1024,
     "searchFCModel": {
-      "model": "gpt-4o-mini",
+      "model": "gpt-4.1-mini",
       "provider": "openai",
     },
     "searchMode": "off",

package/src/server/mock.ts

@@ -1,8 +0,0 @@
-/**
- * This file contains the root router of your tRPC-backend
- */
-import { createCallerFactory } from '@/libs/trpc';
-
-import { edgeRouter } from './routers/edge';
-
-export const createCaller = createCallerFactory(edgeRouter);