Clean up channel.onmessage when stream terminates

tauri-apps · Dec 5, 2024 · 3f9f336 · 3f9f336
1 parent e503a77
commit 3f9f336
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/plugins/http/api-iife.js b/plugins/http/api-iife.js
diff --git a/plugins/http/guest-js/index.ts b/plugins/http/guest-js/index.ts
@@ -206,10 +206,11 @@ export async function fetch(
     rid
   })
 
+  const channel = new Channel<number[]>()
+
   // Create ReadableStream from channel messages
   const stream = new ReadableStream({
     start(controller) {
-      const channel = new Channel<number[]>()
       channel.onmessage = (arr) => {
         const chunk = new Uint8Array(arr)
 
@@ -230,8 +231,12 @@ export async function fetch(
       // If the promise fails, make sure the stream is closed
       readPromise.catch((e) => {
         console.error('error reading body', e)
+        channel.onmessage = () => {}
         controller.error(e)
       })
+    },
+    cancel() {
+      channel.onmessage = () => {}
     }
   })