koa 3.0.0-alpha.2 → 3.0.0-alpha.4

package/lib/application.js

@@ -55,7 +55,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 +258,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
 

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/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
   },
 
   /**
@@ -256,7 +256,7 @@ module.exports = {
       if (!host) host = this.get('Host')
     }
     if (!host) return ''
-    return host.split(/\s*,\s*/, 1)[0]
+    return splitCommaSeparatedValues(host, 1)[0]
   },
 
   /**
@@ -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)
       }
@@ -401,7 +401,7 @@ module.exports = {
     if (this.socket.encrypted) return 'https'
     if (!this.app.proxy) return 'http'
     const proto = this.get('X-Forwarded-Proto')
-    return proto ? proto.split(/\s*,\s*/, 1)[0] : 'http'
+    return proto ? splitCommaSeparatedValues(proto, 1)[0] : 'http'
   },
 
   /**
@@ -433,7 +433,7 @@ module.exports = {
     const proxy = this.app.proxy
     const val = this.get(this.app.proxyIpHeader)
     let ips = proxy && val
-      ? val.split(/\s*,\s*/)
+      ? splitCommaSeparatedValues(val)
       : []
     if (this.app.maxIpsCount > 0) {
       ips = ips.slice(-this.app.maxIpsCount)
@@ -723,3 +723,15 @@ module.exports = {
 if (util.inspect.custom) {
   module.exports[util.inspect.custom] = module.exports.inspect
 }
+
+/**
+ * Split a comma-separated value string into an array of values, with an optional limit.
+ * All the values are trimmed of whitespace.
+ *
+ * @param {string} value - The comma-separated value string to split.
+ * @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())
+}

package/lib/response.js

@@ -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'
   },
 
   /**
@@ -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.2",
+  "version": "3.0.0-alpha.4",
   "publishConfig": {
     "tag": "experimental"
   },
@@ -70,5 +70,6 @@
   "files": [
     "dist",
     "lib"
-  ]
+  ],
+  "homepage": "https://koajs.com"
 }