@pnpm/fs.graceful-fs 1100.2.0 → 1100.2.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pnpm/fs.graceful-fs
 
+## 1100.2.2
+
+### Patch Changes
+
+- Installs in different projects that share a global virtual store no longer fail on Windows with `Access is denied` while repairing the same slot [#15114](https://github.com/pnpm/pnpm/issues/15114).
+
+## 1100.2.1
+
+### Patch Changes
+
+- Windows filesystem operations now retry permission errors for up to one second. Permanent permission errors previously delayed failure by a minute. Sharing and lock violations retain their one-minute retry budget [pnpm/pnpm#14682](https://github.com/pnpm/pnpm/issues/14682).
+
 ## 1100.2.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -21,12 +21,27 @@ declare const _default: {
 };
 export default _default;
 /**
- * Renames `src` over `dest`, waiting out a Windows sharing violation — an
- * EPERM, EACCES or EBUSY from whoever else holds the file open — for up to a
- * minute before rethrowing it. Every other error is thrown right away.
+ * Renames `src` over `dest`, retrying Windows EBUSY errors for up to a minute.
+ * EPERM and EACCES have a one-second budget because they can also indicate
+ * permanent permission or destination conflicts. Other errors are thrown
+ * right away.
  *
  * `dest` is never removed to make room for the rename: a concurrent install may
  * still be reading that dirent, and a reader has to see either the whole file
  * that was there or the whole file replacing it.
  */
 export declare function renameFileWithRetry(src: string, dest: string): void;
+/**
+ * Reads `target`'s stats without following it, with the retry policy of
+ * {@link renameFileWithRetry}.
+ *
+ * A Windows path another process has just unlinked stays delete-pending until
+ * the last handle on it closes, and inspecting it fails with EPERM for as long
+ * as that lasts. Retrying lets the unlink land, so a caller that reads ENOENT
+ * as an absent entry sees the same absence POSIX shows it at once.
+ */
+export declare function lstatWithRetry(target: string): fs.Stats;
+/**
+ * Removes a file, with the retry policy of {@link renameFileWithRetry}.
+ */
+export declare function unlinkWithRetry(target: string): void;

package/lib/index.js

@@ -1,9 +1,10 @@
 import fs from 'node:fs';
 import util, { promisify } from 'node:util';
 import gfs from 'graceful-fs';
-const RENAME_RETRY_BUDGET_MS = 60_000;
-const RENAME_RETRY_BACKOFF_CAP_MS = 100;
-const renameRetrySleepBuffer = new Int32Array(new SharedArrayBuffer(4));
+const FILE_LOCK_RETRY_BUDGET_MS = 60_000;
+const PERMISSION_DENIED_RETRY_BUDGET_MS = 1_000;
+const FILE_LOCK_RETRY_BACKOFF_CAP_MS = 100;
+const fileLockRetrySleepBuffer = new Int32Array(new SharedArrayBuffer(4));
 export default {
     chmod: promisify(gfs.chmod),
     copyFile: promisify(gfs.copyFile),
@@ -46,32 +47,65 @@ function withEagainRetry(fn, maxRetries = 15) {
     };
 }
 /**
- * Renames `src` over `dest`, waiting out a Windows sharing violation — an
- * EPERM, EACCES or EBUSY from whoever else holds the file open — for up to a
- * minute before rethrowing it. Every other error is thrown right away.
+ * Renames `src` over `dest`, retrying Windows EBUSY errors for up to a minute.
+ * EPERM and EACCES have a one-second budget because they can also indicate
+ * permanent permission or destination conflicts. Other errors are thrown
+ * right away.
  *
  * `dest` is never removed to make room for the rename: a concurrent install may
  * still be reading that dirent, and a reader has to see either the whole file
  * that was there or the whole file replacing it.
  */
 export function renameFileWithRetry(src, dest) {
+    withFileLockRetry(() => {
+        fs.renameSync(src, dest);
+    });
+}
+/**
+ * Reads `target`'s stats without following it, with the retry policy of
+ * {@link renameFileWithRetry}.
+ *
+ * A Windows path another process has just unlinked stays delete-pending until
+ * the last handle on it closes, and inspecting it fails with EPERM for as long
+ * as that lasts. Retrying lets the unlink land, so a caller that reads ENOENT
+ * as an absent entry sees the same absence POSIX shows it at once.
+ */
+export function lstatWithRetry(target) {
+    return withFileLockRetry(() => fs.lstatSync(target));
+}
+/**
+ * Removes a file, with the retry policy of {@link renameFileWithRetry}.
+ */
+export function unlinkWithRetry(target) {
+    withFileLockRetry(() => {
+        fs.unlinkSync(target);
+    });
+}
+function withFileLockRetry(operation) {
     const startedAt = Date.now();
     let backoffMs = 0;
+    let budgetMs = FILE_LOCK_RETRY_BUDGET_MS;
     for (;;) {
         try {
-            fs.renameSync(src, dest);
-            return;
+            return operation();
         }
         catch (err) {
-            if (!isTransientRenameError(err) || Date.now() - startedAt >= RENAME_RETRY_BUDGET_MS)
+            if (!isTransientFileLockError(err))
+                throw err;
+            if (err.code === 'EPERM' || err.code === 'EACCES')
+                budgetMs = Math.min(budgetMs, PERMISSION_DENIED_RETRY_BUDGET_MS);
+            const remainingMs = budgetMs - (Date.now() - startedAt);
+            if (remainingMs <= 0)
                 throw err;
             if (backoffMs > 0)
-                Atomics.wait(renameRetrySleepBuffer, 0, 0, backoffMs);
-            backoffMs = Math.min(backoffMs + 10, RENAME_RETRY_BACKOFF_CAP_MS);
+                Atomics.wait(fileLockRetrySleepBuffer, 0, 0, Math.min(backoffMs, remainingMs));
+            if (Date.now() - startedAt >= budgetMs)
+                throw err;
+            backoffMs = Math.min(backoffMs + 10, FILE_LOCK_RETRY_BACKOFF_CAP_MS);
         }
     }
 }
-function isTransientRenameError(err) {
+function isTransientFileLockError(err) {
     return process.platform === 'win32' &&
         util.types.isNativeError(err) &&
         'code' in err &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/fs.graceful-fs",
-  "version": "1100.2.0",
+  "version": "1100.2.2",
   "description": "Promisified graceful-fs",
   "keywords": [
     "pnpm",
@@ -30,7 +30,8 @@
     "graceful-fs": "^4.2.11"
   },
   "devDependencies": {
-    "@pnpm/fs.graceful-fs": "1100.2.0",
+    "@jest/globals": "30.4.1",
+    "@pnpm/fs.graceful-fs": "1100.2.2",
     "@types/graceful-fs": "^4.1.9"
   },
   "engines": {
@@ -40,8 +41,9 @@
     "preset": "@pnpm/jest-config"
   },
   "scripts": {
-    "lint": "eslint \"src/**/*.ts\"",
-    "test": "pn compile",
-    "compile": "tsgo --build && pn lint --fix"
+    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
+    "test": "pn compile && pn .test",
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }