Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't need isJSON here #1399

Merged
merged 5 commits into from
Oct 15, 2019
Merged

don't need isJSON here #1399

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44bd54b
isJSON will be always true here
tinovyatkin Oct 14, 2019
5e22f9c
don't need isJSON here
tinovyatkin Oct 14, 2019
5a939a9
merge changes
tinovyatkin Oct 15, 2019
d734559
Merge branch 'master' into dont-need-is-json-here
tinovyatkin Oct 15, 2019
639f5b2
more semantic way
tinovyatkin Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions lib/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const contentDisposition = require('content-disposition');
const ensureErrorHandler = require('error-inject');
const getType = require('cache-content-type');
const onFinish = require('on-finished');
const isJSON = require('koa-is-json');
const escape = require('escape-html');
const typeis = require('type-is').is;
const statuses = require('statuses');
Expand All @@ -20,6 +19,7 @@ const vary = require('vary');
const only = require('only');
const util = require('util');
const encodeUrl = require('encodeurl');
const Stream = require('stream');

/**
* Prototype.
Expand Down Expand Up @@ -201,18 +201,15 @@ module.exports = {
*/

get length() {
const len = this.header['content-length'];
const body = this.body;

if (null == len) {
if (!body) return;
if ('string' == typeof body) return Buffer.byteLength(body);
if (Buffer.isBuffer(body)) return body.length;
if (isJSON(body)) return Buffer.byteLength(JSON.stringify(body));
return;
if (this.has('Content-Length')) {
return parseInt(this.get('Content-Length'), 10) || 0;
}

return Math.trunc(len) || 0;
const { body } = this;
if (!body || body instanceof Stream) return undefined;
if ('string' === typeof body) return Buffer.byteLength(body);
if (Buffer.isBuffer(body)) return body.length;
return Buffer.byteLength(JSON.stringify(body));
},

/**
Expand Down