koa 2.11.0 → 2.12.0

package/History.md

@@ -1,4 +1,21 @@
 
+2.12.0 / 2020-05-18
+==================
+
+**features**
+  * [[`0d2f421`](http://github.com/koajs/koa/commit/0d2f421c265350d3d84e1bc261572954479f27d3)] - feat: error handler treat err.statusCode as the same as err.status (#1460) (Vijay Krishnavanshi <<vijaykrishnavanshi@gmail.com>>)
+  * [[`8d52105`](http://github.com/koajs/koa/commit/8d52105a34234be9e771ff3b76b43e4e30328943)] - feat: allow bodyless responses for non empty status codes (#1447) (ejose19 <<8742215+ejose19@users.noreply.github.com>>)
+
+**others**
+  * [[`faeaff5`](http://github.com/koajs/koa/commit/faeaff5c149a81a188ab8e5af0b994029e45acbb)] - fox: remove `error-inject` and fix error handling (#1409) (Konstantin Vyatkin <<tino@vtkn.io>>)
+  * [[`f7c732f`](http://github.com/koajs/koa/commit/f7c732fd06f724505e9090add4d977e667da55a8)] - docs: fixed incorrect onerror example (#1459) (Paul Annekov <<paul.annekov@gmail.com>>)
+  * [[`143d8f7`](http://github.com/koajs/koa/commit/143d8f72f2a232b4c97eac00e7811015911e4f7c)] - Always use strict equality. (#1225) (Yazan Medanat <<medanat@gmail.com>>)
+  * [[`6b6b0dd`](http://github.com/koajs/koa/commit/6b6b0ddf7aff073e65493c6efaffab8331c0331c)] - docs(api): add app.use chainability note (#1449) (Zac Anger <<zac@zacanger.com>>)
+  * [[`8ddab48`](http://github.com/koajs/koa/commit/8ddab48cbdbca1e6d1cc8c3ddae45491db524d51)] - docs: Document response status with empty body (#1445) (Marc-Aurèle DARCHE <<152407+madarche@users.noreply.github.com>>)
+  * [[`7deedb2`](http://github.com/koajs/koa/commit/7deedb235274223f1b9da46dee296545b23598de)] - docs: Updating context.md with the latest cookies opts (#1433) (Brad Ito <<phlogisticfugu@users.noreply.github.com>>)
+  * [[`3e97a10`](http://github.com/koajs/koa/commit/3e97a106bb846d9337737011bb85149ddd797229)] - docs(links): remove Google+ link (#1439) (laffachan <<45162759+laffachan@users.noreply.github.com>>)
+  * [[`eda2760`](http://github.com/koajs/koa/commit/eda27608f7d39ede86d7b402aae64b1867ce31c6)] - build: Drop unused Travis sudo: false directive (#1416) (Olle Jonsson <<olle.jonsson@gmail.com>>)
+
 2.11.0 / 2019-10-28
 ==================
 

package/Readme.md

@@ -221,7 +221,6 @@ See [AUTHORS](AUTHORS).
  - [Examples](https://github.com/koajs/examples)
  - [Middleware](https://github.com/koajs/koa/wiki) list
  - [Wiki](https://github.com/koajs/koa/wiki)
- - [G+ Community](https://plus.google.com/communities/101845768320796750641)
  - [Reddit Community](https://www.reddit.com/r/koajs)
  - [Mailing list](https://groups.google.com/forum/#!forum/koajs)
  - [中文文档 v1.x](https://github.com/guo-yu/koa-guide)

package/lib/application.js

@@ -197,7 +197,7 @@ module.exports = class Application extends Emitter {
   onerror(err) {
     if (!(err instanceof Error)) throw new TypeError(util.format('non-error thrown: %j', err));
 
-    if (404 == err.status || err.expose) return;
+    if (404 === err.status || err.expose) return;
     if (this.silent) return;
 
     const msg = err.stack || err.toString();
@@ -238,6 +238,11 @@ function respond(ctx) {
 
   // status body
   if (null == body) {
+    if (ctx.response._explicitNullBody) {
+      ctx.response.remove('Content-Type');
+      ctx.response.remove('Transfer-Encoding');
+      return res.end();
+    }
     if (ctx.req.httpVersionMajor >= 2) {
       body = String(code);
     } else {
@@ -252,7 +257,7 @@ function respond(ctx) {
 
   // responses
   if (Buffer.isBuffer(body)) return res.end(body);
-  if ('string' == typeof body) return res.end(body);
+  if ('string' === typeof body) return res.end(body);
   if (body instanceof Stream) return body.pipe(res);
 
   // body: json

package/lib/context.js

@@ -143,16 +143,18 @@ const proto = module.exports = {
     // force text/plain
     this.type = 'text';
 
+    let statusCode = err.status || err.statusCode;
+
     // ENOENT support
-    if ('ENOENT' == err.code) err.status = 404;
+    if ('ENOENT' === err.code) statusCode = 404;
 
     // default to 500
-    if ('number' != typeof err.status || !statuses[err.status]) err.status = 500;
+    if ('number' !== typeof statusCode || !statuses[statusCode]) statusCode = 500;
 
     // respond
-    const code = statuses[err.status];
+    const code = statuses[statusCode];
     const msg = err.expose ? err.message : code;
-    this.status = err.status;
+    this.status = err.status = statusCode;
     this.length = Buffer.byteLength(msg);
     res.end(msg);
   },

package/lib/request.js

@@ -272,7 +272,7 @@ module.exports = {
   get hostname() {
     const host = this.host;
     if (!host) return '';
-    if ('[' == host[0]) return this.URL.hostname || ''; // IPv6
+    if ('[' === host[0]) return this.URL.hostname || ''; // IPv6
     return host.split(':', 1)[0];
   },
 
@@ -311,10 +311,10 @@ module.exports = {
     const s = this.ctx.status;
 
     // GET or HEAD for weak freshness validation only
-    if ('GET' != method && 'HEAD' != method) return false;
+    if ('GET' !== method && 'HEAD' !== method) return false;
 
     // 2xx or 304 as per rfc2616 14.26
-    if ((s >= 200 && s < 300) || 304 == s) {
+    if ((s >= 200 && s < 300) || 304 === s) {
       return fresh(this.header, this.response.header);
     }
 
@@ -382,7 +382,7 @@ module.exports = {
 
   get length() {
     const len = this.get('Content-Length');
-    if (len == '') return;
+    if (len === '') return;
     return ~~len;
   },
 
@@ -415,7 +415,7 @@ module.exports = {
    */
 
   get secure() {
-    return 'https' == this.protocol;
+    return 'https' === this.protocol;
   },
 
   /**

package/lib/response.js

@@ -6,7 +6,6 @@
  */
 
 const contentDisposition = require('content-disposition');
-const ensureErrorHandler = require('error-inject');
 const getType = require('cache-content-type');
 const onFinish = require('on-finished');
 const escape = require('escape-html');
@@ -139,6 +138,7 @@ module.exports = {
     // no content
     if (null == val) {
       if (!statuses.empty[this.status]) this.status = 204;
+      if (val === null) this._explicitNullBody = true;
       this.remove('Content-Type');
       this.remove('Content-Length');
       this.remove('Transfer-Encoding');
@@ -152,7 +152,7 @@ module.exports = {
     const setType = !this.has('Content-Type');
 
     // string
-    if ('string' == typeof val) {
+    if ('string' === typeof val) {
       if (setType) this.type = /^\s*</.test(val) ? 'html' : 'text';
       this.length = Buffer.byteLength(val);
       return;
@@ -166,12 +166,13 @@ module.exports = {
     }
 
     // stream
-    if ('function' == typeof val.pipe) {
+    if (val instanceof Stream) {
       onFinish(this.res, destroy.bind(null, val));
-      ensureErrorHandler(val, err => this.ctx.onerror(err));
-
-      // overwriting
-      if (null != original && original != val) this.remove('Content-Length');
+      if (original != val) {
+        val.once('error', err => this.ctx.onerror(err));
+        // overwriting
+        if (null != original) this.remove('Content-Length');
+      }
 
       if (setType) this.type = 'bin';
       return;
@@ -257,7 +258,7 @@ module.exports = {
 
   redirect(url, alt) {
     // location
-    if ('back' == url) url = this.ctx.get('Referrer') || alt || '/';
+    if ('back' === url) url = this.ctx.get('Referrer') || alt || '/';
     this.set('Location', encodeUrl(url));
 
     // status
@@ -324,7 +325,7 @@ module.exports = {
    */
 
   set lastModified(val) {
-    if ('string' == typeof val) val = new Date(val);
+    if ('string' === typeof val) val = new Date(val);
     this.set('Last-Modified', val.toUTCString());
   },
 
@@ -457,7 +458,7 @@ module.exports = {
   set(field, val) {
     if (this.headerSent) return;
 
-    if (2 == arguments.length) {
+    if (2 === arguments.length) {
       if (Array.isArray(val)) val = val.map(v => typeof v === 'string' ? v : String(v));
       else if (typeof val !== 'string') val = String(val);
       this.res.setHeader(field, val);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "Koa web app framework",
   "main": "lib/application.js",
   "scripts": {
@@ -32,7 +32,6 @@
     "depd": "^1.1.2",
     "destroy": "^1.0.4",
     "encodeurl": "^1.0.2",
-    "error-inject": "^1.0.0",
     "escape-html": "^1.0.3",
     "fresh": "~0.5.2",
     "http-assert": "^1.3.0",