@openscout/web 0.2.38 → 0.2.39

package/dist/openscout-web-server.mjs

@@ -4180,6 +4180,21 @@ import { fileURLToPath as fileURLToPath4 } from "url";
 function isTmpPath(p) {
   return /^\/(?:private\/)?tmp\//.test(p);
 }
+function resolveAdvertiseScope() {
+  const raw2 = (process.env.OPENSCOUT_ADVERTISE_SCOPE ?? "").trim().toLowerCase();
+  if (raw2 === "mesh")
+    return "mesh";
+  if (raw2 === "local")
+    return "local";
+  return DEFAULT_ADVERTISE_SCOPE;
+}
+function resolveBrokerHost(scope = resolveAdvertiseScope()) {
+  const explicit = process.env.OPENSCOUT_BROKER_HOST;
+  if (typeof explicit === "string" && explicit.trim().length > 0) {
+    return explicit;
+  }
+  return scope === "mesh" ? DEFAULT_BROKER_HOST_MESH : DEFAULT_BROKER_HOST;
+}
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -4299,7 +4314,8 @@ function resolveBrokerServiceConfig() {
   const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
   const logsDirectory = join9(supportDirectory, "logs", "broker");
   const controlHome = isTmpPath(supportPaths.controlHome) ? join9(homedir6(), ".openscout", "control-plane") : supportPaths.controlHome;
-  const brokerHost = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST;
+  const advertiseScope = resolveAdvertiseScope();
+  const brokerHost = resolveBrokerHost(advertiseScope);
   const brokerPort = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT), 10);
   const brokerUrl = process.env.OPENSCOUT_BROKER_URL ?? buildDefaultBrokerUrl(brokerHost, brokerPort);
   const launchAgentPath = join9(homedir6(), "Library", "LaunchAgents", `${label}.plist`);
