Fix bing with sec_access_token

Author: wong2

src/app/bots/bing/api.ts

@@ -1,5 +1,5 @@
 import { random } from 'lodash-es'
-import { FetchError, ofetch } from 'ofetch'
+import { FetchError, FetchResponse, ofetch } from 'ofetch'
 import { uuid } from '~utils'
 import { ChatError, ErrorCode } from '~utils/errors'
 import { ConversationResponse } from './types'
@@ -17,29 +17,38 @@ export async function createConversation(): Promise<ConversationResponse> {
     'x-ms-useragent': 'azsdk-js-api-client-factory/1.0.0-beta.1 core-rest-pipeline/1.10.3 OS/macOS',
   }
 
-  let resp: ConversationResponse
+  let rawResponse: FetchResponse<ConversationResponse>
   try {
-    resp = await ofetch(API_ENDPOINT, { headers, redirect: 'error' })
-    if (!resp.result) {
+    rawResponse = await ofetch.raw<ConversationResponse>(API_ENDPOINT, { headers, redirect: 'error' })
+    if (!rawResponse._data?.result) {
       throw new Error('Invalid response')
     }
   } catch (err) {
     console.error('retry bing create', err)
-    resp = await ofetch(API_ENDPOINT, {
+    rawResponse = await ofetch.raw<ConversationResponse>(API_ENDPOINT, {
       headers: { ...headers, 'x-forwarded-for': randomIP() },
       redirect: 'error',
     })
-    if (!resp) {
+    if (!rawResponse._data) {
       throw new FetchError(`Failed to fetch (${API_ENDPOINT})`)
     }
   }
 
-  if (resp.result.value !== 'Success') {
-    const message = `${resp.result.value}: ${resp.result.message}`
-    if (resp.result.value === 'UnauthorizedRequest') {
+  const data = rawResponse._data
+
+  if (data.result.value !== 'Success') {
+    const message = `${data.result.value}: ${data.result.message}`
+    if (data.result.value === 'UnauthorizedRequest') {
       throw new ChatError(message, ErrorCode.BING_UNAUTHORIZED)
     }
     throw new Error(message)
   }
-  return resp
+
+  const conversationSignature = rawResponse.headers.get('x-sydney-conversationsignature')!
+  const encryptedConversationSignature = rawResponse.headers.get('x-sydney-encryptedconversationsignature') || undefined
+
+  data.conversationSignature = data.conversationSignature || conversationSignature
+  data.encryptedConversationSignature = encryptedConversationSignature
+
+  return data
 }

src/app/bots/bing/index.ts

@@ -107,6 +107,7 @@ export class BingWebBot extends AbstractBot {
       this.conversationContext = {
         conversationId: conversation.conversationId,
         conversationSignature: conversation.conversationSignature,
+        encryptedConversationSignature: conversation.encryptedConversationSignature,
         clientId: conversation.clientId,
         invocationId: 0,
         conversationStyle: bingConversationStyle,
@@ -120,7 +121,7 @@ export class BingWebBot extends AbstractBot {
       imageUrl = await this.uploadImage(params.image)
     }
 
-    const wsp = new WebSocketAsPromised('wss://sydney.bing.com/sydney/ChatHub', {
+    const wsp = new WebSocketAsPromised(this.buildWssUrl(conversation.encryptedConversationSignature), {
       packMessage: websocketUtils.packMessage,
       unpackMessage: websocketUtils.unpackMessage,
     })
@@ -245,4 +246,11 @@ export class BingWebBot extends AbstractBot {
     }
     return `https://www.bing.com/images/blob?bcid=${resp.blobId}`
   }
+
+  private buildWssUrl(encryptedConversationSignature: string | undefined) {
+    if (!encryptedConversationSignature) {
+      return 'wss://sydney.bing.com/sydney/ChatHub'
+    }
+    return `wss://sydney.bing.com/sydney/ChatHub?sec_access_token=${encodeURIComponent(encryptedConversationSignature)}`
+  }
 }

src/app/bots/bing/types.ts

@@ -4,6 +4,7 @@ export interface ConversationResponse {
   conversationId: string
   clientId: string
   conversationSignature: string
+  encryptedConversationSignature?: string
   result: {
     value: string
     message: null
@@ -28,6 +29,7 @@ export interface ConversationInfo {
   conversationSignature: string
   invocationId: number
   conversationStyle: BingConversationStyle
+  encryptedConversationSignature?: string
 }
 
 export interface BingChatResponse {