@openscout/scout 0.2.73 → 0.2.74

package/dist/runtime/base-daemon.mjs

@@ -2226,6 +2226,29 @@ function readNumber2(value) {
 function readHealthTransport(value) {
   return value === "unix_socket" || value === "http" || value === "in_process" ? value : undefined;
 }
+function readRuntimeFreshness(value) {
+  if (!isRecord3(value))
+    return;
+  const state = readString2(value.state);
+  const basis = readString2(value.basis);
+  const detail = readString2(value.detail);
+  if (!state || !basis || !detail)
+    return;
+  return {
+    state,
+    intentional: readBoolean(value.intentional) ?? false,
+    basis,
+    artifactCommit: readString2(value.artifactCommit) ?? null,
+    expectedCommit: readString2(value.expectedCommit) ?? null,
+    pin: readString2(value.pin) ?? null,
+    pinReason: readString2(value.pinReason) ?? null,
+    manifestPath: readString2(value.manifestPath) ?? null,
+    version: readString2(value.version) ?? null,
+    builtAt: readString2(value.builtAt) ?? null,
+    sourceDirty: readBoolean(value.sourceDirty) ?? null,
+    detail
+  };
+}
 function normalizeNativeServiceStatus(input, config) {
   const healthRecord = isRecord3(input.health) ? input.health : {};
   const healthReachable = readBoolean(healthRecord.reachable) ?? readBoolean(input.reachable) ?? false;
@@ -2241,6 +2264,7 @@ function normalizeNativeServiceStatus(input, config) {
   const stdoutLogPath = readString2(input.stdoutLogPath) ?? config.stdoutLogPath;
   const stderrLogPath = readString2(input.stderrLogPath) ?? config.stderrLogPath;
   const lastLogLine = readString2(input.lastLogLine) ?? (healthReachable ? readLastLogLine([stdoutLogPath, stderrLogPath]) : readLastLogLine([stderrLogPath, stdoutLogPath]));
+  const runtimeFreshness = readRuntimeFreshness(input.runtimeFreshness);
   return {
     label: readString2(input.label) ?? config.label,
     mode: readString2(input.mode) ?? config.mode,
@@ -2275,6 +2299,7 @@ function normalizeNativeServiceStatus(input, config) {
       ...isRecord3(healthRecord.services) ? { services: healthRecord.services } : {},
       error: healthError
     },
+    ...runtimeFreshness ? { runtimeFreshness } : {},
     lastLogLine
   };
 }
@@ -2579,8 +2604,12 @@ function formatBrokerServiceStatus(status) {
     `reachable: ${status.reachable ? "yes" : "no"}`,
     `health: ${status.health.ok ? "ok" : status.health.error ?? "unreachable"}`,
     `health transport: ${status.health.transport ?? "unknown"}`,
+    `runtime freshness: ${status.runtimeFreshness?.state ?? "unavailable"}`,
     `logs: ${status.stdoutLogPath}`
   ];
+  if (status.runtimeFreshness) {
+    lines.push(`runtime freshness detail: ${status.runtimeFreshness.detail}`);
+  }
   if (status.health.socketFallbackError) {
     lines.push(`socket fallback: ${status.health.socketFallbackError}`);
   }
@@ -2934,6 +2963,7 @@ 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 WEB_START_RETRY_MS = 5000;
 var MENU_BUNDLE_ID = "app.openscout.scout.menu";
 var MENU_PROCESS_NAME = "ScoutMenu";
 var PROCESS_NAME = "scout-base";
@@ -2949,6 +2979,8 @@ var brokerRestartDelayMs = RESTART_MIN_DELAY_MS;
 var edgeRestartDelayMs = RESTART_MIN_DELAY_MS;
 var supervisedWebPid = null;
 var baseKeepAlive = null;
+var webStartRetryTimer = null;
+var webStartInFlight = false;
 var config = resolveBrokerServiceConfig();
 var brokerControlUrl = buildLocalBrokerControlUrl(config.brokerHost, config.brokerPort);
 function log(message, details) {
@@ -3207,33 +3239,54 @@ async function startWebWhenBrokerIsReady() {
   if (process.env.OPENSCOUT_BASE_START_WEB === "0") {
     return;
   }
-  if (!await waitForBrokerHealth()) {
-    warn("broker did not become healthy before web startup timeout");
+  if (webStartInFlight) {
     return;
   }
+  webStartInFlight = true;
   try {
-    const edgeConfig = resolveEdgeConfig();
-    const scheme = forwardedProtoForEdgeScheme(edgeConfig.scheme);
-    const response = await fetch(new URL("/v1/web/start", brokerControlUrl), {
-      method: "POST",
-      headers: {
-        accept: "application/json",
-        "x-forwarded-host": edgeConfig.portalHost,
-        "x-forwarded-proto": scheme
-      },
-      signal: AbortSignal.timeout(15000)
-    });
-    const body = await response.json();
-    supervisedWebPid = typeof body.pid === "number" ? body.pid : resolvePortListenerPid(Number.parseInt(process.env.OPENSCOUT_WEB_PORT ?? "", 10) || resolveWebPort());
-    if (!response.ok || body.ok !== true) {
-      warn("web server did not report healthy", body.error ?? response.statusText);
+    if (!await waitForBrokerHealth()) {
+      warn("broker did not become healthy before web startup timeout");
+      scheduleWebStartRetry();
       return;
     }
-    log("web server ready", { pid: supervisedWebPid });
-  } catch (error) {
-    warn("web server startup failed", error instanceof Error ? error.message : String(error));
+    try {
+      const edgeConfig = resolveEdgeConfig();
+      const scheme = forwardedProtoForEdgeScheme(edgeConfig.scheme);
+      const response = await fetch(new URL("/v1/web/start", brokerControlUrl), {
+        method: "POST",
+        headers: {
+          accept: "application/json",
+          "x-forwarded-host": edgeConfig.portalHost,
+          "x-forwarded-proto": scheme
+        },
+        signal: AbortSignal.timeout(15000)
+      });
+      const body = await response.json();
+      supervisedWebPid = typeof body.pid === "number" ? body.pid : resolvePortListenerPid(Number.parseInt(process.env.OPENSCOUT_WEB_PORT ?? "", 10) || resolveWebPort());
+      if (!response.ok || body.ok !== true) {
+        warn("web server did not report healthy", body.error ?? response.statusText);
+        scheduleWebStartRetry();
+        return;
+      }
+      log("web server ready", { pid: supervisedWebPid });
+    } catch (error) {
+      warn("web server startup failed", error instanceof Error ? error.message : String(error));
+      scheduleWebStartRetry();
+    }
+  } finally {
+    webStartInFlight = false;
   }
 }
+function scheduleWebStartRetry() {
+  if (shuttingDown || webStartRetryTimer || process.env.OPENSCOUT_BASE_START_WEB === "0") {
+    return;
+  }
+  webStartRetryTimer = setTimeout(() => {
+    webStartRetryTimer = null;
+    startWebWhenBrokerIsReady();
+  }, WEB_START_RETRY_MS);
+  webStartRetryTimer.unref();
+}
 function resolvePortListenerPid(port) {
   const result = spawnSync2("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], {
     encoding: "utf8"
@@ -3337,6 +3390,10 @@ async function shutdown(exitCode = 0) {
     clearInterval(baseKeepAlive);
     baseKeepAlive = null;
   }
+  if (webStartRetryTimer) {
+    clearTimeout(webStartRetryTimer);
+    webStartRetryTimer = null;
+  }
   stopSupervisedWeb();
   stopMenuBarApp();
   const activeCaddyProcess = caddyProcess;