@openscout/scout 0.2.109 → 0.2.110

package/dist/runtime/broker-process-manager.mjs

@@ -5,7 +5,7 @@ import "reflect-metadata";
 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 { basename as basename2, dirname as dirname3, join as join5, resolve as resolve2 } from "path";
+import { basename as basename2, dirname as dirname4, join as join5, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 
 // packages/runtime/src/broker-api.ts
@@ -171,6 +171,15 @@ async function requestBrokerWire(baseUrl, path, options) {
     }
   };
 }
+
+class ScoutBrokerHttpError extends Error {
+  status;
+  constructor(status, path, body) {
+    super(`${path} returned ${status}: ${body}`);
+    this.status = status;
+    this.name = "ScoutBrokerHttpError";
+  }
+}
 async function requestScoutBrokerJsonWithTrace(baseUrl, path, options = {}) {
   const { response, trace } = await requestBrokerWire(baseUrl, path, options);
   let parsed;
@@ -187,7 +196,7 @@ async function requestScoutBrokerJsonWithTrace(baseUrl, path, options = {}) {
     if (parsedJson && options.acceptErrorJson?.(parsed)) {
       return { value: parsed, trace };
     }
-    throw new Error(`${path} returned ${response.status}: ${response.text}`);
+    throw new ScoutBrokerHttpError(response.status, path, response.text);
   }
   if (parsedJson) {
     return { value: parsed, trace };
@@ -459,11 +468,18 @@ class NodeSqliteDatabaseAdapter {
 
 // packages/runtime/src/support-paths.ts
 import { homedir } from "os";
-import { join } from "path";
+import { dirname, join } from "path";
 var OPENSCOUT_RPC_CUTOVER_MARKER = "rpc-runtime-cutover-v1";
+function defaultOpenScoutSupportDirectory(home = homedir()) {
+  if (process.platform === "darwin") {
+    return join(home, "Library", "Application Support", "OpenScout");
+  }
+  const xdgDataHome = process.env.XDG_DATA_HOME?.trim();
+  return join(xdgDataHome || join(home, ".local", "share"), "openscout");
+}
 function resolveOpenScoutSupportPaths() {
   const home = homedir();
-  const supportDirectory = process.env.OPENSCOUT_SUPPORT_DIRECTORY ?? join(home, "Library", "Application Support", "OpenScout");
+  const supportDirectory = process.env.OPENSCOUT_SUPPORT_DIRECTORY ?? defaultOpenScoutSupportDirectory(home);
   const logsDirectory = join(supportDirectory, "logs");
   const runtimeDirectory = join(supportDirectory, "runtime");
   const catalogDirectory = join(supportDirectory, "catalog");
@@ -1897,7 +1913,7 @@ import {
   writeFileSync
 } from "fs";
 import { homedir as homedir3, hostname as osHostname } from "os";
-import { dirname, join as join3 } from "path";
+import { dirname as dirname2, join as join3 } from "path";
 
 // packages/runtime/src/node-identity.ts
 var NODE_CARD_TTL_MS = 24 * 60 * 60 * 1000;
@@ -2022,7 +2038,7 @@ function resolveBrokerPort() {
 // packages/runtime/src/tool-resolution.ts
 import { accessSync, constants, existsSync as existsSync4 } from "fs";
 import { homedir as homedir4 } from "os";
-import { basename, dirname as dirname2, join as join4, resolve } from "path";
+import { basename, dirname as dirname3, join as join4, resolve } from "path";
 var DEFAULT_COMMON_EXECUTABLE_DIRECTORIES = [
   join4(homedir4(), ".bun", "bin"),
   "/opt/homebrew/bin",
@@ -2152,7 +2168,7 @@ function readPersistedAdvertiseScope(supportDirectory) {
 }
 function writePersistedAdvertiseScope(scope, supportDirectory) {
   const path = meshBindConfigPath(supportDirectory);
-  mkdirSync2(dirname3(path), { recursive: true });
+  mkdirSync2(dirname4(path), { recursive: true });
   const payload = { version: 1, advertiseScope: scope };
   const tmp = `${path}.${process.pid}.tmp`;
   writeFileSync2(tmp, `${JSON.stringify(payload, null, 2)}
@@ -2328,7 +2344,7 @@ function runtimePackageDir() {
   const fromGlobal = findGlobalRuntimeDir();
   if (fromGlobal)
     return fromGlobal;
-  const moduleDir = dirname3(fileURLToPath(import.meta.url));
+  const moduleDir = dirname4(fileURLToPath(import.meta.url));
   return resolve2(moduleDir, "..");
 }
 function isInstalledRuntimePackageDir(candidate) {
@@ -2362,7 +2378,7 @@ function findGlobalRuntimeDir() {
   return null;
 }
 function findBundledRuntimeDir() {
-  const moduleDir = dirname3(fileURLToPath(import.meta.url));
+  const moduleDir = dirname4(fileURLToPath(import.meta.url));
   return resolveBundledRuntimeDirFromModuleDir(moduleDir);
 }
 function resolveBundledRuntimeDirFromModuleDir(moduleDir) {
@@ -2381,7 +2397,7 @@ function resolveBundledRuntimeDirFromModuleDir(moduleDir) {
   return null;
 }
 function resolveSourceWorkspaceRuntimeDir(bundledPackageDir) {
-  const packagesDir = dirname3(bundledPackageDir);
+  const packagesDir = dirname4(bundledPackageDir);
   if (resolve2(packagesDir, "cli") !== resolve2(bundledPackageDir))
     return null;
   const runtimeDir = join5(packagesDir, "runtime");
@@ -2404,7 +2420,7 @@ function findWorkspaceRuntimeDir(startDir) {
     if (existsSync5(join5(candidate, "package.json")) && existsSync5(join5(candidate, "src"))) {
       return candidate;
     }
-    const parent = dirname3(current);
+    const parent = dirname4(current);
     if (parent === current)
       return null;
     current = parent;
@@ -2451,7 +2467,7 @@ function resolveBrokerServiceConfig() {
   const serviceAdapter = resolveBrokerServiceAdapter();
   const uid = typeof process.getuid === "function" ? process.getuid() : Number.parseInt(process.env.UID ?? "0", 10);
   const supportPaths = resolveOpenScoutSupportPaths();
-  const defaultSupportDir = join5(homedir5(), "Library", "Application Support", "OpenScout");
+  const defaultSupportDir = defaultOpenScoutSupportDirectory();
   const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
   const runtimeDirectory = join5(supportDirectory, "runtime");
   const logsDirectory = join5(supportDirectory, "logs", "broker");
@@ -2510,7 +2526,7 @@ function findWorkspaceRootFromRuntimeDir(runtimePackageDir2) {
     if (existsSync5(join5(current, "Cargo.toml")) && existsSync5(join5(current, "crates", "scoutd", "Cargo.toml"))) {
       return current;
     }
-    const parent = dirname3(current);
+    const parent = dirname4(current);
     if (parent === current)
       return null;
     current = parent;
@@ -2520,7 +2536,12 @@ function workspaceScoutdAllowed() {
   const raw = process.env.OPENSCOUT_ALLOW_WORKSPACE_SCOUTD?.trim().toLowerCase();
   return raw === "1" || raw === "true" || raw === "yes" || raw === "on";
 }
+function nativeSupervisorNotApplicableDetail(platform = process.platform) {
+  return platform === "linux" ? "native supervisor: not applicable on linux" : `native supervisor: not applicable on ${platform}`;
+}
 function resolveScoutdCommand(config = resolveBrokerServiceConfig()) {
+  if (process.platform !== "darwin")
+    return null;
   const explicit = resolveEnvExecutable(process.env.OPENSCOUT_SCOUTD_BIN);
   if (explicit) {
     return { path: explicit, source: "env" };
@@ -2533,7 +2554,7 @@ function resolveScoutdCommand(config = resolveBrokerServiceConfig()) {
     workspaceRoot ? join5(workspaceRoot, "packages", "cli", "bin", "scoutd") : null,
     workspaceRoot ? join5(workspaceRoot, "packages", "runtime", "bin", "scoutd") : null,
     join5(config.runtimeDirectory, "scoutd"),
-    join5(dirname3(config.runtimePackageDir), "scout", "bin", "scoutd")
+    join5(dirname4(config.runtimePackageDir), "scout", "bin", "scoutd")
   ];
   for (const candidate of packageCandidates) {
     const resolved = executableCandidate(candidate);
@@ -2663,6 +2684,8 @@ function normalizeNativeServiceStatus(input, config) {
       reachable: healthReachable,
       ok: healthOk,
       checkedAt: readNumber2(healthRecord.checkedAt) ?? Date.now(),
+      state: readString2(healthRecord.state),
+      durationMs: readNumber2(healthRecord.durationMs),
       transport: healthTransport,
       socketPath: config.brokerSocketPath,
       ...healthSocketFallbackError ? { socketFallbackError: healthSocketFallbackError } : {},
@@ -2774,6 +2797,9 @@ async function runScoutdServiceCommand(command, config, timeoutMs = SCOUTD_DEFAU
   }
   const scoutd = resolveScoutdCommand(config);
   if (!scoutd) {
+    if (process.platform !== "darwin") {
+      throw new Error(nativeSupervisorNotApplicableDetail());
+    }
     throw new Error("Unable to locate scoutd for broker service management. Build scoutd with `npm run scoutd:build`, install a package that includes scoutd, or set OPENSCOUT_SCOUTD_BIN.");
   }
   const stdout = await runScoutdJson(scoutd.path, command, nativeServiceEnvironment(config, scoutd.path), timeoutMs);
@@ -3050,6 +3076,7 @@ export {
   resolveBrokerHost,
   resolveAdvertiseScope,
   readPersistedAdvertiseScope,
+  nativeSupervisorNotApplicableDetail,
   meshBindConfigPath,
   isLoopbackHost,
   isBrokerServiceEntrypoint,

package/dist/runtime/mesh-discover.mjs

@@ -5,7 +5,7 @@ import "reflect-metadata";
 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 { basename as basename2, dirname as dirname3, join as join5, resolve as resolve2 } from "path";
+import { basename as basename2, dirname as dirname4, join as join5, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 
 // packages/runtime/src/broker-api.ts
@@ -171,6 +171,15 @@ async function requestBrokerWire(baseUrl, path, options) {
     }
   };
 }
+
+class ScoutBrokerHttpError extends Error {
+  status;
+  constructor(status, path, body) {
+    super(`${path} returned ${status}: ${body}`);
+    this.status = status;
+    this.name = "ScoutBrokerHttpError";
+  }
+}
 async function requestScoutBrokerJsonWithTrace(baseUrl, path, options = {}) {
   const { response, trace } = await requestBrokerWire(baseUrl, path, options);
   let parsed;
@@ -187,7 +196,7 @@ async function requestScoutBrokerJsonWithTrace(baseUrl, path, options = {}) {
     if (parsedJson && options.acceptErrorJson?.(parsed)) {
       return { value: parsed, trace };
     }
-    throw new Error(`${path} returned ${response.status}: ${response.text}`);
+    throw new ScoutBrokerHttpError(response.status, path, response.text);
   }
   if (parsedJson) {
     return { value: parsed, trace };
@@ -459,11 +468,18 @@ class NodeSqliteDatabaseAdapter {
 
 // packages/runtime/src/support-paths.ts
 import { homedir } from "os";
-import { join } from "path";
+import { dirname, join } from "path";
 var OPENSCOUT_RPC_CUTOVER_MARKER = "rpc-runtime-cutover-v1";
+function defaultOpenScoutSupportDirectory(home = homedir()) {
+  if (process.platform === "darwin") {
+    return join(home, "Library", "Application Support", "OpenScout");
+  }
+  const xdgDataHome = process.env.XDG_DATA_HOME?.trim();
+  return join(xdgDataHome || join(home, ".local", "share"), "openscout");
+}
 function resolveOpenScoutSupportPaths() {
   const home = homedir();
-  const supportDirectory = process.env.OPENSCOUT_SUPPORT_DIRECTORY ?? join(home, "Library", "Application Support", "OpenScout");
+  const supportDirectory = process.env.OPENSCOUT_SUPPORT_DIRECTORY ?? defaultOpenScoutSupportDirectory(home);
   const logsDirectory = join(supportDirectory, "logs");
   const runtimeDirectory = join(supportDirectory, "runtime");
   const catalogDirectory = join(supportDirectory, "catalog");
@@ -1897,7 +1913,7 @@ import {
   writeFileSync
 } from "fs";
 import { homedir as homedir3, hostname as osHostname } from "os";
-import { dirname, join as join3 } from "path";
+import { dirname as dirname2, join as join3 } from "path";
 
 // packages/runtime/src/node-identity.ts
 var NODE_CARD_TTL_MS = 24 * 60 * 60 * 1000;
@@ -2006,7 +2022,7 @@ function resolveBrokerPort() {
 // packages/runtime/src/tool-resolution.ts
 import { accessSync, constants, existsSync as existsSync4 } from "fs";
 import { homedir as homedir4 } from "os";
-import { basename, dirname as dirname2, join as join4, resolve } from "path";
+import { basename, dirname as dirname3, join as join4, resolve } from "path";
 var DEFAULT_COMMON_EXECUTABLE_DIRECTORIES = [
   join4(homedir4(), ".bun", "bin"),
   "/opt/homebrew/bin",
@@ -2259,7 +2275,7 @@ function runtimePackageDir() {
   const fromGlobal = findGlobalRuntimeDir();
   if (fromGlobal)
     return fromGlobal;
-  const moduleDir = dirname3(fileURLToPath(import.meta.url));
+  const moduleDir = dirname4(fileURLToPath(import.meta.url));
   return resolve2(moduleDir, "..");
 }
 function isInstalledRuntimePackageDir(candidate) {
@@ -2293,7 +2309,7 @@ function findGlobalRuntimeDir() {
   return null;
 }
 function findBundledRuntimeDir() {
-  const moduleDir = dirname3(fileURLToPath(import.meta.url));
+  const moduleDir = dirname4(fileURLToPath(import.meta.url));
   return resolveBundledRuntimeDirFromModuleDir(moduleDir);
 }
 function resolveBundledRuntimeDirFromModuleDir(moduleDir) {
@@ -2312,7 +2328,7 @@ function resolveBundledRuntimeDirFromModuleDir(moduleDir) {
   return null;
 }
 function resolveSourceWorkspaceRuntimeDir(bundledPackageDir) {
-  const packagesDir = dirname3(bundledPackageDir);
+  const packagesDir = dirname4(bundledPackageDir);
   if (resolve2(packagesDir, "cli") !== resolve2(bundledPackageDir))
     return null;
   const runtimeDir = join5(packagesDir, "runtime");
@@ -2335,7 +2351,7 @@ function findWorkspaceRuntimeDir(startDir) {
     if (existsSync5(join5(candidate, "package.json")) && existsSync5(join5(candidate, "src"))) {
       return candidate;
     }
-    const parent = dirname3(current);
+    const parent = dirname4(current);
     if (parent === current)
       return null;
     current = parent;
@@ -2382,7 +2398,7 @@ function resolveBrokerServiceConfig() {
   const serviceAdapter = resolveBrokerServiceAdapter();
   const uid = typeof process.getuid === "function" ? process.getuid() : Number.parseInt(process.env.UID ?? "0", 10);
   const supportPaths = resolveOpenScoutSupportPaths();
-  const defaultSupportDir = join5(homedir5(), "Library", "Application Support", "OpenScout");
+  const defaultSupportDir = defaultOpenScoutSupportDirectory();
   const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
   const runtimeDirectory = join5(supportDirectory, "runtime");
   const logsDirectory = join5(supportDirectory, "logs", "broker");
@@ -2441,7 +2457,7 @@ function findWorkspaceRootFromRuntimeDir(runtimePackageDir2) {
     if (existsSync5(join5(current, "Cargo.toml")) && existsSync5(join5(current, "crates", "scoutd", "Cargo.toml"))) {
       return current;
     }
-    const parent = dirname3(current);
+    const parent = dirname4(current);
     if (parent === current)
       return null;
     current = parent;
@@ -2451,7 +2467,12 @@ function workspaceScoutdAllowed() {
   const raw = process.env.OPENSCOUT_ALLOW_WORKSPACE_SCOUTD?.trim().toLowerCase();
   return raw === "1" || raw === "true" || raw === "yes" || raw === "on";
 }
+function nativeSupervisorNotApplicableDetail(platform = process.platform) {
+  return platform === "linux" ? "native supervisor: not applicable on linux" : `native supervisor: not applicable on ${platform}`;
+}
 function resolveScoutdCommand(config = resolveBrokerServiceConfig()) {
+  if (process.platform !== "darwin")
+    return null;
   const explicit = resolveEnvExecutable(process.env.OPENSCOUT_SCOUTD_BIN);
   if (explicit) {
     return { path: explicit, source: "env" };
@@ -2464,7 +2485,7 @@ function resolveScoutdCommand(config = resolveBrokerServiceConfig()) {
     workspaceRoot ? join5(workspaceRoot, "packages", "cli", "bin", "scoutd") : null,
     workspaceRoot ? join5(workspaceRoot, "packages", "runtime", "bin", "scoutd") : null,
     join5(config.runtimeDirectory, "scoutd"),
-    join5(dirname3(config.runtimePackageDir), "scout", "bin", "scoutd")
+    join5(dirname4(config.runtimePackageDir), "scout", "bin", "scoutd")
   ];
   for (const candidate of packageCandidates) {
     const resolved = executableCandidate(candidate);
@@ -2594,6 +2615,8 @@ function normalizeNativeServiceStatus(input, config) {
       reachable: healthReachable,
       ok: healthOk,
       checkedAt: readNumber2(healthRecord.checkedAt) ?? Date.now(),
+      state: readString2(healthRecord.state),
+      durationMs: readNumber2(healthRecord.durationMs),
       transport: healthTransport,
       socketPath: config.brokerSocketPath,
       ...healthSocketFallbackError ? { socketFallbackError: healthSocketFallbackError } : {},
@@ -2705,6 +2728,9 @@ async function runScoutdServiceCommand(command, config, timeoutMs = SCOUTD_DEFAU
   }
   const scoutd = resolveScoutdCommand(config);
   if (!scoutd) {
+    if (process.platform !== "darwin") {
+      throw new Error(nativeSupervisorNotApplicableDetail());
+    }
     throw new Error("Unable to locate scoutd for broker service management. Build scoutd with `npm run scoutd:build`, install a package that includes scoutd, or set OPENSCOUT_SCOUTD_BIN.");
   }
   const stdout = await runScoutdJson(scoutd.path, command, nativeServiceEnvironment(config, scoutd.path), timeoutMs);