pacote 9.3.0 → 9.5.1

package/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 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="9.5.1"></a>
+## [9.5.1](https://github.com/zkat/pacote/compare/v9.5.0...v9.5.1) (2019-06-17)
+
+
+### Bug Fixes
+
+* **audit:** npm audit fix ([127a28b](https://github.com/zkat/pacote/commit/127a28b))
+* **errors:** Fix "TypeError: err.code.match is not a function" error ([#170](https://github.com/zkat/pacote/issues/170)) ([92f5e4c](https://github.com/zkat/pacote/commit/92f5e4c))
+* **git:** limit retry times, avoid unlimited retries ([#172](https://github.com/zkat/pacote/issues/172)) ([8bbd051](https://github.com/zkat/pacote/commit/8bbd051))
+
+
+
+<a name="9.5.0"></a>
+# [9.5.0](https://github.com/zkat/pacote/compare/v9.4.1...v9.5.0) (2019-02-18)
+
+
+### Features
+
+* **enjoy-by:** add `before` as an alias to enjoy-by ([75d62b7](https://github.com/zkat/pacote/commit/75d62b7))
+
+
+
+<a name="9.4.1"></a>
+## [9.4.1](https://github.com/zkat/pacote/compare/v9.4.0...v9.4.1) (2019-01-24)
+
+
+### Bug Fixes
+
+* **directory, finalize-manifest:** strip byte order marker from JSON ([723ad63](https://github.com/zkat/pacote/commit/723ad63))
+
+
+
+<a name="9.4.0"></a>
+# [9.4.0](https://github.com/zkat/pacote/compare/v9.3.0...v9.4.0) (2019-01-14)
+
+
+### Features
+
+* **registry:** fall back to fullfat if something might be wrong with corgis ([0e71d6b](https://github.com/zkat/pacote/commit/0e71d6b))
+
+
+
 <a name="9.3.0"></a>
 # [9.3.0](https://github.com/zkat/pacote/compare/v9.2.3...v9.3.0) (2018-12-21)
 

package/README.md

@@ -231,7 +231,7 @@ even though npm itself does.
 
 ##### <a name="opts-enjoy-by"></a> `opts.enjoy-by`
 
-* Alias: `opts.enjoyBy`
+* Alias: `opts.enjoyBy`, `opts.before`
 * Type: Date-able
 * Default: undefined
 

package/lib/fetchers/directory.js

@@ -5,6 +5,7 @@ const BB = require('bluebird')
 const Fetcher = require('../fetch')
 const glob = BB.promisify(require('glob'))
 const packDir = require('../util/pack-dir')
+const readJson = require('../util/read-json')
 const path = require('path')
 const pipe = BB.promisify(require('mississippi').pipe)
 const through = require('mississippi').through
@@ -34,11 +35,11 @@ Fetcher.impl(fetchDirectory, {
     const pkgPath = path.join(spec.fetchSpec, 'package.json')
     const srPath = path.join(spec.fetchSpec, 'npm-shrinkwrap.json')
     return BB.join(
-      readFileAsync(pkgPath).then(JSON.parse).catch({ code: 'ENOENT' }, err => {
+      readFileAsync(pkgPath).then(readJson).catch({ code: 'ENOENT' }, err => {
         err.code = 'ENOPACKAGEJSON'
         throw err
       }),
-      readFileAsync(srPath).then(JSON.parse).catch({ code: 'ENOENT' }, () => null),
+      readFileAsync(srPath).then(readJson).catch({ code: 'ENOENT' }, () => null),
       (pkg, sr) => {
         pkg._shrinkwrap = sr
         pkg._hasShrinkwrap = !!sr

package/lib/fetchers/registry/manifest.js

@@ -16,9 +16,10 @@ function manifest (spec, opts) {
 }
 
 function getManifest (spec, opts) {
-  return fetchPackument(spec, opts.concat({
+  opts = opts.concat({
     fullMetadata: opts.enjoyBy ? true : opts.fullMetadata
-  })).then(packument => {
+  })
+  return fetchPackument(spec, opts).then(packument => {
     try {
       return pickManifest(packument, spec.fetchSpec, {
         defaultTag: opts.defaultTag,
@@ -29,14 +30,15 @@ function getManifest (spec, opts) {
       if (err.code === 'ETARGET' && packument._cached && !opts.offline) {
         opts.log.silly(
           'registry:manifest',
-          `no matching version for ${spec.name}@${spec.fetchSpec} in the cache. Forcing revalidation`
+          `no matching version for ${spec.name}@${spec.fetchSpec} in the cache. Forcing revalidation.`
         )
         opts = opts.concat({
           preferOffline: false,
           preferOnline: true
         })
         return fetchPackument(spec, opts.concat({
-          fullMetadata: opts.enjoyBy ? true : opts.fullMetadata
+          // Fetch full metadata in case ETARGET was due to corgi delay
+          fullMetadata: true
         })).then(packument => {
           return pickManifest(packument, spec.fetchSpec, {
             defaultTag: opts.defaultTag,

package/lib/fetchers/registry/packument.js

@@ -59,7 +59,15 @@ function fetchPackument (uri, registry, spec, opts) {
       mem.set(memoKey, packument)
     }
     return packument
-  }))
+  })).catch(err => {
+    if (err.code === 'E404' && !opts.fullMetadata) {
+      return fetchPackument(uri, registry, spec, opts.concat({
+        fullMetadata: true
+      }))
+    } else {
+      throw err
+    }
+  })
 }
 
 class ObjProxy {

package/lib/finalize-manifest.js

@@ -13,6 +13,7 @@ const path = require('path')
 const pipe = BB.promisify(require('mississippi').pipe)
 const ssri = require('ssri')
 const tar = require('tar')
+const readJson = require('./util/read-json')
 
 // `finalizeManifest` takes as input the various kinds of manifests that
 // manifest handlers ('lib/fetchers/*.js#manifest()') return, and makes sure
@@ -212,7 +213,7 @@ function jsonFromStream (filename, dataStream) {
         entry.on('error', cb)
         finished(entry).then(() => {
           try {
-            cb(null, JSON.parse(data))
+            cb(null, readJson(data))
           } catch (err) {
             cb(err)
           }

package/lib/util/git.js

@@ -40,8 +40,10 @@ const GIT_TRANSIENT_ERRORS = [
 
 const GIT_TRANSIENT_ERROR_RE = new RegExp(GIT_TRANSIENT_ERRORS)
 
-function shouldRetry (error) {
-  return GIT_TRANSIENT_ERROR_RE.test(error)
+const GIT_TRANSIENT_ERROR_MAX_RETRY_NUMBER = 3
+
+function shouldRetry (error, number) {
+  return GIT_TRANSIENT_ERROR_RE.test(error) && (number < GIT_TRANSIENT_ERROR_MAX_RETRY_NUMBER)
 }
 
 const GIT_ = 'GIT_'
@@ -188,7 +190,7 @@ function execGit (gitArgs, gitOpts, opts) {
         opts.log.silly('pacote', 'Retrying git command: ' + gitArgs.join(' ') + ' attempt # ' + number)
       }
       return execFileAsync(gitPath, gitArgs, mkOpts(gitOpts, opts)).catch((err) => {
-        if (shouldRetry(err)) {
+        if (shouldRetry(err, number)) {
           retry(err)
         } else {
           throw err
@@ -219,7 +221,7 @@ function spawnGit (gitArgs, gitOpts, opts) {
       child.stderr.on('data', d => { stderr += d })
 
       return finished(child, true).catch(err => {
-        if (shouldRetry(stderr)) {
+        if (shouldRetry(stderr, number)) {
           retry(err)
         } else {
           err.stderr = stderr

package/lib/util/opt-check.js

@@ -13,6 +13,7 @@ module.exports = figgyPudding({
   dmode: {},
   'enjoy-by': 'enjoyBy',
   enjoyBy: {},
+  before: 'enjoyBy',
   fmode: {},
   'fetch-retries': { default: 2 },
   'fetch-retry-factor': { default: 10 },

package/lib/util/read-json.js

@@ -0,0 +1,15 @@
+'use strict'
+
+module.exports = function (content) {
+  // Code also yanked from read-package-json.
+  function stripBOM (content) {
+    content = content.toString()
+    // Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
+    // because the buffer-to-string conversion in `fs.readFileSync()`
+    // translates it to FEFF, the UTF-16 BOM.
+    if (content.charCodeAt(0) === 0xFEFF) return content.slice(1)
+    return content
+  }
+
+  return JSON.parse(stripBOM(content))
+}

package/lib/with-tarball-stream.js

@@ -107,7 +107,7 @@ function withTarballStream (spec, opts, streamHandler) {
               // 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 (opts.cache && err.code && !String(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.`)
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacote",
-  "version": "9.3.0",
+  "version": "9.5.1",
   "description": "JavaScript package downloader",
   "main": "index.js",
   "files": [
@@ -72,12 +72,12 @@
   "devDependencies": {
     "nock": "^10.0.3",
     "npmlog": "^4.1.2",
-    "nyc": "^13.1.0",
+    "nyc": "^14.1.1",
     "require-inject": "^1.4.3",
     "standard": "^12.0.1",
     "standard-version": "^4.4.0",
     "tacks": "^1.2.7",
-    "tap": "^12.1.0",
+    "tap": "^12.7.0",
     "tar-stream": "^1.6.2",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.7"