fix(streaming): call stream.abort() explicitly when request is aborted

honojs · Jun 25, 2024 · 9f5a78c · 9f5a78c
1 parent 21c94b0
commit 9f5a78c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/helper/streaming/sse.ts b/src/helper/streaming/sse.ts
@@ -66,6 +66,15 @@ export const streamSSE = (
   const { readable, writable } = new TransformStream()
   const stream = new SSEStreamingApi(writable, readable)
 
+  // bun does not cancel response stream when request is canceled, so detect abort by signal
+  c.req.raw.signal.addEventListener('abort', () => {
+    // "referencing a `c` that is never null in a condition" is a work around for bun (maybe JIT).
+    // If `c` is not referenced in this closure, this event will not fire.
+    if (c) {
+      stream.abort()
+    }
+  })
+
   c.header('Transfer-Encoding', 'chunked')
   c.header('Content-Type', 'text/event-stream')
   c.header('Cache-Control', 'no-cache')

diff --git a/src/helper/streaming/stream.ts b/src/helper/streaming/stream.ts
@@ -8,6 +8,15 @@ export const stream = (
 ): Response => {
   const { readable, writable } = new TransformStream()
   const stream = new StreamingApi(writable, readable)
+
+  // bun does not cancel response stream when request is canceled, so detect abort by signal
+  c.req.raw.signal.addEventListener('abort', () => {
+    // "referencing a `c` that is never null in a condition" is a work around for bun (maybe JIT).
+    // If `c` is not referenced in this closure, this event will not fire.
+    if (c) {
+      stream.abort()
+    }
+  })
   ;(async () => {
     try {
       await cb(stream)