fix: fixed xhr abort

hans000 · Sep 1, 2024 · a100816 · a100816
1 parent 42de1e0
commit a100816
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/injected/proxy/handle.ts b/src/injected/proxy/handle.ts
@@ -200,7 +200,7 @@ export function proxyFakeXhrInstance(this: ProxyXMLHttpRequest, options: Options
             // event source stream
             if (isEventSource) {
                 this.responseText = ''
-                for await (const item of asyncGenerator(matchItem.chunks!, matchItem.chunkInterval)) {
+                for await (const item of asyncGenerator(matchItem.chunks!, matchItem.chunkInterval, controller.signal)) {
                     const str = formatChunk(item, matchItem.chunkTemplate)
                     this.responseText += str
                     handleStateChange.call(this, XMLHttpRequest.LOADING)

diff --git a/src/tools/index.ts b/src/tools/index.ts
@@ -12,7 +12,14 @@ export function formatChunk(chunk: string, tpl = 'data: $1\n\n') {
 
 export async function* asyncGenerator(data: unknown[], delay = 1000, signal?: AbortSignal) {
     const list = data.map(item => typeof item !== 'string' ? JSON.stringify(item) : item)
+    let rejectReason
+    signal?.addEventListener('abort', (event: any) => {
+        rejectReason = event.target.reason
+    })
     for (const item of list) {
+        if (rejectReason) {
+            throw new Error(rejectReason)
+        }
         await new Promise(resolve => setTimeout(resolve, delay))
         yield item
     }