mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-17 19:21:29 +03:00
Code Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
Nick Uraltsev
2016-05-18 19:44:21 -07:00
parent 716e487038 05a522fc12
commit 94a2128549
22 changed files with 507 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/http.js
+40 -37
View File
@@ -9,6 +9,7 @@ var url = require('url');
var zlib = require('zlib');
var pkg = require('./../../package.json');
var Buffer = require('buffer').Buffer;
var settle = require('../helpers/settle');
/*eslint consistent-return:0*/
module.exports = function httpAdapter(resolve, reject, config) {
@@ -24,13 +25,13 @@ module.exports = function httpAdapter(resolve, reject, config) {
headers['User-Agent'] = 'axios/' + pkg.version;
}
if (data) {
if (data && !utils.isStream(data)) {
if (utils.isArrayBuffer(data)) {
data = new Buffer(new Uint8Array(data));
} else if (utils.isString(data)) {
data = new Buffer(data, 'utf-8');
} else {
return reject(new Error('Data after transformation must be a string or an ArrayBuffer'));
return reject(new Error('Data after transformation must be a string, an ArrayBuffer, or a Stream'));
}
// Add Content-Length header if data exists
@@ -93,44 +94,42 @@ module.exports = function httpAdapter(resolve, reject, config) {
break;
}
var responseBuffer = [];
stream.on('data', function handleStreamData(chunk) {
responseBuffer.push(chunk);
var response = {
status: res.statusCode,
statusText: res.statusMessage,
headers: res.headers,
config: config,
request: req
};
// make sure the content length is not over the maxContentLength if specified
if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
reject(new Error('maxContentLength size of ' + config.maxContentLength + ' exceeded'));
}
});
if (config.responseType === 'stream') {
response.data = stream;
settle(resolve, reject, response);
} else {
var responseBuffer = [];
stream.on('data', function handleStreamData(chunk) {
responseBuffer.push(chunk);
stream.on('error', function handleStreamError(err) {
if (aborted) return;
reject(err);
});
// make sure the content length is not over the maxContentLength if specified
if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
reject(new Error('maxContentLength size of ' + config.maxContentLength + ' exceeded'));
}
});
stream.on('end', function handleStreamEnd() {
var d = Buffer.concat(responseBuffer);
if (config.responseType !== 'arraybuffer') {
d = d.toString('utf8');
}
var response = {
data: transformData(
d,
res.headers,
config.transformResponse
),
status: res.statusCode,
statusText: res.statusMessage,
headers: res.headers,
config: config,
request: req
};
stream.on('error', function handleStreamError(err) {
if (aborted) return;
reject(err);
});
// Resolve or reject the Promise based on the status
(res.statusCode >= 200 && res.statusCode < 300 ?
resolve :
reject)(response);
});
stream.on('end', function handleStreamEnd() {
var responseData = Buffer.concat(responseBuffer);
if (config.responseType !== 'arraybuffer') {
responseData = responseData.toString('utf8');
}
response.data = transformData(responseData, res.headers, config.transformResponse);
settle(resolve, reject, response);
});
}
});
// Handle errors
@@ -152,5 +151,9 @@ module.exports = function httpAdapter(resolve, reject, config) {
}
// Send the request
req.end(data);
if (utils.isStream(data)) {
data.pipe(req);
} else {
req.end(data);
}
};