Merge branch 'dev1.1' into beian

src/pages/api/chat/chatGpt.ts

@@ -69,56 +69,51 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         stream: true
       },
       {
+        timeout: 20000,
         responseType: 'stream',
         httpsAgent: openaiProxy?.httpsAgent
       }
     );
+    console.log('response success');
 
     let AIResponse = '';
 
     // 解析数据
     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) {
     let errorText = err;
     if (err.code === 'ECONNRESET') {

src/pages/chat/index.tsx

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