fix: handle calling writable.end() correctly (#96)

honojs · Nov 15, 2023 · efa3fe2 · efa3fe2
1 parent 3575d60
commit efa3fe2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -8,14 +8,12 @@ export function writeFromReadableStream(stream: ReadableStream<Uint8Array>, writ
     return
   }
   const reader = stream.getReader()
-  writable.on('drain', onDrain)
   writable.on('close', cancel)
   writable.on('error', cancel)
   reader.read().then(flow, cancel)
   return reader.closed.finally(() => {
     writable.off('close', cancel)
     writable.off('error', cancel)
-    writable.off('drain', onDrain)
   })
   function cancel(error?: any) {
     reader.cancel(error).catch(() => {})
@@ -28,7 +26,9 @@ export function writeFromReadableStream(stream: ReadableStream<Uint8Array>, writ
     try {
       if (done) {
         writable.end()
-      } else if (writable.write(value)) {
+      } else if (!writable.write(value)) {
+        writable.once("drain", onDrain);
+      } else {
         return reader.read().then(flow, cancel)
       }
     } catch (e) {