koa 3.0.0-alpha.4 → 3.0.0-alpha.5

package/lib/application.js

@@ -16,6 +16,7 @@ const Emitter = require('events')
 const util = require('util')
 const Stream = require('stream')
 const http = require('http')
+const isStream = require('./is-stream.js')
 const only = require('./only.js')
 const { HttpError } = require('http-errors')
 
@@ -304,10 +305,10 @@ function respond (ctx) {
 
   if (Buffer.isBuffer(body)) return res.end(body)
   if (typeof body === 'string') return res.end(body)
-  if (body instanceof Stream) return body.pipe(res)
   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)
 
   // body: json
   body = JSON.stringify(body)

package/lib/is-stream.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const Stream = require('stream')
+
+// TODO: use a third party library for this
+
+module.exports = (stream) => {
+  return (
+    stream instanceof Stream ||
+    (stream !== null &&
+      typeof stream === 'object' &&
+      !!stream.readable &&
+      typeof stream.pipe === 'function' &&
+      typeof stream.read === 'function' &&
+      typeof stream.readable === 'boolean' &&
+      typeof stream.readableObjectMode === 'boolean' &&
+      typeof stream.destroy === 'function' &&
+      typeof stream.destroyed === 'boolean')
+  )
+}

package/lib/response.js

@@ -14,10 +14,10 @@ const destroy = require('destroy')
 const assert = require('assert')
 const extname = require('path').extname
 const vary = require('vary')
+const isStream = require('./is-stream.js')
 const only = require('./only.js')
 const util = require('util')
 const encodeUrl = require('encodeurl')
-const Stream = require('stream')
 const deprecate = require('depd')('koa')
 
 /**
@@ -172,7 +172,7 @@ module.exports = {
     }
 
     // stream
-    if (val instanceof Stream) {
+    if (isStream(val)) {
       onFinish(this.res, destroy.bind(null, val))
       if (original !== val) {
         val.once('error', err => this.ctx.onerror(err))
@@ -240,7 +240,7 @@ module.exports = {
     }
 
     const { body } = this
-    if (!body || body instanceof Stream) return undefined
+    if (!body || isStream(body)) return undefined
     if (typeof body === 'string') return Buffer.byteLength(body)
     if (Buffer.isBuffer(body)) return body.length
     return Buffer.byteLength(JSON.stringify(body))
@@ -309,7 +309,7 @@ module.exports = {
     if (this.ctx.accepts('html')) {
       url = escape(url)
       this.type = 'text/html; charset=utf-8'
-      this.body = `Redirecting to <a href="${url}">${url}</a>.`
+      this.body = `Redirecting to ${url}.`
       return
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "publishConfig": {
     "tag": "experimental"
   },
@@ -55,7 +55,7 @@
     "on-finished": "^2.3.0",
     "parseurl": "^1.3.2",
     "statuses": "^2.0.1",
-    "type-is": "^1.6.16",
+    "type-is": "^2.0.1",
     "vary": "^1.1.2"
   },
   "devDependencies": {