@nordbyte/nordrelay 0.5.2 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nordbyte/nordrelay",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Remote control plane for coding agents across messaging channels.",
   "type": "module",
   "author": "Ricardo",
@@ -23,6 +23,7 @@
     "claude-code",
     "claude",
     "telegram",
+    "discord",
     "bot",
     "automation"
   ],
@@ -63,6 +64,7 @@
     "@anthropic-ai/claude-agent-sdk": "^0.2.140",
     "@grammyjs/auto-retry": "^2.0.2",
     "@openai/codex-sdk": "^0.130.0",
+    "discord.js": "^14.26.4",
     "grammy": "^1.41.1",
     "zod": "^4.4.3"
   },

package/plugins/nordrelay/scripts/nordrelay.mjs

@@ -66,6 +66,10 @@ function parseArgs(argv) {
     else if (arg === "--no-restart") options.restartAfterUpdate = false;
     else if (arg === "--restart") options.restartAfterUpdate = true;
     else if (arg === "--token") options.telegramBotToken = requireValue(copy, ++i, arg);
+    else if (arg === "--disable-telegram") options.disableTelegram = true;
+    else if (arg === "--enable-discord") options.enableDiscord = true;
+    else if (arg === "--discord-token") options.discordBotToken = requireValue(copy, ++i, arg);
+    else if (arg === "--discord-client-id") options.discordClientId = requireValue(copy, ++i, arg);
     else if (arg === "--admin-email") options.adminEmail = requireValue(copy, ++i, arg);
     else if (arg === "--admin-name") options.adminName = requireValue(copy, ++i, arg);
     else if (arg === "--admin-password") options.adminPassword = requireValue(copy, ++i, arg);
@@ -81,6 +85,9 @@ function parseArgs(argv) {
   options.pidFile = path.join(options.home, "nordrelay.pid");
   options.stateFile = path.join(options.home, "state.json");
   options.logFile = path.join(options.home, "nordrelay.log");
+  options.webPidFile = path.join(options.home, "nordrelay-web.pid");
+  options.webStateFile = path.join(options.home, "web-state.json");
+  options.webLogFile = path.join(options.home, "nordrelay-web.log");
   return options;
 }
 
@@ -175,6 +182,26 @@ async function readPid(pidFile) {
   }
 }
 
+async function readWebState(options) {
+  return await readJson(options.webStateFile, {});
+}
+
+async function readWebPid(options) {
+  return await readPid(options.webPidFile);
+}
+
+async function isWebDashboardRunning(options) {
+  return isProcessRunning(await readWebPid(options));
+}
+
+async function writeWebState(options, patch) {
+  await writeJsonAtomic(options.webStateFile, {
+    updatedAt: nowIso(),
+    logFile: options.webLogFile,
+    ...patch,
+  });
+}
+
 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);
@@ -233,7 +260,9 @@ async function commandStart(options, settings = {}) {
     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)`);
+      const webPid = await readWebPid(options);
+      const webHint = isProcessRunning(webPid) ? `(running with PID ${webPid})` : "(run `nordrelay web` to start it)";
+      console.log(`WebUI: ${formatDashboardUrl(dashboard)} ${webHint}`);
     }
     console.log(`Log: ${options.logFile}`);
     return;
@@ -251,7 +280,9 @@ async function commandStart(options, settings = {}) {
 
   console.log(`Started ${APP_NAME} ${VERSION} with PID ${child.pid}`);
   if (!settings.skipWebHint) {
-    console.log(`WebUI: ${formatDashboardUrl(dashboard)} (run \`nordrelay web\` to start it)`);
+    const webPid = await readWebPid(options);
+    const webHint = isProcessRunning(webPid) ? `(running with PID ${webPid})` : "(run `nordrelay web` to start it)";
+    console.log(`WebUI: ${formatDashboardUrl(dashboard)} ${webHint}`);
   }
   console.log(`Startup is still in progress. Log: ${options.logFile}`);
 }
@@ -286,7 +317,51 @@ async function waitForState(stateFile, pid, timeoutMs) {
   return await readJson(stateFile);
 }
 
