Commit 03bd69ef by xzyfer

Revert "Replace "request" by "got""

This reverts commit c2d24c23.

Unfortunately got does not have good [proxy support][1] which
was missed during review.

Fixes #1458

[1]: https://github.com/sindresorhus/got/issues/79
parent 7e0c359c
...@@ -58,13 +58,13 @@ ...@@ -58,13 +58,13 @@
"gaze": "^1.0.0", "gaze": "^1.0.0",
"get-stdin": "^4.0.1", "get-stdin": "^4.0.1",
"glob": "^7.0.3", "glob": "^7.0.3",
"got": "^5.5.0",
"meow": "^3.7.0", "meow": "^3.7.0",
"in-publish": "^2.0.0", "in-publish": "^2.0.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"nan": "^2.2.0", "nan": "^2.2.0",
"node-gyp": "^3.3.1", "node-gyp": "^3.3.1",
"npmconf": "^2.1.2", "npmconf": "^2.1.2",
"request": "^2.61.0",
"sass-graph": "^2.1.1" "sass-graph": "^2.1.1"
}, },
"devDependencies": { "devDependencies": {
......
...@@ -7,9 +7,9 @@ var fs = require('fs'), ...@@ -7,9 +7,9 @@ var fs = require('fs'),
mkdir = require('mkdirp'), mkdir = require('mkdirp'),
npmconf = require('npmconf'), npmconf = require('npmconf'),
path = require('path'), path = require('path'),
got = require('got'),
pkg = require('../package.json'),
sass = require('../lib/extensions'); sass = require('../lib/extensions');
request = require('request'),
pkg = require('../package.json');
/** /**
* Download file, if succeeds save, if not delete * Download file, if succeeds save, if not delete
...@@ -30,6 +30,9 @@ function download(url, dest, cb) { ...@@ -30,6 +30,9 @@ function download(url, dest, cb) {
'or configure npm proxy via', eol, eol, 'or configure npm proxy via', eol, eol,
' npm config set proxy http://example.com:8080'].join('')); ' npm config set proxy http://example.com:8080'].join(''));
}; };
var successful = function(response) {
return response.statusCode >= 200 && response.statusCode < 300;
};
applyProxy({ rejectUnauthorized: false }, function(options) { applyProxy({ rejectUnauthorized: false }, function(options) {
options.headers = { options.headers = {
...@@ -39,14 +42,19 @@ function download(url, dest, cb) { ...@@ -39,14 +42,19 @@ function download(url, dest, cb) {
].join('') ].join('')
}; };
try { try {
got.stream(url, options) request(url, options, function(err, response) {
.on('error', function(error) { if (err) {
reportError(error); reportError(err);
}) } else if (!successful(response)) {
.on('end', function() { reportError(['HTTP error', response.statusCode, response.statusMessage].join(' '));
cb(); } else {
}) cb();
.pipe(fs.createWriteStream(dest)); }
}).on('response', function(response) {
if (successful(response)) {
response.pipe(fs.createWriteStream(dest));
}
});
} catch (err) { } catch (err) {
cb(err); cb(err);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment