Merge branch 'main' into NODE-6559-ci

Author: W-A-James

packages/bson-bench/src/common.ts

@@ -1,6 +1,6 @@
 import * as cp from 'child_process';
 import { once } from 'events';
-import { join, sep } from 'path';
+import { join } from 'path';
 
 import { exists } from './utils';
 
@@ -46,7 +46,8 @@ export class Package {
       this.library = match[1] as 'bson' | 'bson-ext';
 
       this.localPath = match[2];
-      this.computedModuleName = `${this.library}-local-${this.localPath.replaceAll(sep, '_')}`;
+      const cleanedLocalPath = this.localPath.replaceAll('/', '_').replaceAll('\\', '_');
+      this.computedModuleName = `${this.library}-local-${cleanedLocalPath}`;
     } else {
       throw new Error('unknown package specifier');
     }

packages/bson-bench/src/task.ts

@@ -194,10 +194,12 @@ export class Task {
       this.children.push(child);
 
       // listen for results or error
-      const resultOrError: ResultMessage | ErrorMessage = (await once(child, 'message'))[0];
+      const resultOrErrorPromise = once(child, 'message');
+      // Wait for process to exit
+      const exit = once(child, 'exit');
 
-      // wait for child to close
-      await once(child, 'exit');
+      const resultOrError: ResultMessage | ErrorMessage = (await resultOrErrorPromise)[0];
+      await exit;
 
       this.hasRun = true;
       switch (resultOrError.type) {