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

Jump to bottom

replace https with request to allow for proxy configuration #166

Closed
wants to merge 1 commit into from
Closed

replace https with request to allow for proxy configuration #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 10 additions & 27 deletions lib/shared/get-blacklist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
'use strict';

var https = require('https');

var concat = require('concat-stream');
var request = require('request');

var url = 'https://gulpjs.com/plugins/blackList.json';

function collect(stream, cb) {
stream.on('error', cb);
stream.pipe(concat(onSuccess));

function onSuccess(result) {
cb(null, result);
}
}

function parse(str, cb) {
try {
cb(null, JSON.parse(str));
Expand All @@ -25,25 +14,19 @@ function parse(str, cb) {

// TODO: Test this impl
function getBlacklist(cb) {
https.get(url, onRequest);
request(url, function(error, response, body) {
processResponse(error, response, body);
});

function onRequest(res) {
if (res.statusCode !== 200) {
function processResponse(error, response, body) {
if (error || (response && response.statusCode !== 200)) {
// TODO: Test different status codes
return cb(new Error('Request failed. Status Code: ' + res.statusCode));
}

res.setEncoding('utf8');

collect(res, onCollect);
}

function onCollect(err, result) {
if (err) {
return cb(err);
return cb(new Error(response
? 'Request failed. Status Code: ' + response.statusCode
: error));
}

parse(result, onParse);
parse(body, onParse);
}

function onParse(err, blacklist) {
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"ansi-colors": "^1.0.1",
"archy": "^1.0.0",
"array-sort": "^1.0.0",
"concat-stream": "^1.6.0",
"color-support": "^1.1.3",
"concat-stream": "^1.6.0",
"copy-props": "^2.0.1",
"fancy-log": "^1.3.2",
"gulplog": "^1.0.0",
Expand All @@ -46,6 +46,7 @@
"mute-stdout": "^1.0.0",
"pretty-hrtime": "^1.0.0",
"replace-homedir": "^1.0.0",
"request": "^2.88.0",
"semver-greatest-satisfied-range": "^1.1.0",
"v8flags": "^3.0.1",
"yargs": "^7.1.0"
Expand Down