11.1.2

changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 2025-01-07 - 11.1.2 - fix(fs)
+Fix issues in file stability check and directory existence verification in fs module
+
+- Removed unused variable 'isFileAvailable' in 'waitForFileToBeReady'.
+- Fixed logic for ensuring the target directory exists before setting up file stability watcher.
+- Refactored directory existence logic into 'ensureDirectoryExists' function.
+
+## 2025-01-07 - 11.1.1 - fix(fs)
+Improve waitForFileToBeReady function for file stability detection
+
+- Enhanced error handling and file stability checks in waitForFileToBeReady function
+- Added timeout feature for file readiness check
+- Improved directory access check before file availability check
+
 ## 2025-01-07 - 11.1.0 - feat(SmartFile)
 Add rename functionality to SmartFile class
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@push.rocks/smartfile",
   "private": false,
-  "version": "11.1.0",
+  "version": "11.1.2",
   "description": "Provides comprehensive tools for efficient file management in Node.js using TypeScript, including handling streams, virtual directories, and various file operations.",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -49,7 +49,7 @@
     "@push.rocks/smartjson": "^5.0.20",
     "@push.rocks/smartmime": "^2.0.4",
     "@push.rocks/smartpath": "^5.0.18",
-    "@push.rocks/smartpromise": "^4.0.4",
+    "@push.rocks/smartpromise": "^4.1.0",
     "@push.rocks/smartrequest": "^2.0.23",
     "@push.rocks/smartstream": "^3.2.5",
     "@types/fs-extra": "^11.0.4",
@@ -63,8 +63,8 @@
     "@git.zone/tsbuild": "^2.2.0",
     "@git.zone/tsrun": "^1.3.3",
     "@git.zone/tstest": "^1.0.90",
-    "@push.rocks/tapbundle": "^5.5.3",
-    "@types/node": "^22.10.2"
+    "@push.rocks/tapbundle": "^5.5.4",
+    "@types/node": "^22.10.5"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartfile',
-  version: '11.1.0',
+  version: '11.1.2',
   description: 'Provides comprehensive tools for efficient file management in Node.js using TypeScript, including handling streams, virtual directories, and various file operations.'
 }

ts/fs.ts

@@ -205,7 +205,7 @@ export const toObjectSync = (filePathArg, fileTypeArg?) => {
   } catch (err) {
     err.message = `Failed to read file at ${filePathArg}` + err.message;
     throw err;
-  };
+  }
 };
 
 /**
@@ -397,37 +397,64 @@ export const listFileTree = async (
 
 /**
  * Watches for file stability before resolving the promise.
+ * @param filePathArg The path of the file to monitor.
+ * @param timeoutMs The maximum time to wait for the file to stabilize (in milliseconds). Default is 60 seconds.
+ * @returns A promise that resolves when the file is stable or rejects on timeout or error.
  */
-export const waitForFileToBeReady = (filePathArg: string): Promise<void> => {
+export const waitForFileToBeReady = (
+  filePathArg: string,
+  timeoutMs: number = 60000
+): Promise<void> => {
   return new Promise(async (resolve, reject) => {
     let lastFileSize = -1;
     let fileIsStable = false;
 
-    const checkFileStability = async () => {
-      let currentFileSize: number;
-      const deferred = plugins.smartpromise.defer();
-      plugins.fs.stat(filePathArg, (err, stats) => {
-        if (err) {
-          fileIsStable = true;
-          watcher.close();
-          reject(err);
-          return;
+    const startTime = Date.now();
+    const fileDir = plugins.path.dirname(filePathArg);
+
+    const ensureDirectoryExists = async () => {
+      while (true) {
+        try {
+          // Check if the directory exists
+          await plugins.smartpromise.fromCallback((cb) =>
+            plugins.fs.access(fileDir, plugins.fs.constants.R_OK, cb)
+          );
+          break; // Exit the loop if the directory exists
+        } catch (err) {
+          if (Date.now() - startTime > timeoutMs) {
+            reject(new Error(`Timeout waiting for directory to exist: ${fileDir}`));
+            return;
+          }
+          // Wait and retry
+          await plugins.smartdelay.delayFor(500);
         }
-        currentFileSize = stats.size;
-        deferred.resolve();
-      });
-      await deferred.promise;
-      if (currentFileSize === lastFileSize) {
-        fileIsStable = true;
-        await plugins.smartdelay.delayFor(100);
-        resolve();
       }
-      lastFileSize = currentFileSize;
     };
 
-    const watcher = plugins.fs.watch(filePathArg, (eventType, filename) => {
-      if (eventType === 'change') {
-        checkFileStability();
+    const checkFileStability = async () => {
+      try {
+        const stats = await plugins.smartpromise.fromCallback((cb) =>
+          plugins.fs.stat(filePathArg, cb)
+        );
+        if (stats.size === lastFileSize) {
+          fileIsStable = true;
+        } else {
+          lastFileSize = stats.size;
+          fileIsStable = false;
+        }
+      } catch (err) {
+        if (err.code !== 'ENOENT') {
+          throw err; // Only ignore ENOENT (file not found) errors
+        }
+      }
+    };
+
+    // Ensure the directory exists before setting up the watcher
+    await ensureDirectoryExists();
+
+    const watcher = plugins.fs.watch(filePathArg, { persistent: true }, async () => {
+      if (!fileIsStable) {
+        await checkFileStability();
       }
     });
 
@@ -436,13 +463,28 @@ export const waitForFileToBeReady = (filePathArg: string): Promise<void> => {
       reject(error);
     });
 
-    while (!fileIsStable) {
-      await checkFileStability();
-      if (!fileIsStable) {
-        await plugins.smartdelay.delayFor(5000);
+    try {
+      while (!fileIsStable) {
+        // Check for timeout
+        if (Date.now() - startTime > timeoutMs) {
+          watcher.close();
+          reject(new Error(`Timeout waiting for file to be ready: ${filePathArg}`));
+          return;
+        }
+
+        // Check file stability
+        await checkFileStability();
+        if (!fileIsStable) {
+          await plugins.smartdelay.delayFor(1000); // Polling interval
+        }
       }
+
+      watcher.close();
+      resolve();
+    } catch (err) {
+      watcher.close();
+      reject(err);
     }
-    watcher.close();
   });
 };
 
@@ -493,4 +535,4 @@ export let toFs = async (
 
 export const stat = async (filePathArg: string) => {
   return plugins.fsPromises.stat(filePathArg);
-}
+};