@inceptionstack/roundhouse 0.3.15 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inceptionstack/roundhouse",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "type": "module",
   "description": "Multi-platform chat gateway that routes messages through a configured AI agent",
   "license": "MIT",

package/src/cli/doctor/checks/credentials.ts

@@ -1,62 +1,48 @@
 /**
- * Credential checks
+ * Credential checks — validates token presence and format.
+ * API connectivity is tested by the telegram checks (checks/telegram.ts).
  */
 
-import type { DoctorCheck } from "../types";
+import { readFile } from "node:fs/promises";
+import { parseEnvFile } from "../../env-file";
+import type { DoctorCheck, DoctorContext } from "../types";
+
+/**
+ * Resolve the Telegram bot token from process env or the .env file.
+ * Shared by credential and telegram checks.
+ */
+export async function resolveToken(ctx: DoctorContext): Promise<string | null> {
+  let token = ctx.env.TELEGRAM_BOT_TOKEN;
+  if (!token) {
+    try {
+      const entries = parseEnvFile(await readFile(ctx.envFilePath, "utf8"));
+      const raw = entries.get("TELEGRAM_BOT_TOKEN");
+      if (raw) token = raw.replace(/^["']|["']$/g, "");
+    } catch {}
+  }
+  return token || null;
+}
 
 export const credentialChecks: DoctorCheck[] = [
   {
     id: "telegram-token", category: "credentials", name: "Telegram bot token",
     async run(ctx) {
-      // Check both process env and the systemd env file
-      let token = ctx.env.TELEGRAM_BOT_TOKEN;
-      if (!token) {
-        try {
-          const { readFile } = await import("node:fs/promises");
-          const envContent = await readFile(ctx.envFilePath, "utf8");
-          const match = envContent.match(/^TELEGRAM_BOT_TOKEN=(.+)$/m);
-          if (match) token = match[1].trim().replace(/^["']|["']$/g, "");
-        } catch {}
-      }
+      const base = { id: "telegram-token", category: "credentials" as const, name: "Telegram bot token" };
+      const token = await resolveToken(ctx);
+
       if (!token) {
         return {
-          id: "telegram-token", category: "credentials", name: "Telegram bot token",
-          status: "fail", summary: "TELEGRAM_BOT_TOKEN not set",
+          ...base, status: "fail", summary: "TELEGRAM_BOT_TOKEN not set",
           details: ["Set TELEGRAM_BOT_TOKEN in your environment or ~/.roundhouse/.env"],
         };
       }
       if (!/^\d+:[A-Za-z0-9_-]+$/.test(token)) {
         return {
-          id: "telegram-token", category: "credentials", name: "Telegram bot token",
-          status: "fail", summary: "invalid format",
+          ...base, status: "fail", summary: "invalid format",
           details: ["Token should match pattern: digits:alphanumeric"],
         };
       }
-      // Try getMe
-      try {
-        const res = await fetch(`https://api.telegram.org/bot${token}/getMe`, {
-          signal: AbortSignal.timeout(10000),
-        });
-        if (res.ok) {
-          const data = await res.json() as any;
-          const username = data.result?.username ?? "unknown";
-          return {
-            id: "telegram-token", category: "credentials", name: "Telegram bot token",
-            status: "pass", summary: `@${username}`,
-          };
-        }
-        return {
-          id: "telegram-token", category: "credentials", name: "Telegram bot token",
-          status: "fail", summary: `API returned ${res.status}`,
-          details: ["Token may be invalid or revoked"],
-        };
-      } catch (err) {
-        return {
-          id: "telegram-token", category: "credentials", name: "Telegram bot token",
-          status: "warn", summary: "cannot reach Telegram API",
-          details: [(err as Error).message],
-        };
-      }
+      return { ...base, status: "pass", summary: "present, valid format" };
     },
   },
 ];

package/src/cli/doctor/checks/telegram.ts

@@ -1,22 +1,19 @@
 /**
- * Telegram connectivity checks
+ * Telegram connectivity checks — tests API access, config, and webhook status.
+ * Token resolution is shared with credentials.ts via resolveToken().
  */
 
 import { readFile } from "node:fs/promises";
-import type { DoctorCheck } from "../types";
-import { parseEnvFile } from "../../env-file";
+import type { DoctorCheck, DoctorContext } from "../types";
+import { resolveToken } from "./credentials";
 
-/** Resolve the bot token from env or .env file */
-async function resolveToken(ctx: { env: NodeJS.ProcessEnv; envFilePath: string }): Promise<string | null> {
-  let token = ctx.env.TELEGRAM_BOT_TOKEN;
-  if (!token) {
-    try {
-      const entries = parseEnvFile(await readFile(ctx.envFilePath, "utf8"));
-      const raw = entries.get("TELEGRAM_BOT_TOKEN");
-      if (raw) token = raw.replace(/^["']|["']$/g, "");
-    } catch {}
+/** Load and parse the gateway config, returning null on any error. */
+async function loadGatewayConfig(ctx: DoctorContext): Promise<any | null> {
+  try {
+    return JSON.parse(await readFile(ctx.configPath, "utf8"));
+  } catch {
+    return null;
   }
-  return token || null;
 }
 
 export const telegramChecks: DoctorCheck[] = [
@@ -24,17 +21,15 @@ export const telegramChecks: DoctorCheck[] = [
     id: "telegram-configured", category: "network", name: "Telegram adapter configured",
     async run(ctx) {
       const base = { id: "telegram-configured", category: "network" as const, name: "Telegram adapter configured" };
-      try {
-        const raw = await readFile(ctx.configPath, "utf8");
-        const cfg = JSON.parse(raw);
-        if (cfg.chat?.adapters?.telegram) {
-          const mode = cfg.chat.adapters.telegram.mode ?? "polling";
-          return { ...base, status: "pass", summary: `mode: ${mode}` };
-        }
-        return { ...base, status: "info", summary: "not configured (no telegram adapter in config)" };
-      } catch {
+      const cfg = await loadGatewayConfig(ctx);
+      if (!cfg) {
         return { ...base, status: "info", summary: "skipped (no config file)" };
       }
+      if (cfg.chat?.adapters?.telegram) {
+        const mode = cfg.chat.adapters.telegram.mode ?? "polling";
+        return { ...base, status: "pass", summary: `mode: ${mode}` };
+      }
+      return { ...base, status: "info", summary: "not configured (no telegram adapter in config)" };
     },
   },
 
@@ -77,13 +72,8 @@ export const telegramChecks: DoctorCheck[] = [
         return { ...base, status: "info", summary: "skipped (no token)" };
       }
 
-      // Check what mode is configured
-      let configuredMode = "polling";
-      try {
-        const raw = await readFile(ctx.configPath, "utf8");
-        const cfg = JSON.parse(raw);
-        configuredMode = cfg.chat?.adapters?.telegram?.mode ?? "polling";
-      } catch {}
+      const cfg = await loadGatewayConfig(ctx);
+      const configuredMode = cfg?.chat?.adapters?.telegram?.mode ?? "polling";
 
       try {
         const res = await fetch(`https://api.telegram.org/bot${token}/getWebhookInfo`, {
@@ -99,7 +89,7 @@ export const telegramChecks: DoctorCheck[] = [
         if (configuredMode === "polling") {
           if (webhookUrl) {
             return {
-              ...base, status: "warn", summary: `webhook set but mode is polling`,
+              ...base, status: "warn", summary: "webhook set but mode is polling",
               details: [
                 `Webhook URL: ${webhookUrl}`,
                 "Polling won't receive updates while a webhook is active.",
@@ -109,7 +99,6 @@ export const telegramChecks: DoctorCheck[] = [
           }
           return { ...base, status: "pass", summary: `no webhook (polling mode), ${pendingUpdates} pending updates` };
         } else {
-          // webhook mode
           if (!webhookUrl) {
             return { ...base, status: "warn", summary: "webhook mode configured but no webhook set" };
           }

package/src/cli/doctor.ts

@@ -7,7 +7,7 @@ import { formatResult, formatSummary, formatCategoryHeader } from "./doctor/outp
 import { runDoctor, createDoctorContext } from "./doctor/runner";
 
 const CATEGORY_ORDER: DoctorCategory[] = [
-  "system", "config", "credentials", "agent", "stt", "disk", "systemd",
+  "system", "config", "credentials", "network", "agent", "stt", "disk", "systemd",
 ];
 
 export async function cmdDoctor(args: string[]): Promise<void> {