@openscout/scout 0.2.69 → 0.2.72

package/dist/runtime/base-daemon.mjs

@@ -15,6 +15,7 @@ import { fileURLToPath } from "url";
 
 // packages/runtime/src/broker-api.ts
 import { request as httpRequest } from "http";
+var DEFAULT_BROKER_JSON_REQUEST_TIMEOUT_MS = 30000;
 function normalizeBaseUrl(baseUrl) {
   const trimmed = baseUrl.trim();
   if (!trimmed) {
@@ -115,12 +116,19 @@ function requestBrokerOverUnixSocket(socketPath, baseUrl, path, options) {
     request.end();
   });
 }
+function defaultBrokerRequestSignal(options) {
+  return options.signal ?? AbortSignal.timeout(DEFAULT_BROKER_JSON_REQUEST_TIMEOUT_MS);
+}
 async function requestBrokerWire(baseUrl, path, options) {
+  const requestOptions = {
+    ...options,
+    signal: defaultBrokerRequestSignal(options)
+  };
   const socketPath = options.socketPath?.trim();
   if (socketPath) {
     try {
       return {
-        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, options),
+        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, requestOptions),
         trace: {
           transport: "unix_socket",
           socketPath
@@ -131,7 +139,7 @@ async function requestBrokerWire(baseUrl, path, options) {
         throw error;
       }
       return {
-        response: await requestBrokerOverHttp(baseUrl, path, options),
+        response: await requestBrokerOverHttp(baseUrl, path, requestOptions),
         trace: {
           transport: "http",
           socketPath,
@@ -141,7 +149,7 @@ async function requestBrokerWire(baseUrl, path, options) {
     }
   }
   return {
-    response: await requestBrokerOverHttp(baseUrl, path, options),
+    response: await requestBrokerOverHttp(baseUrl, path, requestOptions),
     trace: {
       transport: "http"
     }
@@ -182,6 +190,8 @@ function resolveOpenScoutSupportPaths() {
   const logsDirectory = join(supportDirectory, "logs");
   const runtimeDirectory = join(supportDirectory, "runtime");
   const catalogDirectory = join(supportDirectory, "catalog");
+  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join(home, ".openscout", "control-plane");
+  const knowledgeDirectory = join(controlHome, "knowledge");
   return {
     supportDirectory,
     logsDirectory,
@@ -193,8 +203,12 @@ function resolveOpenScoutSupportPaths() {
     settingsPath: join(supportDirectory, "settings.json"),
     harnessCatalogPath: join(catalogDirectory, "harness-catalog.json"),
     relayAgentsRegistryPath: join(supportDirectory, "relay-agents.json"),
+    managedInstallsPath: join(supportDirectory, "managed-installs.json"),
     relayHubDirectory: process.env.OPENSCOUT_RELAY_HUB ?? join(home, ".openscout", "relay"),
-    controlHome: process.env.OPENSCOUT_CONTROL_HOME ?? join(home, ".openscout", "control-plane"),
+    controlHome,
+    knowledgeDirectory,
+    knowledgeQmdDirectory: join(knowledgeDirectory, "qmd"),
+    knowledgeSqlitePath: join(knowledgeDirectory, "knowledge.sqlite"),
     desktopStatusPath: join(supportDirectory, "agent-status.json"),
     workspaceStatePath: join(supportDirectory, "workspace-state.json"),
     cutoverMarkerPath: join(supportDirectory, OPENSCOUT_RPC_CUTOVER_MARKER)
@@ -342,6 +356,7 @@ function resolveBrokerHost(scope = resolveAdvertiseScope()) {
 }
 var BROKER_SERVICE_POLL_INTERVAL_MS = 100;
 var DEFAULT_BROKER_START_TIMEOUT_MS = 15000;
+var DEFAULT_BROKER_STOP_TIMEOUT_MS = 20000;
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -437,6 +452,13 @@ function resolveBrokerStartTimeoutMs() {
   }
   return DEFAULT_BROKER_START_TIMEOUT_MS;
 }
+function resolveBrokerStopTimeoutMs() {
+  const explicit = Number.parseInt(process.env.OPENSCOUT_BROKER_STOP_TIMEOUT_MS ?? "", 10);
+  if (Number.isFinite(explicit) && explicit > 0) {
+    return Math.max(explicit, BROKER_SERVICE_POLL_INTERVAL_MS);
+  }
+  return DEFAULT_BROKER_STOP_TIMEOUT_MS;
+}
 function resolveBrokerServiceLabel(mode) {
   const explicit = process.env.OPENSCOUT_SERVICE_LABEL?.trim() || process.env.OPENSCOUT_BROKER_SERVICE_LABEL?.trim();
   if (explicit) {
@@ -526,7 +548,18 @@ function renderLaunchAgentPlist(config) {
       "OPENSCOUT_NODE_QUALIFIER",
       "OPENSCOUT_TAILSCALE_BIN",
       "OPENSCOUT_TAILSCALE_STATUS_JSON",
-      "OPENSCOUT_SSE_KEEPALIVE_MS"
+      "OPENSCOUT_SSE_KEEPALIVE_MS",
+      "OPENSCOUT_WEB_EDGE_SCHEME",
+      "OPENSCOUT_WEB_PUBLIC_ORIGIN",
+      "OPENSCOUT_WEB_PORTAL_HOST",
+      "OPENSCOUT_WEB_LOCAL_NAME",
+      "OPENSCOUT_WEB_ADVERTISED_HOST",
+      "OPENSCOUT_WEB_TRUSTED_HOSTS",
+      "OPENSCOUT_WEB_TRUSTED_ORIGINS",
+      "OPENSCOUT_WEB_PORT",
+      "OPENSCOUT_WEB_FLAG_BUNDLE",
+      "OPENSCOUT_WEB_EXPERIENCE",
+      "OPENSCOUT_WEB_AB_VARIANT"
     ])
   };
   if (coreAgentsValue) {
@@ -809,6 +842,7 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
   bootoutLegacyBrokerService(config);
   writeLaunchAgentPlist(config);
   runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
+  await waitForBrokerServiceStopped(config);
   runCommand(launchctlPath(), ["bootstrap", config.domainTarget, config.launchAgentPath], { allowFailure: true });
   runCommand(launchctlPath(), ["kickstart", "-k", config.serviceTarget], { allowFailure: true });
   const attempts = Math.ceil(resolveBrokerStartTimeoutMs() / BROKER_SERVICE_POLL_INTERVAL_MS);
@@ -825,16 +859,21 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
 function sleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
-async function stopBrokerService(config = resolveBrokerServiceConfig()) {
-  runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
-  for (let attempt = 0;attempt < 30; attempt += 1) {
-    const status = await brokerServiceStatus(config);
-    if (!status.health.reachable) {
+async function waitForBrokerServiceStopped(config) {
+  let status = await brokerServiceStatus(config);
+  const attempts = Math.ceil(resolveBrokerStopTimeoutMs() / BROKER_SERVICE_POLL_INTERVAL_MS);
+  for (let attempt = 0;attempt < attempts; attempt += 1) {
+    status = await brokerServiceStatus(config);
+    if (!status.loaded && !status.health.reachable) {
       return status;
     }
     await sleep(BROKER_SERVICE_POLL_INTERVAL_MS);
   }
-  return brokerServiceStatus(config);
+  return status;
+}
+async function stopBrokerService(config = resolveBrokerServiceConfig()) {
+  runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
+  return waitForBrokerServiceStopped(config);
 }
 async function restartBrokerService(config = resolveBrokerServiceConfig()) {
   await stopBrokerService(config);
@@ -1282,6 +1321,7 @@ var RESTART_MIN_DELAY_MS = 1000;
 var RESTART_MAX_DELAY_MS = 30000;
 var BROKER_HEALTH_TIMEOUT_MS = 30000;
 var BROKER_HEALTH_POLL_MS = 250;
+var CHILD_SHUTDOWN_TIMEOUT_MS = 12000;
 var MENU_BUNDLE_ID = "com.openscout.menu";
 var MENU_PROCESS_NAME = "OpenScoutMenu";
 var PROCESS_NAME = "scout-base";
@@ -1395,6 +1435,9 @@ function resolveEdgeScheme() {
   }
   return "http";
 }
+function forwardedProtoForEdgeScheme(scheme) {
+  return scheme === "http" ? "http" : "https";
+}
 function resolveEdgeConfig() {
   const portalHost = process.env.OPENSCOUT_WEB_PORTAL_HOST?.trim() || DEFAULT_SCOUT_WEB_PORTAL_HOST;
   const nodeHost = process.env.OPENSCOUT_WEB_ADVERTISED_HOST?.trim() || (process.env.OPENSCOUT_WEB_LOCAL_NAME?.trim() ? resolveScoutWebNamedHostname(process.env.OPENSCOUT_WEB_LOCAL_NAME) : resolveConfiguredScoutWebHostname());
@@ -1519,7 +1562,7 @@ async function startWebWhenBrokerIsReady() {
   }
   try {
     const edgeConfig = resolveEdgeConfig();
-    const scheme = edgeConfig.scheme === "https" ? "https" : "http";
+    const scheme = forwardedProtoForEdgeScheme(edgeConfig.scheme);
     const response = await fetch(new URL("/v1/web/start", config.brokerUrl), {
       method: "POST",
       headers: {
@@ -1588,6 +1631,44 @@ function stopMenuBarApp() {
   }
   spawn("pkill", ["-x", MENU_PROCESS_NAME], { stdio: "ignore" }).unref();
 }
+function isChildExited(child) {
+  return child.exitCode !== null || child.signalCode !== null;
+}
+function waitForChildExit(child, timeoutMs) {
+  if (isChildExited(child)) {
+    return Promise.resolve(true);
+  }
+  return new Promise((resolve4) => {
+    const timeout = setTimeout(() => {
+      child.off("exit", onExit);
+      resolve4(false);
+    }, timeoutMs);
+    timeout.unref();
+    const onExit = () => {
+      clearTimeout(timeout);
+      resolve4(true);
+    };
+    child.once("exit", onExit);
+  });
+}
+async function terminateChildProcess(child, label, timeoutMs = CHILD_SHUTDOWN_TIMEOUT_MS) {
+  if (!child || isChildExited(child)) {
+    return;
+  }
+  if (!child.killed) {
+    child.kill("SIGTERM");
+  }
+  if (await waitForChildExit(child, timeoutMs)) {
+    return;
+  }
+  warn(`${label} did not exit after SIGTERM; forcing shutdown`, { pid: child.pid });
+  try {
+    child.kill("SIGKILL");
+  } catch {
+    return;
+  }
+  await waitForChildExit(child, 2000);
+}
 function stopSupervisedWeb() {
   if (supervisedWebPid && supervisedWebPid > 0) {
     try {
@@ -1607,11 +1688,10 @@ async function shutdown(exitCode = 0) {
   }
   stopSupervisedWeb();
   stopMenuBarApp();
+  const activeCaddyProcess = caddyProcess;
   stopEdgeProcesses();
-  if (brokerProcess && !brokerProcess.killed) {
-    brokerProcess.kill("SIGTERM");
-  }
-  await sleep2(500);
+  await terminateChildProcess(brokerProcess, "broker");
+  await terminateChildProcess(activeCaddyProcess, "local edge", 2000);
   process.exit(exitCode);
 }
 function sleep2(ms) {