nodejs
diff --git a/‎lib/internal/modules/esm/hooks.js‎
Lines changed: 4 additions & 0 deletions b/‎lib/internal/modules/esm/hooks.js‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎lib/internal/modules/esm/worker.js‎
Lines changed: 13 additions & 0 deletions b/‎lib/internal/modules/esm/worker.js‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎test/es-module/test-esm-loader-hooks.mjs‎
Lines changed: 48 additions & 0 deletions b/‎test/es-module/test-esm-loader-hooks.mjs‎
Lines changed: 48 additions & 0 deletions
@@ -501,6 +501,7 @@ class HooksProxy {
       },
     });
     this.#worker.unref(); // ! Allows the process to eventually exit.
+    this.#worker.on('exit', process.exit);
   }
 
   #waitForWorker() {
@@ -510,6 +511,7 @@ class HooksProxy {
         debug('wait for signal from worker');
         AtomicsWait(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, 0);
         const response = this.#worker.receiveMessageSync();
+        if (response.message.status === 'exit') { return; }
         const { preloadScripts } = this.#unwrapMessage(response);
         this.#executePreloadScripts(preloadScripts);
       }
@@ -590,6 +592,8 @@ class HooksProxy {
     debug('got sync response from worker', { method, args });
     if (response.message.status === 'never-settle') {
       process.exit(13);
+    } else if (response.message.status === 'exit') {
+      process.exit(response.message.body);
     }
     return this.#unwrapMessage(response);
   }
 
@@ -66,6 +66,19 @@ async function customizedModuleWorker(lock, syncCommPort, errorHandler) {
   let hooks, preloadScripts, initializationError;
   let hasInitializationError = false;
 
+  {
+    // If a custom hook is calling `process.exit`, we should wake up the main thread
+    // so it can detect the exit event.
+    const { exit } = process;
+    process.exit = function(code) {
+      syncCommPort.postMessage(wrapMessage('exit', code ?? process.exitCode));
+      AtomicsAdd(lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, 1);
+      AtomicsNotify(lock, WORKER_TO_MAIN_THREAD_NOTIFICATION);
+      return ReflectApply(exit, this, arguments);
+    };
+  }
+
+
   try {
     initializeESM();
     const initResult = await initializeHooks();
 
@@ -143,4 +143,52 @@ describe('Loader hooks', { concurrency: true }, () => {
     assert.strictEqual(code, 0);
     assert.strictEqual(signal, null);
   });
+
+  it('should be fine to call `process.exit` from a custom async hook', async () => {
+    const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
+      '--no-warnings',
+      '--experimental-import-meta-resolve',
+      '--experimental-loader',
+      'data:text/javascript,export function load(a,b,next){if(a==="data:exit")process.exit(42);return next(a,b)}',
+      '--input-type=module',
+      '--eval',
+      'import "data:exit"',
+    ]);
+
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, '');
+    assert.strictEqual(code, 42);
+    assert.strictEqual(signal, null);
+  });
+
+  it('should be fine to call `process.exit` from a custom sync hook', async () => {
+    const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
+      '--no-warnings',
+      '--experimental-import-meta-resolve',
+      '--experimental-loader',
+      'data:text/javascript,export function resolve(a,b,next){if(a==="exit:")process.exit(42);return next(a,b)}',
+      '--input-type=module',
+      '--eval',
+      'import "data:text/javascript,import.meta.resolve(%22exit:%22)"',
+    ]);
+
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, '');
+    assert.strictEqual(code, 42);
+    assert.strictEqual(signal, null);
+  });
+
+  it('should be fine to call `process.exit` from the loader thread top-level', async () => {
+    const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
+      '--no-warnings',
+      '--experimental-loader',
+      'data:text/javascript,process.exit(42)',
+      fixtures.path('empty.js'),
+    ]);
+
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, '');
+    assert.strictEqual(code, 42);
+    assert.strictEqual(signal, null);
+  });
 });
Original file line number	Diff line number	Diff line change
@@ -501,6 +501,7 @@ class HooksProxy {
501	501	},
502	502	});
503	503	this.#worker.unref(); // ! Allows the process to eventually exit.
	504	+ this.#worker.on('exit', process.exit);
504	505	}
505	506
506	507	#waitForWorker() {
@@ -510,6 +511,7 @@ class HooksProxy {
510	511	debug('wait for signal from worker');
511	512	AtomicsWait(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, 0);
512	513	const response = this.#worker.receiveMessageSync();
	514	+ if (response.message.status === 'exit') { return; }
513	515	const { preloadScripts } = this.#unwrapMessage(response);
514	516	this.#executePreloadScripts(preloadScripts);
515	517	}
@@ -590,6 +592,8 @@ class HooksProxy {
590	592	debug('got sync response from worker', { method, args });
591	593	if (response.message.status === 'never-settle') {
592	594	process.exit(13);
	595	+ } else if (response.message.status === 'exit') {
	596	+ process.exit(response.message.body);
593	597	}
594	598	return this.#unwrapMessage(response);
595	599	}