@lobehub/chat 1.79.8 → 1.79.9

package/src/libs/oidc-provider/config.ts

@@ -5,27 +5,26 @@ import { ClientMetadata } from 'oidc-provider';
  */
 export const defaultClients: ClientMetadata[] = [
   {
-    // 公共客户端，令牌端点无需认证
     application_type: 'native',
     client_id: 'lobehub-desktop',
-    description: 'LobeHub Desktop',
+    client_name: 'LobeHub Desktop',
     // 仅支持授权码流程
     grant_types: ['authorization_code', 'refresh_token'],
+
     // 明确指明是原生应用
     isFirstParty: true,
 
-    name: 'LobeHub Desktop',
+    logo_uri: 'https://hub-apac-1.lobeobjects.space/lobehub-desktop-icon.png',
 
     // 桌面端注册的自定义协议回调（使用反向域名格式）
     post_logout_redirect_uris: ['com.lobehub.desktop://auth/logout/callback'],
 
-    // 公共客户端，无密钥
     redirect_uris: ['com.lobehub.desktop://auth/callback', 'https://oauthdebugger.com/debug'],
 
     // 支持授权码获取令牌和刷新令牌
     response_types: ['code'],
 
-    // 标记为第一方客户端
+    // 标记为公共客户端客户端，无密钥
     token_endpoint_auth_method: 'none',
   },
 ];

package/src/libs/oidc-provider/http-adapter.ts

@@ -22,22 +22,13 @@ export const convertHeadersToNodeHeaders = (nextHeaders: Headers): Record<string
 /**
  * 创建用于 OIDC Provider 的 Node.js HTTP 请求对象
  * @param req Next.js 请求对象
- * @param pathPrefix 路径前缀
- * @param bodyText 可选的请求体文本，用于 POST 请求
  */
