cacache 11.0.1 → 11.2.0

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="11.2.0"></a>
+# [11.2.0](https://github.com/zkat/cacache/compare/v11.1.0...v11.2.0) (2018-08-08)
+
+
+### Features
+
+* **read:** add sync support to other internal read.js fns ([fe638b6](https://github.com/zkat/cacache/commit/fe638b6))
+
+
+
+<a name="11.1.0"></a>
+# [11.1.0](https://github.com/zkat/cacache/compare/v11.0.3...v11.1.0) (2018-08-01)
+
+
+### Features
+
+* **read:** add sync support for low-level content read ([b43af83](https://github.com/zkat/cacache/commit/b43af83))
+
+
+
+<a name="11.0.3"></a>
+## [11.0.3](https://github.com/zkat/cacache/compare/v11.0.2...v11.0.3) (2018-08-01)
+
+
+### Bug Fixes
+
+* **config:** add ssri config options ([#136](https://github.com/zkat/cacache/issues/136)) ([10d5d9a](https://github.com/zkat/cacache/commit/10d5d9a))
+* **perf:** refactor content.read to avoid lstats ([c5ac10e](https://github.com/zkat/cacache/commit/c5ac10e))
+* **test:** oops when removing safe-buffer ([1950490](https://github.com/zkat/cacache/commit/1950490))
+
+
+
+<a name="11.0.2"></a>
+## [11.0.2](https://github.com/zkat/cacache/compare/v11.0.1...v11.0.2) (2018-05-07)
+
+
+### Bug Fixes
+
+* **verify:** size param no longer lost in a verify ([#131](https://github.com/zkat/cacache/issues/131)) ([c614a19](https://github.com/zkat/cacache/commit/c614a19)), closes [#130](https://github.com/zkat/cacache/issues/130)
+
+
+
 <a name="11.0.1"></a>
 ## [11.0.1](https://github.com/zkat/cacache/compare/v11.0.0...v11.0.1) (2018-04-10)
 

package/lib/content/read.js

@@ -10,7 +10,8 @@ const pipe = BB.promisify(require('mississippi').pipe)
 const ssri = require('ssri')
 const Y = require('../util/y.js')
 
-BB.promisifyAll(fs)
+const lstatAsync = BB.promisify(fs.lstat)
+const readFileAsync = BB.promisify(fs.readFile)
 
 const ReadOpts = figgyPudding({
   size: {}
@@ -19,10 +20,8 @@ const ReadOpts = figgyPudding({
 module.exports = read
 function read (cache, integrity, opts) {
   opts = ReadOpts(opts)
-  return pickContentSri(cache, integrity).then(content => {
-    const sri = content.sri
-    const cpath = contentPath(cache, sri)
-    return fs.readFileAsync(cpath, null).then(data => {
+  return withContentSri(cache, integrity, (cpath, sri) => {
+    return readFileAsync(cpath, null).then(data => {
       if (typeof opts.size === 'number' && opts.size !== data.length) {
         throw sizeError(opts.size, data.length)
       } else if (ssri.checkData(data, sri)) {
@@ -34,17 +33,31 @@ function read (cache, integrity, opts) {
   })
 }
 
+module.exports.sync = readSync
+function readSync (cache, integrity, opts) {
+  opts = ReadOpts(opts)
+  return withContentSriSync(cache, integrity, (cpath, sri) => {
+    const data = fs.readFileSync(cpath)
+    if (typeof opts.size === 'number' && opts.size !== data.length) {
+      throw sizeError(opts.size, data.length)
+    } else if (ssri.checkData(data, sri)) {
+      return data
+    } else {
+      throw integrityError(sri, cpath)
+    }
+  })
+}
+
 module.exports.stream = readStream
 module.exports.readStream = readStream
 function readStream (cache, integrity, opts) {
   opts = ReadOpts(opts)
   const stream = new PassThrough()
-  pickContentSri(
-    cache, integrity
-  ).then(content => {
-    const sri = content.sri
+  withContentSri(cache, integrity, (cpath, sri) => {
+    return lstatAsync(cpath).then(stat => ({cpath, sri, stat}))
+  }).then(({cpath, sri, stat}) => {
     return pipe(
-      fs.createReadStream(contentPath(cache, sri)),
+      fs.createReadStream(cpath),
       ssri.integrityStream({
         integrity: sri,
         size: opts.size
@@ -57,37 +70,93 @@ function readStream (cache, integrity, opts) {
   return stream
 }
 
+let copyFileAsync
 if (fs.copyFile) {
   module.exports.copy = copy
+  module.exports.copy.sync = copySync
+  copyFileAsync = BB.promisify(fs.copyFile)
 }
+
 function copy (cache, integrity, dest, opts) {
   opts = ReadOpts(opts)
-  return pickContentSri(cache, integrity).then(content => {
-    const sri = content.sri
-    const cpath = contentPath(cache, sri)
-    return fs.copyFileAsync(cpath, dest).then(() => content.size)
+  return withContentSri(cache, integrity, (cpath, sri) => {
+    return copyFileAsync(cpath, dest)
+  })
+}
+
+function copySync (cache, integrity, dest, opts) {
+  opts = ReadOpts(opts)
+  return withContentSriSync(cache, integrity, (cpath, sri) => {
+    return fs.copyFileSync(cpath, dest)
   })
 }
 
 module.exports.hasContent = hasContent
 function hasContent (cache, integrity) {
   if (!integrity) { return BB.resolve(false) }
-  return pickContentSri(cache, integrity)
-    .catch({code: 'ENOENT'}, () => false)
-    .catch({code: 'EPERM'}, err => {
+  return withContentSri(cache, integrity, (cpath, sri) => {
+    return lstatAsync(cpath).then(stat => ({size: stat.size, sri, stat}))
+  }).catch(err => {
+    if (err.code === 'ENOENT') { return false }
+    if (err.code === 'EPERM') {
       if (process.platform !== 'win32') {
         throw err
       } else {
         return false
       }
-    }).then(content => {
-      if (!content.sri) return false
-      return ({ sri: content.sri, size: content.stat.size })
-    })
+    }
+  })
 }
 
-module.exports._pickContentSri = pickContentSri
-function pickContentSri (cache, integrity) {
+module.exports.hasContent.sync = hasContentSync
+function hasContentSync (cache, integrity) {
+  if (!integrity) { return false }
+  return withContentSriSync(cache, integrity, (cpath, sri) => {
+    try {
+      const stat = fs.lstatSync(cpath)
+      return {size: stat.size, sri, stat}
+    } catch (err) {
+      if (err.code === 'ENOENT') { return false }
+      if (err.code === 'EPERM') {
+        if (process.platform !== 'win32') {
+          throw err
+        } else {
+          return false
+        }
+      }
+    }
+  })
+}
+
+function withContentSri (cache, integrity, fn) {
+  return BB.try(() => {
+    const sri = ssri.parse(integrity)
+    // If `integrity` has multiple entries, pick the first digest
+    // with available local data.
+    const algo = sri.pickAlgorithm()
+    const digests = sri[algo]
+    if (digests.length <= 1) {
+      const cpath = contentPath(cache, digests[0])
+      return fn(cpath, digests[0])
+    } else {
+      return BB.any(sri[sri.pickAlgorithm()].map(meta => {
+        return withContentSri(cache, meta, fn)
+      }, {concurrency: 1}))
+        .catch(err => {
+          if ([].some.call(err, e => e.code === 'ENOENT')) {
+            throw Object.assign(
+              new Error('No matching content found for ' + sri.toString()),
+              {code: 'ENOENT'}
+            )
+          } else {
+            throw err[0]
+          }
+        })
+    }
+  })
+}
+
+function withContentSriSync (cache, integrity, fn) {
   const sri = ssri.parse(integrity)
   // If `integrity` has multiple entries, pick the first digest
   // with available local data.
@@ -95,21 +164,17 @@ function pickContentSri (cache, integrity) {
   const digests = sri[algo]
   if (digests.length <= 1) {
     const cpath = contentPath(cache, digests[0])
-    return fs.lstatAsync(cpath).then(stat => ({ sri: digests[0], stat }))
+    return fn(cpath, digests[0])
   } else {
-    return BB.any(sri[sri.pickAlgorithm()].map(meta => {
-      return pickContentSri(cache, meta)
-    }))
-      .catch(err => {
-        if ([].some.call(err, e => e.code === 'ENOENT')) {
-          throw Object.assign(
-            new Error('No matching content found for ' + sri.toString()),
-            {code: 'ENOENT'}
-          )
-        } else {
-          throw err[0]
-        }
-      })
+    let lastErr = null
+    for (const meta of sri[sri.pickAlgorithm()]) {
+      try {
+        return withContentSriSync(cache, meta, fn)
+      } catch (err) {
+        lastErr = err
+      }
+    }
+    if (lastErr) { throw lastErr }
   }
 }
 

package/lib/verify.js

@@ -197,7 +197,8 @@ function rebuildBucket (cache, bucket, stats, opts) {
         return index.insert(cache, entry.key, entry.integrity, {
           uid: opts.uid,
           gid: opts.gid,
-          metadata: entry.metadata
+          metadata: entry.metadata,
+          size: entry.size
         }).then(() => { stats.totalEntries++ })
       }).catch({code: 'ENOENT'}, () => {
         stats.rejectedEntries++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "11.0.1",
+  "version": "11.2.0",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -63,7 +63,7 @@
     "figgy-pudding": "^3.1.0",
     "glob": "^7.1.2",
     "graceful-fs": "^4.1.11",
-    "lru-cache": "^4.1.2",
+    "lru-cache": "^4.1.3",
     "mississippi": "^3.0.0",
     "mkdirp": "^0.5.1",
     "move-concurrently": "^1.0.1",
@@ -78,11 +78,10 @@
     "chalk": "^2.3.2",
     "cross-env": "^5.1.4",
     "require-inject": "^1.4.2",
-    "safe-buffer": "^5.1.1",
     "standard": "^11.0.1",
-    "standard-version": "^4.3.0",
-    "tacks": "^1.2.2",
-    "tap": "^11.1.3",
+    "standard-version": "^4.4.0",
+    "tacks": "^1.2.7",
+    "tap": "^12.0.1",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.8"
   },

package/put.js

@@ -13,10 +13,14 @@ const PutOpts = figgyPudding({
   integrity: {},
   memoize: {},
   metadata: {},
+  pickAlgorithm: {},
   size: {},
   tmpPrefix: {},
   uid: {},
-  gid: {}
+  gid: {},
+  single: {},
+  sep: {},
+  strict: {}
 })
 
 module.exports = putData