@camstack/agent 1.1.18 → 1.1.20

package/dist/cli.js

@@ -37,15 +37,106 @@ var path6 = __toESM(require("path"));
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var import_fastify = __toESM(require("fastify"));
-function resolveUiDistDir(dataDir) {
-  const candidates = [
-    path.resolve(__dirname, "../../addon-agent-ui/dist"),
-    path.join(dataDir, "addons", "@camstack", "addon-agent-ui", "dist"),
-    path.join(dataDir, "agent-ui")
-  ];
-  for (const dir of candidates) {
-    if (fs.existsSync(path.join(dir, "index.html"))) return dir;
+
+// src/derive-hub-url.ts
+var HUB_API_PORT = 4443;
+function deriveHubUrlFromHubAddress(hubAddress) {
+  const trimmed = hubAddress.trim();
+  if (trimmed.length === 0) return void 0;
+  const afterAt = trimmed.includes("@") ? trimmed.split("@")[1] ?? "" : trimmed;
+  const authority = afterAt.split("/")[0] ?? "";
+  const host = extractHostFromAuthority(authority);
+  if (host === void 0) return void 0;
+  return `https://${host}:${HUB_API_PORT}`;
+}
+function deriveHubUrlForExport(hubUrlWasExplicit, hubAddress) {
+  if (hubUrlWasExplicit) return void 0;
+  if (hubAddress === void 0) return void 0;
+  return deriveHubUrlFromHubAddress(hubAddress);
+}
+function extractHostFromAuthority(authority) {
+  const value = authority.trim();
+  if (value.length === 0) return void 0;
+  if (value.startsWith("[")) {
+    const end = value.indexOf("]");
+    if (end > 0) return value.slice(0, end + 1);
+    return void 0;
+  }
+  const host = value.split(":")[0] ?? "";
+  return host.length > 0 ? host : void 0;
+}
+var HUB_NODE_ID = "hub";
+var IPV4_MAPPED_PREFIX = "::ffff:";
+var IPV4_DOTTED_QUAD = /^\d{1,3}(?:\.\d{1,3}){3}$/;
+function pickIpv4(ipList) {
+  if (!ipList) return null;
+  for (const ip of ipList) {
+    if (ip.includes(":")) continue;
+    if (ip.startsWith("127.")) continue;
+    return ip;
+  }
+  return null;
+}
+function normalizeObservedHost(raw) {
+  if (raw === void 0 || raw === null) return void 0;
+  const trimmed = raw.trim();
+  if (trimmed.length === 0) return void 0;
+  if (trimmed.startsWith("[")) return trimmed;
+  if (trimmed.toLowerCase().startsWith(IPV4_MAPPED_PREFIX)) {
+    const mapped = trimmed.slice(IPV4_MAPPED_PREFIX.length);
+    if (IPV4_DOTTED_QUAD.test(mapped)) return mapped;
+  }
+  if (trimmed.includes(":")) return `[${trimmed}]`;
+  return trimmed;
+}
+function deriveHubUrlFromRegistry(nodes) {
+  const hub = nodes.find((node) => node.id === HUB_NODE_ID);
+  if (hub === void 0) return void 0;
+  const host = normalizeObservedHost(hub.udpAddress) ?? pickIpv4(hub.ipList) ?? hub.hostname;
+  if (host === void 0 || host.length === 0) return void 0;
+  return `https://${host}:${HUB_API_PORT}`;
+}
+
+// src/agent-http.ts
+function compareVersions(a, b) {
+  if (a === null && b === null) return 0;
+  if (a === null) return -1;
+  if (b === null) return 1;
+  const pa = a.split(".").map((s) => Number.parseInt(s, 10) || 0);
+  const pb = b.split(".").map((s) => Number.parseInt(s, 10) || 0);
+  const len = Math.max(pa.length, pb.length);
+  for (let i = 0; i < len; i++) {
+    const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
+function readUiDistCandidate(baseDir) {
+  const dir = path.join(baseDir, "dist");
+  if (!fs.existsSync(path.join(dir, "index.html"))) return null;
+  let version = null;
+  try {
+    const parsed = JSON.parse(fs.readFileSync(path.join(baseDir, "package.json"), "utf-8"));
+    version = typeof parsed.version === "string" ? parsed.version : null;
+  } catch {
+    version = null;
   }
+  return { dir, version };
+}
+function pickUiDist(installed, bundled) {
+  if (installed && bundled) {
+    return compareVersions(bundled.version, installed.version) > 0 ? bundled.dir : installed.dir;
+  }
+  return installed?.dir ?? bundled?.dir ?? null;
+}
+function resolveUiDistDir(dataDir, bundledAddonsDir, siblingDistDir = path.resolve(__dirname, "../../addon-agent-ui/dist")) {
+  if (fs.existsSync(path.join(siblingDistDir, "index.html"))) return siblingDistDir;
+  const installed = readUiDistCandidate(path.join(dataDir, "addons", "@camstack", "addon-agent-ui"));
+  const bundled = bundledAddonsDir ? readUiDistCandidate(path.join(bundledAddonsDir, "addon-agent-ui")) : null;
+  const picked = pickUiDist(installed, bundled);
+  if (picked) return picked;
+  const legacy = path.join(dataDir, "agent-ui");
+  if (fs.existsSync(path.join(legacy, "index.html"))) return legacy;
   return null;
 }
 function readConfigFile(configPath) {
@@ -68,15 +159,6 @@ function getRegistryNodes(broker) {
     return [];
   }
 }
-function pickIpv4(ipList) {
-  if (!ipList) return null;
-  for (const ip of ipList) {
-    if (ip.includes(":")) continue;
-    if (ip.startsWith("127.")) continue;
-    return ip;
-  }
-  return null;
-}
 function resolveHubEndpoint(nodes) {
   const hub = nodes.find((n) => n.id === "hub");
   if (!hub) return null;
@@ -224,19 +306,26 @@ async function createAgentHttpServer(getBroker, config) {
     const nodes = getRegistryNodes(b);
     return mapDiscoveredNodes(nodes, b.nodeID);
   });
-  const uiDir = resolveUiDistDir(config.dataDir);
+  const uiDir = resolveUiDistDir(config.dataDir, process.env["CAMSTACK_BUNDLED_ADDONS_DIR"]);
   if (uiDir) {
     const fastifyStatic = await import("@fastify/static");
     await app.register(fastifyStatic.default, {
       root: uiDir,
       prefix: "/",
       wildcard: false,
-      decorateReply: false
+      // MUST stay true: the SPA-fallback below uses `reply.sendFile`, which
+      // only exists when the plugin decorates Reply. With `false` every
+      // fallback request 500'd with "reply.sendFile is not a function".
+      decorateReply: true
     });
     app.setNotFoundHandler(async (req, reply) => {
       if (req.url.startsWith("/api/") || req.url.startsWith("/health")) {
         return reply.status(404).send({ error: "Not found" });
       }
+      if (req.url.startsWith("/assets/")) {
+        console.warn(`[Agent] UI asset not found (stale index.html?): ${req.url}`);
+        return reply.status(404).send({ error: "Asset not found" });
+      }
       return reply.type("text/html").sendFile("index.html");
     });
     console.log(`[Agent] UI served from: ${uiDir}`);
@@ -1005,6 +1094,14 @@ var import_system4 = require("@camstack/system");
 var agentLogManager = new import_system4.LogManager(5e3);
 async function startAgent(configPath) {
   const config = loadAgentConfig(configPath);
+  const hubUrlWasExplicit = process.env["CAMSTACK_HUB_URL"] !== void 0;
+  const derivedHubUrl = deriveHubUrlForExport(hubUrlWasExplicit, config.hubAddress);
+  if (derivedHubUrl !== void 0) {
+    process.env["CAMSTACK_HUB_URL"] = derivedHubUrl;
+    console.log(
+      `[Agent] Derived CAMSTACK_HUB_URL=${derivedHubUrl} from hub address "${config.hubAddress}"`
+    );
+  }
   if (config.hubAddress) {
     console.log(
       `[Agent] Starting node "${config.nodeId}" (name="${config.name}") connecting to ${config.hubAddress}`
@@ -1051,6 +1148,13 @@ async function startAgent(configPath) {
     console.log(
       `[Agent] New config: hub=${fresh.hubAddress ?? "discovery"}, secret=${fresh.secret ? "yes" : "none"}`
     );
+    const freshHubUrl = deriveHubUrlForExport(hubUrlWasExplicit, fresh.hubAddress);
+    if (freshHubUrl !== void 0 && process.env["CAMSTACK_HUB_URL"] !== freshHubUrl) {
+      process.env["CAMSTACK_HUB_URL"] = freshHubUrl;
+      console.log(
+        `[Agent] Derived CAMSTACK_HUB_URL=${freshHubUrl} from hub address "${fresh.hubAddress}"`
+      );
+    }
     broker = (0, import_system3.createBroker)({
       nodeID: config.nodeId,
       mode: "agent",
@@ -1315,6 +1419,25 @@ async function startAgent(configPath) {
   (0, import_system3.registerEventBusService)(broker);
   broker.createService((0, import_system3.createHwAccelService)((0, import_system3.createKernelHwAccel)()));
   await broker.start();
+  let hubUrlFromRegistry;
+  const reconcileHubUrlFromRegistry = () => {
+    if (hubUrlWasExplicit) return;
+    const current = process.env["CAMSTACK_HUB_URL"];
+    if (current !== void 0 && current !== hubUrlFromRegistry) return;
+    const fromRegistry = deriveHubUrlFromRegistry(
+      getRegistryNodes(broker)
+    );
+    if (fromRegistry === void 0 || fromRegistry === current) return;
+    process.env["CAMSTACK_HUB_URL"] = fromRegistry;
+    hubUrlFromRegistry = fromRegistry;
+    console.log(`[Agent] Derived CAMSTACK_HUB_URL=${fromRegistry} from live hub connection`);
+  };
+  reconcileHubUrlFromRegistry();
+  broker.localBus.on("$node.connected", (data) => {
+    const node = data.node;
+    if (node?.id !== "hub") return;
+    reconcileHubUrlFromRegistry();
+  });
   let udsEventBridgeDispose = null;
   if (agentUdsRegistry !== void 0) {
     const agentBrokerEventBus = (0, import_system3.getBrokerEventBus)(broker);
@@ -1795,6 +1918,9 @@ Environment variables (override CLI args):
   CAMSTACK_DATA_DIR         Data directory path
   CAMSTACK_LOG_LEVEL        Log level
   CAMSTACK_CLUSTER_SECRET   Cluster secret
+  CAMSTACK_HUB_URL          Derived automatically from the hub address; set
+                            only to override the cross-node stream/recording
+                            pull host
 
 Examples:
   camstack-agent --hub 192.168.1.100