@lobehub/chat 1.35.9 → 1.35.10

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

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 
+import { serverDB } from '@/database/server';
 import { TopicModel } from '@/database/server/models/topic';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
 import { BatchTaskResult } from '@/types/service';
@@ -8,7 +9,7 @@ const topicProcedure = authedProcedure.use(async (opts) => {
   const { ctx } = opts;
 
   return opts.next({
-    ctx: { topicModel: new TopicModel(ctx.userId) },
+    ctx: { topicModel: new TopicModel(serverDB, ctx.userId) },
   });
 });
 
@@ -78,6 +79,7 @@ export const topicRouter = router({
     return ctx.topicModel.queryAll();
   }),
 
+  // TODO: this procedure should be used with authedProcedure
   getTopics: publicProcedure
     .input(
       z.object({
@@ -89,7 +91,7 @@ export const topicRouter = router({
     .query(async ({ input, ctx }) => {
       if (!ctx.userId) return [];
 
-      const topicModel = new TopicModel(ctx.userId);
+      const topicModel = new TopicModel(serverDB, ctx.userId);
 
       return topicModel.query(input);
     }),

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

@@ -3,6 +3,7 @@ import { currentUser } from '@clerk/nextjs/server';
 import { z } from 'zod';
 
 import { enableClerk } from '@/const/auth';
+import { serverDB } from '@/database/server';
 import { MessageModel } from '@/database/server/models/message';
 import { SessionModel } from '@/database/server/models/session';
 import { UserModel, UserNotFoundError } from '@/database/server/models/user';
@@ -12,7 +13,7 @@ import { UserGuideSchema, UserInitializationState, UserPreference } from '@/type
 
 const userProcedure = authedProcedure.use(async (opts) => {
   return opts.next({
-    ctx: { userModel: new UserModel() },
+    ctx: { userModel: new UserModel(serverDB, opts.ctx.userId) },
   });
 });
 
@@ -23,7 +24,7 @@ export const userRouter = router({
     // get or create first-time user
     while (!state) {
       try {
-        state = await ctx.userModel.getUserState(ctx.userId);
+        state = await ctx.userModel.getUserState();
       } catch (error) {
         if (enableClerk && error instanceof UserNotFoundError) {
           const user = await currentUser();
@@ -56,10 +57,10 @@ export const userRouter = router({
       }
     }
 
-    const messageModel = new MessageModel(ctx.userId);
+    const messageModel = new MessageModel(serverDB, ctx.userId);
     const messageCount = await messageModel.count();
 
-    const sessionModel = new SessionModel(ctx.userId);
+    const sessionModel = new SessionModel(serverDB, ctx.userId);
     const sessionCount = await sessionModel.count();
 
     return {
@@ -77,25 +78,25 @@ export const userRouter = router({
   }),
 
   makeUserOnboarded: userProcedure.mutation(async ({ ctx }) => {
-    return ctx.userModel.updateUser(ctx.userId, { isOnboarded: true });
+    return ctx.userModel.updateUser({ isOnboarded: true });
   }),
 
   resetSettings: userProcedure.mutation(async ({ ctx }) => {
-    return ctx.userModel.deleteSetting(ctx.userId);
+    return ctx.userModel.deleteSetting();
   }),
 
   updateGuide: userProcedure.input(UserGuideSchema).mutation(async ({ ctx, input }) => {
-    return ctx.userModel.updateGuide(ctx.userId, input);
+    return ctx.userModel.updateGuide(input);
   }),
 
   updatePreference: userProcedure.input(z.any()).mutation(async ({ ctx, input }) => {
-    return ctx.userModel.updatePreference(ctx.userId, input);
+    return ctx.userModel.updatePreference(input);
   }),
 
   updateSettings: userProcedure
     .input(z.object({}).passthrough())
     .mutation(async ({ ctx, input }) => {
-      return ctx.userModel.updateSetting(ctx.userId, input);
+      return ctx.userModel.updateSetting(input);
     }),
 });
 

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

@@ -1,4 +1,5 @@
 import { JWTPayload } from '@/const/auth';
+import { serverDB } from '@/database/server';
 import { AsyncTaskModel } from '@/database/server/models/asyncTask';
 import { FileModel } from '@/database/server/models/file';
 import { ChunkContentParams, ContentChunk } from '@/server/modules/ContentChunk';
@@ -21,8 +22,8 @@ export class ChunkService {
 
     this.chunkClient = new ContentChunk();
 
-    this.fileModel = new FileModel(userId);
-    this.asyncTaskModel = new AsyncTaskModel(userId);
+    this.fileModel = new FileModel(serverDB, userId);
+    this.asyncTaskModel = new AsyncTaskModel(serverDB, userId);
   }
 
   async chunkContent(params: ChunkContentParams) {

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

@@ -7,11 +7,9 @@ import { pino } from '@/libs/logger';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 
 export class NextAuthUserService {
-  userModel;
   adapter;
 
   constructor() {
-    this.userModel = new UserModel();
     this.adapter = LobeNextAuthDbAdapter(serverDB);
   }
 
@@ -29,8 +27,10 @@ export class NextAuthUserService {
 
     // 2. If found, Update user data from provider
     if (user?.id) {
+      const userModel = new UserModel(serverDB, user.id);
+
       // Perform update
-      await this.userModel.updateUser(user.id, {
+      await userModel.updateUser({
         avatar: data?.avatar,
         email: data?.email,
         fullName: data?.fullName,

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

@@ -1,13 +1,14 @@
 import { UserJSON } from '@clerk/backend';
 import { NextResponse } from 'next/server';
 
+import { serverDB } from '@/database/server';
 import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 
 export class UserService {
   createUser = async (id: string, params: UserJSON) => {
     // Check if user already exists
-    const res = await UserModel.findById(id);
+    const res = await UserModel.findById(serverDB, id);
 
     // If user already exists, skip creating a new user
     if (res)
@@ -27,7 +28,7 @@ export class UserService {
     /* ↑ cloud slot ↑ */
 
     // 2. create user in database
-    await UserModel.createUser({
+    await UserModel.createUser(serverDB, {
       avatar: params.image_url,
       clerkCreatedAt: new Date(params.created_at),
       email: email?.email_address,
@@ -49,7 +50,7 @@ export class UserService {
     if (id) {
       pino.info('delete user due to clerk webhook');
 
-      await UserModel.deleteUser(id);
+      await UserModel.deleteUser(serverDB, id);
 
       return NextResponse.json({ message: 'user deleted' }, { status: 200 });
     } else {
@@ -61,10 +62,10 @@ export class UserService {
   updateUser = async (id: string, params: UserJSON) => {
     pino.info('updating user due to clerk webhook');
 
-    const userModel = new UserModel();
+    const userModel = new UserModel(serverDB, id);
 
     // Check if user already exists
-    const res = await UserModel.findById(id);
+    const res = await UserModel.findById(serverDB, id);
 
     // If user not exists, skip update the user
     if (!res)
@@ -79,7 +80,7 @@ export class UserService {
     const email = params.email_addresses.find((e) => e.id === params.primary_email_address_id);
     const phone = params.phone_numbers.find((e) => e.id === params.primary_phone_number_id);
 
-    await userModel.updateUser(id, {
+    await userModel.updateUser({
       avatar: params.image_url,
       email: email?.email_address,
       firstName: params.first_name,