fix: build error

chatgpt-web-dev · Mar 25, 2023 · d2b04a6 · d2b04a6
1 parent 7b48303
commit d2b04a6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 35 deletions.
diff --git a/service/package.json b/service/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "start": "esno ./src/index.ts",
     "dev": "esno watch ./src/index.ts",
-    "prod": "node ./build/index.mjs",
+    "prod": "esno ./build/index.js",
     "build": "pnpm clean && tsup",
     "clean": "rimraf build",
     "lint": "eslint .",

diff --git a/service/src/index.ts b/service/src/index.ts
@@ -30,7 +30,7 @@ app.all('*', (_, res, next) => {
 
 router.get('/chatrooms', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const rooms = await getChatRooms(userId)
     const result = []
     rooms.forEach((r) => {
@@ -50,7 +50,7 @@ router.get('/chatrooms', auth, async (req, res) => {
 
 router.post('/room-create', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const { title, roomId } = req.body as { title: string; roomId: number }
     const room = await createChatRoom(userId, title, roomId)
     res.send({ status: 'Success', message: null, data: room })
@@ -63,7 +63,7 @@ router.post('/room-create', auth, async (req, res) => {
 
 router.post('/room-rename', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const { title, roomId } = req.body as { title: string; roomId: number }
     const room = await renameChatRoom(userId, title, roomId)
     res.send({ status: 'Success', message: null, data: room })
@@ -76,7 +76,7 @@ router.post('/room-rename', auth, async (req, res) => {
 
 router.post('/room-delete', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const { roomId } = req.body as { roomId: number }
     if (!roomId || !await existsChatRoom(userId, roomId)) {
       res.send({ status: 'Fail', message: 'Unknow room', data: null })
@@ -93,7 +93,7 @@ router.post('/room-delete', auth, async (req, res) => {
 
 router.get('/chat-hisroty', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const roomId = +req.query.roomid
     const lastTime = req.query.lasttime as string
     if (!roomId || !await existsChatRoom(userId, roomId)) {
@@ -146,7 +146,7 @@ router.get('/chat-hisroty', auth, async (req, res) => {
 
 router.post('/chat-delete', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const { roomId, uuid, inversion } = req.body as { roomId: number; uuid: number; inversion: boolean }
     if (!roomId || !await existsChatRoom(userId, roomId)) {
       res.send({ status: 'Fail', message: 'Unknow room', data: null })
@@ -163,7 +163,7 @@ router.post('/chat-delete', auth, async (req, res) => {
 
 router.post('/chat-clear-all', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     await deleteAllChatRooms(userId)
     res.send({ status: 'Success', message: null, data: null })
   }
@@ -175,7 +175,7 @@ router.post('/chat-clear-all', auth, async (req, res) => {
 
 router.post('/chat-clear', auth, async (req, res) => {
   try {
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const { roomId } = req.body as { roomId: number }
     if (!roomId || !await existsChatRoom(userId, roomId)) {
       res.send({ status: 'Fail', message: 'Unknow room', data: null })
@@ -426,7 +426,7 @@ router.post('/setting-mail', rootAuth, async (req, res) => {
 router.post('/mail-test', rootAuth, async (req, res) => {
   try {
     const config = req.body as MailConfig
-    const userId = new ObjectId(req.headers.userId as string)
+    const userId = req.headers.userId as string
     const user = await getUserById(userId)
     await sendTestMail(user.email, config)
     res.send({ status: 'Success', message: '发送成功 | Successfully', data: null })

diff --git a/service/src/storage/model.ts b/service/src/storage/model.ts
@@ -28,25 +28,13 @@ export class UserInfo {
   }
 }
 
-export class UserOauth {
-  userId: number
-  oauthType: OauthType
-  oauthId: string
-
-  constructor(userId: number, oauthType: OauthType, oauthId: string) {
-    this.userId = userId
-    this.oauthType = oauthType
-    this.oauthId = oauthId
-  }
-}
-
 export class ChatRoom {
   _id: ObjectId
   roomId: number
-  userId: number
+  userId: string
   title: string
   status: Status = Status.Normal
-  constructor(userId: number, title: string, roomId: number) {
+  constructor(userId: string, title: string, roomId: number) {
     this.userId = userId
     this.title = title
     this.roomId = roomId

diff --git a/service/src/storage/mongo.ts b/service/src/storage/mongo.ts
@@ -34,12 +34,12 @@ export async function updateChat(chatId: string, response: string, messageId: st
   await chatCol.updateOne(query, update)
 }
 
-export async function createChatRoom(userId: ObjectId, title: string, roomId: number) {
+export async function createChatRoom(userId: string, title: string, roomId: number) {
   const room = new ChatRoom(userId, title, roomId)
   await roomCol.insertOne(room)
   return room
 }
-export async function renameChatRoom(userId: ObjectId, title: string, roomId: number) {
+export async function renameChatRoom(userId: string, title: string, roomId: number) {
   const query = { userId, roomId }
   const update = {
     $set: {
@@ -50,25 +50,25 @@ export async function renameChatRoom(userId: ObjectId, title: string, roomId: nu
   return result
 }
 
-export async function deleteChatRoom(userId: ObjectId, roomId: number) {
+export async function deleteChatRoom(userId: string, roomId: number) {
   const result = await roomCol.updateOne({ roomId, userId }, { $set: { status: Status.Deleted } })
   await clearChat(roomId)
   return result
 }
 
-export async function getChatRooms(userId: ObjectId) {
+export async function getChatRooms(userId: string) {
   const cursor = await roomCol.find({ userId, status: { $ne: Status.Deleted } })
   const rooms = []
   await cursor.forEach(doc => rooms.push(doc))
   return rooms
 }
 
-export async function existsChatRoom(userId: ObjectId, roomId: number) {
+export async function existsChatRoom(userId: string, roomId: number) {
   const room = await roomCol.findOne({ roomId, userId })
   return !!room
 }
 
-export async function deleteAllChatRooms(userId: ObjectId) {
+export async function deleteAllChatRooms(userId: string) {
   await roomCol.updateMany({ userId, status: Status.Normal }, { $set: { status: Status.Deleted } })
   await chatCol.updateMany({ userId, status: Status.Normal }, { $set: { status: Status.Deleted } })
 }
@@ -133,8 +133,8 @@ export async function createUser(email: string, password: string): Promise<UserI
   return userInfo
 }
 
-export async function updateUserInfo(userId: ObjectId, user: UserInfo) {
-  const result = userCol.updateOne({ _id: userId }
+export async function updateUserInfo(userId: string, user: UserInfo) {
+  const result = userCol.updateOne({ _id: new ObjectId(userId) }
     , { $set: { name: user.name, description: user.description, avatar: user.avatar } })
   return result
 }
@@ -144,8 +144,8 @@ export async function getUser(email: string): Promise<UserInfo> {
   return await userCol.findOne({ email }) as UserInfo
 }
 
-export async function getUserById(userId: ObjectId): Promise<UserInfo> {
-  return await userCol.findOne({ _id: userId }) as UserInfo
+export async function getUserById(userId: string): Promise<UserInfo> {
+  return await userCol.findOne({ _id: new ObjectId(userId) }) as UserInfo
 }
 
 export async function verifyUser(email: string) {

diff --git a/service/tsup.config.ts b/service/tsup.config.ts
@@ -4,7 +4,7 @@ export default defineConfig({
   entry: ['src/index.ts'],
   outDir: 'build',
   target: 'es2020',
-  format: ['esm'],
+  format: ['cjs'],
   splitting: false,
   sourcemap: true,
   minify: false,