fs: fix nonNativeWatcher watching folder with existing files

MoLow · targos · commit e4316124faa5 · 2022-12-12T16:17:11.000Z
PR-URL: #45500 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/lib/internal/fs/recursive_watch.js b/lib/internal/fs/recursive_watch.js
@@ -199,6 +199,9 @@ class FSWatcher extends EventEmitter {
         this.emit('change', 'rename', pathRelative(this.#rootPath, file));
       } else if (currentStats.isDirectory()) {
         this.#watchFolder(file);
+      } else {
+        // Watching a directory will trigger a change event for child files)
+        this.emit('change', 'change', pathRelative(this.#rootPath, file));
       }
     });
   }
diff --git a/test/parallel/test-fs-watch-recursive.js b/test/parallel/test-fs-watch-recursive.js
@@ -22,6 +22,37 @@ const tmpdir = require('../common/tmpdir');
 const testDir = tmpdir.path;
 tmpdir.refresh();
 
+(async () => {
+  // Watch a folder and update an already existing file in it.
+
+  const rootDirectory = fs.mkdtempSync(testDir + path.sep);
+  const testDirectory = path.join(rootDirectory, 'test-0');
+  fs.mkdirSync(testDirectory);
+
+  const testFile = path.join(testDirectory, 'file-1.txt');
+  fs.writeFileSync(testFile, 'hello');
+
+  const watcher = fs.watch(testDirectory, { recursive: true });
+  let watcherClosed = false;
+  watcher.on('change', common.mustCallAtLeast(function(event, filename) {
+    // Libuv inconsistenly emits a rename event for the file we are watching
+    assert.ok(event === 'change' || event === 'rename');
+
+    if (filename === path.basename(testFile)) {
+      watcher.close();
+      watcherClosed = true;
+    }
+  }));
+
+  await setTimeout(common.platformTimeout(100));
+  fs.writeFileSync(testFile, 'hello');
+
+  process.once('exit', function() {
+    assert(watcherClosed, 'watcher Object was not closed');
+  });
+})().then(common.mustCall());
+
+
 (async () => {
   // Add a file to already watching folder
 

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,9 @@ class FSWatcher extends EventEmitter {`
`199`	`199`	`this.emit('change', 'rename', pathRelative(this.#rootPath, file));`
`200`	`200`	`} else if (currentStats.isDirectory()) {`
`201`	`201`	`this.#watchFolder(file);`
	`202`	`+ } else {`
	`203`	`+ // Watching a directory will trigger a change event for child files)`
	`204`	`+ this.emit('change', 'change', pathRelative(this.#rootPath, file));`
`202`	`205`	`}`
`203`	`206`	`});`
`204`	`207`	`}`