feat: 尝试加入重试机制降低Sydney不响应的概率

apps/chat.js

@@ -770,6 +770,9 @@ export class chatgpt extends plugin {
         }
         let response
         let reply = ''
+        let retry = 3
+        let errorMessage = ''
+        do {
           try {
             let opt = _.cloneDeep(conversation) || {}
             opt.toneStyle = Config.toneStyle
@@ -785,17 +788,20 @@ export class chatgpt extends plugin {
               })
               response.quote = response.details.adaptiveCards?.[0]?.body?.[0]?.text?.replace(/\[\^[0-9]+\^\]/g, '').replace(response.response, '').split('\n')
             }
+            errorMessage = ''
+            break
           } catch (error) {
-          const code = error?.data?.code || 503
+            const message = error?.message || error?.data?.message || `与Bing通信时出错: ${JSON.parse(error)}`
-          if (code === 503) {
+            if (message !== 'Timed out waiting for first message.') {
               logger.error(error)
             }
-          console.error(error)
+            retry--
-          const message = error?.message || error?.data?.message || `与Bing通信时出错: ${JSON.parse(error)}`
+            errorMessage = message === 'Timed out waiting for response. Try enabling debug mode to see more information.' ? (reply ? `${reply}\n不行了，我的大脑过载了，处理不过来了!` : '必应的小脑瓜不好使了，不知道怎么回答！') : message
-          return {
-            text: message === 'Timed out waiting for response. Try enabling debug mode to see more information.' ? (reply != '' ? `${reply}\n不行了，我的大脑过载了，处理不过来了!` : '必应的小脑瓜不好使了，不知道怎么回答！') : message
-          }
           }
+        } while (retry > 0)
+        if (errorMessage) {
+          return { text: errorMessage }
+        } else {
           return {
             text: response.response,
             quote: response.quote,
@@ -806,6 +812,7 @@ export class chatgpt extends plugin {
             parentMessageId: response.messageId
           }
         }
+      }
       case 'api3': {
         // official without cloudflare
         let accessToken = await redis.get('CHATGPT:TOKEN')

utils/SydneyAIClient.js

@@ -200,7 +200,8 @@ export default class SydneyAIClient {
       parentMessageId = invocationId || crypto.randomUUID(),
       onProgress,
       abortController = new AbortController(),
-      timeout = Config.defaultTimeoutMs
+      timeout = Config.defaultTimeoutMs,
+      firstMessageTimeout = 10000
     } = opts
     if (typeof onProgress !== 'function') {
       onProgress = () => {}
@@ -341,10 +342,17 @@ export default class SydneyAIClient {
           reject(new Error('Timed out waiting for response. Try enabling debug mode to see more information.'))
         }
       }, timeout)
+      const firstTimeout = setTimeout(() => {
+        if (!replySoFar) {
+          this.cleanupWebSocketConnection(ws)
+          reject(new Error('Timed out waiting for first message.'))
+        }
+      }, firstMessageTimeout)
 
       // abort the request if the abort controller is aborted
       abortController.signal.addEventListener('abort', () => {
         clearTimeout(messageTimeout)
+        clearTimeout(firstTimeout)
         this.cleanupWebSocketConnection(ws)
         if (replySoFar) {
           resolve({