@travetto/worker 4.0.0 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/worker",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Process management utilities, with a focus on inter-process communication",
   "keywords": [
     "exec",
@@ -25,7 +25,7 @@
     "directory": "module/worker"
   },
   "dependencies": {
-    "@travetto/base": "^4.0.0",
+    "@travetto/base": "^4.0.2",
     "generic-pool": "^3.9.0"
   },
   "travetto": {

package/src/pool.ts

@@ -1,5 +1,4 @@
 import os from 'node:os';
-import timers from 'node:timers/promises';
 import { Options, Pool, createPool } from 'generic-pool';
 
 import { Env, Util } from '@travetto/base';
@@ -78,7 +77,7 @@ export class WorkPool {
     // Listen for shutdown
     opts?.shutdown?.addEventListener('abort', async () => {
       while (pendingAcquires) {
-        await timers.setTimeout(10);
+        await Util.nonBlockingTimeout(10);
       }
       await pool.drain();
       await pool.clear();

package/src/support/barrier.ts

@@ -1,5 +1,3 @@
-import { setTimeout } from 'node:timers/promises';
-
 import { TimeSpan, Util } from '@travetto/base';
 
 import { Timeout } from './timeout';
@@ -19,7 +17,7 @@ export class Barrier {
   static listenForUnhandled(): Promise<never> & { cancel: () => void } {
     const uncaught = Util.resolvablePromise<never>();
     const uncaughtWithCancel: typeof uncaught & { cancel?: () => void } = uncaught;
-    const onError = (err: Error): void => { setTimeout(1).then(() => uncaught.reject(err)); };
+    const onError = (err: Error): void => { Util.queueMacroTask().then(() => uncaught.reject(err)); };
     process.on('unhandledRejection', onError).on('uncaughtException', onError);
     const cancel = (): void => {
       process.off('unhandledRejection', onError).off('unhandledException', onError);

package/src/support/timeout.ts

@@ -1,4 +1,4 @@
-import { clearTimeout } from 'node:timers';
+import timers from 'node:timers/promises';
 import { TimeSpan, TimeUtil, Util } from '@travetto/base';
 import { ExecutionError } from './error';
 
@@ -7,7 +7,7 @@ import { ExecutionError } from './error';
  */
 export class Timeout extends ExecutionError {
 
-  #id: ReturnType<typeof setTimeout> | undefined;
+  #timeout?: AbortController;
   #promise = Util.resolvablePromise();
   #duration: number;
 
@@ -20,10 +20,10 @@ export class Timeout extends ExecutionError {
    * Stop timeout from firing
    */
   cancel(): void {
-    if (this.#id) {
-      clearTimeout(this.#id);
+    if (this.#timeout) {
       this.#promise.resolve();
-      this.#id = undefined;
+      this.#timeout.abort();
+      this.#timeout = undefined;
     }
   }
 
@@ -31,9 +31,11 @@ export class Timeout extends ExecutionError {
    * Wait for timeout as a promise
    */
   wait(): Promise<void> {
-    if (!this.#id) {
-      this.#id = setTimeout(() => this.#promise.reject(this), this.#duration);
-      this.#id.unref();
+    if (!this.#timeout) {
+      this.#timeout = new AbortController();
+      timers.setTimeout(this.#duration, undefined, { ref: false, signal: this.#timeout.signal })
+        .then(() => this.#promise.reject(this))
+        .catch(() => false);
     }
     return this.#promise;
   }