fix: Trust the filesystem to move files

lib/content/write.js

@@ -4,7 +4,7 @@ const events = require('events')
 
 const contentPath = require('./path')
 const fs = require('fs/promises')
-const moveFile = require('../util/move-file')
+const { moveFile } = require('@npmcli/fs')
 const { Minipass } = require('minipass')
 const Pipeline = require('minipass-pipeline')
 const Flush = require('minipass-flush')
@@ -161,8 +161,14 @@ async function moveToDestination (tmp, cache, sri, opts) {
   const destDir = path.dirname(destination)
 
   await fs.mkdir(destDir, { recursive: true })
-  await moveFile(tmp.target, destination)
-  tmp.moved = true
+  try {
+    await moveFile(tmp.target, destination, { overwrite: false })
+    tmp.moved = true
+  } catch (err) {
+    if (!err.message.startsWith('The destination file exists')) {
+      throw Object.assign(err, { code: 'EEXIST' })
+    }
+  }
 }
 
 function sizeError (expected, found) {

package.json

@@ -54,7 +54,6 @@
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.4",
     "p-map": "^4.0.0",
-    "promise-inflight": "^1.0.1",
     "ssri": "^10.0.0",
     "tar": "^6.1.11",
     "unique-filename": "^3.0.0"

test/content/write.js

@@ -233,6 +233,22 @@ t.test('cleans up tmp on successful completion', async t => {
   })
 })
 
+t.test('Handles moveFile error other than EEXIST', async t => {
+  const write = t.mock('../../lib/content/write.js', {
+    '@npmcli/fs': {
+      moveFile: async () => {
+        throw new Error('Unknown error')
+      },
+    },
+  })
+  const CONTENT = 'foobarbaz'
+  const CACHE = t.testdir()
+  await t.rejects(
+    write.stream(CACHE).end(CONTENT).promise(),
+    { message: 'Unknown error' }
+  )
+})
+
 t.test('cleans up tmp on streaming error', (t) => {
   const CONTENT = 'foobarbaz'
   const CACHE = t.testdir()