@codemation/cli 0.0.7 → 0.0.11

package/dist/{CliBin-Bx1lFBi5.js → CliBin-BAnFX1wL.js}

@@ -7,7 +7,7 @@ import { randomUUID } from "node:crypto";
 import { access, copyFile, cp, mkdir, open, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { spawn } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { config, parse } from "dotenv";
 import { watch } from "chokidar";
@@ -391,6 +391,7 @@ var DevCommand = class {
 		});
 	}
 	async runQueuedRebuild(prepared, state, gatewayBaseUrl, proxyServer, request) {
+		request.changedPaths;
 		proxyServer.setBuildStatus("building");
 		proxyServer.broadcastBuildStarted();
 		try {
@@ -1574,8 +1575,9 @@ var CliDevProxyServer = class {
 	childWorkflowSocket = null;
 	server = null;
 	uiProxyTarget = null;
-	constructor(listenPort) {
+	constructor(listenPort, listenPortConflictDescriber) {
 		this.listenPort = listenPort;
+		this.listenPortConflictDescriber = listenPortConflictDescriber;
 	}
 	async start() {
 		if (this.server) return;
@@ -1597,7 +1599,9 @@ var CliDevProxyServer = class {
 			this.handleUpgrade(request, socket, head);
 		});
 		await new Promise((resolve, reject) => {
-			server.once("error", reject);
+			server.once("error", (error) => {
+				this.rejectListenError(error, reject);
+			});
 			server.listen(this.listenPort, "127.0.0.1", () => {
 				resolve();
 			});
@@ -1681,7 +1685,6 @@ var CliDevProxyServer = class {
 	async handleHttpRequest(req, res) {
 		const pathname = this.safePathname(req.url ?? "");
 		const uiProxyTarget = this.uiProxyTarget;
-		const activeRuntimeTarget = this.activeRuntime ? `http://127.0.0.1:${this.activeRuntime.httpPort}` : void 0;
 		if (pathname === "/api/dev/health" && req.method === "GET") {
 			res.writeHead(200, { "content-type": "application/json" });
 			res.end(JSON.stringify({
@@ -1690,15 +1693,6 @@ var CliDevProxyServer = class {
 			}));
 			return;
 		}
-		if (pathname === "/api/dev/bootstrap-summary") {
-			if (!activeRuntimeTarget) {
-				res.writeHead(503, { "content-type": "text/plain" });
-				res.end("Runtime is rebuilding.");
-				return;
-			}
-			this.proxy.web(req, res, { target: activeRuntimeTarget });
-			return;
-		}
 		if (uiProxyTarget && pathname.startsWith("/api/auth/")) {
 			this.proxy.web(req, res, { target: uiProxyTarget.replace(/\/$/, "") });
 			return;
@@ -1709,7 +1703,7 @@ var CliDevProxyServer = class {
 				res.end("Runtime is rebuilding.");
 				return;
 			}
-			this.proxy.web(req, res, { target: activeRuntimeTarget });
+			this.proxy.web(req, res, { target: `http://127.0.0.1:${this.activeRuntime.httpPort}` });
 			return;
 		}
 		if (uiProxyTarget) {
@@ -1747,6 +1741,16 @@ var CliDevProxyServer = class {
 			return url.split("?")[0] ?? url;
 		}
 	}
+	async rejectListenError(error, reject) {
+		if (error.code !== "EADDRINUSE") {
+			reject(error);
+			return;
+		}
+		const description = await this.listenPortConflictDescriber.describeLoopbackPort(this.listenPort);
+		const baseMessage = `Dev gateway port ${this.listenPort} is already in use on 127.0.0.1.`;
+		const suffix = description === null ? " Stop the process using that port or change the configured Codemation dev port." : ` Listener: ${description}. Stop that process or change the configured Codemation dev port.`;
+		reject(new Error(`${baseMessage}${suffix}`, { cause: error instanceof Error ? error : void 0 }));
+	}
 	broadcastDev(message) {
 		const text = JSON.stringify(message);
 		for (const client of this.devClients) if (client.readyState === WebSocket.OPEN) client.send(text);
@@ -1911,11 +1915,74 @@ var CliDevProxyServer = class {
 	}
 };
 
+//#endregion
+//#region src/dev/ListenPortConflictDescriber.ts
+var ListenPortConflictDescriber = class {
+	constructor(platform = process$1.platform) {
+		this.platform = platform;
+	}
+	async describeLoopbackPort(port) {
+		if (!Number.isInteger(port) || port <= 0) return null;
+		if (this.platform !== "linux" && this.platform !== "darwin") return null;
+		const raw = await this.readLsofOutput(port);
+		if (raw === null) return null;
+		const occupants = this.parseLsofOutput(raw);
+		if (occupants.length === 0) return null;
+		return occupants.map((occupant) => `pid=${occupant.pid} command=${occupant.command} endpoint=${occupant.endpoint}`).join("; ");
+	}
+	async readLsofOutput(port) {
+		try {
+			return await new Promise((resolve, reject) => {
+				execFile("lsof", [
+					"-nP",
+					`-iTCP:${port}`,
+					"-sTCP:LISTEN",
+					"-Fpcn"
+				], (error, stdout) => {
+					if (error) {
+						reject(error);
+						return;
+					}
+					resolve(stdout);
+				});
+			});
+		} catch {
+			return null;
+		}
+	}
+	parseLsofOutput(raw) {
+		const occupants = [];
+		let currentPid = null;
+		let currentCommand = null;
+		for (const line of raw.split("\n")) {
+			if (line.length < 2) continue;
+			const prefix = line[0];
+			const value = line.slice(1).trim();
+			if (prefix === "p") {
+				currentPid = Number.parseInt(value, 10);
+				currentCommand = null;
+				continue;
+			}
+			if (prefix === "c") {
+				currentCommand = value;
+				continue;
+			}
+			if (prefix === "n" && currentPid !== null && currentCommand !== null) occupants.push({
+				pid: currentPid,
+				command: currentCommand,
+				endpoint: value
+			});
+		}
+		return occupants;
+	}
+};
+
 //#endregion
 //#region src/dev/CliDevProxyServerFactory.ts
 var CliDevProxyServerFactory = class {
+	listenPortConflictDescriber = new ListenPortConflictDescriber();
 	create(gatewayPort) {
-		return new CliDevProxyServer(gatewayPort);
+		return new CliDevProxyServer(gatewayPort, this.listenPortConflictDescriber);
 	}
 };
 
@@ -2919,12 +2986,8 @@ var NextHostConsumerServerCommandFactory = class {
 //#region src/runtime/TypeScriptRuntimeConfigurator.ts
 var TypeScriptRuntimeConfigurator = class {
 	configure(repoRoot) {
-		if (this.hasExplicitOverride()) return;
 		process$1.env.CODEMATION_TSCONFIG_PATH = path.resolve(repoRoot, "tsconfig.base.json");
 	}
-	hasExplicitOverride() {
-		return typeof process$1.env.CODEMATION_TSCONFIG_PATH === "string" && process$1.env.CODEMATION_TSCONFIG_PATH.length > 0;
-	}
 };
 
 //#endregion

package/dist/bin.js

@@ -1,4 +1,4 @@
-import { t as CliBin } from "./CliBin-Bx1lFBi5.js";
+import { t as CliBin } from "./CliBin-BAnFX1wL.js";
 import process from "node:process";
 import "reflect-metadata";
 

package/dist/index.d.ts

@@ -23283,7 +23283,6 @@ declare class CliPathResolver {
 //#region src/runtime/TypeScriptRuntimeConfigurator.d.ts
 declare class TypeScriptRuntimeConfigurator {
   configure(repoRoot: string): void;
-  private hasExplicitOverride;
 }
 //#endregion
 //#region src/commands/BuildCommand.d.ts
@@ -23418,6 +23417,15 @@ declare class DevBootstrapSummaryFetcher {
   fetch(gatewayBaseUrl: string): Promise<DevBootstrapSummaryJson | null>;
 }
 //#endregion
+//#region src/dev/ListenPortConflictDescriber.d.ts
+declare class ListenPortConflictDescriber {
+  private readonly platform;
+  constructor(platform?: NodeJS.Platform);
+  describeLoopbackPort(port: number): Promise<string | null>;
+  private readLsofOutput;
+  private parseLsofOutput;
+}
+//#endregion
 //#region src/dev/CliDevProxyServer.d.ts
 type ProxyRuntimeTarget = Readonly<{
   httpPort: number;
@@ -23426,6 +23434,7 @@ type ProxyRuntimeTarget = Readonly<{
 type BuildStatus = "idle" | "building";
 declare class CliDevProxyServer {
   private readonly listenPort;
+  private readonly listenPortConflictDescriber;
   private readonly proxy;
   private readonly devClients;
   private readonly devWss;
@@ -23438,7 +23447,7 @@ declare class CliDevProxyServer {
   private childWorkflowSocket;
   private server;
   private uiProxyTarget;
-  constructor(listenPort: number);
+  constructor(listenPort: number, listenPortConflictDescriber: ListenPortConflictDescriber);
   start(): Promise<void>;
   stop(): Promise<void>;
   setUiProxyTarget(target: string | null): void;
@@ -23452,6 +23461,7 @@ declare class CliDevProxyServer {
   private handleHttpRequest;
   private handleUpgrade;
   private safePathname;
+  private rejectListenError;
   private broadcastDev;
   private broadcastWorkflowLifecycleToSubscribedRooms;
   private connectWorkflowClient;
@@ -23471,6 +23481,7 @@ declare class CliDevProxyServer {
 //#endregion
 //#region src/dev/CliDevProxyServerFactory.d.ts
 declare class CliDevProxyServerFactory {
+  private readonly listenPortConflictDescriber;
   create(gatewayPort: number): CliDevProxyServer;
 }
 //#endregion

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as CliProgram, i as CliPathResolver, n as CliProgramFactory, o as ConsumerOutputBuilder, r as CodemationCliApplicationSession, s as ConsumerBuildOptionsParser, t as CliBin } from "./CliBin-Bx1lFBi5.js";
+import { a as CliProgram, i as CliPathResolver, n as CliProgramFactory, o as ConsumerOutputBuilder, r as CodemationCliApplicationSession, s as ConsumerBuildOptionsParser, t as CliBin } from "./CliBin-BAnFX1wL.js";
 import { CodemationPluginDiscovery } from "@codemation/host/server";
 
 export { CliBin, CliPathResolver, CliProgram, CliProgramFactory, CodemationCliApplicationSession, CodemationPluginDiscovery, ConsumerBuildOptionsParser, ConsumerOutputBuilder };

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "@codemation/cli",
-  "version": "0.0.7",
+  "version": "0.0.11",
   "publishConfig": {
     "access": "public"
   },
   "author": "Made Relevant B.V.",
   "homepage": "https://www.maderelevant.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/MadeRelevant/codemation",
+    "directory": "packages/cli"
+  },
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,8 +37,8 @@
     "reflect-metadata": "^0.2.2",
     "typescript": "^5.9.3",
     "ws": "^8.19.0",
-    "@codemation/host": "0.0.7",
-    "@codemation/next-host": "0.0.7"
+    "@codemation/host": "0.0.11",
+    "@codemation/next-host": "0.0.11"
   },
   "devDependencies": {
     "@types/http-proxy": "^1.17.15",

package/src/commands/DevCommand.ts

@@ -387,6 +387,7 @@ export class DevCommand {
       shouldRestartUi: boolean;
     }>,
   ): Promise<void> {
+    void request.changedPaths;
     proxyServer.setBuildStatus("building");
     proxyServer.broadcastBuildStarted();
     try {

package/src/dev/CliDevProxyServer.ts

@@ -3,6 +3,7 @@ import { ApiPaths } from "@codemation/host";
 import httpProxy from "http-proxy";
 import type { Duplex } from "node:stream";
 import { WebSocket, WebSocketServer } from "ws";
+import type { ListenPortConflictDescriber } from "./ListenPortConflictDescriber";
 
 type WorkflowClientMessage =
   | Readonly<{ kind: "subscribe"; roomId: string }>
@@ -29,7 +30,10 @@ export class CliDevProxyServer {
   private server: HttpServer | null = null;
   private uiProxyTarget: string | null = null;
 
-  constructor(private readonly listenPort: number) {}
+  constructor(
+    private readonly listenPort: number,
+    private readonly listenPortConflictDescriber: ListenPortConflictDescriber,
+  ) {}
 
   async start(): Promise<void> {
     if (this.server) {
@@ -53,7 +57,9 @@ export class CliDevProxyServer {
       this.handleUpgrade(request, socket, head);
     });
     await new Promise<void>((resolve, reject) => {
-      server.once("error", reject);
+      server.once("error", (error) => {
+        void this.rejectListenError(error, reject);
+      });
       server.listen(this.listenPort, "127.0.0.1", () => {
         resolve();
       });
@@ -147,7 +153,6 @@ export class CliDevProxyServer {
   private async handleHttpRequest(req: IncomingMessage, res: ServerResponse): Promise<void> {
     const pathname = this.safePathname(req.url ?? "");
     const uiProxyTarget = this.uiProxyTarget;
-    const activeRuntimeTarget = this.activeRuntime ? `http://127.0.0.1:${this.activeRuntime.httpPort}` : undefined;
     if (pathname === "/api/dev/health" && req.method === "GET") {
       res.writeHead(200, { "content-type": "application/json" });
       res.end(
@@ -160,17 +165,6 @@ export class CliDevProxyServer {
       );
       return;
     }
-    if (pathname === "/api/dev/bootstrap-summary") {
-      if (!activeRuntimeTarget) {
-        res.writeHead(503, { "content-type": "text/plain" });
-        res.end("Runtime is rebuilding.");
-        return;
-      }
-      this.proxy.web(req, res, {
-        target: activeRuntimeTarget,
-      });
-      return;
-    }
     if (uiProxyTarget && pathname.startsWith("/api/auth/")) {
       this.proxy.web(req, res, {
         target: uiProxyTarget.replace(/\/$/, ""),
@@ -184,7 +178,7 @@ export class CliDevProxyServer {
         return;
       }
       this.proxy.web(req, res, {
-        target: activeRuntimeTarget,
+        target: `http://127.0.0.1:${this.activeRuntime.httpPort}`,
       });
       return;
     }
@@ -230,6 +224,22 @@ export class CliDevProxyServer {
     }
   }
 
+  private async rejectListenError(error: unknown, reject: (reason?: unknown) => void): Promise<void> {
+    const errorWithCode = error as Error & Readonly<{ code?: unknown }>;
+    if (errorWithCode.code !== "EADDRINUSE") {
+      reject(error);
+      return;
+    }
+
+    const description = await this.listenPortConflictDescriber.describeLoopbackPort(this.listenPort);
+    const baseMessage = `Dev gateway port ${this.listenPort} is already in use on 127.0.0.1.`;
+    const suffix =
+      description === null
+        ? " Stop the process using that port or change the configured Codemation dev port."
+        : ` Listener: ${description}. Stop that process or change the configured Codemation dev port.`;
+    reject(new Error(`${baseMessage}${suffix}`, { cause: error instanceof Error ? error : undefined }));
+  }
+
   private broadcastDev(message: Readonly<Record<string, unknown>>): void {
     const text = JSON.stringify(message);
     for (const client of this.devClients) {

package/src/dev/CliDevProxyServerFactory.ts

@@ -1,7 +1,10 @@
 import { CliDevProxyServer } from "./CliDevProxyServer";
+import { ListenPortConflictDescriber } from "./ListenPortConflictDescriber";
 
 export class CliDevProxyServerFactory {
+  private readonly listenPortConflictDescriber = new ListenPortConflictDescriber();
+
   create(gatewayPort: number): CliDevProxyServer {
-    return new CliDevProxyServer(gatewayPort);
+    return new CliDevProxyServer(gatewayPort, this.listenPortConflictDescriber);
   }
 }

package/src/dev/ListenPortConflictDescriber.ts

@@ -0,0 +1,83 @@
+import { execFile } from "node:child_process";
+import process from "node:process";
+
+type PortOccupant = Readonly<{
+  pid: number;
+  command: string;
+  endpoint: string;
+}>;
+
+export class ListenPortConflictDescriber {
+  constructor(private readonly platform: NodeJS.Platform = process.platform) {}
+
+  async describeLoopbackPort(port: number): Promise<string | null> {
+    if (!Number.isInteger(port) || port <= 0) {
+      return null;
+    }
+    if (this.platform !== "linux" && this.platform !== "darwin") {
+      return null;
+    }
+
+    const raw = await this.readLsofOutput(port);
+    if (raw === null) {
+      return null;
+    }
+    const occupants = this.parseLsofOutput(raw);
+    if (occupants.length === 0) {
+      return null;
+    }
+
+    return occupants
+      .map((occupant) => `pid=${occupant.pid} command=${occupant.command} endpoint=${occupant.endpoint}`)
+      .join("; ");
+  }
+
+  private async readLsofOutput(port: number): Promise<string | null> {
+    try {
+      return await new Promise<string>((resolve, reject) => {
+        execFile("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-Fpcn"], (error, stdout) => {
+          if (error) {
+            reject(error);
+            return;
+          }
+          resolve(stdout);
+        });
+      });
+    } catch {
+      return null;
+    }
+  }
+
+  private parseLsofOutput(raw: string): ReadonlyArray<PortOccupant> {
+    const occupants: PortOccupant[] = [];
+    let currentPid: number | null = null;
+    let currentCommand: string | null = null;
+
+    for (const line of raw.split("\n")) {
+      if (line.length < 2) {
+        continue;
+      }
+      const prefix = line[0];
+      const value = line.slice(1).trim();
+
+      if (prefix === "p") {
+        currentPid = Number.parseInt(value, 10);
+        currentCommand = null;
+        continue;
+      }
+      if (prefix === "c") {
+        currentCommand = value;
+        continue;
+      }
+      if (prefix === "n" && currentPid !== null && currentCommand !== null) {
+        occupants.push({
+          pid: currentPid,
+          command: currentCommand,
+          endpoint: value,
+        });
+      }
+    }
+
+    return occupants;
+  }
+}

package/src/runtime/TypeScriptRuntimeConfigurator.ts

@@ -3,13 +3,6 @@ import process from "node:process";
 
 export class TypeScriptRuntimeConfigurator {
   configure(repoRoot: string): void {
-    if (this.hasExplicitOverride()) {
-      return;
-    }
     process.env.CODEMATION_TSCONFIG_PATH = path.resolve(repoRoot, "tsconfig.base.json");
   }
-
-  private hasExplicitOverride(): boolean {
-    return typeof process.env.CODEMATION_TSCONFIG_PATH === "string" && process.env.CODEMATION_TSCONFIG_PATH.length > 0;
-  }
 }