@openscout/scout 0.2.97 → 0.2.102

package/dist/runtime/base-daemon.mjs

@@ -4,7 +4,7 @@ import "reflect-metadata";
 // packages/runtime/src/base-daemon.ts
 import { spawn as spawn3 } from "child_process";
 import { existsSync as existsSync7, mkdirSync as mkdirSync4, openSync, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir7 } from "os";
+import { homedir as homedir7, networkInterfaces as networkInterfaces2 } from "os";
 import { dirname as dirname5, join as join7, resolve as resolve3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -12,7 +12,7 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 import { spawn as spawn2, spawnSync } from "child_process";
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir5, networkInterfaces } from "os";
-import { dirname as dirname3, join as join5, resolve as resolve2 } from "path";
+import { basename as basename2, dirname as dirname3, join as join5, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 
 // packages/runtime/src/broker-api.ts
@@ -1506,12 +1506,14 @@ class ProbeCommandError extends Error {
   code;
   exitCode;
   signal;
+  stderr;
   constructor(message, options) {
     super(message);
     this.name = "ProbeCommandError";
     this.code = options.code;
     this.exitCode = options.exitCode;
     this.signal = options.signal;
+    this.stderr = options.stderr;
   }
 }
 var DEFAULT_STDOUT_CAP_BYTES = 1024 * 1024;
@@ -1624,7 +1626,7 @@ async function execProbeFile(ctx, file, args, options = {}) {
         resolve({ stdout, stderr, exitCode });
         return;
       }
-      reject(new ProbeCommandError(`${file} exited with ${exitCode ?? signal ?? "unknown status"}`, { code: "exit", exitCode, signal }));
+      reject(new ProbeCommandError(`${file} exited with ${exitCode ?? signal ?? "unknown status"}`, { code: "exit", exitCode, signal, stderr }));
     });
   });
 }
@@ -1940,6 +1942,9 @@ function validateLocalConfig(input) {
   if (typeof raw.webLocalName === "string" && raw.webLocalName.trim().length > 0) {
     out.webLocalName = raw.webLocalName.trim();
   }
+  if (raw.webLanScope === "full" || raw.webLanScope === "pairing") {
+    out.webLanScope = raw.webLanScope;
+  }
   if (raw.ports && typeof raw.ports === "object") {
     const ports = raw.ports;
     const p = {};
@@ -2966,7 +2971,13 @@ function formatBrokerServiceStatus(status) {
   return lines.join(`
 `);
 }
-if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1] && !process.argv[1].endsWith("/main.mjs")) {
+function isBrokerServiceEntrypoint(moduleUrl, argvEntry) {
+  if (!argvEntry)
+    return false;
+  const modulePath = fileURLToPath(moduleUrl);
+  return modulePath === argvEntry && ["broker-process-manager.ts", "broker-process-manager.js", "broker-process-manager.mjs"].includes(basename2(modulePath));
+}
+if (isBrokerServiceEntrypoint(import.meta.url, process.argv[1])) {
   main().catch((error) => {
     console.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
@@ -3702,12 +3713,15 @@ function renderCaddyViteDevRouteBlock(route, scheme) {
 ` + `  }
 ` + `}`;
 }
-function renderOpenScoutCaddyfile(config) {
+function renderOpenScoutCaddyfile(config, siteImportsGlob) {
   const schemes = config.scheme === "both" ? ["http", "https"] : [config.scheme];
   const startPage = renderOpenScoutStartPage(config);
   const blocks = schemes.flatMap((scheme) => config.routes.map((route) => route.mode === "vite-dev" ? renderCaddyViteDevRouteBlock(route, scheme) : renderCaddyDefaultRouteBlock(config, route, scheme, startPage))).join(`
 
 `);
+  const imports = siteImportsGlob ? `
+import ${JSON.stringify(siteImportsGlob)}
+` : "";
   return `{
   log {
     level WARN
@@ -3715,7 +3729,7 @@ function renderOpenScoutCaddyfile(config) {
 }
 
 ${blocks}
-`;
+${imports}`;
 }
 
 // packages/runtime/src/base-daemon.ts
@@ -3787,6 +3801,12 @@ function appendCsvValues(input, values) {
 function resolveTailnetWebHosts() {
   return readTailscaleSelfWebHostsSync();
 }
+function resolveLanWebHosts() {
+  if (process.env.OPENSCOUT_WEB_TRUST_LAN_ADDRESSES?.trim() === "0") {
+    return [];
+  }
+  return Object.values(networkInterfaces2()).flatMap((entries) => entries ?? []).filter((entry) => !entry.internal).map((entry) => entry.address).filter((address) => !address.toLowerCase().startsWith("fe80:"));
+}
 function resolveWebTrustedHostsEnv() {
   return appendCsvValues(process.env.OPENSCOUT_WEB_TRUSTED_HOSTS, resolveTailnetWebHosts());
 }
@@ -3898,7 +3918,8 @@ function resolveEdgeConfig() {
     viteHmrPath: process.env.OPENSCOUT_WEB_VITE_HMR_PATH,
     extraHosts: [
       ...splitCsv(process.env.OPENSCOUT_WEB_TRUSTED_HOSTS),
-      ...resolveTailnetWebHosts()
+      ...resolveTailnetWebHosts(),
+      ...resolveLanWebHosts()
     ]
   });
 }
@@ -3947,7 +3968,9 @@ function startLocalEdge() {
   const edgeConfig = resolveEdgeConfig();
   const schemes = edgeConfig.scheme === "both" ? ["http", "https"] : [edgeConfig.scheme];
   const caddyfilePath = resolveLocalEdgeCaddyfilePath();
-  writeFileSync4(caddyfilePath, renderOpenScoutCaddyfile(edgeConfig), "utf8");
+  const sitesDirectory = join7(dirname5(caddyfilePath), "sites");
+  ensureDirectory(sitesDirectory);
+  writeFileSync4(caddyfilePath, renderOpenScoutCaddyfile(edgeConfig, join7(sitesDirectory, "*.caddy")), "utf8");
   mdnsProcesses = schemes.flatMap((scheme) => {
     const edgePort = scheme === "https" ? 443 : 80;
     const suffix = scheme.toUpperCase();