Track worker errors

They're not native due to nodejs/node#48716, but we want to treat them as such anyway.
avajs · Jul 30, 2023 · beff6b2 · beff6b2
1 parent f047694
commit beff6b2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/lib/fork.js b/lib/fork.js
@@ -6,7 +6,7 @@ import {Worker} from 'node:worker_threads';
 import Emittery from 'emittery';
 
 import {controlFlow} from './ipc-flow-control.cjs';
-import serializeError from './serialize-error.js';
+import serializeError, {tagWorkerError} from './serialize-error.js';
 
 let workerPath = new URL('worker/base.js', import.meta.url);
 export function _testOnlyReplaceWorkerPath(replacement) {
@@ -134,7 +134,7 @@ export default function loadFork(file, options, execArgv = process.execArgv) {
 		});
 
 		worker.on('error', error => {
-			emitStateChange({type: 'worker-failed', err: serializeError('Worker error', false, error, file)});
+			emitStateChange({type: 'worker-failed', err: serializeError('Worker error', false, tagWorkerError(error), file)});
 			finish();
 		});
 

diff --git a/lib/plugin-support/shared-workers.js b/lib/plugin-support/shared-workers.js
@@ -2,7 +2,7 @@ import events from 'node:events';
 import {pathToFileURL} from 'node:url';
 import {Worker} from 'node:worker_threads';
 
-import serializeError from '../serialize-error.js';
+import serializeError, {tagWorkerError} from '../serialize-error.js';
 
 const LOADER = new URL('shared-worker-loader.js', import.meta.url);
 
@@ -34,7 +34,7 @@ function launchWorker(filename, initialData) {
 	const launched = {
 		statePromises: {
 			available: waitForAvailable(worker),
-			error: events.once(worker, 'error').then(([error]) => error),
+			error: events.once(worker, 'error').then(([error]) => tagWorkerError(error)),
 		},
 		exited: false,
 		worker,

diff --git a/lib/serialize-error.js b/lib/serialize-error.js
@@ -1,6 +1,7 @@
 import path from 'node:path';
 import process from 'node:process';
 import {fileURLToPath, pathToFileURL} from 'node:url';
+import {isNativeError} from 'node:util/types';
 
 import cleanYamlObject from 'clean-yaml-object';
 import concordance from 'concordance';
@@ -145,8 +146,21 @@ function trySerializeError(error, shouldBeautifyStack, testFile) {
 	return retval;
 }
 
+const workerErrors = new WeakSet();
+export function tagWorkerError(error) {
+	// Track worker errors, which aren't native due to https://github.com/nodejs/node/issues/48716.
+	// Still include the check for isNativeError() in case the issue is fixed in the future.
+	if (isNativeError(error) || error instanceof Error) {
+		workerErrors.add(error);
+	}
+
+	return error;
+}
+
+const isWorkerError = error => workerErrors.has(error);
+
 export default function serializeError(origin, shouldBeautifyStack, error, testFile) {
-	if (!isError(error)) {
+	if (!isError(error) && !isWorkerError(error)) {
 		return {
 			avaAssertionError: false,
 			nonErrorObject: true,