1 files changed, 4 insertions, 17 deletions

diff --git a/lib/internal/modules/esm/hooks.js b/lib/internal/modules/esm/hooks.js
index 667c4c0576..d927e3c9ba 100644
--- a/lib/internal/modules/esm/hooks.js
+++ b/lib/internal/modules/esm/hooks.js
@@ -521,14 +521,6 @@ class HooksProxy {
     }
   }
 
-  #beforeExitHandler = () => {
-    debug('beforeExit main thread', this.#lock, this.#numberOfPendingAsyncResponses);
-    if (this.#numberOfPendingAsyncResponses !== 0) {
-      // The worker still has some work to do, let's wait for it before terminating the process.
-      this.#worker.ref();
-    }
-  };
-
   async makeAsyncRequest(method, ...args) {
     this.#waitForWorker();
 
@@ -544,11 +536,9 @@ class HooksProxy {
       // come AFTER the last task in the event loop has run its course and there would be nothing
       // left keeping the thread alive (and once the main thread dies, the whole process stops).
       // However we want to keep the process alive until the worker thread responds (or until the
-      // event loop of the worker thread is also empty). So we add the beforeExit handler whose
-      // mission is to lock the main thread until we hear back from the worker thread. The `if`
-      // condition is there so we only add the event handler once (if there are already pending
-      // async responses, the previous calls have added the event listener).
-      process.on('beforeExit', this.#beforeExitHandler);
+      // event loop of the worker thread is also empty), so we ref the worker until we get all the
+      // responses back.
+      this.#worker.ref();
     }
 
     let response;
@@ -557,16 +547,13 @@ class HooksProxy {
       await AtomicsWaitAsync(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, this.#workerNotificationLastId).value;
       this.#workerNotificationLastId = AtomicsLoad(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION);
 
-      // In case the beforeExit handler was called during the await, we revert its actions.
-      this.#worker.unref();
-
       response = receiveMessageOnPort(asyncCommChannel.port1);
     } while (response == null);
     debug('got async response from worker', { method, args }, this.#lock);
 
     if (--this.#numberOfPendingAsyncResponses === 0) {
       // We got all the responses from the worker, its job is done (until next time).
-      process.off('beforeExit', this.#beforeExitHandler);
+      this.#worker.unref();
     }
 
     const body = this.#unwrapMessage(response);