fix: AbortController for Bing Mode

Author: josStorer

src/background/apis/bing-web.mjs

@@ -21,8 +21,8 @@ export async function generateAnswersWithBingWebApi(
     if (msg.stop) {
       console.debug('stop generating')
       port.postMessage({ done: true })
-      controller.abort()
       port.onMessage.removeListener(stopListener)
+      controller.abort()
     }
   }
   port.onMessage.addListener(stopListener)
@@ -36,6 +36,14 @@ export async function generateAnswersWithBingWebApi(
   let answer = ''
   const response = await bingAIClient
     .sendMessage(question, {
+      abortController: controller,
+      toneStyle: (await getUserConfig()).modelMode,
+      onProgress: (token) => {
+        answer += token
+        // remove reference markers [^number^]
+        answer = answer.replaceAll(/\[\^\d+\^\]/g, '')
+        port.postMessage({ answer: answer, done: false, session: null })
+      },
       ...(session.bingWeb.conversationId
         ? {
             conversationId: session.bingWeb.conversationId,
@@ -44,13 +52,6 @@ export async function generateAnswersWithBingWebApi(
             invocationId: session.bingWeb.invocationId,
           }
         : {}),
-      onProgress: (token) => {
-        answer += token
-        // remove reference markers [^number^]
-        answer = answer.replaceAll(/\[\^\d+\^\]/g, '')
-        port.postMessage({ answer: answer, done: false, session: null })
-      },
-      toneStyle: (await getUserConfig()).modelMode,
     })
     .catch((err) => {
       port.onMessage.removeListener(stopListener)

src/background/apis/chatgpt-web.mjs

@@ -57,8 +57,8 @@ export async function generateAnswersWithChatgptWebApi(port, question, session,
     if (msg.stop) {
       console.debug('stop generating')
       port.postMessage({ done: true })
-      controller.abort()
       port.onMessage.removeListener(stopListener)
+      controller.abort()
     }
   }
   port.onMessage.addListener(stopListener)

src/background/apis/custom-api.mjs

@@ -27,8 +27,8 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
     if (msg.stop) {
       console.debug('stop generating')
       port.postMessage({ done: true })
-      controller.abort()
       port.onMessage.removeListener(stopListener)
+      controller.abort()
     }
   }
   port.onMessage.addListener(stopListener)

src/background/apis/openai-api.mjs

@@ -39,8 +39,8 @@ export async function generateAnswersWithGptCompletionApi(
     if (msg.stop) {
       console.debug('stop generating')
       port.postMessage({ done: true })
-      controller.abort()
       port.onMessage.removeListener(stopListener)
+      controller.abort()
     }
   }
   port.onMessage.addListener(stopListener)
@@ -116,8 +116,8 @@ export async function generateAnswersWithChatgptApi(port, question, session, api
     if (msg.stop) {
       console.debug('stop generating')
       port.postMessage({ done: true })
-      controller.abort()
       port.onMessage.removeListener(stopListener)
+      controller.abort()
     }
   }
   port.onMessage.addListener(stopListener)