From 65aefbd99c43f0a88f5ec739088cd46bd3355551 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 26 Jun 2017 21:39:59 -0700 Subject: [PATCH] httpbase: minor. --- lib/http/base.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/http/base.js b/lib/http/base.js index 3ca1901f..5991d287 100644 --- a/lib/http/base.js +++ b/lib/http/base.js @@ -286,10 +286,11 @@ HTTPBase.prototype.bodyParser = function bodyParser(options) { * Parse request body. * @private * @param {ServerRequest} req + * @param {Object} options * @returns {Promise} */ -HTTPBase.prototype.parseBody = async function parseBody(req, opt) { +HTTPBase.prototype.parseBody = async function parseBody(req, options) { var body = Object.create(null); var type = req.contentType; var data; @@ -297,20 +298,20 @@ HTTPBase.prototype.parseBody = async function parseBody(req, opt) { if (req.method === 'GET') return body; - data = await this.readBody(req, 'utf8', opt); + data = await this.readBody(req, 'utf8', options); if (!data) return body; - if (opt.contentType) - type = opt.contentType; + if (options.contentType) + type = options.contentType; switch (type) { case 'json': body = JSON.parse(data); break; case 'form': - body = parsePairs(data, opt.keyLimit); + body = parsePairs(data, options.keyLimit); break; default: break; @@ -323,13 +324,14 @@ HTTPBase.prototype.parseBody = async function parseBody(req, opt) { * Read and buffer request body. * @param {ServerRequest} req * @param {String} enc + * @param {Object} options * @returns {Promise} */ -HTTPBase.prototype.readBody = function readBody(req, enc, opt) { +HTTPBase.prototype.readBody = function readBody(req, enc, options) { var self = this; return new Promise(function(resolve, reject) { - return self._readBody(req, enc, opt, resolve, reject); + return self._readBody(req, enc, options, resolve, reject); }); }; @@ -338,11 +340,12 @@ HTTPBase.prototype.readBody = function readBody(req, enc, opt) { * @private * @param {ServerRequest} req * @param {String} enc + * @param {Object} options * @param {Function} resolve * @param {Function} reject */ -HTTPBase.prototype._readBody = function _readBody(req, enc, opt, resolve, reject) { +HTTPBase.prototype._readBody = function _readBody(req, enc, options, resolve, reject) { var decode = new StringDecoder(enc); var hasData = false; var total = 0; @@ -353,7 +356,7 @@ HTTPBase.prototype._readBody = function _readBody(req, enc, opt, resolve, reject timer = null; cleanup(); reject(new Error('Request body timed out.')); - }, opt.timeout); + }, options.timeout); function cleanup() { req.removeListener('data', onData); @@ -370,7 +373,7 @@ HTTPBase.prototype._readBody = function _readBody(req, enc, opt, resolve, reject total += data.length; hasData = true; - if (total > opt.bodyLimit) { + if (total > options.bodyLimit) { reject(new Error('Request body overflow.')); return; }