lib: fix recursive watch in linux

nodejs · Dec 4, 2023 · 501f1df · 501f1df
1 parent d4bcdd8
commit 501f1df
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 46 deletions.
diff --git a/lib/internal/fs/recursive_watch.js b/lib/internal/fs/recursive_watch.js
@@ -4,7 +4,6 @@ const {
   ArrayPrototypePush,
   SafePromiseAllReturnVoid,
   Promise,
-  PromisePrototypeThen,
   SafeMap,
   SafeSet,
   StringPrototypeStartsWith,
@@ -42,31 +41,8 @@ function lazyLoadFsSync() {
   internalSync ??= require('fs');
   return internalSync;
 }
-let kResistStopPropagation;
-
-async function traverse(dir, files = new SafeMap(), symbolicLinks = new SafeSet()) {
-  const { opendir } = lazyLoadFsPromises();
-
-  const filenames = await opendir(dir);
-  const subdirectories = [];
-
-  for await (const file of filenames) {
-    const f = pathJoin(dir, file.name);
 
-    files.set(f, file);
-
-    // Do not follow symbolic links
-    if (file.isSymbolicLink()) {
-      symbolicLinks.add(f);
-    } else if (file.isDirectory()) {
-      ArrayPrototypePush(subdirectories, traverse(f, files));
-    }
-  }
-
-  await SafePromiseAllReturnVoid(subdirectories);
-
-  return files;
-}
+let kResistStopPropagation;
 
 class FSWatcher extends EventEmitter {
   #options = null;
@@ -219,15 +195,9 @@ class FSWatcher extends EventEmitter {
 
       if (file.isDirectory()) {
         this.#files.set(filename, file);
-
-        PromisePrototypeThen(
-          traverse(filename, this.#files, this.#symbolicFiles),
-          () => {
-            for (const f of this.#files.keys()) {
-              this.#watchFile(f);
-            }
-          },
-        );
+        this.#watchFile(filename);
+        this.#watchFolder(filename);
+
       } else {
         this.#watchFile(filename);
       }

diff --git a/test/parallel/test-fs-watch-recursive-add-file-to-existing-subfolder.js b/test/parallel/test-fs-watch-recursive-add-file-to-existing-subfolder.js
@@ -50,7 +50,6 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(childrenAbsolutePath, 'world');
 
   process.once('exit', function() {

diff --git a/test/parallel/test-fs-watch-recursive-add-file-to-new-folder.js b/test/parallel/test-fs-watch-recursive-add-file-to-new-folder.js
@@ -46,9 +46,7 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.mkdirSync(filePath);
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(childrenAbsolutePath, 'world');
 
   process.once('exit', function() {

diff --git a/test/parallel/test-fs-watch-recursive-add-file-with-url.js b/test/parallel/test-fs-watch-recursive-add-file-with-url.js
@@ -43,7 +43,6 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(filePath, 'world');
 
   process.on('exit', function() {

diff --git a/test/parallel/test-fs-watch-recursive-add-file.js b/test/parallel/test-fs-watch-recursive-add-file.js
@@ -41,7 +41,6 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(testFile, 'world');
 
   process.once('exit', function() {

diff --git a/test/parallel/test-fs-watch-recursive-add-folder.js b/test/parallel/test-fs-watch-recursive-add-folder.js
@@ -41,7 +41,6 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.mkdirSync(testFile);
 
   process.once('exit', function() {

diff --git a/test/parallel/test-fs-watch-recursive-assert-leaks.js b/test/parallel/test-fs-watch-recursive-assert-leaks.js
@@ -31,18 +31,15 @@ tmpdir.refresh();
   let watcherClosed = false;
   const watcher = fs.watch(testDirectory, { recursive: true });
   watcher.on('change', common.mustCallAtLeast(async (event, filename) => {
-    await setTimeout(common.platformTimeout(100));
     if (filename === path.basename(filePath)) {
       watcher.close();
       watcherClosed = true;
     }
-    await setTimeout(common.platformTimeout(100));
     assert(!process._getActiveHandles().some((handle) => handle.constructor.name === 'StatWatcher'));
   }));
 
   process.on('exit', function() {
     assert(watcherClosed, 'watcher Object was not closed');
   });
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(filePath, 'content');
 })().then(common.mustCall());
diff --git a/test/parallel/test-fs-watch-recursive-symlink.js b/test/parallel/test-fs-watch-recursive-symlink.js
@@ -48,7 +48,6 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(filePath, 'world');
 
   process.once('exit', function() {
@@ -89,9 +88,7 @@ tmpdir.refresh();
     }
   });
 
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(forbiddenFile, 'world');
-  await setTimeout(common.platformTimeout(100));
   fs.writeFileSync(acceptableFile, 'acceptable');
 
   process.once('exit', function() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,6 @@ tmpdir.refresh(); @@
         }
       });
-      await setTimeout(common.platformTimeout(100));
       fs.writeFileSync(childrenAbsolutePath, 'world');
       process.once('exit', function() {
@@ Expand Down @@