@atlaspack/core 2.12.1-canary.3547 → 2.12.1-canary.3548

package/lib/Atlaspack.js

@@ -166,10 +166,16 @@ class Atlaspack {
     (0, _featureFlags().setFeatureFlags)(featureFlags);
     await _sourceMap().init;
     await (_rust().init === null || _rust().init === void 0 ? void 0 : (0, _rust().init)());
+    this.#disposable = new (_events().Disposable)();
     try {
       _rust().initializeMonitoring === null || _rust().initializeMonitoring === void 0 || (0, _rust().initializeMonitoring)();
-      process.on('exit', () => {
+      const onExit = () => {
         _rust().closeMonitoring === null || _rust().closeMonitoring === void 0 || (0, _rust().closeMonitoring)();
+      };
+      process.on('exit', onExit);
+      this.#disposable.add(() => {
+        process.off('exit', onExit);
+        onExit();
       });
     } catch (e) {
       // Fallthrough
@@ -231,7 +237,6 @@ class Atlaspack {
       ref: optionsRef
     } = await this.#farm.createSharedReference(resolvedOptions, false);
     this.#optionsRef = optionsRef;
-    this.#disposable = new (_events().Disposable)();
     if (this.#initialOptions.workerFarm) {
       // If we don't own the farm, dispose of only these references when
       // Atlaspack ends.

package/lib/atlaspack-v3/WorkerPool.js

@@ -13,6 +13,13 @@ function _path() {
   };
   return data;
 }
+function _promises() {
+  const data = require("timers/promises");
+  _promises = function () {
+    return data;
+  };
+  return data;
+}
 function _worker_threads() {
   const data = require("worker_threads");
   _worker_threads = function () {
@@ -32,8 +39,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * This "WorkerPool" mitigates this problem by reusing worker threads across
  * builds.
  */
+// $FlowFixMe Missing types
 const WORKER_PATH = _path().default.join(__dirname, 'worker', 'index.js');
-function waitForMessage(worker, type) {
+function waitForMessage(worker, type, signal) {
   return new Promise(resolve => {
     const onMessage = message => {
       if (message.type === type) {
@@ -42,6 +50,11 @@ function waitForMessage(worker, type) {
       }
     };
     worker.on('message', onMessage);
+    const onAbort = () => {
+      signal.removeEventListener('abort', onAbort);
+      worker.off('message', onMessage);
+    };
+    signal.addEventListener('abort', onAbort);
   });
 }
 class WorkerPool {
@@ -117,22 +130,31 @@ class WorkerPool {
     return this.#workerPool[workerId];
   }
   async #bootWorker(worker, tx_worker) {
-    const timeout = new Promise((_, reject) => {
-      setTimeout(() => {
-        reject(new Error('Worker failed to register in time'));
-      }, 5000);
-    });
+    const controller = new AbortController();
+    const signal = controller.signal;
     const workerError = new Promise((_, reject) => {
-      worker.once('error', err => {
+      const onError = err => {
         reject(err);
-      });
+      };
+      worker.once('error', onError);
+      const onAbort = () => {
+        signal.removeEventListener('abort', onAbort);
+        worker.off('error', onError);
+      };
+      signal.addEventListener('abort', onAbort);
     });
-    const workerReady = waitForMessage(worker, 'workerRegistered');
+    const workerReady = waitForMessage(worker, 'workerRegistered', signal);
     worker.postMessage({
       type: 'registerWorker',
       tx_worker
     });
-    await Promise.race([timeout, workerError, workerReady]);
+    try {
+      await Promise.race([(0, _promises().setTimeout)(5000, {
+        signal
+      }), workerError, workerReady]);
+    } finally {
+      controller.abort();
+    }
   }
   #createWorker() {
     const worker = new (_worker_threads().Worker)(this.#workerPath, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3547+b586f8787",
+  "version": "2.12.1-canary.3548+fbe8fa22b",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/cache": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/diagnostic": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/events": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/feature-flags": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/fs": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/graph": "3.2.1-canary.3547+b586f8787",
-    "@atlaspack/logger": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/package-manager": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/plugin": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/profiler": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/rust": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/types": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/utils": "2.12.1-canary.3547+b586f8787",
-    "@atlaspack/workers": "2.12.1-canary.3547+b586f8787",
+    "@atlaspack/build-cache": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/cache": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/diagnostic": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/events": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/feature-flags": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/fs": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/graph": "3.2.1-canary.3548+fbe8fa22b",
+    "@atlaspack/logger": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/package-manager": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/plugin": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/profiler": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/rust": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/types": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/utils": "2.12.1-canary.3548+fbe8fa22b",
+    "@atlaspack/workers": "2.12.1-canary.3548+fbe8fa22b",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -66,5 +66,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "b586f878765bdfb490110db5fe4580116d835548"
+  "gitHead": "fbe8fa22be490b46c13bf02cb1abe63597b94c03"
 }

package/src/Atlaspack.js

@@ -118,10 +118,21 @@ export default class Atlaspack {
 
     await initSourcemaps;
     await initRust?.();
+
+    this.#disposable = new Disposable();
+
     try {
       initializeMonitoring?.();
-      process.on('exit', () => {
+
+      const onExit = () => {
         closeMonitoring?.();
+      };
+
+      process.on('exit', onExit);
+
+      this.#disposable.add(() => {
+        process.off('exit', onExit);
+        onExit();
       });
     } catch (e) {
       // Fallthrough
@@ -188,7 +199,6 @@ export default class Atlaspack {
       await this.#farm.createSharedReference(resolvedOptions, false);
     this.#optionsRef = optionsRef;
 
-    this.#disposable = new Disposable();
     if (this.#initialOptions.workerFarm) {
       // If we don't own the farm, dispose of only these references when
       // Atlaspack ends.

package/src/atlaspack-v3/WorkerPool.js

@@ -13,11 +13,17 @@
  * builds.
  */
 import path from 'path';
+// $FlowFixMe Missing types
+import {setTimeout} from 'timers/promises';
 import {Worker} from 'worker_threads';
 
 const WORKER_PATH = path.join(__dirname, 'worker', 'index.js');
 
-export function waitForMessage<T>(worker: Worker, type: string): Promise<T> {
+export function waitForMessage<T>(
+  worker: Worker,
+  type: string,
+  signal: AbortSignal,
+): Promise<T> {
   return new Promise((resolve) => {
     const onMessage = (message: T & {|type: string|}) => {
       if (message.type === type) {
@@ -27,6 +33,13 @@ export function waitForMessage<T>(worker: Worker, type: string): Promise<T> {
     };
 
     worker.on('message', onMessage);
+
+    const onAbort = () => {
+      signal.removeEventListener('abort', onAbort);
+      worker.off('message', onMessage);
+    };
+
+    signal.addEventListener('abort', onAbort);
   });
 }
 
@@ -114,23 +127,37 @@ export class WorkerPool {
   }
 
   async #bootWorker(worker: Worker, tx_worker: number): Promise<void> {
-    const timeout = new Promise((_, reject) => {
-      setTimeout(() => {
-        reject(new Error('Worker failed to register in time'));
-      }, 5000);
-    });
+    const controller = new AbortController();
+    const signal = controller.signal;
 
     const workerError = new Promise((_, reject) => {
-      worker.once('error', (err: Error) => {
+      const onError = (err: Error) => {
         reject(err);
-      });
+      };
+
+      worker.once('error', onError);
+
+      const onAbort = () => {
+        signal.removeEventListener('abort', onAbort);
+        worker.off('error', onError);
+      };
+
+      signal.addEventListener('abort', onAbort);
     });
 
-    const workerReady = waitForMessage(worker, 'workerRegistered');
+    const workerReady = waitForMessage(worker, 'workerRegistered', signal);
 
     worker.postMessage({type: 'registerWorker', tx_worker});
 
-    await Promise.race([timeout, workerError, workerReady]);
+    try {
+      await Promise.race([
+        setTimeout(5000, {signal}),
+        workerError,
+        workerReady,
+      ]);
+    } finally {
+      controller.abort();
+    }
   }
 
   #createWorker(): [number, Worker] {

package/test/atlaspack-v3/WorkerPool.test.js

@@ -6,7 +6,11 @@ import {WorkerPool, waitForMessage} from '../../src/atlaspack-v3/WorkerPool';
 import assert from 'assert';
 
 function probeStatus(worker: Worker) {
-  const response = waitForMessage(worker, 'status');
+  const response = waitForMessage(
+    worker,
+    'status',
+    new AbortController().signal,
+  );
   worker.postMessage({type: 'probeStatus'});
   return response;
 }