pacote 7.6.0 → 8.1.1

package/CHANGELOG.md

@@ -2,6 +2,68 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="8.1.1"></a>
+## [8.1.1](https://github.com/zkat/pacote/compare/v8.1.0...v8.1.1) (2018-04-24)
+
+
+### Bug Fixes
+
+* **tarball:** Remove promise handler error ([#148](https://github.com/zkat/pacote/issues/148)) ([47da3f6](https://github.com/zkat/pacote/commit/47da3f6)), closes [#145](https://github.com/zkat/pacote/issues/145)
+
+
+
+<a name="8.1.0"></a>
+# [8.1.0](https://github.com/zkat/pacote/compare/v8.0.0...v8.1.0) (2018-04-18)
+
+
+### Bug Fixes
+
+* **git:** workaround for mississippi.finished intermitent failures ([#144](https://github.com/zkat/pacote/issues/144)) ([788fd13](https://github.com/zkat/pacote/commit/788fd13)), closes [#143](https://github.com/zkat/pacote/issues/143)
+
+
+### Features
+
+* **tarball:** calculate shasum when missing, not just integrity ([#149](https://github.com/zkat/pacote/issues/149)) ([ccc6e90](https://github.com/zkat/pacote/commit/ccc6e90))
+
+
+
+<a name="8.0.0"></a>
+# [8.0.0](https://github.com/zkat/pacote/compare/v7.6.1...v8.0.0) (2018-04-12)
+
+
+### Bug Fixes
+
+* **git:** make full clones do a full mirror ([85b269b](https://github.com/zkat/pacote/commit/85b269b))
+
+
+### deps
+
+* bump deps ([6737bf6](https://github.com/zkat/pacote/commit/6737bf6))
+
+
+### meta
+
+* drop support for node@4 ([11478ff](https://github.com/zkat/pacote/commit/11478ff))
+
+
+### BREAKING CHANGES
+
+* some dependencies were upgraded to versions that do not
+support node@4.
+* node@4 is no longer supported
+
+
+
+<a name="7.6.1"></a>
+## [7.6.1](https://github.com/zkat/pacote/compare/v7.6.0...v7.6.1) (2018-03-08)
+
+
+### Bug Fixes
+
+* **standard:** update to new standard rules ([bb52d02](https://github.com/zkat/pacote/commit/bb52d02))
+
+
+
 <a name="7.6.0"></a>
 # [7.6.0](https://github.com/zkat/pacote/compare/v7.5.3...v7.6.0) (2018-03-08)
 

package/extract.js

@@ -24,27 +24,27 @@ function extract (spec, dest, opts) {
   return withTarballStream(spec, opts, stream => {
     return tryExtract(spec, stream, dest, opts)
   })
-  .then(() => {
-    if (!opts.resolved) {
-      const pjson = path.join(dest, 'package.json')
-      return readFileAsync(pjson, 'utf8')
-      .then(str => truncateAsync(pjson)
-      .then(() => appendFileAsync(pjson, str.replace(
-        /}\s*$/,
-        `\n,"_resolved": ${
-          JSON.stringify(opts.resolved || '')
-        }\n,"_integrity": ${
-          JSON.stringify(opts.integrity || '')
-        }\n,"_from": ${
-          JSON.stringify(spec.toString())
-        }\n}`
-      ))))
-    }
-  })
-  .then(() => opts.log.silly(
-    'extract',
-    `${spec} extracted to ${dest} (${Date.now() - startTime}ms)`
-  ))
+    .then(() => {
+      if (!opts.resolved) {
+        const pjson = path.join(dest, 'package.json')
+        return readFileAsync(pjson, 'utf8')
+          .then(str => truncateAsync(pjson)
+            .then(() => appendFileAsync(pjson, str.replace(
+              /}\s*$/,
+              `\n,"_resolved": ${
+                JSON.stringify(opts.resolved || '')
+              }\n,"_integrity": ${
+                JSON.stringify(opts.integrity || '')
+              }\n,"_from": ${
+                JSON.stringify(spec.toString())
+              }\n}`
+            ))))
+      }
+    })
+    .then(() => opts.log.silly(
+      'extract',
+      `${spec} extracted to ${dest} (${Date.now() - startTime}ms)`
+    ))
 }
 
 function tryExtract (spec, tarStream, dest, opts) {
@@ -52,19 +52,19 @@ function tryExtract (spec, tarStream, dest, opts) {
     tarStream.on('error', reject)
     setImmediate(resolve)
   })
-  .then(() => rimraf(dest))
-  .then(() => mkdirp(dest))
-  .then(() => new BB((resolve, reject) => {
-    const xtractor = extractStream(spec, dest, opts)
-    tarStream.on('error', reject)
-    xtractor.on('error', reject)
-    xtractor.on('close', resolve)
-    tarStream.pipe(xtractor)
-  }))
-  .catch(err => {
-    if (err.code === 'EINTEGRITY') {
-      err.message = `Verification failed while extracting ${spec}:\n${err.message}`
-    }
-    throw err
-  })
+    .then(() => rimraf(dest))
+    .then(() => mkdirp(dest))
+    .then(() => new BB((resolve, reject) => {
+      const xtractor = extractStream(spec, dest, opts)
+      tarStream.on('error', reject)
+      xtractor.on('error', reject)
+      xtractor.on('close', resolve)
+      tarStream.pipe(xtractor)
+    }))
+    .catch(err => {
+      if (err.code === 'EINTEGRITY') {
+        err.message = `Verification failed while extracting ${spec}:\n${err.message}`
+      }
+      throw err
+    })
 }

package/lib/fetchers/directory.js

@@ -29,6 +29,7 @@ Fetcher.impl(fetchDirectory, {
         pkg._hasShrinkwrap = !!sr
         pkg._resolved = spec.fetchSpec
         pkg._integrity = false // Don't auto-calculate integrity
+        pkg._shasum = false // Don't auto-calculate shasum either
         return pkg
       }
     ).then(pkg => {

package/lib/fetchers/file.js

@@ -52,13 +52,13 @@ Fetcher.impl(fetchFile, {
       } else {
         let integrity
         const cacheWriter = !opts.cache
-        ? BB.resolve(null)
-        : (pipe(
-          fs.createReadStream(src),
-          cacache.put.stream(opts.cache, `pacote:tarball:${src}`, {
-            integrity: opts.integrity
-          }).on('integrity', d => { integrity = d })
-        ))
+          ? BB.resolve(null)
+          : (pipe(
+            fs.createReadStream(src),
+            cacache.put.stream(opts.cache, `pacote:tarball:${src}`, {
+              integrity: opts.integrity
+            }).on('integrity', d => { integrity = d })
+          ))
         return cacheWriter.then(() => {
           if (integrity) { stream.emit('integrity', integrity) }
           return pipe(fs.createReadStream(src), stream)

package/lib/fetchers/git.js

@@ -112,7 +112,8 @@ function plainManifest (repo, spec, opts) {
         _ref: ref,
         _rawRef: spec.gitCommittish || spec.gitRange,
         _uniqueResolved: resolved,
-        _integrity: false
+        _integrity: false,
+        _shasum: false
       }
     } else {
       // We're SOL and need a full clone :(
@@ -125,7 +126,8 @@ function plainManifest (repo, spec, opts) {
         _rawRef: rawRef,
         _resolved: rawRef && rawRef.match(/^[a-f0-9]{40}$/) && resolved,
         _uniqueResolved: rawRef && rawRef.match(/^[a-f0-9]{40}$/) && resolved,
-        _integrity: false
+        _integrity: false,
+        _shasum: false
       }
     }
   })
@@ -135,16 +137,16 @@ function resolve (url, spec, name, opts) {
   const isSemver = !!spec.gitRange
   return git.revs(url, opts).then(remoteRefs => {
     return isSemver
-    ? pickManifest({
-      versions: remoteRefs.versions,
-      'dist-tags': remoteRefs['dist-tags'],
-      name: name
-    }, spec.gitRange, opts)
-    : remoteRefs
-    ? BB.resolve(
-      remoteRefs.refs[spec.gitCommittish] || remoteRefs.refs[remoteRefs.shas[spec.gitCommittish]]
-    )
-    : null
+      ? pickManifest({
+        versions: remoteRefs.versions,
+        'dist-tags': remoteRefs['dist-tags'],
+        name: name
+      }, spec.gitRange, opts)
+      : remoteRefs
+        ? BB.resolve(
+          remoteRefs.refs[spec.gitCommittish] || remoteRefs.refs[remoteRefs.shas[spec.gitCommittish]]
+        )
+        : null
   })
 }
 

package/lib/fetchers/registry/fetch.js

@@ -68,12 +68,12 @@ function logRequest (uri, res, startTime, opts) {
 
 function getCacheMode (opts) {
   return opts.offline
-  ? 'only-if-cached'
-  : opts.preferOffline
-  ? 'force-cache'
-  : opts.preferOnline
-  ? 'no-cache'
-  : 'default'
+    ? 'only-if-cached'
+    : opts.preferOffline
+      ? 'force-cache'
+      : opts.preferOnline
+        ? 'no-cache'
+        : 'default'
 }
 
 function getHeaders (uri, registry, opts) {

package/lib/fetchers/registry/manifest.js

@@ -28,8 +28,8 @@ function manifest (spec, opts) {
 
 function metadataUrl (registry, name) {
   const normalized = registry.slice(-1) !== '/'
-  ? registry + '/'
-  : registry
+    ? registry + '/'
+    : registry
   return url.resolve(normalized, name)
 }
 

package/lib/fetchers/registry/tarball.js

@@ -41,6 +41,7 @@ function tarball (spec, opts) {
     )
     fetchStream.on('error', err => stream.emit('error', err))
     fetchStream.pipe(stream)
+    return null
   }).catch(err => stream.emit('error', err))
   return stream
 }
@@ -60,20 +61,21 @@ function fromManifest (manifest, spec, opts) {
     integrity: manifest._integrity,
     algorithms: [
       manifest._integrity
-      ? ssri.parse(manifest._integrity).pickAlgorithm()
-      : 'sha1'
+        ? ssri.parse(manifest._integrity).pickAlgorithm()
+        : 'sha1'
     ],
     spec
   }, opts))
-  .then(res => {
-    const hash = res.headers.get('x-local-cache-hash')
-    if (hash) {
-      stream.emit('integrity', decodeURIComponent(hash))
-    }
-    res.body.on('error', err => stream.emit('error', err))
-    res.body.pipe(stream)
-  })
-  .catch(err => stream.emit('error', err))
+    .then(res => {
+      const hash = res.headers.get('x-local-cache-hash')
+      if (hash) {
+        stream.emit('integrity', decodeURIComponent(hash))
+      }
+      res.body.on('error', err => stream.emit('error', err))
+      res.body.pipe(stream)
+      return null
+    })
+    .catch(err => stream.emit('error', err))
   return stream
 }
 

package/lib/finalize-manifest.js

@@ -5,7 +5,7 @@ const BB = require('bluebird')
 const cacache = require('cacache')
 const cacheKey = require('./util/cache-key')
 const fetchFromManifest = require('./fetch').fromManifest
-const finished = BB.promisify(require('mississippi').finished)
+const finished = require('./util/finished')
 const minimatch = require('minimatch')
 const normalize = require('normalize-package-data')
 const optCheck = require('./util/opt-check')
@@ -38,8 +38,8 @@ function finalizeManifest (pkg, spec, opts) {
   opts = optCheck(opts)
 
   const cachedManifest = (opts.cache && key && !opts.preferOnline && !opts.fullMetadata)
-  ? cacache.get.info(opts.cache, key, opts)
-  : BB.resolve(null)
+    ? cacache.get.info(opts.cache, key, opts)
+    : BB.resolve(null)
 
   return cachedManifest.then(cached => {
     if (cached && cached.metadata.manifest) {
@@ -47,8 +47,8 @@ function finalizeManifest (pkg, spec, opts) {
     } else {
       return tarballedProps(pkg, spec, opts).then(props => {
         return pkg && pkg.name
-        ? new Manifest(pkg, props, opts.fullMetadata)
-        : new Manifest(props, null, opts.fullMetadata)
+          ? new Manifest(pkg, props, opts.fullMetadata)
+          : new Manifest(props, null, opts.fullMetadata)
       }).then(manifest => {
         const cacheKey = key || finalKey(manifest, spec)
         if (!opts.cache || !cacheKey) {
@@ -98,7 +98,7 @@ function Manifest (pkg, fromTarball, fullMetadata) {
   // and if they don't, we need to extract and read the tarball ourselves.
   // These are details required by the installer.
   this._integrity = pkg._integrity || fromTarball._integrity || null
-  this._shasum = pkg._shasum || null
+  this._shasum = pkg._shasum || fromTarball._shasum || null
   this._shrinkwrap = pkg._shrinkwrap || fromTarball._shrinkwrap || null
   this.bin = pkg.bin || fromTarball.bin || null
 
@@ -140,7 +140,9 @@ function tarballedProps (pkg, spec, opts) {
     pkg.directories &&
     pkg.directories.bin
   ))
-  const needsHash = !pkg || (!pkg._integrity && pkg._integrity !== false)
+  const needsIntegrity = !pkg || (!pkg._integrity && pkg._integrity !== false)
+  const needsShasum = !pkg || (!pkg._shasum && pkg._shasum !== false)
+  const needsHash = needsIntegrity || needsShasum
   const needsManifest = !pkg || !pkg.name
   const needsExtract = needsShrinkwrap || needsBin || needsManifest
   if (!needsShrinkwrap && !needsBin && !needsHash && !needsManifest) {
@@ -153,7 +155,7 @@ function tarballedProps (pkg, spec, opts) {
       needsShrinkwrap && jsonFromStream('npm-shrinkwrap.json', extracted),
       needsManifest && jsonFromStream('package.json', extracted),
       needsBin && getPaths(extracted),
-      needsHash && ssri.fromStream(tarStream),
+      needsHash && ssri.fromStream(tarStream, {algorithms: ['sha1', 'sha512']}),
       needsExtract && pipe(tarStream, extracted),
       (sr, mani, paths, hash) => {
         if (needsManifest && !mani) {
@@ -169,8 +171,8 @@ function tarballedProps (pkg, spec, opts) {
         // to add to bin
         if (paths && paths.length) {
           const dirBin = mani
-          ? (mani && mani.directories && mani.directories.bin)
-          : (pkg && pkg.directories && pkg.directories.bin)
+            ? (mani && mani.directories && mani.directories.bin)
+            : (pkg && pkg.directories && pkg.directories.bin)
           if (dirBin) {
             extraProps.bin = {}
             paths.forEach(filePath => {
@@ -188,7 +190,8 @@ function tarballedProps (pkg, spec, opts) {
           _resolved: (mani && mani._resolved) ||
           (pkg && pkg._resolved) ||
           spec.fetchSpec,
-          _integrity: hash && hash.toString()
+          _integrity: needsIntegrity && hash && hash.sha512 && hash.sha512[0].toString(),
+          _shasum: needsShasum && hash && hash.sha1 && hash.sha1[0].hexDigest()
         })
       }
     )

package/lib/util/finished.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const BB = require('bluebird')
+
+module.exports = function (child, hasExitCode = false) {
+  return BB.fromNode(function (cb) {
+    child.on('error', cb)
+    child.on(hasExitCode ? 'close' : 'end', function (exitCode) {
+      if (exitCode === undefined || exitCode === 0) {
+        cb()
+      } else {
+        let err = new Error('exited with error code: ' + exitCode)
+        cb(err)
+      }
+    })
+  })
+}

package/lib/util/git.js

@@ -6,7 +6,7 @@ const cp = require('child_process')
 const execFileAsync = BB.promisify(cp.execFile, {
   multiArgs: true
 })
-const finished = BB.promisify(require('mississippi').finished)
+const finished = require('./finished')
 const LRU = require('lru-cache')
 const optCheck = require('./opt-check')
 const osenv = require('osenv')
@@ -70,16 +70,14 @@ try {
 module.exports.clone = fullClone
 function fullClone (repo, committish, target, opts) {
   opts = optCheck(opts)
-  const gitArgs = ['clone', '-q', repo, target]
+  const gitArgs = ['clone', '--mirror', '-q', repo, path.join(target, '.git')]
   if (process.platform === 'win32') {
     gitArgs.push('--config', 'core.longpaths=true')
   }
-  return execGit(gitArgs, {
-    cwd: path.dirname(target)
-  }, opts).then(() => {
-    return committish && execGit(['checkout', committish], {
-      cwd: target
-    })
+  return execGit(gitArgs, {cwd: target}).then(() => {
+    return execGit(['init'], {cwd: target})
+  }).then(() => {
+    return execGit(['checkout', committish || 'HEAD'], {cwd: target})
   }).then(() => {
     return updateSubmodules(target, opts)
   }).then(() => headSha(target, opts))
@@ -215,7 +213,7 @@ function spawnGit (gitArgs, gitOpts, opts) {
       child.stdout.on('data', d => { stdout += d })
       child.stderr.on('data', d => { stderr += d })
 
-      return finished(child).catch(err => {
+      return finished(child, true).catch(err => {
         if (shouldRetry(stderr)) {
           retry(err)
         } else {
@@ -258,10 +256,10 @@ const REFS_HEADS = 'refs/heads/'
 const HEAD = 'HEAD'
 function refType (ref) {
   return ref.indexOf(REFS_TAGS) !== -1
-  ? 'tag'
-  : ref.indexOf(REFS_HEADS) !== -1
-  ? 'branch'
-  : ref.endsWith(HEAD)
-  ? 'head'
-  : 'other'
+    ? 'tag'
+    : ref.indexOf(REFS_HEADS) !== -1
+      ? 'branch'
+      : ref.endsWith(HEAD)
+        ? 'head'
+        : 'other'
 }

package/lib/util/opt-check.js

@@ -45,8 +45,8 @@ function PacoteOptions (opts) {
   this.fullMetadata = opts.fullMetadata
   this.alwaysAuth = opts.alwaysAuth
   this.includeDeprecated = opts.includeDeprecated == null
-  ? true
-  : opts.includeDeprecated
+    ? true
+    : opts.includeDeprecated
 
   this.dirPacker = opts.dirPacker || null
 

package/lib/util/pack-dir.js

@@ -14,8 +14,8 @@ function packDir (manifest, label, dir, target, opts) {
   opts = optCheck(opts)
 
   const packer = opts.dirPacker
-  ? BB.resolve(opts.dirPacker(manifest, dir))
-  : mkPacker(dir)
+    ? BB.resolve(opts.dirPacker(manifest, dir))
+    : mkPacker(dir)
 
   if (!opts.cache) {
     return packer.then(packer => pipe(packer, target))

package/lib/with-tarball-stream.js

@@ -27,107 +27,107 @@ function withTarballStream (spec, opts, streamHandler) {
     opts.resolved &&
     opts.resolved.startsWith('file:')
   )
-  ? BB.try(() => {
+    ? BB.try(() => {
     // NOTE - this is a special shortcut! Packages installed as files do not
     // have a `resolved` field -- this specific case only occurs when you have,
     // say, a git dependency or a registry dependency that you've packaged into
     // a local file, and put that file: spec in the `resolved` field.
-    opts.log.silly('pacote', `trying ${spec} by local file: ${opts.resolved}`)
-    const file = path.resolve(opts.where || '.', opts.resolved.substr(5))
-    return statAsync(file)
-    .then(() => {
-      const verifier = ssri.integrityStream({integrity: opts.integrity})
-      const stream = fs.createReadStream(file)
-      .on('error', err => verifier.emit('error', err))
-      .pipe(verifier)
-      return streamHandler(stream)
-    })
-    .catch(err => {
-      if (err.code === 'EINTEGRITY') {
-        opts.log.warn('pacote', `EINTEGRITY while extracting ${spec} from ${file}.You will have to recreate the file.`)
-        opts.log.verbose('pacote', `EINTEGRITY for ${spec}: ${err.message}`)
-      }
-      throw err
+      opts.log.silly('pacote', `trying ${spec} by local file: ${opts.resolved}`)
+      const file = path.resolve(opts.where || '.', opts.resolved.substr(5))
+      return statAsync(file)
+        .then(() => {
+          const verifier = ssri.integrityStream({integrity: opts.integrity})
+          const stream = fs.createReadStream(file)
+            .on('error', err => verifier.emit('error', err))
+            .pipe(verifier)
+          return streamHandler(stream)
+        })
+        .catch(err => {
+          if (err.code === 'EINTEGRITY') {
+            opts.log.warn('pacote', `EINTEGRITY while extracting ${spec} from ${file}.You will have to recreate the file.`)
+            opts.log.verbose('pacote', `EINTEGRITY for ${spec}: ${err.message}`)
+          }
+          throw err
+        })
     })
-  })
-  : BB.reject(Object.assign(new Error('no file!'), {code: 'ENOENT'}))
+    : BB.reject(Object.assign(new Error('no file!'), {code: 'ENOENT'}))
 
   const tryDigest = tryFile
-  .catch(err => {
-    if (
-      opts.preferOnline ||
+    .catch(err => {
+      if (
+        opts.preferOnline ||
       !opts.cache ||
       !opts.integrity ||
       !RETRIABLE_ERRORS.has(err.code)
-    ) {
-      throw err
-    } else {
-      opts.log.silly('tarball', `trying ${spec} by hash: ${opts.integrity}`)
-      const stream = cacache.get.stream.byDigest(
-        opts.cache, opts.integrity, opts
-      )
-      stream.once('error', err => stream.on('newListener', (ev, l) => {
-        if (ev === 'error') { l(err) }
-      }))
-      return streamHandler(stream)
-      .catch(err => {
-        if (err.code === 'EINTEGRITY' || err.code === 'Z_DATA_ERROR') {
-          opts.log.warn('tarball', `cached data for ${spec} (${opts.integrity}) seems to be corrupted. Refreshing cache.`)
-          return cleanUpCached(opts.cache, opts.integrity, opts)
-          .then(() => { throw err })
-        } else {
-          throw err
-        }
-      })
-    }
-  })
+      ) {
+        throw err
+      } else {
+        opts.log.silly('tarball', `trying ${spec} by hash: ${opts.integrity}`)
+        const stream = cacache.get.stream.byDigest(
+          opts.cache, opts.integrity, opts
+        )
+        stream.once('error', err => stream.on('newListener', (ev, l) => {
+          if (ev === 'error') { l(err) }
+        }))
+        return streamHandler(stream)
+          .catch(err => {
+            if (err.code === 'EINTEGRITY' || err.code === 'Z_DATA_ERROR') {
+              opts.log.warn('tarball', `cached data for ${spec} (${opts.integrity}) seems to be corrupted. Refreshing cache.`)
+              return cleanUpCached(opts.cache, opts.integrity, opts)
+                .then(() => { throw err })
+            } else {
+              throw err
+            }
+          })
+      }
+    })
 
   const trySpec = tryDigest
-  .catch(err => {
-    if (!RETRIABLE_ERRORS.has(err.code)) {
+    .catch(err => {
+      if (!RETRIABLE_ERRORS.has(err.code)) {
       // If it's not one of our retriable errors, bail out and give up.
-      throw err
-    } else {
-      opts.log.silly(
-        'tarball',
-        `no local data for ${spec}. Extracting by manifest.`
-      )
-      return BB.resolve(retry((tryAgain, attemptNum) => {
-        const tardata = fetch.tarball(spec, opts)
-        if (!opts.resolved) {
-          tardata.on('manifest', m => {
-            opts.resolved = m._resolved
-          })
-          tardata.on('integrity', i => {
-            opts.integrity = i
-          })
-        }
-        return BB.try(() => streamHandler(tardata))
-        .catch(err => {
-          // Retry once if we have a cache, to clear up any weird conditions.
-          // Don't retry network errors, though -- make-fetch-happen has already
-          // taken care of making sure we're all set on that front.
-          if (opts.cache && err.code && !err.code.match(/^E\d{3}$/)) {
-            if (err.code === 'EINTEGRITY' || err.code === 'Z_DATA_ERROR') {
-              opts.log.warn('tarball', `tarball data for ${spec} (${opts.integrity}) seems to be corrupted. Trying one more time.`)
-            }
-            return cleanUpCached(opts.cache, err.sri, opts)
-            .then(() => tryAgain(err))
-          } else {
-            throw err
+        throw err
+      } else {
+        opts.log.silly(
+          'tarball',
+          `no local data for ${spec}. Extracting by manifest.`
+        )
+        return BB.resolve(retry((tryAgain, attemptNum) => {
+          const tardata = fetch.tarball(spec, opts)
+          if (!opts.resolved) {
+            tardata.on('manifest', m => {
+              opts.resolved = m._resolved
+            })
+            tardata.on('integrity', i => {
+              opts.integrity = i
+            })
           }
-        })
-      }, {retries: 1}))
-    }
-  })
+          return BB.try(() => streamHandler(tardata))
+            .catch(err => {
+              // Retry once if we have a cache, to clear up any weird conditions.
+              // Don't retry network errors, though -- make-fetch-happen has already
+              // taken care of making sure we're all set on that front.
+              if (opts.cache && err.code && !err.code.match(/^E\d{3}$/)) {
+                if (err.code === 'EINTEGRITY' || err.code === 'Z_DATA_ERROR') {
+                  opts.log.warn('tarball', `tarball data for ${spec} (${opts.integrity}) seems to be corrupted. Trying one more time.`)
+                }
+                return cleanUpCached(opts.cache, err.sri, opts)
+                  .then(() => tryAgain(err))
+              } else {
+                throw err
+              }
+            })
+        }, {retries: 1}))
+      }
+    })
 
   return trySpec
-  .catch(err => {
-    if (err.code === 'EINTEGRITY') {
-      err.message = `Verification failed while extracting ${spec}:\n${err.message}`
-    }
-    throw err
-  })
+    .catch(err => {
+      if (err.code === 'EINTEGRITY') {
+        err.message = `Verification failed while extracting ${spec}:\n${err.message}`
+      }
+      throw err
+    })
 }
 
 function cleanUpCached (cachePath, integrity, opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacote",
-  "version": "7.6.0",
+  "version": "8.1.1",
   "description": "JavaScript package downloader",
   "main": "index.js",
   "files": [
@@ -42,16 +42,16 @@
   "license": "MIT",
   "dependencies": {
     "bluebird": "^3.5.1",
-    "cacache": "^10.0.4",
+    "cacache": "^11.0.1",
     "get-stream": "^3.0.0",
     "glob": "^7.1.2",
-    "lru-cache": "^4.1.1",
-    "make-fetch-happen": "^2.6.0",
+    "lru-cache": "^4.1.2",
+    "make-fetch-happen": "^4.0.1",
     "minimatch": "^3.0.4",
-    "mississippi": "^2.0.0",
+    "mississippi": "^3.0.0",
     "mkdirp": "^0.5.1",
     "normalize-package-data": "^2.4.0",
-    "npm-package-arg": "^6.0.0",
+    "npm-package-arg": "^6.1.0",
     "npm-packlist": "^1.1.10",
     "npm-pick-manifest": "^2.1.0",
     "osenv": "^0.1.5",
@@ -61,20 +61,20 @@
     "rimraf": "^2.6.2",
     "safe-buffer": "^5.1.1",
     "semver": "^5.5.0",
-    "ssri": "^5.2.4",
-    "tar": "^4.3.3",
+    "ssri": "^6.0.0",
+    "tar": "^4.4.1",
     "unique-filename": "^1.1.0",
     "which": "^1.3.0"
   },
   "devDependencies": {
-    "nock": "^9.1.6",
+    "nock": "^9.2.5",
     "npmlog": "^4.1.2",
-    "nyc": "^11.4.1",
+    "nyc": "^11.6.0",
     "require-inject": "^1.4.2",
-    "standard": "^10.0.3",
+    "standard": "^11.0.1",
     "standard-version": "^4.3.0",
     "tacks": "^1.2.6",
-    "tap": "^11.1.0",
+    "tap": "^11.1.3",
     "tar-stream": "^1.5.5",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.7"

package/tarball.js

@@ -45,7 +45,7 @@ function tarballStream (spec, opts) {
       })
     }
   })
-  .catch(err => output.emit('error', err))
+    .catch(err => output.emit('error', err))
   return output
 }
 
@@ -54,14 +54,14 @@ function tarballToFile (spec, dest, opts) {
   opts = optCheck(opts)
   spec = npa(spec, opts.where)
   return mkdirp(path.dirname(dest))
-  .then(() => withTarballStream(spec, opts, stream => {
-    return rimraf(dest)
-    .then(() => new BB((resolve, reject) => {
-      const writer = fs.createWriteStream(dest)
-      stream.on('error', reject)
-      writer.on('error', reject)
-      writer.on('close', resolve)
-      stream.pipe(writer)
+    .then(() => withTarballStream(spec, opts, stream => {
+      return rimraf(dest)
+        .then(() => new BB((resolve, reject) => {
+          const writer = fs.createWriteStream(dest)
+          stream.on('error', reject)
+          writer.on('error', reject)
+          writer.on('close', resolve)
+          stream.pipe(writer)
+        }))
     }))
-  }))
 }