@@ -4319,7 +4335,8 @@ function resolveBrokerServiceConfig() {
     bunExecutable: resolveBunExecutable(),
     brokerHost,
     brokerPort,
-    brokerUrl
+    brokerUrl,
+    advertiseScope
   };
 }
 function renderLaunchAgentPlist(config) {
@@ -4331,6 +4348,7 @@ function renderLaunchAgentPlist(config) {
     OPENSCOUT_CONTROL_HOME: config.controlHome,
     OPENSCOUT_BROKER_SERVICE_MODE: config.mode,
     OPENSCOUT_BROKER_SERVICE_LABEL: config.label,
+    OPENSCOUT_ADVERTISE_SCOPE: config.advertiseScope,
     HOME: homedir6(),
     PATH: launchPath,
     ...collectOptionalEnvVars([
@@ -4660,7 +4678,7 @@ function formatBrokerServiceStatus(status) {
   return lines.join(`
 `);
 }
-var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_PORT = 65535, BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
+var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_HOST_MESH = "0.0.0.0", DEFAULT_BROKER_PORT = 65535, DEFAULT_ADVERTISE_SCOPE = "local", BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
 var init_broker_service = __esm(async () => {
   init_support_paths();
   DEFAULT_BROKER_URL = buildDefaultBrokerUrl();
@@ -8745,6 +8763,14 @@ async function readTailscalePeers() {
 }
 
 // server/core/mesh/service.ts
+function isLoopbackBrokerUrl(url) {
+  try {
+    const hostname2 = new URL(url).hostname;
+    return hostname2 === "127.0.0.1" || hostname2 === "::1" || hostname2 === "localhost";
+  } catch {
+    return false;
+  }
+}
 async function readTailscaleStatus() {
   const peers = await readTailscalePeers();
   return {
@@ -8760,7 +8786,9 @@ function computeWarnings(health, localNode, nodes, tailscale) {
     return warnings;
   }
   if (localNode?.advertiseScope === "local") {
-    warnings.push("Broker is bound to 127.0.0.1 \u2014 mesh peers cannot reach it. " + "Set OPENSCOUT_BROKER_HOST=0.0.0.0 or use your Tailscale IP.");
+    warnings.push("Node advertise scope is `local` \u2014 peers will not discover this broker. " + "Set OPENSCOUT_ADVERTISE_SCOPE=mesh and restart the broker.");
+  } else if (localNode?.advertiseScope === "mesh" && localNode.brokerUrl && isLoopbackBrokerUrl(localNode.brokerUrl)) {
+    warnings.push("Broker advertises mesh scope but is bound to loopback \u2014 peers cannot reach it. " + "Unset OPENSCOUT_BROKER_HOST (mesh default is 0.0.0.0) or use your Tailscale IP.");
   }
   const remoteNodes = Object.values(nodes).filter((n) => n.id !== localNode?.id);
   if (remoteNodes.length === 0 && tailscale.onlineCount > 0) {

package/dist/pair-supervisor.mjs

@@ -4755,6 +4755,21 @@ import { fileURLToPath as fileURLToPath3 } from "url";
 function isTmpPath(p) {
   return /^\/(?:private\/)?tmp\//.test(p);
 }
+function resolveAdvertiseScope() {
+  const raw = (process.env.OPENSCOUT_ADVERTISE_SCOPE ?? "").trim().toLowerCase();
+  if (raw === "mesh")
+    return "mesh";
+  if (raw === "local")
+    return "local";
+  return DEFAULT_ADVERTISE_SCOPE;
+}
+function resolveBrokerHost(scope = resolveAdvertiseScope()) {
+  const explicit = process.env.OPENSCOUT_BROKER_HOST;
+  if (typeof explicit === "string" && explicit.trim().length > 0) {
+    return explicit;
+  }
+  return scope === "mesh" ? DEFAULT_BROKER_HOST_MESH : DEFAULT_BROKER_HOST;
+}
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -4874,7 +4889,8 @@ function resolveBrokerServiceConfig() {
   const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
   const logsDirectory = join12(supportDirectory, "logs", "broker");
   const controlHome = isTmpPath(supportPaths.controlHome) ? join12(homedir11(), ".openscout", "control-plane") : supportPaths.controlHome;
-  const brokerHost = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST;
+  const advertiseScope = resolveAdvertiseScope();
+  const brokerHost = resolveBrokerHost(advertiseScope);
   const brokerPort = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT), 10);
   const brokerUrl = process.env.OPENSCOUT_BROKER_URL ?? buildDefaultBrokerUrl(brokerHost, brokerPort);
   const launchAgentPath = join12(homedir11(), "Library", "LaunchAgents", `${label}.plist`);
@@ -4894,7 +4910,8 @@ function resolveBrokerServiceConfig() {
     bunExecutable: resolveBunExecutable(),
     brokerHost,
     brokerPort,
-    brokerUrl
+    brokerUrl,
+    advertiseScope
   };
 }
 function renderLaunchAgentPlist(config) {
@@ -4906,6 +4923,7 @@ function renderLaunchAgentPlist(config) {
     OPENSCOUT_CONTROL_HOME: config.controlHome,
     OPENSCOUT_BROKER_SERVICE_MODE: config.mode,
     OPENSCOUT_BROKER_SERVICE_LABEL: config.label,
+    OPENSCOUT_ADVERTISE_SCOPE: config.advertiseScope,
     HOME: homedir11(),
     PATH: launchPath,
     ...collectOptionalEnvVars([
@@ -5235,7 +5253,7 @@ function formatBrokerServiceStatus(status) {
   return lines.join(`
 `);
 }
-var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_PORT = 65535, BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
+var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_HOST_MESH = "0.0.0.0", DEFAULT_BROKER_PORT = 65535, DEFAULT_ADVERTISE_SCOPE = "local", BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
 var init_broker_service = __esm(async () => {
   init_support_paths();
   DEFAULT_BROKER_URL = buildDefaultBrokerUrl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openscout/web",
-  "version": "0.2.38",
+  "version": "0.2.39",
   "description": "Standalone lightweight Scout web UI with its own bundled Bun server",
   "license": "UNLICENSED",
   "type": "module",
@@ -34,8 +34,8 @@
     "@noble/ciphers": "^2.1.1",
     "@noble/curves": "^2.0.1",
     "@noble/hashes": "^2.0.1",
-    "@openscout/protocol": "0.2.38",
-    "@openscout/runtime": "0.2.38",
+    "@openscout/protocol": "0.2.39",
+    "@openscout/runtime": "0.2.39",
     "@trpc/server": "^11.16.0",
     "@types/react": "^19",
     "@types/react-dom": "^19",