@lobehub/lobehub 2.0.0-next.60 → 2.0.0-next.62

package/packages/database/src/models/topic.ts

@@ -72,7 +72,7 @@ export class TopicModel {
 
     const keywordLowerCase = keyword.toLowerCase();
 
-    // 查询标题匹配的主题
+    // Query topics matching by title
     const topicsByTitle = await this.db.query.topics.findMany({
       orderBy: [desc(topics.updatedAt)],
       where: and(
@@ -82,7 +82,7 @@ export class TopicModel {
       ),
     });
 
-    // 查询消息内容匹配的主题ID
+    // Query topic IDs matching by message content
     const topicIdsByMessages = await this.db
       .select({ topicId: messages.topicId })
       .from(messages)
@@ -96,19 +96,19 @@ export class TopicModel {
         ),
       )
       .groupBy(messages.topicId);
-    // 如果没有通过消息内容找到主题，直接返回标题匹配的主题
+    // If no topics found by message content, return topics matching by title
     if (topicIdsByMessages.length === 0) {
       return topicsByTitle;
     }
 
-    // 查询通过消息内容找到的主题
+    // Query topics found by message content
     const topicIds = topicIdsByMessages.map((t) => t.topicId);
     const topicsByMessages = await this.db.query.topics.findMany({
       orderBy: [desc(topics.updatedAt)],
       where: and(eq(topics.userId, this.userId), inArray(topics.id, topicIds)),
     });
 
-    // 合并结果并去重
+    // Merge results and deduplicate
     const allTopics = [...topicsByTitle];
     const existingIds = new Set(topicsByTitle.map((t) => t.id));
 
@@ -118,7 +118,7 @@ export class TopicModel {
       }
     }
 
