cacache 21.0.0 → 21.0.2

package/lib/content/write.js

@@ -10,6 +10,7 @@ const Pipeline = require('minipass-pipeline')
 const Flush = require('minipass-flush')
 const path = require('path')
 const ssri = require('ssri')
+const cacheDir = require('../util/cache-dir')
 const { tmpName } = require('../util/tmp')
 const fsm = require('fs-minipass')
 
@@ -153,6 +154,7 @@ async function pipeToTmp (inputStream, cache, tmpTarget, opts) {
 
 async function makeTmp (cache, opts) {
   const tmpTarget = tmpName(cache, opts.tmpPrefix)
+  await cacheDir.mkdir(cache)
   await fs.mkdir(path.dirname(tmpTarget), { recursive: true })
   return {
     target: tmpTarget,

package/lib/entry-index.js

@@ -13,6 +13,7 @@ const { Minipass } = require('minipass')
 const path = require('path')
 const ssri = require('ssri')
 const { tmpName } = require('./util/tmp')
+const cacheDir = require('./util/cache-dir')
 
 const contentPath = require('./content/path')
 const hashToSegments = require('./util/hash-to-segments')
@@ -70,6 +71,7 @@ async function compact (cache, key, matchFn, opts = {}) {
 
   const setup = async () => {
     const target = tmpName(cache, opts.tmpPrefix)
+    await cacheDir.mkdir(cache)
     await mkdir(path.dirname(target), { recursive: true })
     return {
       target,
@@ -121,6 +123,7 @@ async function insert (cache, key, integrity, opts = {}) {
     metadata,
   }
   try {
+    await cacheDir.mkdir(cache)
     await mkdir(path.dirname(bucket), { recursive: true })
     const stringified = JSON.stringify(entry)
     // NOTE - Cleverness ahoy!

package/lib/rm.js

@@ -27,5 +27,6 @@ module.exports.all = all
 async function all (cache) {
   memo.clearMemoized()
   const paths = await glob(path.join(cache, '*(content-*|index-*)'), { silent: true, nosort: true })
+  paths.push(path.join(cache, 'CACHEDIR.TAG'))
   return Promise.all(paths.map((p) => rm(p, { recursive: true, force: true })))
 }

package/lib/util/cache-dir.js

@@ -0,0 +1,29 @@
+'use strict'
+
+const fs = require('fs/promises')
+const path = require('path')
+
+const tagContent = `Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by cacache.
+# For information about cache directory tags, see https://bford.info/cachedir/
+`
+
+async function mkdir (cache) {
+  await fs.mkdir(cache, { recursive: true, owner: 'inherit' })
+  await writeTag(cache)
+}
+
+async function writeTag (cache) {
+  try {
+    await fs.writeFile(path.join(cache, 'CACHEDIR.TAG'), tagContent, { flag: 'wx' })
+  } catch (err) {
+    if (err.code !== 'EEXIST') {
+      throw err
+    }
+  }
+}
+
+module.exports = {
+  mkdir,
+  tagContent,
+}

package/lib/util/tmp.js

@@ -4,6 +4,7 @@ const crypto = require('crypto')
 const { withTempDir } = require('@npmcli/fs')
 const fs = require('fs/promises')
 const path = require('path')
+const cacheDir = require('./cache-dir')
 
 module.exports.mkdir = mktmpdir
 
@@ -15,6 +16,7 @@ module.exports.tmpName = function tmpName (cache, tmpPrefix) {
 async function mktmpdir (cache, opts = {}) {
   const { tmpPrefix } = opts
   const tmpDir = path.join(cache, 'tmp')
+  await cacheDir.mkdir(cache)
   await fs.mkdir(tmpDir, { recursive: true, owner: 'inherit' })
   // do not use path.join(), it drops the trailing / if tmpPrefix is unset
   const target = `${tmpDir}${path.sep}${tmpPrefix || ''}`
@@ -28,5 +30,7 @@ function withTmp (cache, opts, cb) {
     cb = opts
     opts = {}
   }
-  return withTempDir(path.join(cache, 'tmp'), cb, opts)
+  return cacheDir.mkdir(cache).then(() =>
+    withTempDir(path.join(cache, 'tmp'), cb, opts)
+  )
 }

package/lib/verify.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const {
-  mkdir,
   readFile,
   rm,
   stat,
@@ -12,6 +11,7 @@ const contentPath = require('./content/path')
 const fsm = require('fs-minipass')
 const glob = require('./util/glob.js')
 const index = require('./entry-index')
+const cacheDir = require('./util/cache-dir')
 const path = require('path')
 const ssri = require('ssri')
 
@@ -77,7 +77,7 @@ async function markEndTime () {
 
 async function fixPerms (cache, opts) {
   opts.log.silly('verify', 'fixing cache permissions')
-  await mkdir(cache, { recursive: true })
+  await cacheDir.mkdir(cache)
   return null
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "21.0.0",
+  "version": "21.0.2",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -48,7 +48,7 @@
   "dependencies": {
     "@npmcli/fs": "^6.0.0",
     "fs-minipass": "^3.0.0",
-    "glob": "^13.0.0",
+    "glob": "^14.0.3",
     "lru-cache": "^11.1.0",
     "minipass": "^7.0.3",
     "minipass-collect": "^2.0.1",
@@ -58,8 +58,8 @@
     "ssri": "^14.0.0"
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^6.0.1",
-    "@npmcli/template-oss": "5.1.0",
+    "@npmcli/eslint-config": "^7.0.0",
+    "@npmcli/template-oss": "5.1.1",
     "tap": "^16.0.0"
   },
   "engines": {
@@ -68,7 +68,7 @@
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "5.1.0",
+    "version": "5.1.1",
     "publish": "true"
   },
   "author": "GitHub Inc.",