koa 3.0.0-alpha.3 → 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')
 
@@ -55,7 +56,7 @@ module.exports = class Application extends Emitter {
     * @param {string} [options.proxyIpHeader] Proxy IP header, defaults to X-Forwarded-For
     * @param {number} [options.maxIpsCount] Max IPs read from proxy IP header, default to 0 (means infinity)
     * @param {function} [options.compose] Function to handle middleware composition
-    * @param {boolean} [options.asyncLocalStorage] Max IPs read from proxy IP header, default to 0 (means infinity)
+    * @param {boolean} [options.asyncLocalStorage] Enable AsyncLocalStorage, default to false
     *
     */
 
@@ -258,9 +259,10 @@ function respond (ctx) {
   // allow bypassing koa
   if (ctx.respond === false) return
 
-  if (!ctx.writable) return
-
   const res = ctx.res
+
+  if (!ctx.writable) return res.end()
+
   let body = ctx.body
   const code = ctx.status
 
@@ -303,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/context.js

@@ -150,9 +150,6 @@ const proto = module.exports = {
 
     let statusCode = err.status || err.statusCode
 
-    // ENOENT support
-    if (err.code === 'ENOENT') statusCode = 404
-
     // default to 500
     if (typeof statusCode !== 'number' || !statuses.message[statusCode]) statusCode = 500
 

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/request.js

@@ -89,14 +89,14 @@ module.exports = {
   },
 
   /**
-   * Get origin of URL.
+   * Get the origin header.
    *
    * @return {String}
    * @api public
    */
 
   get origin () {
-    return `${this.protocol}://${this.host}`
+    return this.req.headers.origin || null
   },
 
   /**
@@ -109,7 +109,7 @@ module.exports = {
   get href () {
     // support: `GET http://example.com/foo`
     if (/^https?:\/\//i.test(this.originalUrl)) return this.originalUrl
-    return this.origin + this.originalUrl
+    return this.protocol + '://' + this.host + this.originalUrl
   },
 
   /**
@@ -288,7 +288,7 @@ module.exports = {
     if (!this.memoizedURL) {
       const originalUrl = this.originalUrl || '' // avoid undefined in template string
       try {
-        this.memoizedURL = new URL(`${this.origin}${originalUrl}`)
+        this.memoizedURL = new URL(`${this.protocol}://${this.host}${originalUrl}`)
       } catch (err) {
         this.memoizedURL = Object.create(null)
       }
@@ -732,6 +732,6 @@ if (util.inspect.custom) {
  * @param {number} [limit] - The maximum number of values to return.
  * @returns {string[]} An array of values from the comma-separated string.
  */
-function splitCommaSeparatedValues(value, limit) {
-  return value.split(',', limit).map(v => v.trim());
+function splitCommaSeparatedValues (value, limit) {
+  return value.split(',', limit).map(v => v.trim())
 }

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))
@@ -211,7 +211,7 @@ module.exports = {
 
     // json
     this.remove('Content-Length')
-    this.type = 'json'
+    if (!this.type || !/\bjson\b/i.test(this.type)) this.type = 'json'
   },
 
   /**
@@ -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
     }
 
@@ -513,22 +513,18 @@ module.exports = {
    *    this.set('Accept', 'application/json');
    *    this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
    *
-   * @param {String|Object|Array} field
-   * @param {*} val
+   * @param {String|{ [k: string]: any }} field
+   * @param {any} [val]
    * @api public
    */
 
   set (field, val) {
-    if (this.headerSent) return
+    if (this.headerSent || !field) return
 
-    if (arguments.length === 2) {
-      if (Array.isArray(val)) val = val.map(v => typeof v === 'string' ? v : String(v))
-      else if (typeof val !== 'string') val = String(val)
+    if (typeof field === 'string') {
       this.res.setHeader(field, val)
     } else {
-      for (const key in field) {
-        this.set(key, field[key])
-      }
+      Object.keys(field).forEach(header => this.res.setHeader(header, field[header]))
     }
   },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa",
-  "version": "3.0.0-alpha.3",
+  "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": {
@@ -70,5 +70,6 @@
   "files": [
     "dist",
     "lib"
-  ]
+  ],
+  "homepage": "https://koajs.com"
 }