@travetto/compiler 4.0.0-rc.3 → 4.0.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "4.0.0-rc.3",
+  "version": "4.0.0-rc.5",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.4.0",
-    "@travetto/manifest": "^4.0.0-rc.3",
-    "@travetto/transformer": "^4.0.0-rc.3",
+    "@travetto/manifest": "^4.0.0-rc.5",
+    "@travetto/transformer": "^4.0.0-rc.5",
     "@types/node": "^20.11.16"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.0-rc.4"
+    "@travetto/cli": "^4.0.0-rc.6"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -70,7 +70,7 @@ export class Compiler {
         break;
       }
       case 'reset': {
-        Log.info('Triggering reset due to change in core files');
+        Log.info('Triggering reset due to change in core files', err?.cause);
         EventUtil.sendEvent('state', { state: 'reset' });
         process.exitCode = 0;
         break;

package/src/watch.ts

@@ -128,7 +128,7 @@ export class CompilerWatcher {
         sourceFile === ROOT_PKG ||
         (action === 'delete' && (sourceFile === OUTPUT_PATH || sourceFile === COMPILER_PATH))
       ) {
-        throw new Error('RESET');
+        throw new Error('RESET', { cause: `${action}:${sourceFile}` });
       }
 
       const fileType = ManifestModuleUtil.getFileType(sourceFile);

package/support/entry.trvc.ts

@@ -47,6 +47,7 @@ export const main = (ctx: ManifestContext) => {
   const ops = {
     /** Stop the server */
     async stop(): Promise<void> {
+      LogUtil.initLogs(ctx);
       if (await client.stop()) {
         console.log(`Stopped server ${ctx.workspace.path}: ${client}`);
       } else {
@@ -62,6 +63,7 @@ export const main = (ctx: ManifestContext) => {
 
     /** Clean the server */
     async clean(): Promise<void> {
+      LogUtil.initLogs(ctx);
       if (await client.clean()) {
         return console.log(`Clean triggered ${ctx.workspace.path}:`, buildFolders);
       } else {
@@ -90,7 +92,7 @@ export const main = (ctx: ManifestContext) => {
     async getLoader(): Promise<(mod: string) => Promise<unknown>> {
       // Short circuit if we can
       if (!(await client.isWatching())) {
-        await compile('build', 'error');
+        await compile('build', LogUtil.isInteractiveShell ? 'info' : 'error');
       }
       return CommonUtil.moduleLoader(ctx);
     },

package/support/log.ts

@@ -31,10 +31,15 @@ export class LogUtil {
     }
   }
 
+  /** Are we in a shell that is interactive */
+  static get isInteractiveShell(): boolean {
+    return !!process.env.PS1 && process.stdout.isTTY;
+  }
+
   /**
    * Set level for operation
    */
-  static initLogs(ctx: ManifestContext, defaultLevel: CompilerLogLevel): void {
+  static initLogs(ctx: ManifestContext, defaultLevel?: CompilerLogLevel): void {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const build = process.env.TRV_BUILD as CompilerLogLevel | 'none';
     if (build !== 'none' && process.env.TRV_QUIET !== 'true') {
@@ -42,7 +47,7 @@ export class LogUtil {
     }
     this.root = ctx.workspace.path;
     // If we are in info or a terminal and also in a tty
-    this.logProgress = ((this.isLevelActive('info') || process.env.PS1) && process.stdout.isTTY) ? this.#logProgressEvent : undefined;
+    this.logProgress = (this.isLevelActive('info') && process.stdout.isTTY) ? this.#logProgressEvent : undefined;
     if (this.logProgress) {
       process.stdout.write(`${ESC}?25l`); // Hide cursor
     }

package/support/server/client.ts

@@ -43,7 +43,7 @@ export class CompilerClient {
     const timeoutId = setTimeout(() => {
       logTimeout && this.#log('error', `Timeout on request to ${this.#url}${rel}`);
       ctrl.abort('TIMEOUT');
-    }, 100).unref();
+    }, opts?.timeout ?? 100).unref();
     try {
       return await fetch(`${this.#url}${rel}`, { ...opts, signal: ctrl.signal });
     } finally {
@@ -53,7 +53,7 @@ export class CompilerClient {
 
   /** Get server information, if server is running */
   info(): Promise<CompilerServerInfo | undefined> {
-    return this.#fetch('/info', {}, false).then(v => v.json(), () => undefined)
+    return this.#fetch('/info', { timeout: 200 }, false).then(v => v.json(), () => undefined)
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       .then(v => v as CompilerServerInfo);
   }

package/support/server/process-handle.ts

@@ -3,13 +3,16 @@ import path from 'node:path';
 import timers from 'node:timers/promises';
 
 import type { ManifestContext } from '@travetto/manifest';
+import { CompilerLogger, LogUtil } from '../log';
 
 export class ProcessHandle {
 
   #file: string;
+  #log: CompilerLogger;
 
   constructor(ctx: ManifestContext, name: string) {
     this.#file = path.resolve(ctx.workspace.path, ctx.build.toolFolder, `${name}.pid`);
+    this.#log = LogUtil.logger(`process-handle.${name}`);
   }
 
   async writePid(pid: number): Promise<void> {
@@ -26,15 +29,19 @@ export class ProcessHandle {
     if (!pid) { return false; }
     try {
       process.kill(pid, 0); // See if process is still running
-      return false;
-    } catch { }
-    return true; // Still running
+      this.#log('debug', 'Is running', pid);
+      return true;
+    } catch {
+      this.#log('debug', 'Is not running', pid);
+    }
+    return false; // Not running
   }
 
   async kill(): Promise<boolean> {
     const pid = await this.getPid();
     if (pid && await this.isRunning()) {
       try {
+        this.#log('debug', 'Killing', pid);
         return process.kill(pid);
       } catch { }
     }
@@ -44,6 +51,7 @@ export class ProcessHandle {
   async ensureKilled(gracePeriod: number = 3000): Promise<boolean> {
     const start = Date.now();
     const pid = await this.getPid();
+    this.#log('debug', 'Ensuring Killed', pid);
     while (pid && (Date.now() - start) < gracePeriod) { // Ensure its done
       if (!await this.isRunning()) {
         return true;
@@ -51,8 +59,10 @@ export class ProcessHandle {
       await timers.setTimeout(100);
     }
     try {
+      this.#log('debug', 'Force Killing', pid);
       pid && process.kill(pid); // Force kill
     } catch { }
+    this.#log('debug', 'Did Kill', this.#file, !!pid);
     return pid !== undefined;
   }
 }

package/support/server/server.ts

@@ -7,8 +7,8 @@ import type { ManifestContext } from '@travetto/manifest';
 
 import type { CompilerMode, CompilerProgressEvent, CompilerEvent, CompilerEventType, CompilerServerInfo } from '../types';
 import { LogUtil } from '../log';
-import { CompilerClient } from './client';
 import { CommonUtil } from '../util';
+import { CompilerClient } from './client';
 import { ProcessHandle } from './process-handle';
 
 const log = LogUtil.logger('compiler-server');
@@ -123,8 +123,9 @@ export class CompilerServer {
     this.info.iteration = Date.now();
     await new Promise(r => setTimeout(r, 20));
     for (const el of Object.values(this.#listeners)) {
-      el.res.end();
+      try { el.res.end(); } catch { }
     }
+    this.#listeners = {}; // Ensure its empty
   }
 
   async #clean(): Promise<{ clean: boolean }> {
@@ -144,19 +145,18 @@ export class CompilerServer {
     log('debug', 'Receive request', { action, subAction });
 
     let out: unknown;
+    let close = false;
     switch (action) {
       case 'event': return await this.#addListener(subAction, res);
       case 'clean': out = await this.#clean(); break;
-      case 'stop': {
-        // Must send immediately
-        res.end(JSON.stringify({ closing: true }));
-        await this.close();
-        break;
-      }
+      case 'stop': out = JSON.stringify({ closing: true }); close = true; break;
       case 'info':
       default: out = this.info ?? {}; break;
     }
     res.end(JSON.stringify(out));
+    if (close) {
+      await this.close();
+    }
   }
 
   /**
@@ -217,11 +217,7 @@ export class CompilerServer {
     } catch { // Timeout or other error
       // Force shutdown
       this.#server.closeAllConnections();
-      if (this.info.compilerPid) { // Ensure its killed
-        try {
-          process.kill(this.info.compilerPid);
-        } catch { }
-      }
+      await this.#handle.compiler.kill();
     }
 
     log('info', 'Closed down server');

package/support/setup.ts

@@ -216,7 +216,7 @@ export class CompilerSetup {
         const names: string[] = [];
         const mods = Object.values(manifest.modules).filter(x => x.workspace && x.name !== ctx.workspace.name);
         for (const mod of mods) {
-          const modCtx = ManifestUtil.getModuleContext(ctx, mod.sourceFolder);
+          const modCtx = ManifestUtil.getModuleContext(ctx, mod.sourceFolder, true);
           const modManifest = await ManifestUtil.buildManifest(modCtx);
           await ManifestUtil.writeManifest(modManifest);
           names.push(mod.name);

package/support/util.ts

@@ -63,7 +63,8 @@ export class CommonUtil {
       const controller = new AbortController();
       setMaxListeners(1000, controller.signal);
       // Chain
-      parent.addEventListener('abort', () => controller.abort());
+      const kill = (): void => controller.abort();
+      parent.addEventListener('abort', kill);
 
       const comp = src(controller.signal);
 
@@ -75,6 +76,7 @@ export class CommonUtil {
         if (shouldRestart(ev)) {
           log('debug', 'Restarting stream');
           controller.abort(); // Ensure terminated of process
+          parent.removeEventListener('abort', kill);
           continue outer;
         }
       }