fix: 适应必应API改版

apps/chat.js

@@ -1731,8 +1731,9 @@ export class chatgpt extends plugin {
               // token过期了
                 let bingTokens = JSON.parse(await redis.get('CHATGPT:BING_TOKENS'))
                 const badBingToken = bingTokens.findIndex(element => element.Token === bingToken)
+                if (badBingToken > 0) {
                   // 可能是微软抽风，给三次机会
-              if (bingTokens[badBingToken].exception) {
+                  if (bingTokens[badBingToken]?.exception) {
                     if (bingTokens[badBingToken].exception <= 3) {
                       bingTokens[badBingToken].exception += 1
                     } else {
@@ -1743,6 +1744,9 @@ export class chatgpt extends plugin {
                     bingTokens[badBingToken].exception = 1
                   }
                   await redis.set('CHATGPT:BING_TOKENS', JSON.stringify(bingTokens))
+                } else {
+                  retry = retry - 1
+                }
                 errorMessage = 'UnauthorizedRequest：必应token不正确或已过期'
               // logger.warn(`token${bingToken}疑似不存在或已过期，再试试`)
               // retry = retry - 1

utils/SydneyAIClient.js

@@ -100,7 +100,7 @@ export default class SydneyAIClient {
       this.opts.host = 'https://edgeservices.bing.com/edgesvc'
     }
     logger.mark('使用host：' + this.opts.host)
-    let response = await fetch(`${this.opts.host}/turing/conversation/create`, fetchOptions)
+    let response = await fetch(`${this.opts.host}/turing/conversation/create?bundleVersion=1.1055.6`, fetchOptions)
     let text = await response.text()
     let retry = 10
     while (retry >= 0 && response.status === 200 && !text) {
@@ -115,7 +115,11 @@ export default class SydneyAIClient {
       throw new Error('创建sydney对话失败: status code: ' + response.status + response.statusText)
     }
     try {
-      return JSON.parse(text)
+      let r = JSON.parse(text)
+      if (!r.conversationSignature) {
+        r.encryptedconversationsignature = response.headers.get('x-sydney-encryptedconversationsignature')
+      }
+      return r
     } catch (err) {
       logger.error('创建sydney对话失败: status code: ' + response.status + response.statusText)
       logger.error(text)
@@ -123,7 +127,7 @@ export default class SydneyAIClient {
     }
   }
 
-  async createWebSocketConnection () {
+  async createWebSocketConnection (encryptedconversationsignature = '') {
     await this.initCache()
     // let WebSocket = await getWebSocket()
     return new Promise((resolve, reject) => {
@@ -136,7 +140,11 @@ export default class SydneyAIClient {
         sydneyHost = Config.sydneyReverseProxy.replace('https://', 'wss://').replace('http://', 'ws://')
       }
       logger.mark(`use sydney websocket host: ${sydneyHost}`)
-      let ws = new WebSocket(sydneyHost + '/sydney/ChatHub', undefined, { agent, origin: 'https://edgeservices.bing.com' })
+      let host = sydneyHost + '/sydney/ChatHub'
+      if (encryptedconversationsignature) {
+        host += `?sec_access_token=${encodeURIComponent(encryptedconversationsignature)}`
+      }
+      let ws = new WebSocket(host, undefined, { agent, origin: 'https://edgeservices.bing.com' })
       ws.on('error', (err) => {
         console.error(err)
         reject(err)
@@ -219,6 +227,7 @@ export default class SydneyAIClient {
     // if (messageType === 'Chat') {
     //   logger.warn('该Bing账户token已被限流，降级至使用非搜索模式。本次对话AI将无法使用Bing搜索返回的内容')
     // }
+    let encryptedconversationsignature = ''
     if (typeof onProgress !== 'function') {
       onProgress = () => { }
     }
@@ -231,7 +240,7 @@ export default class SydneyAIClient {
       if (createNewConversationResponse.result?.value === 'UnauthorizedRequest') {
         throw new Error(`UnauthorizedRequest: ${createNewConversationResponse.result.message}`)
       }
-      if (!createNewConversationResponse.conversationSignature || !createNewConversationResponse.conversationId || !createNewConversationResponse.clientId) {
+      if (!createNewConversationResponse.conversationId || !createNewConversationResponse.clientId) {
         const resultValue = createNewConversationResponse.result?.value
         if (resultValue) {
           throw new Error(`${resultValue}: ${createNewConversationResponse.result.message}`)
@@ -241,7 +250,8 @@ export default class SydneyAIClient {
       ({
         conversationSignature,
         conversationId,
-        clientId
+        clientId,
+        encryptedconversationsignature
       } = createNewConversationResponse)
     }
     let pureSydney = Config.toneStyle === 'Sydney'
@@ -331,7 +341,7 @@ export default class SydneyAIClient {
       role: 'User',
       message
     }
-    const ws = await this.createWebSocketConnection()
+    const ws = await this.createWebSocketConnection(encryptedconversationsignature)
     if (Config.debug) {
       logger.mark('sydney websocket constructed successful')
     }
@@ -361,9 +371,7 @@ export default class SydneyAIClient {
     let maxConv = Config.maxNumUserMessagesInConversation
     const currentDate = moment().format('YYYY-MM-DDTHH:mm:ssZ')
     const imageDate = await this.kblobImage(opts.imageUrl)
-    const obj = {
+    let argument0 = {
-      arguments: [
-        {
       source: 'cib',
       optionsSets,
       allowedMessageTypes: ['ActionRequest', 'Chat', 'Context',
@@ -372,6 +380,7 @@ export default class SydneyAIClient {
       sliceIds: [
 
       ],
+      requestId: crypto.randomUUID(),
       traceId: genRanHex(32),
       scenario: 'Underside',
       verbosity: 'verbose',
@@ -417,6 +426,12 @@ export default class SydneyAIClient {
       conversationId,
       previousMessages
     }
+    if (encryptedconversationsignature) {
+      delete argument0.conversationSignature
+    }
+    const obj = {
+      arguments: [
+        argument0
       ],
       invocationId: invocationId.toString(),
       target: 'chat',