fix(fs): improve filesystem helpers: use sync rename for reliability on certain filesystems; retry rmdir with delays and avoid recursive rm; bump @push.rocks/smartfs to ^1.3.2

2026-03-05 12:46:49 +00:00
parent 5fa93923d2
commit f136fe2e40
5 changed files with 45 additions and 22 deletions
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
 # Changelog

+## 2026-03-05 - 4.1.9 - fix(fs)
+improve filesystem helpers: use sync rename for reliability on certain filesystems; retry rmdir with delays and avoid recursive rm; bump @push.rocks/smartfs to ^1.3.2
+
+- move(): use fs.renameSync to improve reliability on XFS/mounted filesystems where async rename can be interrupted by process managers
+- removeEmptyDirectory(): retry fs.promises.rmdir up to 5 attempts with incremental delays; return on ENOENT; avoid recursive rm on ENOTEMPTY to prevent removing still-valid references
+- Dependency bump: @push.rocks/smartfs from ^1.3.1 to ^1.3.2
+
 ## 2026-03-05 - 4.1.8 - fix(unpack)
 catch unpack errors and add verbose unpack logging

--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
    "@push.rocks/smartcli": "^4.0.20",
    "@push.rocks/smartdelay": "^3.0.5",
    "@push.rocks/smartfile": "^13.1.2",
-    "@push.rocks/smartfs": "^1.3.1",
+    "@push.rocks/smartfs": "^1.3.2",
    "@push.rocks/smartlog": "^3.2.1",
    "@push.rocks/smartpath": "^6.0.0",
    "@push.rocks/smartpromise": "^4.2.3",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
        specifier: ^13.1.2
        version: 13.1.2
      '@push.rocks/smartfs':
-        specifier: ^1.3.1
-        version: 1.3.1
+        specifier: ^1.3.2
+        version: 1.3.2
      '@push.rocks/smartlog':
        specifier: ^3.2.1
        version: 3.2.1
@@ -973,8 +973,8 @@ packages:
  '@push.rocks/smartfile@13.1.2':
    resolution: {integrity: sha512-DaEhwmnGEpX4coeeToaw4cZe3pNBhH7CY1iGr+d3pIXihozREvzzAR9/0i2r7bUXXL5+Lgy8YYIk5ZS+fwxMKA==}

-  '@push.rocks/smartfs@1.3.1':
-    resolution: {integrity: sha512-ZSduVS8tM+/erbyCTvRRvc9gLWwbpqN5xdIIkMr+gub7fowSeJb7tR2rnGwySa63DyimU0q2KTp79VV9YqGLeg==}
+  '@push.rocks/smartfs@1.3.2':
+    resolution: {integrity: sha512-Fpr4O4xb5DUMBjmgUr3TCimmt6tAjCAPefUU2isV5xexbZS0vhBNiB2GehhuvAXmXDrbQcsTgd8hs6ags6SDog==}

  '@push.rocks/smartguard@3.1.0':
    resolution: {integrity: sha512-J23q84f1O+TwFGmd4lrO9XLHUh2DaLXo9PN/9VmTWYzTkQDv5JehmifXVI0esophXcCIfbdIu6hbt7/aHlDF4A==}
@@ -3991,7 +3991,7 @@ snapshots:
      '@push.rocks/smartenv': 6.0.0
      '@push.rocks/smartfeed': 1.4.0
      '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smartjson': 5.2.0
      '@push.rocks/smartlog': 3.2.1
      '@push.rocks/smartlog-destination-devtools': 1.0.12
@@ -4870,7 +4870,7 @@ snapshots:
      '@push.rocks/npmextra': 5.3.3
      '@push.rocks/smartcli': 4.0.20
      '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smartinteract': 2.0.16
      '@push.rocks/smartlog': 3.2.1
      '@push.rocks/smartlog-destination-local': 9.0.2
