Merge pull request #112 from zhujunsan/kerwin_main

chatUsage 中，userId 记录改为 ObjectID 类型，以方便之后的 aggregate 等操作

Author: Kerwin1202

service/src/chatgpt/index.ts

@@ -145,13 +145,13 @@ async function containsSensitiveWords(audit: AuditConfig, text: string): Promise
   }
   return false
 }
-let cachedBanlance: number | undefined
+let cachedBalance: number | undefined
 let cacheExpiration = 0
 
 async function fetchBalance() {
   const now = new Date().getTime()
-  if (cachedBanlance && cacheExpiration > now)
-    return Promise.resolve(cachedBanlance.toFixed(3))
+  if (cachedBalance && cacheExpiration > now)
+    return Promise.resolve(cachedBalance.toFixed(3))
 
   // 计算起始日期和结束日期
   const startDate = new Date(now - 90 * 24 * 60 * 60 * 1000)
@@ -209,10 +209,10 @@ async function fetchBalance() {
     const totalUsage = usageData.total_usage / 100
 
     // 计算剩余额度
-    cachedBanlance = totalAmount - totalUsage
+    cachedBalance = totalAmount - totalUsage
     cacheExpiration = now + 60 * 60 * 1000
 
-    return Promise.resolve(cachedBanlance.toFixed(3))
+    return Promise.resolve(cachedBalance.toFixed(3))
   }
   catch (error) {
     global.console.error(error)

service/src/index.ts

@@ -1,6 +1,7 @@
 import express from 'express'
 import jwt from 'jsonwebtoken'
 import * as dotenv from 'dotenv'
+import { ObjectId } from 'mongodb'
 import type { RequestProps } from './types'
 import type { ChatContext, ChatMessage } from './chatgpt'
 import { chatConfig, chatReplyProcess, containsSensitiveWords, initApi, initAuditService } from './chatgpt'
@@ -264,7 +265,7 @@ router.post('/chat', auth, async (req, res) => {
           response.data.text,
           response.data.id,
           response.data.detail?.usage as UsageResponse,
-          previousResponse)
+          previousResponse as [])
       }
       else {
         await updateChat(message._id as unknown as string,
@@ -274,7 +275,7 @@ router.post('/chat', auth, async (req, res) => {
       }
 
       if (response.data.usage) {
-        await insertChatUsage(req.headers.userId as string,
+        await insertChatUsage(new ObjectId(req.headers.userId as string),
           roomId,
           message._id,
           response.data.id,
@@ -368,7 +369,7 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
           result.data.text,
           result.data.id,
           result.data.detail?.usage as UsageResponse,
-          previousResponse)
+          previousResponse as [])
       }
       else {
         await updateChat(message._id as unknown as string,
@@ -378,7 +379,7 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
       }
 
       if (result.data.detail?.usage) {
-        await insertChatUsage(req.headers.userId as string,
+        await insertChatUsage(new ObjectId(req.headers.userId),
           roomId,
           message._id,
           result.data.id,

service/src/storage/model.ts

@@ -95,7 +95,7 @@ export class UsageResponse {
 
 export class ChatUsage {
   _id: ObjectId
-  userId: string
+  userId: ObjectId
   roomId: number
   chatId: ObjectId
   messageId: string
@@ -104,7 +104,7 @@ export class ChatUsage {
   totalTokens: number
   estimated: boolean
   dateTime: number
-  constructor(userId: string, roomId: number, chatId: ObjectId, messageId: string, usage: UsageResponse) {
+  constructor(userId: ObjectId, roomId: number, chatId: ObjectId, messageId: string, usage: UsageResponse) {
     this.userId = userId
     this.roomId = roomId
     this.chatId = chatId

service/src/storage/mongo.ts

@@ -54,7 +54,7 @@ export async function updateChat(chatId: string, response: string, messageId: st
   await chatCol.updateOne(query, update)
 }
 
-export async function insertChatUsage(userId: string, roomId: number, chatId: ObjectId, messageId: string, usage: UsageResponse) {
+export async function insertChatUsage(userId: ObjectId, roomId: number, chatId: ObjectId, messageId: string, usage: UsageResponse) {
   const chatUsage = new ChatUsage(userId, roomId, chatId, messageId, usage)
   await usageCol.insertOne(chatUsage)
   return chatUsage
@@ -72,8 +72,7 @@ export async function renameChatRoom(userId: string, title: string, roomId: numb
       title,
     },
   }
-  const result = await roomCol.updateOne(query, update)
-  return result
+  return await roomCol.updateOne(query, update)
 }
 
 export async function deleteChatRoom(userId: string, roomId: number) {
@@ -161,7 +160,7 @@ export async function deleteChat(roomId: number, uuid: number, inversion: boolea
       },
     }
   }
-  chatCol.updateOne(query, update)
+  await chatCol.updateOne(query, update)
 }
 
 export async function createUser(email: string, password: string): Promise<UserInfo> {
@@ -175,15 +174,13 @@ export async function createUser(email: string, password: string): Promise<UserI
 }
 
 export async function updateUserInfo(userId: string, user: UserInfo) {
-  const result = userCol.updateOne({ _id: new ObjectId(userId) }
+  return userCol.updateOne({ _id: new ObjectId(userId) }
     , { $set: { name: user.name, description: user.description, avatar: user.avatar } })
-  return result
 }
 
 export async function updateUserPassword(userId: string, password: string) {
-  const result = userCol.updateOne({ _id: new ObjectId(userId) }
+  return userCol.updateOne({ _id: new ObjectId(userId) }
     , { $set: { password, updateTime: new Date().toLocaleString() } })
-  return result
 }
 
 export async function getUser(email: string): Promise<UserInfo> {