Merge branch 'dev1.1' into beian

src/components/Markdown/index.module.scss

@@ -8,7 +8,7 @@
   animation: blink 0.6s infinite;
   animation: blink 0.6s infinite;
 }
 }
 .animation {
 .animation {
-  :last-child::after {
+  > :last-child::after {
     display: inline-block;
     display: inline-block;
     content: '';
     content: '';
     width: 4px;
     width: 4px;

src/pages/api/chat/chatGpt.ts

@@ -69,56 +69,51 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         stream: true
         stream: true
       },
       },
       {
       {
+        timeout: 20000,
         responseType: 'stream',
         responseType: 'stream',
         httpsAgent: openaiProxy?.httpsAgent
         httpsAgent: openaiProxy?.httpsAgent
       }
       }
     );
     );
+    console.log('response success');
 
 
     let AIResponse = '';
     let AIResponse = '';
 
 
     // 解析数据
     // 解析数据
     const decoder = new TextDecoder();
     const decoder = new TextDecoder();
-    new ReadableStream({
-      async start(controller) {
-        // callback
-        async function onParse(event: ParsedEvent | ReconnectInterval) {
-          if (event.type === 'event') {
-            const data = event.data;
-            if (data === '[DONE]') {
-              controller.close();
-              res.write('event: done\ndata: \n\n');
-              res.end();
-              // 存入库
-              await ChatWindow.findByIdAndUpdate(windowId, {
-                $push: {
-                  content: {
-                    obj: 'AI',
-                    value: AIResponse
-                  }
-                },
-                updateTime: Date.now()
-              });
-              return;
-            }
-            try {
-              const json = JSON.parse(data);
-              const content: string = json.choices[0].delta.content || '';
-              res.write(`event: responseData\ndata: ${content.replace(/\n/g, '<br/>')}\n\n`);
-              AIResponse += content;
-            } catch (e) {
-              // maybe parse error
-              controller.error(e);
-              res.end();
-            }
-          }
+    const onParse = async (event: ParsedEvent | ReconnectInterval) => {
+      if (event.type === 'event') {
+        const data = event.data;
+        if (data === '[DONE]') {
+          // 存入库
+          await ChatWindow.findByIdAndUpdate(windowId, {
+            $push: {
+              content: {
+                obj: 'AI',
+                value: AIResponse
+              }
+            },
+            updateTime: Date.now()
+          });
+          res.write('event: done\ndata: \n\n');
+          res.end();
+          return;
         }
         }
-
-        const parser = createParser(onParse);
-        for await (const chunk of chatResponse.data as any) {
-          parser.feed(decoder.decode(chunk));
+        try {
+          const json = JSON.parse(data);
+          const content: string = json.choices[0].delta.content || '';
+          // console.log('content:', content)
+          res.write(`event: responseData\ndata: ${content.replace(/\n/g, '<br/>')}\n\n`);
+          AIResponse += content;
+        } catch (e) {
+          res.end();
         }
         }
       }
       }
-    });
+    };
+
+    const parser = createParser(onParse);
+    for await (const chunk of chatResponse.data as any) {
+      parser.feed(decoder.decode(chunk));
+    }
   } catch (err: any) {
   } catch (err: any) {
     let errorText = err;
     let errorText = err;
     if (err.code === 'ECONNRESET') {
     if (err.code === 'ECONNRESET') {

src/pages/chat/index.tsx

@@ -127,14 +127,14 @@ const Chat = () => {
         let timer = setTimeout(() => {
         let timer = setTimeout(() => {
           event.close();
           event.close();
           reject('服务器超时');
           reject('服务器超时');
-        }, 300000);
+        }, 30000);
         event.addEventListener('responseData', ({ data }) => {
         event.addEventListener('responseData', ({ data }) => {
           /* 重置定时器 */
           /* 重置定时器 */
           clearTimeout(timer);
           clearTimeout(timer);
           timer = setTimeout(() => {
           timer = setTimeout(() => {
             event.close();
             event.close();
             reject('服务器超时');
             reject('服务器超时');
-          }, 300000);
+          }, 30000);
 
 
           const msg = data.replace(/<br\/>/g, '\n');
           const msg = data.replace(/<br\/>/g, '\n');
           setChatList((state) =>
           setChatList((state) =>
@@ -264,7 +264,7 @@ const Chat = () => {
   const reEdit = useCallback(async () => {
   const reEdit = useCallback(async () => {
     if (chatList[chatList.length - 1]?.obj !== 'Human') return;
     if (chatList[chatList.length - 1]?.obj !== 'Human') return;
     // 删除数据库最后一句
     // 删除数据库最后一句
-    delLastMessage(windowId);
+    await delLastMessage(windowId);
     const val = chatList[chatList.length - 1].value;
     const val = chatList[chatList.length - 1].value;
 
 
     setInputVal(val);
     setInputVal(val);

src/service/mongo.ts

 import mongoose from 'mongoose';
 import mongoose from 'mongoose';
-import type { Mongoose } from 'mongoose';
 
 
-let cachedClient: Mongoose;
-
-export async function connectToDatabase() {
-  if (cachedClient && cachedClient.connection.readyState === 1) {
-    return cachedClient;
+/**
+ * 连接 MongoDB 数据库
+ */
+export async function connectToDatabase(): Promise<void> {
+  // @ts-ignore
+  if (global.mongodb) {
+    return;
+  }
+  // @ts-ignore
+  global.mongodb = 'connecting';
+  console.log('connect mongo');
+  try {
+    // @ts-ignore
+    global.mongodb = await mongoose.connect(process.env.MONGODB_URI as string, {
+      dbName: 'doc_gpt',
+      maxPoolSize: 10,
+      minPoolSize: 1
+    });
+  } catch (error) {
+    console.error('mongo connect error');
+    // @ts-ignore
+    global.mongodb = null;
   }
   }
-
-  cachedClient = await mongoose.connect(process.env.MONGODB_URI as string, {
-    dbName: 'doc_gpt'
-  });
-
-  return cachedClient;
 }
 }
 
 
 export * from './models/authCode';
 export * from './models/authCode';

src/types/index.d.ts

+import type { Mongoose } from 'mongoose';
+
+declare global {
+  interface Global {
+    mongodb: Mongoose;
+  }
+}
+
+export type a = string;

tsconfig.json

@@ -19,6 +19,6 @@
       "@/*": ["./src/*"]
       "@/*": ["./src/*"]
     }
     }
   },
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
   "exclude": ["node_modules"]
   "exclude": ["node_modules"]
 }
 }