@travetto/compiler 4.0.4 → 4.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",

package/src/compiler.ts

@@ -10,7 +10,7 @@ import { CompileEmitEvent, CompileEmitter } from './types';
 import { EventUtil } from './event';
 
 import { IpcLogger } from '../support/log';
-import { CommonUtil } from '../support/util';
+import { TimerUtil } from '../support/timer';
 
 const log = new IpcLogger({ level: 'debug' });
 
@@ -82,7 +82,7 @@ export class Compiler {
     process.removeAllListeners('disconnect');
     process.removeAllListeners('message');
     this.#ctrl.abort();
-    CommonUtil.nonBlockingTimeout(1000).then(() => process.exit()); // Allow upto 1s to shutdown gracefully
+    TimerUtil.nonBlockingTimeout(1000).then(() => process.exit()); // Allow upto 1s to shutdown gracefully
   }
 
   /**
@@ -113,7 +113,7 @@ export class Compiler {
     }
     EventUtil.sendEvent('progress', { total: files.length, idx: files.length, message: 'Complete', operation: 'compile', complete: true });
 
-    await CommonUtil.queueMacroTask();
+    await TimerUtil.queueMacroTask();
 
     log.debug(`Compiled ${i} files`);
   }

package/support/server/client.ts

@@ -6,7 +6,7 @@ import { ManifestContext } from '@travetto/manifest';
 
 import type { CompilerEvent, CompilerEventType, CompilerServerInfo, CompilerStateType } from '../types';
 import type { LogShape } from '../log';
-import { CommonUtil } from '../util';
+import { TimerUtil } from '../timer';
 import { ProcessHandle } from './process-handle';
 
 type FetchEventsConfig<T> = {
@@ -129,7 +129,7 @@ export class CompilerClient {
           if (line.trim().charAt(0) === '{') {
             const val = JSON.parse(line);
             if (cfg.until?.(val)) {
-              await CommonUtil.queueMacroTask();
+              await TimerUtil.queueMacroTask();
               ctrl.abort();
             }
             yield val;
@@ -140,7 +140,7 @@ export class CompilerClient {
       }
       signal.removeEventListener('abort', quit);
 
-      await CommonUtil.queueMacroTask();
+      await TimerUtil.queueMacroTask();
 
       info = await this.info();
 

package/support/server/process-handle.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 
 import type { ManifestContext } from '@travetto/manifest';
 import { Log, Logger } from '../log';
-import { CommonUtil } from '../util';
+import { TimerUtil } from '../timer';
 
 export class ProcessHandle {
 
@@ -56,7 +56,7 @@ export class ProcessHandle {
       if (!await this.isRunning()) {
         return true;
       }
-      await CommonUtil.nonBlockingTimeout(100);
+      await TimerUtil.nonBlockingTimeout(100);
     }
     try {
       this.#log.debug('Force Killing', pid);

package/support/server/server.ts

@@ -8,6 +8,7 @@ import type { ManifestContext } from '@travetto/manifest';
 import type { CompilerMode, CompilerProgressEvent, CompilerEvent, CompilerEventType, CompilerServerInfo } from '../types';
 import { Log } from '../log';
 import { CommonUtil } from '../util';
+import { TimerUtil } from '../timer';
 import { CompilerClient } from './client';
 import { ProcessHandle } from './process-handle';
 
@@ -77,7 +78,7 @@ export class CompilerServer {
         .on('close', () => log.debug('Server close event'));
 
       const url = new URL(this.#url);
-      CommonUtil.queueMacroTask().then(() => this.#server.listen(+url.port, url.hostname)); // Run async
+      TimerUtil.queueMacroTask().then(() => this.#server.listen(+url.port, url.hostname)); // Run async
     });
 
     if (output === 'retry') {
@@ -121,7 +122,7 @@ export class CompilerServer {
   async #disconnectActive(): Promise<void> {
     log.info('Server disconnect requested');
     this.info.iteration = Date.now();
-    await CommonUtil.nonBlockingTimeout(20);
+    await TimerUtil.nonBlockingTimeout(20);
     for (const el of Object.values(this.#listeners)) {
       try { el.res.end(); } catch { }
     }
@@ -204,7 +205,7 @@ export class CompilerServer {
 
     try {
       await new Promise((resolve, reject) => {
-        CommonUtil.nonBlockingTimeout(2000).then(reject); // Wait 2s max
+        TimerUtil.nonBlockingTimeout(2000).then(reject); // Wait 2s max
         this.#server.close(resolve);
         this.#emitEvent({ type: 'state', payload: { state: 'closed' } });
         setImmediate(() => {

package/support/timer.ts

@@ -0,0 +1,17 @@
+import timers from 'node:timers/promises';
+
+export class TimerUtil {
+  /**
+   * Non-blocking timeout, that is cancellable
+   */
+  static nonBlockingTimeout(time: number): Promise<void> {
+    return timers.setTimeout(time, undefined, { ref: false }).catch(() => { });
+  }
+
+  /**
+   * Queue new macrotask
+   */
+  static queueMacroTask(): Promise<void> {
+    return timers.setImmediate(undefined);
+  }
+}

package/support/util.ts

@@ -1,6 +1,5 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import timers from 'node:timers/promises';
 import { setMaxListeners } from 'node:events';
 
 import type { ManifestContext } from '@travetto/manifest';
@@ -106,18 +105,4 @@ export class CommonUtil {
       return import(path.join(outputRoot, 'node_modules', mod)); // Return function to run import on a module
     };
   }
-
-  /**
-   * Non-blocking timeout, that is cancellable
-   */
-  static nonBlockingTimeout(time: number): Promise<void> {
-    return timers.setTimeout(time, undefined, { ref: false }).catch(() => { });
-  }
-
-  /**
-   * Queue new macrotask
-   */
-  static queueMacroTask(): Promise<void> {
-    return timers.setImmediate(undefined);
-  }
 }