async-request
Advanced tools
Comparing version 1.1.0 to 1.2.0
@@ -13,5 +13,9 @@ "use strict"; | ||
request.debug = false; | ||
Arequest = function (defaultOptions) { | ||
var arequest = undefined; | ||
Arequest.validateOptions(defaultOptions); | ||
arequest = function callee$1$0(url, options) { | ||
@@ -24,6 +28,6 @@ return _regeneratorRuntime.async(function callee$1$0$(context$2$0) { | ||
options = _.assign({ url: url }, options, defaultOptions); | ||
options = Arequest.mapOptions(options); | ||
options = _.assign({ url: url }, options); | ||
request(options, function (error, response) { | ||
@@ -54,2 +58,6 @@ if (error) { | ||
if (options.cookieJar === true) { | ||
options.cookieJar = request.jar(); | ||
} | ||
return Arequest(options); | ||
@@ -61,2 +69,5 @@ }; | ||
/** | ||
* | ||
*/ | ||
Arequest.validateOptions = function (options) { | ||
@@ -69,3 +80,3 @@ var unknownOption = undefined; | ||
unknownOption = _.first(_.difference(_.keys(options), ["method", "data", "headers", "proxy"])); | ||
unknownOption = _.first(_.difference(_.keys(options), ["method", "data", "headers", "proxy", "cookieJar", "cookieJar2"])); | ||
@@ -95,2 +106,8 @@ if (unknownOption) { | ||
if (options.cookieJar) { | ||
options.jar = options.cookieJar; | ||
delete options.cookieJar; | ||
} | ||
return options; | ||
@@ -100,2 +117,2 @@ }; | ||
module.exports = Arequest({}); | ||
//# sourceMappingURL=data:application/json;base64,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LENBQUMsT0FBTyxHQUFHLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyIsImZpbGUiOiJtYWluLmpzIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5sZXQgQXJlcXVlc3QsXG4gICAgcmVxdWVzdCA9IHJlcXVpcmUoJ3JlcXVlc3QnKSxcbiAgICBfID0gcmVxdWlyZSgnbG9kYXNoJyk7XG5cbkFyZXF1ZXN0ID0gKGRlZmF1bHRPcHRpb25zKSA9PiB7XG4gICAgbGV0IGFyZXF1ZXN0O1xuXG4gICAgYXJlcXVlc3QgPSBhc3luYyAodXJsLCBvcHRpb25zKSA9PiB7XG4gICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSkgPT4ge1xuICAgICAgICAgICAgQXJlcXVlc3QudmFsaWRhdGVPcHRpb25zKG9wdGlvbnMpO1xuXG4gICAgICAgICAgICBvcHRpb25zID0gQXJlcXVlc3QubWFwT3B0aW9ucyhvcHRpb25zKTtcblxuICAgICAgICAgICAgb3B0aW9ucyA9IF8uYXNzaWduKHt1cmw6IHVybH0sIG9wdGlvbnMpO1xuXG4gICAgICAgICAgICByZXF1ZXN0KG9wdGlvbnMsIChlcnJvciwgcmVzcG9uc2UpID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoZXJyb3IpIHtcbiAgICAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKGVycm9yKTtcbiAgICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgICByZXNvbHZlKHtcbiAgICAgICAgICAgICAgICAgICAgc3RhdHVzQ29kZTogcmVzcG9uc2Uuc3RhdHVzQ29kZSxcbiAgICAgICAgICAgICAgICAgICAgaGVhZGVyczogcmVzcG9uc2UuaGVhZGVycyxcbiAgICAgICAgICAgICAgICAgICAgYm9keTogcmVzcG9uc2UuYm9keVxuICAgICAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgfSk7XG4gICAgICAgIH0pO1xuICAgIH07XG5cbiAgICBhcmVxdWVzdC5kZWZhdWx0cyA9IChvcHRpb25zKSA9PiB7XG4gICAgICAgIGlmICghb3B0aW9ucykge1xuICAgICAgICAgICAgcmV0dXJuIGRlZmF1bHRPcHRpb25zO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIEFyZXF1ZXN0KG9wdGlvbnMpO1xuICAgIH07XG5cbiAgICByZXR1cm4gYXJlcXVlc3Q7XG59O1xuXG5BcmVxdWVzdC52YWxpZGF0ZU9wdGlvbnMgPSAob3B0aW9ucykgPT4ge1xuICAgIGxldCB1bmtub3duT3B0aW9uO1xuXG4gICAgaWYgKCFvcHRpb25zKSB7XG4gICAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICB1bmtub3duT3B0aW9uID0gXy5maXJzdChfLmRpZmZlcmVuY2UoXy5rZXlzKG9wdGlvbnMpLCBbJ21ldGhvZCcsICdkYXRhJywgJ2hlYWRlcnMnLCAncHJveHknXSkpO1xuXG4gICAgaWYgKHVua25vd25PcHRpb24pIHtcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKCdVbmtub3duIG9wdGlvbiAoXCInICsgdW5rbm93bk9wdGlvbiArICdcIikuJyk7XG4gICAgfVxuXG4gICAgaWYgKG9wdGlvbnMubWV0aG9kICYmIF8uaW5kZXhPZihbJ0dFVCcsICdQT1NUJywgJ1BVVCcsICdIRUFEJywgJ0RFTEVURSddLCBvcHRpb25zLm1ldGhvZCkgPT09IC0xKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcignVW5rbm93biBvcHRpb24ubWV0aG9kIHZhbHVlIChcIicgKyBvcHRpb25zLm1ldGhvZCArICdcIikuJyk7XG4gICAgfVxufTtcblxuLyoqXG4gKiBNYXAgb3B0aW9ucyB0byBtZWV0IHRoZSByZXF1ZXN0IGludGVyZmFjZS5cbiAqL1xuQXJlcXVlc3QubWFwT3B0aW9ucyA9IChvcHRpb25zKSA9PiB7XG4gICAgaWYgKCFvcHRpb25zKSB7XG4gICAgICAgIHJldHVybiBvcHRpb25zO1xuICAgIH1cblxuICAgIGlmIChvcHRpb25zLmRhdGEpIHtcbiAgICAgICAgb3B0aW9ucy5mb3JtID0gb3B0aW9ucy5kYXRhO1xuXG4gICAgICAgIGRlbGV0ZSBvcHRpb25zLmRhdGE7XG4gICAgfVxuXG4gICAgcmV0dXJuIG9wdGlvbnM7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IEFyZXF1ZXN0KHt9KTtcbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ== | ||
//# sourceMappingURL=data:application/json;base64,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QUs7QUFDL0IsUUFBSSxDQUFDLE9BQU8sRUFBRTtBQUNWLGVBQU8sT0FBTyxDQUFDO0tBQ2xCOztBQUVELFFBQUksT0FBTyxDQUFDLElBQUksRUFBRTtBQUNkLGVBQU8sQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQzs7QUFFNUIsZUFBTyxPQUFPLENBQUMsSUFBSSxDQUFDO0tBQ3ZCOztBQUVELFFBQUksT0FBTyxDQUFDLFNBQVMsRUFBRTtBQUNuQixlQUFPLENBQUMsR0FBRyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUM7O0FBRWhDLGVBQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQztLQUM1Qjs7QUFFRCxXQUFPLE9BQU8sQ0FBQztDQUNsQixDQUFDOztBQUVGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDIiwiZmlsZSI6Im1haW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbmxldCBBcmVxdWVzdCxcbiAgICByZXF1ZXN0ID0gcmVxdWlyZSgncmVxdWVzdCcpLFxuICAgIF8gPSByZXF1aXJlKCdsb2Rhc2gnKTtcblxucmVxdWVzdC5kZWJ1ZyA9IGZhbHNlO1xuXG5BcmVxdWVzdCA9IChkZWZhdWx0T3B0aW9ucykgPT4ge1xuICAgIGxldCBhcmVxdWVzdDtcblxuICAgIEFyZXF1ZXN0LnZhbGlkYXRlT3B0aW9ucyhkZWZhdWx0T3B0aW9ucyk7XG5cbiAgICBhcmVxdWVzdCA9IGFzeW5jICh1cmwsIG9wdGlvbnMpID0+IHtcbiAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiB7XG4gICAgICAgICAgICBBcmVxdWVzdC52YWxpZGF0ZU9wdGlvbnMob3B0aW9ucyk7XG5cbiAgICAgICAgICAgIG9wdGlvbnMgPSBfLmFzc2lnbih7dXJsOiB1cmx9LCBvcHRpb25zLCBkZWZhdWx0T3B0aW9ucyk7XG5cbiAgICAgICAgICAgIG9wdGlvbnMgPSBBcmVxdWVzdC5tYXBPcHRpb25zKG9wdGlvbnMpO1xuXG4gICAgICAgICAgICByZXF1ZXN0KG9wdGlvbnMsIChlcnJvciwgcmVzcG9uc2UpID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoZXJyb3IpIHtcbiAgICAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKGVycm9yKTtcbiAgICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgICByZXNvbHZlKHtcbiAgICAgICAgICAgICAgICAgICAgc3RhdHVzQ29kZTogcmVzcG9uc2Uuc3RhdHVzQ29kZSxcbiAgICAgICAgICAgICAgICAgICAgaGVhZGVyczogcmVzcG9uc2UuaGVhZGVycyxcbiAgICAgICAgICAgICAgICAgICAgYm9keTogcmVzcG9uc2UuYm9keVxuICAgICAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgfSk7XG4gICAgICAgIH0pO1xuICAgIH07XG5cbiAgICBhcmVxdWVzdC5kZWZhdWx0cyA9IChvcHRpb25zKSA9PiB7XG4gICAgICAgIGlmICghb3B0aW9ucykge1xuICAgICAgICAgICAgcmV0dXJuIGRlZmF1bHRPcHRpb25zO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKG9wdGlvbnMuY29va2llSmFyID09PSB0cnVlKSB7XG4gICAgICAgICAgICBvcHRpb25zLmNvb2tpZUphciA9IHJlcXVlc3QuamFyKCk7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gQXJlcXVlc3Qob3B0aW9ucyk7XG4gICAgfTtcblxuICAgIHJldHVybiBhcmVxdWVzdDtcbn07XG5cbi8qKlxuICpcbiAqL1xuQXJlcXVlc3QudmFsaWRhdGVPcHRpb25zID0gKG9wdGlvbnMpID0+IHtcbiAgICBsZXQgdW5rbm93bk9wdGlvbjtcblxuICAgIGlmICghb3B0aW9ucykge1xuICAgICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgdW5rbm93bk9wdGlvbiA9IF8uZmlyc3QoXy5kaWZmZXJlbmNlKF8ua2V5cyhvcHRpb25zKSwgWydtZXRob2QnLCAnZGF0YScsICdoZWFkZXJzJywgJ3Byb3h5JywgJ2Nvb2tpZUphcicsICdjb29raWVKYXIyJ10pKTtcblxuICAgIGlmICh1bmtub3duT3B0aW9uKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcignVW5rbm93biBvcHRpb24gKFwiJyArIHVua25vd25PcHRpb24gKyAnXCIpLicpO1xuICAgIH1cblxuICAgIGlmIChvcHRpb25zLm1ldGhvZCAmJiBfLmluZGV4T2YoWydHRVQnLCAnUE9TVCcsICdQVVQnLCAnSEVBRCcsICdERUxFVEUnXSwgb3B0aW9ucy5tZXRob2QpID09PSAtMSkge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ1Vua25vd24gb3B0aW9uLm1ldGhvZCB2YWx1ZSAoXCInICsgb3B0aW9ucy5tZXRob2QgKyAnXCIpLicpO1xuICAgIH1cbn07XG5cbi8qKlxuICogTWFwIG9wdGlvbnMgdG8gbWVldCB0aGUgcmVxdWVzdCBpbnRlcmZhY2UuXG4gKi9cbkFyZXF1ZXN0Lm1hcE9wdGlvbnMgPSAob3B0aW9ucykgPT4ge1xuICAgIGlmICghb3B0aW9ucykge1xuICAgICAgICByZXR1cm4gb3B0aW9ucztcbiAgICB9XG5cbiAgICBpZiAob3B0aW9ucy5kYXRhKSB7XG4gICAgICAgIG9wdGlvbnMuZm9ybSA9IG9wdGlvbnMuZGF0YTtcblxuICAgICAgICBkZWxldGUgb3B0aW9ucy5kYXRhO1xuICAgIH1cblxuICAgIGlmIChvcHRpb25zLmNvb2tpZUphcikge1xuICAgICAgICBvcHRpb25zLmphciA9IG9wdGlvbnMuY29va2llSmFyO1xuXG4gICAgICAgIGRlbGV0ZSBvcHRpb25zLmNvb2tpZUphcjtcbiAgICB9XG5cbiAgICByZXR1cm4gb3B0aW9ucztcbn07XG5cbm1vZHVsZS5leHBvcnRzID0gQXJlcXVlc3Qoe30pO1xuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9 |
{ | ||
"name": "async-request", | ||
"description": "async-request is a wrapper for request that uses ES7 async functions.", | ||
"version": "1.1.0", | ||
"version": "1.2.0", | ||
"main": "src/main.js", | ||
@@ -37,4 +37,5 @@ "author": { | ||
"lodash": "^3.5.0", | ||
"request": "^2.53.0" | ||
"request": "^2.53.0", | ||
"tough-cookie": "^0.12.1" | ||
} | ||
} |
@@ -32,3 +32,8 @@ # async-request | ||
}, | ||
proxy: 'http://127.0.0.1:8000' | ||
proxy: 'http://127.0.0.1:8000', | ||
// To create a new cookie jar. | ||
cookieJar: true, | ||
// To use a custom/existing cookie jar. | ||
// https://www.npmjs.com/package/tough-cookie | ||
cookieJar: new tough.CookieJar() | ||
}); | ||
@@ -35,0 +40,0 @@ } catch (e) { |
@@ -7,5 +7,9 @@ 'use strict'; | ||
request.debug = false; | ||
Arequest = (defaultOptions) => { | ||
let arequest; | ||
Arequest.validateOptions(defaultOptions); | ||
arequest = async (url, options) => { | ||
@@ -15,6 +19,6 @@ return new Promise((resolve) => { | ||
options = _.assign({url: url}, options, defaultOptions); | ||
options = Arequest.mapOptions(options); | ||
options = _.assign({url: url}, options); | ||
request(options, (error, response) => { | ||
@@ -39,2 +43,6 @@ if (error) { | ||
if (options.cookieJar === true) { | ||
options.cookieJar = request.jar(); | ||
} | ||
return Arequest(options); | ||
@@ -46,2 +54,5 @@ }; | ||
/** | ||
* | ||
*/ | ||
Arequest.validateOptions = (options) => { | ||
@@ -54,3 +65,3 @@ let unknownOption; | ||
unknownOption = _.first(_.difference(_.keys(options), ['method', 'data', 'headers', 'proxy'])); | ||
unknownOption = _.first(_.difference(_.keys(options), ['method', 'data', 'headers', 'proxy', 'cookieJar', 'cookieJar2'])); | ||
@@ -80,2 +91,8 @@ if (unknownOption) { | ||
if (options.cookieJar) { | ||
options.jar = options.cookieJar; | ||
delete options.cookieJar; | ||
} | ||
return options; | ||
@@ -82,0 +99,0 @@ }; |
'use strict'; | ||
let chai, | ||
expect, | ||
nock, | ||
request; | ||
let chai = require('chai'), | ||
expect = chai.expect, | ||
nock = require('nock'); | ||
chai = require('chai'); | ||
expect = chai.expect; | ||
nock = require('nock'); | ||
request = require('../src/main.js'); | ||
describe('request', () => { | ||
let request; | ||
describe('request', () => { | ||
beforeEach(() => { | ||
request = require('../src/main.js'); | ||
nock.cleanAll(); | ||
nock.disableNetConnect(); | ||
@@ -133,2 +132,25 @@ }); | ||
describe('request(url, {cookieJar})', () => { | ||
it('establishes a cookieJar', async () => { | ||
nock('http://gajus.com') | ||
.get('/set-cookie') | ||
.reply(200, '', { | ||
'set-cookie': 'foo=bar' | ||
}); | ||
nock('http://gajus.com') | ||
.matchHeader('cookie', 'foo=bar') | ||
.get('/use-cookie') | ||
.reply(200); | ||
request = request.defaults({ | ||
cookieJar: true, | ||
//proxy: 'http://127.0.0.1:8080/' | ||
}); | ||
await request('http://gajus.com/set-cookie'); | ||
await request('http://gajus.com/use-cookie'); | ||
}); | ||
}); | ||
describe('request(url, {proxy})', () => { | ||
@@ -135,0 +157,0 @@ // nock does not allow testing proxy. |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
24907
346
71
3
+ Addedtough-cookie@^0.12.1
+ Addedtough-cookie@0.12.1(transitive)