@travetto/compiler 5.0.0-rc.0 → 5.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "5.0.0-rc.0",
+  "version": "5.0.0-rc.1",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.4.1",
-    "@travetto/manifest": "^5.0.0-rc.0",
+    "@travetto/manifest": "^5.0.0-rc.1",
     "@travetto/transformer": "^5.0.0-rc.0",
     "@types/node": "^20.14.10"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.0"
+    "@travetto/cli": "^5.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/entry.trvc.ts

@@ -71,10 +71,9 @@ export const main = (ctx: ManifestContext) => {
 
     /** Stream events */
     events: async (type: string, handler: (ev: unknown) => unknown): Promise<void> => {
-      if (type === 'change' || type === 'log' || type === 'progress' || type === 'state') {
-        for await (const ev of client.fetchEvents(type)) { await handler(ev); }
-      } else if (type === 'all') {
-        for await (const ev of client.fetchEvents(type)) { await handler(ev); }
+      if (type === 'change' || type === 'log' || type === 'progress' || type === 'state' || type === 'all') {
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        for await (const ev of client.fetchEvents(type as 'change')) { await handler(ev); }
       } else {
         throw new Error(`Unknown event type: ${type}`);
       }

package/support/server/process-handle.ts

@@ -16,12 +16,19 @@ export class ProcessHandle {
   }
 
   async writePid(pid: number): Promise<void> {
+    const current = await this.getPid();
+    if (!process.env.TRV_BUILD_REENTRANT && current && pid !== current && current > 0) {
+      try {
+        process.kill(current);
+      } catch { }
+    }
     await fs.mkdir(path.dirname(this.#file), { recursive: true });
     return fs.writeFile(this.#file, JSON.stringify(pid), 'utf8');
   }
 
   getPid(): Promise<number | undefined> {
-    return fs.readFile(this.#file, 'utf8').then(v => +v, () => undefined);
+    return fs.readFile(this.#file, 'utf8')
+      .then(v => +v > 0 ? +v : undefined, () => undefined);
   }
 
   async isRunning(): Promise<boolean> {

package/support/server/server.ts

@@ -190,9 +190,9 @@ export class CompilerServer {
 
       if (ev.type === 'state') {
         this.info.state = ev.payload.state;
-        await this.#handle.compiler.writePid(this.info.compilerPid);
         if (ev.payload.state === 'init' && ev.payload.extra && 'pid' in ev.payload.extra && typeof ev.payload.extra.pid === 'number') {
           this.info.compilerPid = ev.payload.extra.pid;
+          await this.#handle.compiler.writePid(this.info.compilerPid);
         }
         log.info(`State changed: ${this.info.state}`);
       } else if (ev.type === 'log') {
@@ -249,4 +249,4 @@ export class CompilerServer {
     log.info(running ? 'Starting server' : 'Server already running under a different process', this.#url);
     return running ? this : undefined;
   }
-}
+}