-async function commandStop(options) {
+async function stopWebDashboard(options, settings = {}) {
+  const pid = await readWebPid(options);
+  if (!isProcessRunning(pid)) {
+    await fsp.rm(options.webPidFile, { force: true });
+    const state = await readWebState(options);
+    if (state.status === "running" || state.status === "starting") {
+      await writeWebState(options, { status: "stopped", pid: null });
+    }
+    if (!settings.quiet) {
+      console.log("WebUI is not running.");
+    }
+    return false;
+  }
+
+  process.kill(pid, "SIGTERM");
+  for (let i = 0; i < 40; i += 1) {
+    if (!isProcessRunning(pid)) break;
+    await sleep(250);
+  }
+
+  if (isProcessRunning(pid)) {
+    process.kill(pid, "SIGKILL");
+    for (let i = 0; i < 20; i += 1) {
+      if (!isProcessRunning(pid)) break;
+      await sleep(250);
+    }
+  }
+
+  if (isProcessRunning(pid)) {
+    console.log(`WebUI PID ${pid} did not exit after SIGTERM/SIGKILL.`);
+    process.exitCode = 1;
+    return false;
+  }
+  await fsp.rm(options.webPidFile, { force: true });
+  await writeWebState(options, { status: "stopped", pid: null });
+  if (!settings.quiet) {
+    console.log(`Stopped WebUI PID ${pid}.`);
+  }
+  return true;
+}
+
+async function commandStop(options, settings = {}) {
+  if (!settings.keepWeb) {
+    await stopWebDashboard(options);
+  }
   const pid = await readPid(options.pidFile);
   if (!isProcessRunning(pid)) {
     console.log("Connector is not running.");
@@ -313,10 +388,19 @@ async function commandStatus(options) {
   loadEnvFiles(options.home);
   const dashboard = resolveDashboardEndpoint(options);
   const pid = await readPid(options.pidFile);
+  const webPid = await readWebPid(options);
   const state = await readJson(options.stateFile, {});
+  const webState = await readWebState(options);
   const running = isProcessRunning(pid);
+  const webRunning = isProcessRunning(webPid);
+  const webStatus = webRunning ? "running" : webState.status === "running" || webState.status === "starting" ? "stale" : webState.status || "stopped";
+  if (!webRunning && (webState.status === "running" || webState.status === "starting")) {
+    await fsp.rm(options.webPidFile, { force: true });
+    await writeWebState(options, { status: "stopped", pid: null });
+  }
   console.log(`Status: ${state.status || (running ? "running" : "stopped")}`);
   console.log(`PID: ${pid || "-"} (${running ? "running" : "not running"})`);
+  console.log(`WebUI PID: ${webPid || "-"} (${webRunning ? "running" : "not running"})`);
   console.log(`Workspace: ${state.workspace || "-"}`);
   console.log(`Mode: ${state.sessionMode || "per Telegram context"}`);
   console.log(`Auth: ${state.authenticated === undefined ? "-" : state.authenticated ? "yes" : "no"}`);
@@ -326,8 +410,9 @@ 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(`WebUI: ${formatDashboardUrl(dashboard)} (${webStatus})`);
   console.log(`Log: ${options.logFile}`);
+  console.log(`WebUI log: ${options.webLogFile}`);
   if (state.error) console.log(`Error: ${state.error}`);
 }
 
@@ -579,9 +664,17 @@ async function commandInit(options) {
     return;
   }
 
-  const telegramBotToken = options.telegramBotToken ||
-    process.env.TELEGRAM_BOT_TOKEN ||
-    await ask(null, "Telegram bot token", "");
+  const enableTelegram = options.disableTelegram ? "false" : await askChoice(null, "Enable Telegram", "true");
+  const telegramBotToken = enableTelegram === "true"
+    ? options.telegramBotToken || process.env.TELEGRAM_BOT_TOKEN || await ask(null, "Telegram bot token", "")
+    : "";
+  const enableDiscord = options.enableDiscord ? "true" : await askChoice(null, "Enable Discord", "false");
+  const discordBotToken = enableDiscord === "true"
+    ? options.discordBotToken || process.env.DISCORD_BOT_TOKEN || await ask(null, "Discord bot token", "")
+    : "";
+  const discordClientId = enableDiscord === "true"
+    ? options.discordClientId || process.env.DISCORD_CLIENT_ID || await ask(null, "Discord client ID", "")
+    : "";
   const adminEmail = options.adminEmail || await ask(null, "Admin email", "");
   const adminName = options.adminName || await ask(null, "Admin name", "Admin");
   const adminPassword = options.adminPassword || await askSecret(null, "Admin password", "");
@@ -593,7 +686,9 @@ async function commandInit(options) {
   const enableClaudeCode = options.enableClaudeCode ? "true" : await askChoice(null, "Enable Claude Code", "false");
   const stateBackend = options.stateBackend || await askChoice(null, "State backend (json/sqlite)", "json");
 
-  if (!telegramBotToken) throw new Error("Telegram bot token is required.");
+  if (enableTelegram === "true" && !telegramBotToken) throw new Error("Telegram bot token is required when Telegram is enabled.");
+  if (enableDiscord === "true" && !discordBotToken) throw new Error("Discord bot token is required when Discord is enabled.");
+  if (enableTelegram !== "true" && enableDiscord !== "true") throw new Error("At least one chat adapter must be enabled.");
   if (!adminEmail) throw new Error("Admin email is required.");
   if (!adminPassword) throw new Error("Admin password is required.");
   if (enableCodex !== "true" && enablePi !== "true" && enableHermes !== "true" && enableOpenClaw !== "true" && enableClaudeCode !== "true") throw new Error("At least one agent must be enabled.");
@@ -610,7 +705,14 @@ async function commandInit(options) {
   const lines = [
     "# NordRelay local runtime config.",
     "# Keep this file private; it contains bot credentials.",
+    `TELEGRAM_ENABLED=${enableTelegram}`,
     `TELEGRAM_BOT_TOKEN=${telegramBotToken}`,
+    `DISCORD_ENABLED=${enableDiscord}`,
+    `DISCORD_BOT_TOKEN=${discordBotToken}`,
+    `DISCORD_CLIENT_ID=${discordClientId}`,
+    "DISCORD_COMMAND_MODE=both",
+    "DISCORD_MESSAGE_CONTENT_ENABLED=true",
+    "DISCORD_AUTO_REGISTER_COMMANDS=true",
     `NORDRELAY_CODEX_ENABLED=${enableCodex}`,
     `NORDRELAY_PI_ENABLED=${enablePi}`,
     `NORDRELAY_HERMES_ENABLED=${enableHermes}`,
@@ -664,6 +766,7 @@ function parseUserFlags(argv) {
     else if (arg === "--password") flags.password = requireValue(copy, ++i, arg);
     else if (arg === "--group" || arg === "--groups") flags.groups = requireValue(copy, ++i, arg);
     else if (arg === "--telegram-user-id") flags.telegramUserId = Number.parseInt(requireValue(copy, ++i, arg), 10);
+    else if (arg === "--discord-user-id") flags.discordUserId = requireValue(copy, ++i, arg);
     else if (arg === "--user-id") flags.userId = requireValue(copy, ++i, arg);
   }
   return flags;
@@ -695,8 +798,8 @@ async function commandUser(options) {
       ? ["admin"]
       : (flags.groups ? flags.groups.split(",").map((item) => item.trim()).filter(Boolean) : ["user"]);
     const created = flags.subcommand === "create-admin"
-      ? store.createAdmin({ email, displayName: name, password, telegramUserId: flags.telegramUserId })
-      : store.createUser({ email, displayName: name, password, groupIds, telegramUserId: flags.telegramUserId });
+      ? store.createAdmin({ email, displayName: name, password, telegramUserId: flags.telegramUserId, discordUserId: flags.discordUserId })
+      : store.createUser({ email, displayName: name, password, groupIds, telegramUserId: flags.telegramUserId, discordUserId: flags.discordUserId });
     console.log(`Created user ${created.user.email} (${created.groups.map((group) => group.name).join(", ")}).`);
     return;
   }
@@ -721,7 +824,17 @@ async function commandUser(options) {
     return;
   }
 
-  if (flags.subcommand === "link-code") {
+  if (flags.subcommand === "link-discord") {
+    const email = flags.email || await ask(null, "Email", "");
+    const discordUserId = flags.discordUserId || await ask(null, "Discord user id", "");
+    const user = store.getUserByEmail(email);
+    if (!user) throw new Error(`User not found: ${email}`);
+    store.linkDiscordUser(user.user.id, { discordUserId });
+    console.log(`Linked Discord user ${discordUserId} to ${user.user.email}.`);
+    return;
+  }
+
+  if (flags.subcommand === "link-code" || flags.subcommand === "telegram-link-code") {
     const email = flags.email || await ask(null, "Email", "");
     const user = store.getUserByEmail(email);
     if (!user) throw new Error(`User not found: ${email}`);
@@ -731,7 +844,17 @@ async function commandUser(options) {
     return;
   }
 
-  throw new Error("Usage: nordrelay user [list|create-admin|create|reset-password|link-telegram|link-code]");
+  if (flags.subcommand === "discord-link-code") {
+    const email = flags.email || await ask(null, "Email", "");
+    const user = store.getUserByEmail(email);
+    if (!user) throw new Error(`User not found: ${email}`);
+    const code = store.createDiscordLinkCode(user.user.id);
+    console.log(`Discord link code for ${user.user.email}: ${code.code}`);
+    console.log(`Expires: ${code.expiresAt}`);
+    return;
+  }
+
+  throw new Error("Usage: nordrelay user [list|create-admin|create|reset-password|link-telegram|link-discord|link-code|telegram-link-code|discord-link-code]");
 }
 
 async function commandDoctor(options) {
@@ -741,11 +864,16 @@ async function commandDoctor(options) {
   const userSnapshot = userStore?.snapshot();
   const checks = [];
   checks.push(check("Node.js >= 22", Number.parseInt(process.versions.node.split(".")[0], 10) >= 22, process.version));
-  checks.push(check("Telegram bot token", Boolean(process.env.TELEGRAM_BOT_TOKEN), process.env.TELEGRAM_BOT_TOKEN ? "configured" : "missing"));
+  const telegramEnabled = process.env.TELEGRAM_ENABLED !== "false";
+  const discordEnabled = process.env.DISCORD_ENABLED === "true";
+  checks.push(check("Telegram bot token", !telegramEnabled || Boolean(process.env.TELEGRAM_BOT_TOKEN), telegramEnabled ? (process.env.TELEGRAM_BOT_TOKEN ? "configured" : "missing") : "disabled", telegramEnabled ? "fail" : "warn"));
+  checks.push(check("Discord bot token", !discordEnabled || Boolean(process.env.DISCORD_BOT_TOKEN), discordEnabled ? (process.env.DISCORD_BOT_TOKEN ? "configured" : "missing") : "disabled", discordEnabled ? "fail" : "warn"));
+  checks.push(check("Discord client ID", !discordEnabled || Boolean(process.env.DISCORD_CLIENT_ID), discordEnabled ? (process.env.DISCORD_CLIENT_ID ? "configured" : "missing; slash command auto-registration disabled") : "disabled", "warn"));
   checks.push(check("User store", Boolean(userStore), userStore ? userStore.filePath : "missing runtime", userStore ? "pass" : "fail"));
   checks.push(check("Admin user", Boolean(userSnapshot?.adminConfigured), userSnapshot?.adminConfigured ? "configured" : "missing"));
   checks.push(check("WebUI login", true, "required for every dashboard request"));
   checks.push(check("Telegram access", true, "requires linked active users and enabled group chats"));
+  checks.push(check("Discord access", true, "requires linked active users and enabled channels"));
   checks.push(check("Codex enabled flag", process.env.NORDRELAY_CODEX_ENABLED !== "false", `NORDRELAY_CODEX_ENABLED=${process.env.NORDRELAY_CODEX_ENABLED ?? "true"}`));
   checks.push(check("Pi enabled flag", process.env.NORDRELAY_PI_ENABLED === "true" || process.env.NORDRELAY_PI_ENABLED === undefined, `NORDRELAY_PI_ENABLED=${process.env.NORDRELAY_PI_ENABLED ?? "false"}`, process.env.NORDRELAY_PI_ENABLED === "true" ? "pass" : "warn"));
   checks.push(check("Hermes enabled flag", process.env.NORDRELAY_HERMES_ENABLED === "true", `NORDRELAY_HERMES_ENABLED=${process.env.NORDRELAY_HERMES_ENABLED ?? "false"}`, process.env.NORDRELAY_HERMES_ENABLED === "true" ? "pass" : "warn"));
@@ -850,8 +978,21 @@ async function checkOpenClawGateway() {
 async function commandWeb(options) {
   await mkdirp(options.home);
   loadEnvFiles(options.home);
-  const { host, port } = resolveDashboardEndpoint(options, { strict: true });
   await ensureConnectorStartedForWeb(options);
+  await startWebDashboard(options, { detached: false });
+}
+
+async function startWebDashboard(options, settings = {}) {
+  await mkdirp(options.home);
+  loadEnvFiles(options.home);
+  const { host, port } = resolveDashboardEndpoint(options, { strict: true });
+  const currentPid = await readWebPid(options);
+  if (isProcessRunning(currentPid)) {
+    console.log(`NordRelay dashboard already running with PID ${currentPid}.`);
+    console.log(`NordRelay dashboard: ${formatDashboardUrl({ host, port })}`);
+    return;
+  }
+  await fsp.rm(options.webPidFile, { force: true });
   const entry = await resolveWebRuntimeEntry();
   if (!entry) {
     throw new Error(`Missing dashboard runtime. Run \`npm install\` and \`npm run build\` in ${RUNTIME_ROOT}.`);
@@ -864,12 +1005,43 @@ async function commandWeb(options) {
     NORDRELAY_DASHBOARD_HOST: host,
     NORDRELAY_DASHBOARD_PORT: String(port),
   };
+  await writeWebState(options, {
+    status: "starting",
+    pid: null,
+    host,
+    port,
+    url: formatDashboardUrl({ host, port }),
+  });
+  const stdio = settings.detached
+    ? ["ignore", fs.openSync(options.webLogFile, "a"), fs.openSync(options.webLogFile, "a")]
+    : "inherit";
   const child = spawn(entry.command, [...entry.args, "--host", host, "--port", String(port), "--home", options.home], {
     cwd: RUNTIME_ROOT,
     env,
-    stdio: "inherit",
+    detached: Boolean(settings.detached),
+    stdio,
+  });
+  await fsp.writeFile(options.webPidFile, `${child.pid}\n`);
+  await writeWebState(options, {
+    status: "running",
+    pid: child.pid,
+    host,
+    port,
+    url: formatDashboardUrl({ host, port }),
   });
 
+  if (settings.detached) {
+    child.unref();
+    if (Array.isArray(stdio)) {
+      fs.closeSync(stdio[1]);
+      fs.closeSync(stdio[2]);
+    }
+    console.log(`NordRelay dashboard started with PID ${child.pid}.`);
+    console.log(`NordRelay dashboard: ${formatDashboardUrl({ host, port })}`);
+    console.log(`WebUI log: ${options.webLogFile}`);
+    return;
+  }
+
   const forwardSignal = (signal) => {
     if (isProcessRunning(child.pid)) {
       child.kill(signal);
@@ -878,9 +1050,23 @@ async function commandWeb(options) {
   process.once("SIGINT", () => forwardSignal("SIGINT"));
   process.once("SIGTERM", () => forwardSignal("SIGTERM"));
 
-  const exit = await new Promise((resolve) => {
+  const exit = await new Promise((resolve, reject) => {
+    child.once("error", reject);
     child.once("exit", (code, signal) => resolve({ code, signal }));
   });
+  const pid = await readWebPid(options);
+  if (pid === child.pid) {
+    await fsp.rm(options.webPidFile, { force: true });
+  }
+  await writeWebState(options, {
+    status: exit.code === 0 ? "stopped" : "error",
+    pid: null,
+    host,
+    port,
+    url: formatDashboardUrl({ host, port }),
+    exitCode: exit.code,
+    signal: exit.signal,
+  });
   if (exit.signal) {
     process.kill(process.pid, exit.signal);
     return;
@@ -1175,8 +1361,15 @@ async function main() {
   if (options.command === "update") return commandUpdate(options);
   if (options.command === "web" || options.command === "dashboard") return commandWeb(options);
   if (options.command === "restart") {
+    await mkdirp(options.home);
+    loadEnvFiles(options.home);
+    const webWasRunning = await isWebDashboardRunning(options);
     await commandStop(options);
-    return commandStart(options);
+    await commandStart(options);
+    if (webWasRunning && process.exitCode !== 1) {
+      await startWebDashboard(options, { detached: true });
+    }
+    return;
   }
   if (options.command === "foreground") return commandForeground(options);
   if (options.command === "--version" || options.command === "version") {