diff options
Diffstat (limited to 'deps/npm/lib/cache/add-remote-tarball.js')
-rw-r--r-- | deps/npm/lib/cache/add-remote-tarball.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/deps/npm/lib/cache/add-remote-tarball.js b/deps/npm/lib/cache/add-remote-tarball.js index 9591ba89d..e87ac54bb 100644 --- a/deps/npm/lib/cache/add-remote-tarball.js +++ b/deps/npm/lib/cache/add-remote-tarball.js @@ -6,14 +6,13 @@ var mkdir = require("mkdirp") , retry = require("retry") , createWriteStream = require("fs-write-stream-atomic") , npm = require("../npm.js") - , registry = npm.registry , inflight = require("inflight") , addLocalTarball = require("./add-local-tarball.js") , cacheFile = require("npm-cache-filename") module.exports = addRemoteTarball -function addRemoteTarball (u, pkgData, shasum, cb_) { +function addRemoteTarball (u, pkgData, shasum, auth, cb_) { assert(typeof u === "string", "must have module URL") assert(typeof cb_ === "function", "must have callback") @@ -42,11 +41,11 @@ function addRemoteTarball (u, pkgData, shasum, cb_) { log.verbose("addRemoteTarball", [u, shasum]) mkdir(path.dirname(tmp), function (er) { if (er) return cb(er) - addRemoteTarball_(u, tmp, shasum, next) + addRemoteTarball_(u, tmp, shasum, auth, next) }) } -function addRemoteTarball_(u, tmp, shasum, cb) { +function addRemoteTarball_ (u, tmp, shasum, auth, cb) { // Tuned to spread 3 attempts over about a minute. // See formula at <https://github.com/tim-kos/node-retry>. var operation = retry.operation({ @@ -59,12 +58,12 @@ function addRemoteTarball_(u, tmp, shasum, cb) { operation.attempt(function (currentAttempt) { log.info("retry", "fetch attempt " + currentAttempt + " at " + (new Date()).toLocaleTimeString()) - fetchAndShaCheck(u, tmp, shasum, function (er, response, shasum) { + fetchAndShaCheck(u, tmp, shasum, auth, function (er, response, shasum) { // Only retry on 408, 5xx or no `response`. var sc = response && response.statusCode var statusRetry = !sc || (sc === 408 || sc >= 500) if (er && statusRetry && operation.retry(er)) { - log.info("retry", "will retry, error on last attempt: " + er) + log.warn("retry", "will retry, error on last attempt: " + er) return } cb(er, response, shasum) @@ -72,8 +71,8 @@ function addRemoteTarball_(u, tmp, shasum, cb) { }) } -function fetchAndShaCheck (u, tmp, shasum, cb) { - registry.fetch(u, null, function (er, response) { +function fetchAndShaCheck (u, tmp, shasum, auth, cb) { + npm.registry.fetch(u, { auth : auth }, function (er, response) { if (er) { log.error("fetch failed", u) return cb(er, response) |