@nordbyte/nordrelay 0.4.0 → 0.4.1

package/plugins/nordrelay/scripts/nordrelay.mjs

@@ -49,8 +49,8 @@ function parseArgs(argv) {
     home: process.env.NORDRELAY_HOME || DEFAULT_HOME,
     dropPendingUpdates: !envFlag("NORDRELAY_KEEP_PENDING_UPDATES"),
     force: false,
-    host: process.env.NORDRELAY_DASHBOARD_HOST || "127.0.0.1",
-    port: Number.parseInt(process.env.NORDRELAY_DASHBOARD_PORT || "31878", 10),
+    host: undefined,
+    port: undefined,
   };
 
   for (let i = 0; i < copy.length; i += 1) {
@@ -175,9 +175,31 @@ async function readPid(pidFile) {
   }
 }
 
-async function commandStart(options) {
+function resolveDashboardEndpoint(options, settings = {}) {
+  const host = options.host || process.env.NORDRELAY_DASHBOARD_HOST || "127.0.0.1";
+  const rawPort = options.port ?? Number.parseInt(process.env.NORDRELAY_DASHBOARD_PORT || "31878", 10);
+  if (!Number.isFinite(rawPort) || rawPort <= 0) {
+    if (settings.strict) {
+      throw new Error("Dashboard port must be a positive number.");
+    }
+    return { host, port: 31878 };
+  }
+  const port = rawPort;
+  return { host, port };
+}
+
+function formatDashboardUrl(endpoint) {
+  const host = endpoint.host || "127.0.0.1";
+  const displayHost = host === "0.0.0.0" || host === "" ? "127.0.0.1" : host === "::" ? "::1" : host;
+  const formattedHost = displayHost.includes(":") && !displayHost.startsWith("[") ? `[${displayHost}]` : displayHost;
+  const bindHint = displayHost === host ? "" : ` (binds ${host || "all interfaces"})`;
+  return `http://${formattedHost}:${endpoint.port}/${bindHint}`;
+}
+
+async function commandStart(options, settings = {}) {
   await mkdirp(options.home);
   loadEnvFiles(options.home);
+  const dashboard = resolveDashboardEndpoint(options);
 
   const currentPid = await readPid(options.pidFile);
   if (isProcessRunning(currentPid)) {
@@ -210,6 +232,9 @@ async function commandStart(options) {
     console.log(`Started ${APP_NAME} ${VERSION} with PID ${child.pid}`);
     console.log(`Workspace: ${state.workspace || "-"}`);
     console.log(`Mode: ${state.sessionMode || "per Telegram context"}`);
+    if (!settings.skipWebHint) {
+      console.log(`WebUI: ${formatDashboardUrl(dashboard)} (run \`nordrelay web\` to start it)`);
+    }
     console.log(`Log: ${options.logFile}`);
     return;
   }
@@ -225,9 +250,27 @@ async function commandStart(options) {
   }
 
   console.log(`Started ${APP_NAME} ${VERSION} with PID ${child.pid}`);
+  if (!settings.skipWebHint) {
+    console.log(`WebUI: ${formatDashboardUrl(dashboard)} (run \`nordrelay web\` to start it)`);
+  }
   console.log(`Startup is still in progress. Log: ${options.logFile}`);
 }
 
+async function ensureConnectorStartedForWeb(options) {
+  const currentPid = await readPid(options.pidFile);
+  if (isProcessRunning(currentPid)) {
+    console.log(`NordRelay connector already running with PID ${currentPid}.`);
+    return;
+  }
+
+  console.log("Starting NordRelay connector...");
+  const previousExitCode = process.exitCode;
+  await commandStart(options, { skipWebHint: true });
+  if (process.exitCode && process.exitCode !== previousExitCode) {
+    throw new Error(`NordRelay connector failed to start. See ${options.logFile}.`);
+  }
+}
+
 async function waitForState(stateFile, pid, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
@@ -268,6 +311,7 @@ async function commandStop(options) {
 
 async function commandStatus(options) {
   loadEnvFiles(options.home);
+  const dashboard = resolveDashboardEndpoint(options);
   const pid = await readPid(options.pidFile);
   const state = await readJson(options.stateFile, {});
   const running = isProcessRunning(pid);
@@ -282,6 +326,7 @@ async function commandStatus(options) {
   console.log(`OpenClaw CLI: ${state.openClawCli || "-"}`);
   console.log(`Claude Code CLI: ${state.claudeCodeCli || "-"}`);
   console.log(`OpenClaw Gateway: ${state.openClawGateway || process.env.OPENCLAW_GATEWAY_URL || "-"}`);
+  console.log(`WebUI: ${formatDashboardUrl(dashboard)}`);
   console.log(`Log: ${options.logFile}`);
   if (state.error) console.log(`Error: ${state.error}`);
 }
@@ -472,8 +517,8 @@ async function checkOpenClawGateway() {
 async function commandWeb(options) {
   await mkdirp(options.home);
   loadEnvFiles(options.home);
-  const host = options.host || "127.0.0.1";
-  const port = Number.isFinite(options.port) ? options.port : 31878;
+  const { host, port } = resolveDashboardEndpoint(options, { strict: true });
+  await ensureConnectorStartedForWeb(options);
   const entry = await resolveWebRuntimeEntry();
   if (!entry) {
     throw new Error(`Missing dashboard runtime. Run \`npm install\` and \`npm run build\` in ${RUNTIME_ROOT}.`);
@@ -564,21 +609,23 @@ async function commandForeground(options) {
   });
 
   const previousState = await readJson(options.stateFile, {});
+  const stoppedBySignal = exit.signal === "SIGTERM" || exit.signal === "SIGINT";
+  const stopped = exit.code === 0 || stoppedBySignal;
   await writeJsonAtomic(options.stateFile, {
-    status: exit.code === 0 ? "stopped" : "error",
+    status: stopped ? "stopped" : "error",
     pid: process.pid,
     updatedAt: nowIso(),
     exitCode: exit.code,
     signal: exit.signal,
-    error: exit.code === 0 ? undefined : previousState.error,
+    error: stopped ? undefined : previousState.error,
     logFile: options.logFile,
   });
 
-  if (exit.signal) {
+  if (exit.signal && !stoppedBySignal) {
     process.kill(process.pid, exit.signal);
     return;
   }
-  process.exit(exit.code ?? 0);
+  process.exit(stopped ? 0 : exit.code ?? 1);
 }
 
 async function resolveRuntimeEntry() {