From 85809385c856c64638c75cb9821415cd2cacc20c Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Fri, 10 Mar 2023 20:03:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsydney=20502=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=9C=AA=E8=A2=ABcatch=E5=88=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/SydneyAIClient.js | 27 +++++++++------------------
 utils/config.js         |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/utils/SydneyAIClient.js b/utils/SydneyAIClient.js
index 191531c..479d0d2 100644
--- a/utils/SydneyAIClient.js
+++ b/utils/SydneyAIClient.js
@@ -122,26 +122,16 @@ export default class SydneyAIClient {
   async createWebSocketConnection () {
     await this.initCache()
     let WebSocket = await getWebSocket()
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       let agent
       if (this.opts.proxy) {
         agent = new HttpsProxyAgent(this.opts.proxy)
       }
-      let retryTimes = 3
-      let ws
-      do {
-        try {
-          ws = new WebSocket('wss://sydney.bing.com/sydney/ChatHub', { agent })
-          break
-        } catch (err) {
-          logger.warn(err)
-          retryTimes--
-          if (retryTimes === 0) {
-            throw new Error(err)
-          }
-        }
-      } while (retryTimes > 0)
-      ws.on('error', console.error)
+      let ws = new WebSocket('wss://sydney.bing.com/sydney/ChatHub', { agent })
+
+      ws.on('error', (err) => {
+        reject(err)
+      })
 
       ws.on('open', () => {
         if (this.debug) {
@@ -410,6 +400,7 @@ export default class SydneyAIClient {
         const event = events[0]
         switch (event.type) {
           case 1: {
+            // reject(new Error('test'))
             if (stopTokenFound || apology) {
               return
             }
@@ -472,8 +463,8 @@ export default class SydneyAIClient {
             }
             const messages = event.item?.messages || []
             const message = messages.length
-                ? messages[messages.length - 1]
-                : {
+              ? messages[messages.length - 1]
+              : {
                   adaptiveCards: [
                     {
                       body: [
diff --git a/utils/config.js b/utils/config.js
index a4be56f..80c549a 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -55,7 +55,7 @@ const defaultConfig = {
   noiseScaleW: 0.668,
   lengthScale: 1.2,
   initiativeChatGroups: [],
-  version: 'v2.1.2'
+  version: 'v2.1.3'
 }
 const _path = process.cwd()
 let config = {}