-    // 按更新时间排序
+    // Sort by update time
     return allTopics.sort(
       (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
     );
@@ -199,9 +199,9 @@ export class TopicModel {
   };
 
   batchCreate = async (topicParams: (CreateTopicParams & { id?: string })[]) => {
-    // 开始一个事务
+    // Start a transaction
     return this.db.transaction(async (tx) => {
-      // 在 topics 表中批量插入新的 topics
+      // Batch insert new topics into the topics table
       const createdTopics = await tx
         .insert(topics)
         .values(
@@ -216,7 +216,7 @@ export class TopicModel {
         )
         .returning();
 
-      // 对每个新创建的 topic,更新关联的 messages 的 topicId
+      // For each newly created topic, update the topicId of associated messages
       await Promise.all(
         createdTopics.map(async (topic, index) => {
           const messageIds = topicParams[index].messages;
@@ -255,7 +255,7 @@ export class TopicModel {
         })
         .returning();
 
-      // 查找与原始 topic 关联的 messages
+      // Find messages associated with the original topic
       const originalMessages = await tx
         .select()
         .from(messages)

package/src/app/(backend)/middleware/auth/index.ts

@@ -33,10 +33,15 @@ export type RequestHandler = (
 
 export const checkAuth =
   (handler: RequestHandler) => async (req: Request, options: RequestOptions) => {
+    // Clone the request to avoid "Response body object should not be disturbed or locked" error
+    // in Next.js 16 when the body stream has been consumed by Next.js internal mechanisms
+    // This ensures the handler can safely read the request body
+    const clonedReq = req.clone();
+
     // we have a special header to debug the api endpoint in development mode
     const isDebugApi = req.headers.get('lobe-auth-dev-backend-api') === '1';
     if (process.env.NODE_ENV === 'development' && isDebugApi) {
-      return handler(req, { ...options, jwtPayload: { userId: 'DEV_USER' } });
+      return handler(clonedReq, { ...options, jwtPayload: { userId: 'DEV_USER' } });
     }
 
     let jwtPayload: ClientSecretPayload;
@@ -107,5 +112,5 @@ export const checkAuth =
       return createErrorResponse(errorType, { error, ...res, provider: params?.provider });
     }
 
-    return handler(req, { ...options, jwtPayload });
+    return handler(clonedReq, { ...options, jwtPayload });
   };

package/src/app/(backend)/trpc/async/[trpc]/route.ts

@@ -3,10 +3,15 @@ import type { NextRequest } from 'next/server';
 
 import { pino } from '@/libs/logger';
 import { createAsyncRouteContext } from '@/libs/trpc/async/context';
+import { prepareRequestForTRPC } from '@/libs/trpc/utils/request-adapter';
 import { asyncRouter } from '@/server/routers/async';
 
-const handler = (req: NextRequest) =>
-  fetchRequestHandler({
+const handler = (req: NextRequest) => {
+  // Clone the request to avoid "Response body object should not be disturbed or locked" error
+  // in Next.js 16 when the body stream has been consumed by Next.js internal mechanisms
+  const preparedReq = prepareRequestForTRPC(req);
+
+  return fetchRequestHandler({
     // 避免请求之间互相影响
     // https://github.com/lobehub/lobe-chat/discussions/7442#discussioncomment-13658563
     allowBatching: false,
@@ -23,8 +28,9 @@ const handler = (req: NextRequest) =>
       console.error(error);
     },
 
-    req,
+    req: preparedReq,
     router: asyncRouter,
   });
+};
 
 export { handler as GET, handler as POST };

package/src/app/(backend)/trpc/desktop/[trpc]/route.ts

@@ -3,10 +3,15 @@ import type { NextRequest } from 'next/server';
 
 import { pino } from '@/libs/logger';
 import { createLambdaContext } from '@/libs/trpc/lambda/context';
+import { prepareRequestForTRPC } from '@/libs/trpc/utils/request-adapter';
 import { desktopRouter } from '@/server/routers/desktop';
 
-const handler = (req: NextRequest) =>
-  fetchRequestHandler({
+const handler = (req: NextRequest) => {
+  // Clone the request to avoid "Response body object should not be disturbed or locked" error
+  // in Next.js 16 when the body stream has been consumed by Next.js internal mechanisms
+  const preparedReq = prepareRequestForTRPC(req);
+
+  return fetchRequestHandler({
     /**
      * @link https://trpc.io/docs/v11/context
      */
@@ -19,7 +24,7 @@ const handler = (req: NextRequest) =>
       console.error(error);
     },
 
-    req,
+    req: preparedReq,
     responseMeta({ ctx }) {
       const headers = ctx?.resHeaders;
 
@@ -27,5 +32,6 @@ const handler = (req: NextRequest) =>
     },
     router: desktopRouter,
   });
+};
 
 export { handler as GET, handler as POST };

package/src/app/(backend)/trpc/lambda/[trpc]/route.ts

@@ -3,10 +3,15 @@ import type { NextRequest } from 'next/server';
 
 import { pino } from '@/libs/logger';
 import { createLambdaContext } from '@/libs/trpc/lambda/context';
+import { prepareRequestForTRPC } from '@/libs/trpc/utils/request-adapter';
 import { lambdaRouter } from '@/server/routers/lambda';
 
-const handler = (req: NextRequest) =>
-  fetchRequestHandler({
+const handler = (req: NextRequest) => {
+  // Clone the request to avoid "Response body object should not be disturbed or locked" error
+  // in Next.js 16 when the body stream has been consumed by Next.js internal mechanisms
+  const preparedReq = prepareRequestForTRPC(req);
+
+  return fetchRequestHandler({
     /**
      * @link https://trpc.io/docs/v11/context
      */
@@ -19,7 +24,7 @@ const handler = (req: NextRequest) =>
       console.error(error);
     },
 
-    req,
+    req: preparedReq,
     responseMeta({ ctx }) {
       const headers = ctx?.resHeaders;
 
@@ -27,5 +32,6 @@ const handler = (req: NextRequest) =>
     },
     router: lambdaRouter,
   });
+};
 
 export { handler as GET, handler as POST };

package/src/app/(backend)/trpc/mobile/[trpc]/route.ts

@@ -3,10 +3,15 @@ import type { NextRequest } from 'next/server';
 
 import { pino } from '@/libs/logger';
 import { createLambdaContext } from '@/libs/trpc/lambda/context';
+import { prepareRequestForTRPC } from '@/libs/trpc/utils/request-adapter';
 import { mobileRouter } from '@/server/routers/mobile';
 
-const handler = (req: NextRequest) =>
-  fetchRequestHandler({
+const handler = (req: NextRequest) => {
+  // Clone the request to avoid "Response body object should not be disturbed or locked" error
+  // in Next.js 16 when the body stream has been consumed by Next.js internal mechanisms
+  const preparedReq = prepareRequestForTRPC(req);
+
+  return fetchRequestHandler({
     /**
      * @link https://trpc.io/docs/v11/context
      */
@@ -19,7 +24,7 @@ const handler = (req: NextRequest) =>
       console.error(error);
     },
 
-    req,
+    req: preparedReq,
     responseMeta({ ctx }) {
       const headers = ctx?.resHeaders;
 
@@ -27,5 +32,6 @@ const handler = (req: NextRequest) =>
     },
     router: mobileRouter,
   });
+};
 
 export { handler as GET, handler as POST };

package/src/app/(backend)/trpc/tools/[trpc]/route.ts

@@ -3,10 +3,15 @@ import type { NextRequest } from 'next/server';
 
 import { pino } from '@/libs/logger';
 import { createLambdaContext } from '@/libs/trpc/lambda/context';
+import { prepareRequestForTRPC } from '@/libs/trpc/utils/request-adapter';
 import { toolsRouter } from '@/server/routers/tools';
 
-const handler = (req: NextRequest) =>
-  fetchRequestHandler({
+const handler = (req: NextRequest) => {
+  // Clone the request to avoid "Response body object should not be disturbed or locked" error
+  // in Next.js 16 when the body stream has been consumed by Next.js internal mechanisms
+  const preparedReq = prepareRequestForTRPC(req);
+
+  return fetchRequestHandler({
     /**
      * @link https://trpc.io/docs/v11/context
      */
@@ -19,8 +24,9 @@ const handler = (req: NextRequest) =>
       console.error(error);
     },
 
-    req,
+    req: preparedReq,
     router: toolsRouter,
   });
+};
 
 export { handler as GET, handler as POST };

package/src/libs/trpc/utils/request-adapter.ts

@@ -0,0 +1,20 @@
+import { NextRequest } from 'next/server';
+
+/**
+ * Prepare Request object for tRPC fetchRequestHandler
+ *
+ * This function solves the "Response body object should not be disturbed or locked" error
+ * that occurs in Next.js 16 when the request body stream has been consumed or locked
+ * by Next.js internal mechanisms.
+ *
+ * By cloning the Request object, we create an independent body stream that tRPC can safely read.
+ *
+ * @see https://github.com/vercel/next.js/issues/83453
+ * @param req - The original NextRequest object
+ * @returns A cloned Request object with an independent body stream
+ */
+export function prepareRequestForTRPC(req: NextRequest): Request {
+  // Clone the Request to create an independent body stream
+  // This ensures tRPC can read the body even if the original request's body was disturbed
+  return req.clone();
+}