koa 3.0.3 → 3.1.0

package/lib/application.js

@@ -304,10 +304,18 @@ function respond (ctx) {
 
   if (Buffer.isBuffer(body)) return res.end(body)
   if (typeof body === 'string') return res.end(body)
-  if (body instanceof Blob) { return Stream.Readable.from(body.stream()).pipe(res) }
-  if (body instanceof ReadableStream) { return Stream.Readable.from(body).pipe(res) }
-  if (body instanceof Response) { return Stream.Readable.from(body?.body || '').pipe(res) }
-  if (isStream(body)) return body.pipe(res)
+
+  let stream = null
+  if (body instanceof Blob) stream = Stream.Readable.from(body.stream())
+  else if (body instanceof ReadableStream) stream = Stream.Readable.from(body)
+  else if (body instanceof Response) stream = Stream.Readable.from(body?.body || '')
+  else if (isStream(body)) stream = body
+
+  if (stream) {
+    return Stream.pipeline(stream, res, err => {
+      if (err && ctx.app.listenerCount('error')) ctx.onerror(err)
+    })
+  }
 
   // body: json
   body = JSON.stringify(body)

package/lib/response.js

@@ -135,6 +135,14 @@ module.exports = {
   set body (val) {
     const original = this._body
     this._body = val
+
+    const cleanupPreviousStream = () => {
+      if (original && isStream(original)) {
+        original.once('error', () => {})
+        destroy(original)
+      }
+    }
+
     // no content
 
     if (val == null) {
@@ -149,6 +157,7 @@ module.exports = {
       this.remove('Content-Type')
       this.remove('Content-Length')
       this.remove('Transfer-Encoding')
+      cleanupPreviousStream()
       return
     }
 
@@ -162,6 +171,7 @@ module.exports = {
     if (typeof val === 'string') {
       if (setType) this.type = /^\s*</.test(val) ? 'html' : 'text'
       this.length = Buffer.byteLength(val)
+      cleanupPreviousStream()
       return
     }
 
@@ -169,6 +179,7 @@ module.exports = {
     if (Buffer.isBuffer(val)) {
       if (setType) this.type = 'bin'
       this.length = val.length
+      cleanupPreviousStream()
       return
     }
 
@@ -176,9 +187,8 @@ module.exports = {
     if (isStream(val)) {
       onFinish(this.res, destroy.bind(null, val))
       if (original !== val) {
-        val.once('error', err => this.ctx.onerror(err))
-        // overwriting
         if (original != null) this.remove('Content-Length')
+        cleanupPreviousStream()
       }
 
       if (setType) this.type = 'bin'
@@ -188,6 +198,7 @@ module.exports = {
     // ReadableStream
     if (val instanceof ReadableStream) {
       if (setType) this.type = 'bin'
+      cleanupPreviousStream()
       return
     }
 
@@ -195,6 +206,7 @@ module.exports = {
     if (val instanceof Blob) {
       if (setType) this.type = 'bin'
       this.length = val.size
+      cleanupPreviousStream()
       return
     }
 
@@ -206,13 +218,14 @@ module.exports = {
       for (const key of headers.keys()) {
         this.set(key, headers.get(key))
       }
-
+      cleanupPreviousStream()
       return
     }
 
     // json
     this.remove('Content-Length')
     if (!this.type || !/\bjson\b/i.test(this.type)) this.type = 'json'
+    cleanupPreviousStream()
   },
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Koa web app framework",
   "main": "lib/application.js",
   "exports": {