@camstack/agent 1.1.19 → 1.1.21

package/dist/cli.js

@@ -37,6 +37,67 @@ var path6 = __toESM(require("path"));
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var import_fastify = __toESM(require("fastify"));
+
+// 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;
@@ -98,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;
@@ -836,9 +888,12 @@ function createAgentService(deps) {
           }
           const pkgName = entry?.packageName;
           if (pkgName && pkgName !== addonId) {
-            const pkgDir = path4.join(deps.addonsDir, pkgName);
-            if (fs4.existsSync(pkgDir)) {
-              fs4.rmSync(pkgDir, { recursive: true, force: true });
+            const pkgShared = [...deps.loadedAddons.values()].some((e) => e.packageName === pkgName);
+            if (!pkgShared) {
+              const pkgDir = path4.join(deps.addonsDir, pkgName);
+              if (fs4.existsSync(pkgDir)) {
+                fs4.rmSync(pkgDir, { recursive: true, force: true });
+              }
             }
           }
           broker.logger.info(`$agent.undeploy: ${addonId} disposed (instance + service + folder)`);
@@ -1042,6 +1097,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}`
@@ -1088,6 +1151,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",
@@ -1352,6 +1422,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);
@@ -1832,6 +1921,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