-export const createNodeRequest = (
-  req: NextRequest,
-  pathPrefix: string = '/oidc',
-  bodyText?: string,
-): IncomingMessage => {
+export const createNodeRequest = async (req: NextRequest): Promise<IncomingMessage> => {
   // 构建 URL 对象
   const url = new URL(req.url);
 
   // 计算相对于前缀的路径
   let providerPath = url.pathname;
-  if (pathPrefix && url.pathname.startsWith(pathPrefix)) {
-    providerPath = url.pathname.slice(pathPrefix.length);
-  }
 
   // 确保路径始终以/开头
   if (!providerPath.startsWith('/')) {
@@ -47,37 +38,74 @@ export const createNodeRequest = (
   log('Creating Node.js request from Next.js request');
   log('Original path: %s, Provider path: %s', url.pathname, providerPath);
 
+  // Attempt to parse and attach body for relevant methods
+  let parsedBody: any = undefined;
+  const methodsWithBody = ['POST', 'PUT', 'PATCH', 'DELETE'];
+  if (methodsWithBody.includes(req.method)) {
+    const contentType = req.headers.get('content-type')?.split(';')[0]; // Get content type without charset etc.
+    log(`Attempting to parse body for ${req.method} with Content-Type: ${contentType}`);
+    try {
+      // Check if body exists and has size before attempting to parse
+      if (req.body && req.headers.get('content-length') !== '0') {
+        if (contentType === 'application/x-www-form-urlencoded') {
+          const formData = await req.formData();
+          parsedBody = {};
+          formData.forEach((value, key) => {
+            // If a key appears multiple times, keep the last one (standard form behavior)
+            // Or convert to array if oidc-provider expects it:
+            // if (parsedBody[key]) {
+            //   if (!Array.isArray(parsedBody[key])) parsedBody[key] = [parsedBody[key]];
+            //   parsedBody[key].push(value);
+            // } else {
+            //   parsedBody[key] = value;
+            // }
+            parsedBody[key] = value;
+          });
+          log('Parsed form data body: %O', parsedBody);
+        } else if (contentType === 'application/json') {
+          parsedBody = await req.json();
+          log('Parsed JSON body: %O', parsedBody);
+        } else {
+          log(`Body parsing skipped for Content-Type: ${contentType}. Trying text() as fallback.`);
+          // Fallback: try reading as text if content type is unknown but body exists
+          parsedBody = await req.text();
+          log('Parsed body as text fallback.');
+        }
+      } else {
+        log('Request has no body or content-length is 0, skipping parsing.');
+      }
+    } catch (error) {
+      log('Error parsing request body: %O', error);
+      // Keep parsedBody as undefined, let oidc-provider handle the potential issue
+    }
+  }
   const nodeRequest = {
     // 基本属性
     headers: convertHeadersToNodeHeaders(req.headers),
+
     method: req.method,
-    // 模拟可读流行为
+    // 模拟可读流行为 (oidc-provider might not rely on this if body is pre-parsed)
     // eslint-disable-next-line @typescript-eslint/ban-types
     on: (event: string, handler: Function) => {
-      if (event === 'data' && bodyText) {
-        handler(bodyText);
-      }
       if (event === 'end') {
+        // Simulate end immediately as body is already processed or will be attached
         handler();
       }
     },
-
-    url: providerPath + url.search,
-
-    // POST 请求所需属性
-    ...(bodyText && {
-      body: bodyText,
-      readable: true,
-    }),
-
     // 添加 Node.js 服务器所期望的额外属性
     socket: {
       remoteAddress: req.headers.get('x-forwarded-for') || '127.0.0.1',
     },
-  } as unknown as IncomingMessage;
+    url: providerPath + url.search,
+    ...(parsedBody !== undefined && { body: parsedBody }), // Attach body if it exists
+  };
 
   log('Node.js request created with method %s and path %s', nodeRequest.method, nodeRequest.url);
-  return nodeRequest;
+  if (nodeRequest.body) {
+    log('Attached parsed body to Node.js request.');
+  }
+  // Cast back to IncomingMessage for the function's return signature
+  return nodeRequest as unknown as IncomingMessage;
 };
 
 /**
@@ -143,6 +171,12 @@ export const createNodeResponse = (resolvePromise: () => void): ResponseCollecto
 
     headersSent: false,
 
+    removeHeader: (name: string) => {
+      const lowerName = name.toLowerCase();
+      log('Removing header: %s', lowerName);
+      delete state.responseHeaders[lowerName];
+    },
+
     setHeader: (name: string, value: string | string[]) => {
       const lowerName = name.toLowerCase();
       log('Setting header: %s = %s', lowerName, value);
@@ -198,8 +232,6 @@ export const createContextForInteractionDetails = async (
   uid: string,
 ): Promise<{ req: IncomingMessage; res: ServerResponse }> => {
   log('Creating context for interaction details for uid: %s', uid);
-
-  // 使用APP_URL环境变量来构建URL基础部分
   const baseUrl = appEnv.APP_URL!;
   log('Using base URL: %s', baseUrl);
 
@@ -260,7 +292,7 @@ export const createContextForInteractionDetails = async (
 
   // 4. 使用 createNodeRequest 创建模拟的 Node.js IncomingMessage
   // pathPrefix 设置为 '/' 因为我们的 URL 已经是 Provider 期望的路径格式 /interaction/:uid
-  const req: IncomingMessage = createNodeRequest(mockNextRequest, '/');
+  const req: IncomingMessage = await createNodeRequest(mockNextRequest);
   // @ts-ignore - 将解析出的 cookies 附加到模拟的 Node.js 请求上
   req.cookies = realCookies;
   log('Node.js IncomingMessage created, attached real cookies');

package/src/libs/oidc-provider/provider.ts

@@ -1,6 +1,8 @@
 import debug from 'debug';
 import Provider, { Configuration, KoaContextWithOIDC } from 'oidc-provider';
+import urlJoin from 'url-join';
 
+import { appEnv } from '@/config/app';
 import { serverDBEnv } from '@/config/db';
 import { UserModel } from '@/database/models/user';
 import { LobeChatDatabase } from '@/database/type';
@@ -61,18 +63,9 @@ const getCookieKeys = () => {
 /**
  * 创建 OIDC Provider 实例
  * @param db - 数据库实例
- * @param baseUrl - 服务部署的基础URL
  * @returns 配置好的 OIDC Provider 实例
  */
-export const createOIDCProvider = async (
-  db: LobeChatDatabase,
-  baseUrl: string,
-): Promise<Provider> => {
-  const issuerUrl = `${baseUrl}/oidc`;
-  if (!issuerUrl) {
-    throw new Error('Base URL is required for OIDC Provider');
-  }
-
+export const createOIDCProvider = async (db: LobeChatDatabase): Promise<Provider> => {
   // 获取 JWKS
   const jwks = getJWKS();
 
@@ -85,13 +78,41 @@ export const createOIDCProvider = async (
     // 4. Claims 定义
     claims: defaultClaims,
 
+    // 新增：客户端 CORS 控制逻辑
+    clientBasedCORS(ctx, origin, client) {
+      // 检查客户端是否允许此来源
+      // 一个常见的策略是允许所有已注册的 redirect_uris 的来源
+      if (!client || !client.redirectUris) {
+        logProvider('clientBasedCORS: No client or redirectUris found, denying origin: %s', origin);
+        return false; // 如果没有客户端或重定向URI，则拒绝
+      }
+
+      const allowed = client.redirectUris.some((uri) => {
+        try {
+          // 比较来源 (scheme, hostname, port)
+          return new URL(uri).origin === origin;
+        } catch {
+          // 如果 redirect_uri 不是有效的 URL (例如自定义协议)，则跳过
+          return false;
+        }
+      });
+
+      logProvider(
+        'clientBasedCORS check for origin [%s] and client [%s]: %s',
+        origin,
+        client.clientId,
+        allowed ? 'Allowed' : 'Denied',
+      );
+      return allowed;
+    },
+
     // 1. 客户端配置
     clients: defaultClients,
 
     // 7. Cookie 配置
     cookies: {
       keys: cookieKeys,
-      long: { signed: true },
+      long: { path: '/', signed: true },
       short: { path: '/', signed: true },
     },
 
@@ -107,7 +128,6 @@ export const createOIDCProvider = async (
       rpInitiatedLogout: { enabled: true },
       userinfo: { enabled: true },
     },
-
     // 10. 账户查找
     async findAccount(ctx: KoaContextWithOIDC, id: string) {
       logProvider('findAccount called for id: %s', id);
@@ -183,6 +203,7 @@ export const createOIDCProvider = async (
         return undefined;
       }
     },
+
     // 9. 交互策略
     interactions: {
       policy: createInteractionPolicy(),
@@ -225,6 +246,11 @@ export const createOIDCProvider = async (
     // 新增：启用 Refresh Token 轮换
     rotateRefreshToken: true,
 
+    routes: {
+      authorization: '/oidc/auth',
+      end_session: '/oidc/session/end',
+      token: '/oidc/token',
+    },
     // 3. Scopes 定义
     scopes: defaultScopes,
 
@@ -243,7 +269,9 @@ export const createOIDCProvider = async (
   };
 
   // 创建提供者实例
-  const provider = new Provider(issuerUrl, configuration);
+  const baseUrl = urlJoin(appEnv.APP_URL!, '/oidc');
+
+  const provider = new Provider(baseUrl, configuration);
 
   provider.on('server_error', (ctx, err) => {
     logProvider('OIDC Provider Server Error: %O', err); // Use logProvider

package/src/libs/trpc/async/init.ts

@@ -1,7 +1,7 @@
 import { initTRPC } from '@trpc/server';
 import superjson from 'superjson';
 
-import { AsyncContext } from '@/server/asyncContext';
+import { AsyncContext } from './context';
 
 export const asyncTrpc = initTRPC.context<AsyncContext>().create({
   errorFormatter({ shape }) {

package/src/{server → libs/trpc/edge}/context.ts

@@ -28,13 +28,13 @@ export const createContextInner = async (params?: {
   userId: params?.userId,
 });
 
-export type Context = Awaited<ReturnType<typeof createContextInner>>;
+export type EdgeContext = Awaited<ReturnType<typeof createContextInner>>;
 
 /**
  * Creates context for an incoming request
  * @link https://trpc.io/docs/v11/context
  */
-export const createContext = async (request: NextRequest): Promise<Context> => {
+export const createEdgeContext = async (request: NextRequest): Promise<EdgeContext> => {
   // for API-response caching see https://trpc.io/docs/v11/caching
 
   const authorization = request.headers.get(LOBE_CHAT_AUTH_HEADER);

package/src/libs/trpc/{index.ts → edge/index.ts}

@@ -10,40 +10,40 @@
 import { DESKTOP_USER_ID } from '@/const/desktop';
 import { isDesktop } from '@/const/version';
 
-import { trpc } from './init';
+import { userAuth } from '../middleware/userAuth';
+import { edgeTrpc } from './init';
 import { jwtPayloadChecker } from './middleware/jwtPayload';
-import { userAuth } from './middleware/userAuth';
 
 /**
  * Create a router
  * @link https://trpc.io/docs/v11/router
  */
-export const router = trpc.router;
+export const router = edgeTrpc.router;
 
 /**
  * Create an unprotected procedure
  * @link https://trpc.io/docs/v11/procedures
  **/
-export const publicProcedure = trpc.procedure.use(({ next, ctx }) => {
+export const publicProcedure = edgeTrpc.procedure.use(({ next, ctx }) => {
   return next({
     ctx: { userId: isDesktop ? DESKTOP_USER_ID : ctx.userId },
   });
 });
 
 // procedure that asserts that the user is logged in
-export const authedProcedure = trpc.procedure.use(userAuth);
+export const authedProcedure = edgeTrpc.procedure.use(userAuth);
 
 // procedure that asserts that the user add the password
-export const passwordProcedure = trpc.procedure.use(jwtPayloadChecker);
+export const passwordProcedure = edgeTrpc.procedure.use(jwtPayloadChecker);
 
 /**
  * Merge multiple routers together
  * @link https://trpc.io/docs/v11/merging-routers
  */
-export const mergeRouters = trpc.mergeRouters;
+export const mergeRouters = edgeTrpc.mergeRouters;
 
 /**
  * Create a server-side caller
  * @link https://trpc.io/docs/v11/server/server-side-calls
  */
-export const createCallerFactory = trpc.createCallerFactory;
+export const createCallerFactory = edgeTrpc.createCallerFactory;

package/src/libs/trpc/{init.ts → edge/init.ts}

@@ -10,9 +10,9 @@
 import { initTRPC } from '@trpc/server';
 import superjson from 'superjson';
 
-import type { Context } from '@/server/context';
+import type { EdgeContext } from './context';
 
-export const trpc = initTRPC.context<Context>().create({
+export const edgeTrpc = initTRPC.context<EdgeContext>().create({
   /**
    * @link https://trpc.io/docs/v11/error-formatting
    */

package/src/libs/trpc/{middleware → edge/middleware}/jwtPayload.test.ts

@@ -2,9 +2,9 @@
 import { TRPCError } from '@trpc/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { createCallerFactory } from '@/libs/trpc';
-import { trpc } from '@/libs/trpc/init';
-import { AuthContext, createContextInner } from '@/server/context';
+import { createCallerFactory } from '@/libs/trpc/edge';
+import { AuthContext, createContextInner } from '@/libs/trpc/edge/context';
+import { edgeTrpc as trpc } from '@/libs/trpc/edge/init';
 import * as utils from '@/utils/server/jwt';
 
 import { jwtPayloadChecker } from './jwtPayload';

package/src/libs/trpc/{middleware → edge/middleware}/jwtPayload.ts

@@ -1,9 +1,10 @@
 import { TRPCError } from '@trpc/server';
 
-import { trpc } from '@/libs/trpc/init';
 import { getJWTPayload } from '@/utils/server/jwt';
 
-export const jwtPayloadChecker = trpc.middleware(async (opts) => {
+import { edgeTrpc } from '../init';
+
+export const jwtPayloadChecker = edgeTrpc.middleware(async (opts) => {
   const { ctx } = opts;
 
   if (!ctx.authorizationHeader) throw new TRPCError({ code: 'UNAUTHORIZED' });

package/src/libs/trpc/lambda/context.ts

@@ -0,0 +1,70 @@
+import { User } from 'next-auth';
+import { NextRequest } from 'next/server';
+
+import { JWTPayload, LOBE_CHAT_AUTH_HEADER, enableClerk, enableNextAuth } from '@/const/auth';
+import { ClerkAuth, IClerkAuth } from '@/libs/clerk-auth';
+
+export interface AuthContext {
+  authorizationHeader?: string | null;
+  clerkAuth?: IClerkAuth;
+  jwtPayload?: JWTPayload | null;
+  nextAuth?: User;
+  userId?: string | null;
+}
+
+/**
+ * Inner function for `createContext` where we create the context.
+ * This is useful for testing when we don't want to mock Next.js' request/response
+ */
+export const createContextInner = async (params?: {
+  authorizationHeader?: string | null;
+  clerkAuth?: IClerkAuth;
+  nextAuth?: User;
+  userId?: string | null;
+}): Promise<AuthContext> => ({
+  authorizationHeader: params?.authorizationHeader,
+  clerkAuth: params?.clerkAuth,
+  nextAuth: params?.nextAuth,
+  userId: params?.userId,
+});
+
+export type LambdaContext = Awaited<ReturnType<typeof createContextInner>>;
+
+/**
+ * Creates context for an incoming request
+ * @link https://trpc.io/docs/v11/context
+ */
+export const createLambdaContext = async (request: NextRequest): Promise<LambdaContext> => {
+  // for API-response caching see https://trpc.io/docs/v11/caching
+
+  const authorization = request.headers.get(LOBE_CHAT_AUTH_HEADER);
+
+  let userId;
+  let auth;
+
+  if (enableClerk) {
+    const clerkAuth = new ClerkAuth();
+    const result = clerkAuth.getAuthFromRequest(request);
+    auth = result.clerkAuth;
+    userId = result.userId;
+
+    return createContextInner({ authorizationHeader: authorization, clerkAuth: auth, userId });
+  }
+
+  if (enableNextAuth) {
+    try {
+      const { default: NextAuthEdge } = await import('@/libs/next-auth/edge');
+
+      const session = await NextAuthEdge.auth();
+      if (session && session?.user?.id) {
+        auth = session.user;
+        userId = session.user.id;
+      }
+      return createContextInner({ authorizationHeader: authorization, nextAuth: auth, userId });
+    } catch (e) {
+      console.error('next auth err', e);
+    }
+  }
+
+  return createContextInner({ authorizationHeader: authorization, userId });
+};

package/src/libs/trpc/lambda/index.ts

@@ -1 +1,39 @@
-export * from './serverDatabase';
+/**
+ * This is your entry point to setup the root configuration for tRPC on the server.
+ * - `initTRPC` should only be used once per app.
+ * - We export only the functionality that we use so we can enforce which base procedures should be used
+ *
+ * Learn how to create protected base procedures and other things below:
+ * @link https://trpc.io/docs/v11/router
+ * @link https://trpc.io/docs/v11/procedures
+ */
+import { DESKTOP_USER_ID } from '@/const/desktop';
+import { isDesktop } from '@/const/version';
+
+import { userAuth } from '../middleware/userAuth';
+import { trpc } from './init';
+
+/**
+ * Create a router
+ * @link https://trpc.io/docs/v11/router
+ */
+export const router = trpc.router;
+
+/**
+ * Create an unprotected procedure
+ * @link https://trpc.io/docs/v11/procedures
+ **/
+export const publicProcedure = trpc.procedure.use(({ next, ctx }) => {
+  return next({
+    ctx: { userId: isDesktop ? DESKTOP_USER_ID : ctx.userId },
+  });
+});
+
+// procedure that asserts that the user is logged in
+export const authedProcedure = trpc.procedure.use(userAuth);
+
+/**
+ * Create a server-side caller
+ * @link https://trpc.io/docs/v11/server/server-side-calls
+ */
+export const createCallerFactory = trpc.createCallerFactory;

package/src/libs/trpc/lambda/init.ts

@@ -0,0 +1,26 @@
+/**
+ * This is your entry point to setup the root configuration for tRPC on the server.
+ * - `initTRPC` should only be used once per app.
+ * - We export only the functionality that we use so we can enforce which base procedures should be used
+ *
+ * Learn how to create protected base procedures and other things below:
+ * @link https://trpc.io/docs/v11/router
+ * @link https://trpc.io/docs/v11/procedures
+ */
+import { initTRPC } from '@trpc/server';
+import superjson from 'superjson';
+
+import type { LambdaContext } from './context';
+
+export const trpc = initTRPC.context<LambdaContext>().create({
+  /**
+   * @link https://trpc.io/docs/v11/error-formatting
+   */
+  errorFormatter({ shape }) {
+    return shape;
+  },
+  /**
+   * @link https://trpc.io/docs/v11/data-transformers
+   */
+  transformer: superjson,
+});

package/src/libs/trpc/lambda/middleware/index.ts

@@ -0,0 +1,2 @@
+export * from './keyVaults';
+export * from './serverDatabase';

package/src/libs/trpc/{middleware → lambda/middleware}/keyVaults.ts

@@ -1,8 +1,9 @@
 import { TRPCError } from '@trpc/server';
 
-import { trpc } from '@/libs/trpc/init';
 import { getJWTPayload } from '@/utils/server/jwt';
 
+import { trpc } from '../init';
+
 export const keyVaults = trpc.middleware(async (opts) => {
   const { ctx } = opts;
 

package/src/libs/trpc/lambda/{serverDatabase.ts → middleware/serverDatabase.ts}

@@ -1,5 +1,6 @@
 import { getServerDB } from '@/database/core/db-adaptor';
-import { trpc } from '@/libs/trpc/init';
+
+import { trpc } from '../init';
 
 export const serverDatabase = trpc.middleware(async (opts) => {
   const serverDB = await getServerDB();

package/src/libs/trpc/middleware/userAuth.test.ts

@@ -1,10 +1,10 @@
 import { TRPCError } from '@trpc/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-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 { trpc } from '../init';
+import { trpc } from '../lambda/init';
 import { userAuth } from './userAuth';
 
 const appRouter = trpc.router({

package/src/libs/trpc/middleware/userAuth.ts

@@ -4,7 +4,7 @@ import { enableClerk } from '@/const/auth';
 import { DESKTOP_USER_ID } from '@/const/desktop';
 import { isDesktop } from '@/const/version';
 
-import { trpc } from '../init';
+import { trpc } from '../lambda/init';
 
 export const userAuth = trpc.middleware(async (opts) => {
   const { ctx } = opts;

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