RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

httpbase: minor.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-06-26 21:39:59 -07:00
parent 8b74d95280
commit 65aefbd99c
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/http/base.js
View File

@ -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;
}