@lobehub/chat 1.79.7 → 1.79.9

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,7 +5,8 @@ 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';
 

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

@@ -0,0 +1,64 @@
+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;
+
+  constructor(provider: OIDCProvider) {
+    this.provider = provider;
+  }
+  static async initialize() {
+    const provider = await getOIDCProvider();
+
+    return new OIDCService(provider);
+  }
+
+  async getInteractionDetails(uid: string) {
+    const { req, res } = await createContextForInteractionDetails(uid);
+    return this.provider.interactionDetails(req, res);
+  }
+
+  async getInteractionResult(uid: string, result: any) {
+    const { req, res } = await createContextForInteractionDetails(uid);
+    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();
+  }
+}
+
+export { getOIDCProvider } from './oidcProvider';

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

@@ -0,0 +1,25 @@
+import { getDBInstance } from '@/database/core/web-server';
+import { oidcEnv } from '@/envs/oidc';
+import { OIDCProvider, createOIDCProvider } from '@/libs/oidc-provider/provider';
+
+/**
+ * OIDC Provider 实例
+ */
+let provider: OIDCProvider;
+
+/**
+ * 获取 OIDC Provider 实例
+ * @returns OIDC Provider 实例
+ */
+export const getOIDCProvider = async (): Promise<OIDCProvider> => {
+  if (!provider) {
+    if (!oidcEnv.ENABLE_OIDC) {
+      throw new Error('OIDC is not enabled. Set ENABLE_OIDC=1 to enable it.');
+    }
+
+    const db = getDBInstance();
+    provider = await createOIDCProvider(db);
+  }
+
+  return provider;
+};

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);