Migrate from got to simple-get (#945)

The simple-get module provides support for basic auth and
is already used by the future prebuild dependency.
This commit is contained in:
Matt Parrish 2017-09-12 00:38:17 -06:00 committed by Lovell Fuller
parent 5f29d1ba9c
commit 0004f5d2ff
2 changed files with 11 additions and 8 deletions

View File

@ -5,7 +5,7 @@ const os = require('os');
const path = require('path'); const path = require('path');
const caw = require('caw'); const caw = require('caw');
const got = require('got'); const simpleGet = require('simple-get');
const semver = require('semver'); const semver = require('semver');
const tar = require('tar'); const tar = require('tar');
const detectLibc = require('detect-libc'); const detectLibc = require('detect-libc');
@ -95,19 +95,22 @@ module.exports.download_vips = function () {
} catch (err) {} } catch (err) {}
}); });
}); });
const gotOpt = { const url = distBaseUrl + tarFilename;
const simpleGetOpt = {
url: url,
agent: caw(null, { agent: caw(null, {
protocol: 'https' protocol: 'https'
}) })
}; };
const url = distBaseUrl + tarFilename; simpleGet(simpleGetOpt, function (err, response) {
got.stream(url, gotOpt).on('response', function (response) { if (err) {
error('Download of ' + url + ' failed: ' + err.message);
}
if (response.statusCode !== 200) { if (response.statusCode !== 200) {
error(url + ' status code ' + response.statusCode); error(url + ' status code ' + response.statusCode);
} }
}).on('error', function (err) { response.pipe(tmpFile);
error('Download of ' + url + ' failed: ' + err.message); });
}).pipe(tmpFile);
} }
} }
}; };

View File

@ -70,9 +70,9 @@
"caw": "^2.0.0", "caw": "^2.0.0",
"color": "^2.0.0", "color": "^2.0.0",
"detect-libc": "^0.2.0", "detect-libc": "^0.2.0",
"got": "^7.1.0",
"nan": "^2.6.2", "nan": "^2.6.2",
"semver": "^5.3.0", "semver": "^5.3.0",
"simple-get": "^2.7.0",
"tar": "^3.1.5" "tar": "^3.1.5"
}, },
"devDependencies": { "devDependencies": {