From d272faa54dba66b456c089e09454e13064f899a2 Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Fri, 18 Nov 2022 00:26:18 +0200
Subject: [PATCH] fs: fix `nonNativeWatcher` leak of `StatWatchers`

PR-URL: https://github.com/nodejs/node/pull/45501
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
---
 lib/internal/fs/recursive_watch.js       |  9 +++-----
 test/parallel/test-fs-watch-recursive.js | 27 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/lib/internal/fs/recursive_watch.js b/lib/internal/fs/recursive_watch.js
index ed146fa28bed8d..5c7a3e5b39a9a2 100644
--- a/lib/internal/fs/recursive_watch.js
+++ b/lib/internal/fs/recursive_watch.js
@@ -154,14 +154,11 @@ class FSWatcher extends EventEmitter {
             this.#symbolicFiles.add(f);
           }
 
+          this.#files.set(f, file);
           if (file.isFile()) {
             this.#watchFile(f);
-          } else {
-            this.#files.set(f, file);
-
-            if (file.isDirectory() && !file.isSymbolicLink()) {
-              await this.#watchFolder(f);
-            }
+          } else if (file.isDirectory() && !file.isSymbolicLink()) {
+            await this.#watchFolder(f);
           }
         }
       }
diff --git a/test/parallel/test-fs-watch-recursive.js b/test/parallel/test-fs-watch-recursive.js
index a4c22bfbd2ce11..a7ba72dab4dcb9 100644
--- a/test/parallel/test-fs-watch-recursive.js
+++ b/test/parallel/test-fs-watch-recursive.js
@@ -213,6 +213,33 @@ tmpdir.refresh();
   });
 })().then(common.mustCall());
 
+
+(async () => {
+  // Assert recursive watch does not leak handles
+  const rootDirectory = fs.mkdtempSync(testDir + path.sep);
+  const testDirectory = path.join(rootDirectory, 'test-7');
+  const filePath = path.join(testDirectory, 'only-file.txt');
+  fs.mkdirSync(testDirectory);
+
+  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());
+
 (async () => {
   // Handle non-boolean values for options.recursive