@@ -4897,7 +4897,7 @@ snapshots:
      '@push.rocks/smartcli': 4.0.20
      '@push.rocks/smartdelay': 3.0.5
      '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smartlog': 3.2.1
      '@push.rocks/smartnpm': 2.0.6
      '@push.rocks/smartpath': 6.0.0
@@ -4931,7 +4931,7 @@ snapshots:
      '@push.rocks/smartenv': 6.0.0
      '@push.rocks/smartexpect': 2.5.0
      '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smartjson': 6.0.0
      '@push.rocks/smartlog': 3.2.1
      '@push.rocks/smartmongo': 5.1.0(socks@2.8.7)
@@ -5610,7 +5610,7 @@ snapshots:
      '@push.rocks/lik': 6.2.2
      '@push.rocks/smartdelay': 3.0.5
      '@push.rocks/smartfile-interfaces': 1.0.7
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smarthash': 3.2.6
      '@push.rocks/smartjson': 5.2.0
      '@push.rocks/smartmime': 2.0.4
@@ -5622,7 +5622,7 @@ snapshots:
      glob: 11.1.0
      js-yaml: 4.1.1

-  '@push.rocks/smartfs@1.3.1':
+  '@push.rocks/smartfs@1.3.2':
    dependencies:
      '@push.rocks/smartpath': 6.0.0

@@ -5721,7 +5721,7 @@ snapshots:
    dependencies:
      '@push.rocks/mongodump': 1.1.0(socks@2.8.7)
      '@push.rocks/smartdata': 5.16.7(socks@2.8.7)
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smartpath': 5.1.0
      '@push.rocks/smartpromise': 4.2.3
      '@push.rocks/smartrx': 3.0.10
@@ -5748,7 +5748,7 @@ snapshots:
    dependencies:
      '@push.rocks/mongodump': 1.1.0(socks@2.8.7)
      '@push.rocks/smartdata': 5.16.7(socks@2.8.7)
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
      '@push.rocks/smartpath': 5.1.0
      '@push.rocks/smartpromise': 4.2.3
      '@push.rocks/smartrx': 3.0.10
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@@ -3,6 +3,6 @@
 */
 export const commitinfo = {
  name: '@git.zone/tsbuild',
-  version: '4.1.8',
+  version: '4.1.9',
  description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
 }
--- a/ts/mod_fs/classes.fshelpers.ts
+++ b/ts/mod_fs/classes.fshelpers.ts
@@ -130,22 +130,38 @@ export class FsHelpers {

  /**
   * Move/rename a file or directory
+   * Uses renameSync for reliability on XFS/mounted filesystems where async
+   * rename can be interrupted by signals from process managers
   */
  public static async move(src: string, dest: string): Promise<void> {
-    await fs.promises.rename(src, dest);
+    fs.renameSync(src, dest);
  }

  /**
   * Remove an empty directory
   */
  public static async removeEmptyDirectory(dirPath: string): Promise<void> {
+    // Retry rmdir with delays to handle filesystem metadata lag (XFS, NFS, etc.)
+    // NEVER use recursive rm here — if rmdir fails with ENOTEMPTY, entries may
+    // still be valid references to renamed files/dirs that haven't fully detached
+    for (let attempt = 0; attempt < 5; attempt++) {
      try {
        await fs.promises.rmdir(dirPath);
+        return;
      } catch (err: any) {
+        if (err.code === 'ENOENT') {
+          return; // Already gone
+        }
+        if (err.code === 'ENOTEMPTY' && attempt < 4) {
+          // Wait for filesystem metadata to catch up
+          await new Promise(resolve => setTimeout(resolve, 100 * (attempt + 1)));
+          continue;
+        }
+        // Final attempt failed or non-retryable error — leave directory in place
+        // It will be cleaned up by the next build's "clear output directory" step
        if (err.code === 'ENOTEMPTY') {
-        // Filesystem metadata lag — use recursive rm as fallback
-        await fs.promises.rm(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
-      } else if (err.code !== 'ENOENT') {
+          return;
+        }
        throw err;
      }
    }