WIP

Author: JakobJingleheimer

lib/internal/modules/esm/hooks.js

@@ -505,6 +505,9 @@ class HooksProxy {
         AtomicsWait(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, 0);
         const response = this.#worker.receiveMessageSync();
         if (response == null || response.message.status === 'exit') { return; }
+
+        // ! This line catches initialization errors in the worker thread.
+        this.#unwrapMessage(response);
       }
 
       this.#isReady = true;
@@ -587,8 +590,10 @@ class HooksProxy {
       AtomicsWait(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, this.#workerNotificationLastId);
       this.#workerNotificationLastId = AtomicsLoad(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION);
 
+      writeFileSync(1, `HooksProxy::makeSyncRequest: awoken\n`);
       response = this.#worker.receiveMessageSync();
     } while (response == null);
+    writeFileSync(1, `HooksProxy::makeSyncRequest: got response from worker ${JSON.stringify(response)}\n`);
     debug('got sync response from worker', { method, args });
     if (response.message.status === 'never-settle') {
       process.exit(kUnfinishedTopLevelAwait);
@@ -604,6 +609,7 @@ class HooksProxy {
     }
     const { status, body } = response.message;
     if (status === 'error') {
+      writeFileSync(1, `HooksProxy#unwrapMessage: got error from worker ${body}\n`);
       if (body == null || typeof body !== 'object') throw body;
       if (body.serializationFailed || body.serialized == null) {
         throw ERR_WORKER_UNSERIALIZABLE_ERROR();

lib/internal/modules/esm/loader.js

@@ -309,16 +309,16 @@ class ModuleLoader {
    * @returns {Promise<ModuleExports>}
    */
   async import(specifier, parentURL, importAssertions) {
-writeFileSync(1, `ESMLoader::import specifier ${specifier}\n`);
+// writeFileSync(1, `ESMLoader::import specifier ${specifier}\n`);
     const moduleJob = await this.getModuleJob(specifier, parentURL, importAssertions);
-writeFileSync(1, `ESMLoader::import gotModuleJob ${JSON.stringify(moduleJob)}\n`);
+// writeFileSync(1, `ESMLoader::import gotModuleJob ${JSON.stringify(moduleJob)}\n`);
     const { module } = await moduleJob.run().catch((err) => {
-      writeFileSync(1, `ESMLoader::import moduleJob.run caught error ${err.stack}\n`)
+      writeFileSync(1, `ESMLoader::import ${specifier} moduleJob.run caught error ${err.stack}\n`)
       throw err;
     });
-writeFileSync(1, `ESMLoader::import gotModuleJob ${JSON.stringify(module)}\n`);
+writeFileSync(1, `ESMLoader::import ${specifier} gotModuleJob ${JSON.stringify(module)}\n`);
     const namespace = module.getNamespace();
-writeFileSync(1, `ESMLoader::import gotModuleJob ${JSON.stringify(namespace)}\n`);
+writeFileSync(1, `ESMLoader::import ${specifier} gotModuleJob ${JSON.stringify(namespace)}\n`);
     return namespace;
   }
 

lib/internal/modules/esm/module_job.js

@@ -30,7 +30,7 @@ const resolvedPromise = PromiseResolve();
 let debug = require('internal/util/debuglog').debuglog('esm', (fn) => {
   debug = fn;
 });
-const { writeFileSync } = require('fs');
+// const { writeFileSync } = require('fs');
 
 const noop = FunctionPrototype;
 
@@ -114,21 +114,21 @@ class ModuleJob {
   }
 
   async _instantiate() {
-    writeFileSync(1, 'ModuleJob::instantiate()\n');
+    // writeFileSync(1, 'ModuleJob::instantiate()\n');
     const jobsInGraph = new SafeSet();
     const addJobsToDependencyGraph = async (moduleJob) => {
       if (jobsInGraph.has(moduleJob)) {
         return;
       }
       jobsInGraph.add(moduleJob);
-      writeFileSync(1, 'ModuleJob::instantiate() getting linked jobs\n');
+      // writeFileSync(1, 'ModuleJob::instantiate() getting linked jobs\n');
       const dependencyJobs = await moduleJob.linked;
-      writeFileSync(1, 'ModuleJob::instantiate() got linked jobs\n');
+      // writeFileSync(1, 'ModuleJob::instantiate() got linked jobs\n');
       return SafePromiseAllReturnVoid(dependencyJobs, addJobsToDependencyGraph);
     };
     await addJobsToDependencyGraph(this);
 
-    writeFileSync(1, 'ModuleJob::instantiate() job added to dep graph\n');
+    // writeFileSync(1, 'ModuleJob::instantiate() job added to dep graph\n');
     try {
       if (!hasPausedEntry && this.inspectBrk) {
         hasPausedEntry = true;
@@ -138,7 +138,7 @@ class ModuleJob {
         this.module.instantiate();
       }
     } catch (e) {
-      writeFileSync(1, `ModuleJob::instantiate() error: ${e.stack}\n`);
+      // writeFileSync(1, `ModuleJob::instantiate() error: ${e.stack}\n`);
       decorateErrorStack(e);
       // TODO(@bcoe): Add source map support to exception that occurs as result
       // of missing named export. This is currently not possible because
@@ -218,16 +218,16 @@ class ModuleJob {
   }
 
   async run() {
-    writeFileSync(1, `ModuleJob::run() instantiating: ${this.url}\n`);
+    // writeFileSync(1, `ModuleJob::run() instantiating: ${this.url}\n`);
     await this.instantiate();
-    writeFileSync(1, `ModuleJob::run() instantiated: ${this.url}\n`);
+    // writeFileSync(1, `ModuleJob::run() instantiated: ${this.url}\n`);
     const timeout = -1;
     const breakOnSigint = false;
     try {
       await this.module.evaluate(timeout, breakOnSigint);
-      writeFileSync(1, `ModuleJob::run() evaluation complete: ${this.module}\n`);
+      // writeFileSync(1, `ModuleJob::run() evaluation complete: ${this.module}\n`);
     } catch (e) {
-      writeFileSync(1, `ModuleJob::run() error: ${e.stack}\n`);
+      // writeFileSync(1, `ModuleJob::run() error: ${e.stack}\n`);
       if (e?.name === 'ReferenceError' &&
           isCommonJSGlobalLikeNotDefinedError(e.message)) {
         e.message += ' in ES module scope';
@@ -249,7 +249,7 @@ class ModuleJob {
             'to use the \'.cjs\' file extension.';
         }
       }
-      writeFileSync(1, `ModuleJob::run() throwing error: ${e.stack}\n`);
+      // writeFileSync(1, `ModuleJob::run() throwing error: ${e.stack}\n`);
       throw e;
     }
     return { __proto__: null, module: this.module };

lib/internal/modules/esm/utils.js

@@ -153,7 +153,7 @@ async function initializeHooks() {
       customLoaderURLs[i],
       parentURL,
     ).catch((err) => {
-      writeFileSync(1, `initializeHooks: Error registering hooks: ${err.message}\n${err.stack}\n`);
+      writeFileSync(1, `initializeHooks: Error registering hooks: ${err.stack}\n`);
       throw err;
     });
   }

lib/internal/modules/esm/worker.js

@@ -101,12 +101,13 @@ async function customizedModuleWorker(lock, syncCommPort, errorHandler) {
     // be thrown and printed.
     hasInitializationError = true;
     initializationError = exception;
-    writeFileSync(1, `Error initializing hooks: ${exception.stack}\n`);
+    writeFileSync(1, `[Worker] Error initializing hooks: ${exception.stack}\n`);
   }
 
   syncCommPort.on('message', handleMessage);
 
   if (hasInitializationError) {
+    writeFileSync(1, `[Worker] posting initialization error: ${initializationError}\n`);
     syncCommPort.postMessage(wrapMessage('error', initializationError));
   } else {
     syncCommPort.postMessage(wrapMessage('success'));

test/es-module/test-esm-loader-with-syntax-error.mjs

@@ -17,10 +17,8 @@ describe('ESM: loader with syntax error', { concurrency: true }, () => {
     console.log('\n\nstderr', stderr);
     console.log('\n\nstdout', stdout);
 
-    match('foo', /bar/);
-
-    // match(stderr, /SyntaxError \[Error\]:/);
-    // doesNotMatch(stderr, /Bad command or file name/); // It should have crashed before this.
-    // notStrictEqual(code, 0);
+    match(stderr, /SyntaxError \[Error\]:/);
+    doesNotMatch(stderr, /Bad command or file name/); // It should have crashed before this.
+    notStrictEqual(code, 0);
   });
 });