@jango-blockchained/hoox-cli 0.5.1 → 0.5.2

package/src/commands/waf/waf-command.ts

@@ -14,11 +14,8 @@ import type { Command } from "commander";
 import { CloudflareService } from "../../services/cloudflare/cloudflare-service.js";
 import type { WranglerResult } from "../../services/cloudflare/types.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
-import {
-  formatSuccess,
-  formatError,
-  formatTable,
-} from "../../utils/formatters.js";
+import { formatSuccess, formatTable } from "../../utils/formatters.js";
+import { withErrorHandling } from "../../utils/error-handler.js";
 import { theme, icons } from "../../utils/theme.js";
 import type { FormatOptions } from "../../utils/formatters.js";
 import type { WafStatus, WafRule, WafRuleInput } from "./types.js";
@@ -461,15 +458,15 @@ export function registerWafCommand(program: Command): void {
     .description(
       "Show WAF status (enabled/disabled, active rules, recent blocks)"
     )
-    .action(async (_, cmd: Command) => {
-      const opts: FormatOptions = cmd.parent!.parent!.opts();
-      try {
-        await handleStatus(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts: FormatOptions = cmd.parent!.parent!.opts();
+          await handleStatus(opts);
+        },
+        { service: "waf" }
+      )
+    );
 
   // -- waf rules -------------------------------------------------------------
   const rules = waf.command("rules").description("Manage WAF firewall rules");
@@ -477,43 +474,43 @@ export function registerWafCommand(program: Command): void {
   rules
     .command("list")
     .description("List all WAF firewall rules")
-    .action(async (_, cmd: Command) => {
-      const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
-      try {
-        await handleRulesList(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
+          await handleRulesList(opts);
+        },
+        { service: "waf" }
+      )
+    );
 
   rules
     .command("add <type> <value>")
     .description(
       "Add a WAF rule. Types: ip-allowlist, ip-blocklist, rate-limit, custom"
     )
-    .action(async (type: string, value: string, _, cmd: Command) => {
-      const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
-      try {
-        await handleRulesAdd(type, value, opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (type: string, value: string, _, cmd: Command) => {
+          const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
+          await handleRulesAdd(type, value, opts);
+        },
+        { service: "waf" }
+      )
+    );
 
   rules
     .command("remove <ruleId>")
     .description("Remove a WAF rule by ID")
-    .action(async (ruleId: string, _, cmd: Command) => {
-      const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
-      try {
-        await handleRulesRemove(ruleId, opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (ruleId: string, _, cmd: Command) => {
+          const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
+          await handleRulesRemove(ruleId, opts);
+        },
+        { service: "waf" }
+      )
+    );
 
   // -- waf mode --------------------------------------------------------------
   const mode = waf
@@ -523,26 +520,26 @@ export function registerWafCommand(program: Command): void {
   mode
     .command("enable")
     .description("Enable WAF protection on the zone")
-    .action(async (_, cmd: Command) => {
-      const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
-      try {
-        await handleMode("on", opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
+          await handleMode("on", opts);
+        },
+        { service: "waf" }
+      )
+    );
 
   mode
     .command("disable")
     .description("Disable WAF protection on the zone")
-    .action(async (_, cmd: Command) => {
-      const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
-      try {
-        await handleMode("off", opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts: FormatOptions = cmd.parent!.parent!.parent!.opts();
+          await handleMode("off", opts);
+        },
+        { service: "waf" }
+      )
+    );
 }

package/src/index.ts

@@ -7,10 +7,7 @@
 
 import { Command } from "commander";
 import { toError } from "@jango-blockchained/hoox-shared";
-import {
-  FULL_LEGAL_NOTICE,
-  COPYRIGHT,
-} from "@jango-blockchained/hoox-shared/legal";
+import { COPYRIGHT } from "@jango-blockchained/hoox-shared/legal";
 import { CLIError, ExitCode } from "./utils/errors.js";
 import { formatError } from "./utils/formatters.js";
 import { theme } from "./utils/theme.js";
@@ -146,18 +143,11 @@ import { registerDbCommand } from "./commands/db/index.js";
 import { registerMonitorCommand } from "./commands/monitor/index.js";
 import { registerRepairCommand } from "./commands/repair/index.js";
 import { registerUpdateCommand } from "./commands/update/index.js";
+import { registerSchemaCommand } from "./commands/schema/index.js";
 import { registerTUICommand } from "./commands/tui/index.js";
+import { registerDisclaimerCommand } from "./commands/disclaimer/index.js";
 import { runInteractiveTUI } from "./ui/index.js";
 
-// ── Legal / Disclaimer command ──────────────────────────────────────────
-
-program
-  .command("disclaimer")
-  .description("Display legal disclaimers and trademark information")
-  .action(() => {
-    console.log(FULL_LEGAL_NOTICE);
-  });
-
 // ── Command registration ────────────────────────────────────────────────
 
 registerInitCommand(program);
@@ -174,8 +164,10 @@ registerDashboardCommand(program);
 registerDbCommand(program);
 registerMonitorCommand(program);
 registerRepairCommand(program);
+registerSchemaCommand(program);
 registerUpdateCommand(program);
 registerTUICommand(program);
+registerDisclaimerCommand(program);
 
 // ---------------------------------------------------------------------------
 // preAction hooks — auto-check wrangler version before dev/deploy

package/src/services/config/config-service.ts

@@ -1,11 +1,6 @@
 import { parse, printParseErrorCode } from "jsonc-parser";
 import type { ParseError } from "jsonc-parser";
-import type {
-  HooxConfig,
-  WorkerConfig,
-  GlobalConfig,
-  DevConfig,
-} from "./types";
+import type { HooxConfig, WorkerConfig, GlobalConfig } from "./types";
 
 /**
  * Loads, parses, and validates the central wrangler.jsonc configuration.

package/src/services/db/db-service.test.ts

@@ -1,5 +1,12 @@
-import { describe, expect, it } from "bun:test";
+import { describe, expect, it, mock, afterEach } from "bun:test";
 import { DbService } from "./db-service.js";
+import { ConfigService } from "../config/config-service.js";
+
+const origLoad = ConfigService.prototype.load;
+
+afterEach(() => {
+  ConfigService.prototype.load = origLoad;
+});
 
 describe("DbService", () => {
   describe("resolveDbName", () => {
@@ -10,6 +17,11 @@ describe("DbService", () => {
     });
 
     it("falls back to default when no config exists", async () => {
+      // Mock ConfigService.load to throw (simulating no config)
+      ConfigService.prototype.load = mock(async () => {
+        throw new Error("Config file not found");
+      }) as typeof ConfigService.prototype.load;
+
       const svc = new DbService();
       const name = await svc.resolveDbName();
       expect(name).toBe("my-database");

package/src/services/env/env-service.test.ts

@@ -5,7 +5,7 @@ describe("EnvService", () => {
   describe("getDefinitions", () => {
     it("returns all known env var definitions", () => {
       const defs = EnvService.getDefinitions();
-      expect(defs.length).toBe(31);
+      expect(defs.length).toBe(28);
       expect(defs.some((d) => d.name === "CLOUDFLARE_API_TOKEN")).toBe(true);
     });
 
@@ -50,17 +50,26 @@ describe("EnvService", () => {
   describe("getWorkerDevVars", () => {
     it("maps vars to correct workers", () => {
       const vars = {
-        AGENT_OPENAI_KEY: "sk-123",
-        TELEGRAM_BOT_TOKEN: "tg-456",
-        D1_INTERNAL_KEY: "d1-789",
+        AGENT_INTERNAL_KEY: "sk-123",
+        TG_BOT_TOKEN_BINDING: "tg-456",
+        INTERNAL_KEY_BINDING: "d1-789",
+        DASHBOARD_USER: "admin",
+        DASHBOARD_PASS: "pass",
+        TELEGRAM_INTERNAL_KEY: "tg-int-key",
       };
       const result = EnvService.getWorkerDevVars(vars);
       expect(result["workers/agent-worker"]).toBeDefined();
-      expect(result["workers/agent-worker"].AGENT_OPENAI_KEY).toBe("sk-123");
+      expect(result["workers/agent-worker"].AGENT_INTERNAL_KEY).toBe("sk-123");
       expect(result["workers/telegram-worker"]).toBeDefined();
-      expect(result["workers/telegram-worker"].TELEGRAM_BOT_TOKEN).toBe(
+      expect(result["workers/telegram-worker"].TG_BOT_TOKEN_BINDING).toBe(
         "tg-456"
       );
+      expect(result["workers/dashboard"]).toBeDefined();
+      expect(result["workers/dashboard"].DASHBOARD_USER).toBe("admin");
+      expect(result["workers/dashboard"].DASHBOARD_PASS).toBe("pass");
+      expect(result["workers/dashboard"].TELEGRAM_INTERNAL_KEY).toBe(
+        "tg-int-key"
+      );
     });
 
     it("omits workers with no matching vars", () => {
@@ -69,7 +78,7 @@ describe("EnvService", () => {
     });
 
     it("omits empty-string vars", () => {
-      const result = EnvService.getWorkerDevVars({ D1_INTERNAL_KEY: "" });
+      const result = EnvService.getWorkerDevVars({ INTERNAL_KEY_BINDING: "" });
       expect(Object.keys(result).length).toBe(0);
     });
 
@@ -77,14 +86,18 @@ describe("EnvService", () => {
       const vars = {
         WEBHOOK_API_KEY_BINDING: "webhook-key",
         HA_TOKEN_BINDING: "ha-token",
-        API_SERVICE_KEY: "api-key",
+        API_SERVICE_KEY_BINDING: "api-key",
         TELEGRAM_SECRET_TOKEN: "tg-secret",
         WALLET_MNEMONIC_SECRET: "mnemonic",
         WALLET_PK_SECRET: "pk",
-        EMAIL_HOST: "imap.example.com",
-        EMAIL_USER: "user",
-        EMAIL_PASS: "pass",
-        INTERNAL_KEY: "int-key",
+        EMAIL_HOST_BINDING: "imap.example.com",
+        EMAIL_USER_BINDING: "user",
+        EMAIL_PASS_BINDING: "pass",
+        INTERNAL_KEY_BINDING: "int-key",
+        DASHBOARD_USER: "admin",
+        DASHBOARD_PASS: "pass",
+        SESSION_SECRET: "secret-32-char-min-for-session",
+        TELEGRAM_INTERNAL_KEY: "tg-int-key",
       };
       const result = EnvService.getWorkerDevVars(vars);
       expect(result["workers/hoox"]).toBeDefined();
@@ -92,7 +105,9 @@ describe("EnvService", () => {
         "webhook-key"
       );
       expect(result["workers/hoox"].HA_TOKEN_BINDING).toBe("ha-token");
-      expect(result["workers/trade-worker"].API_SERVICE_KEY).toBe("api-key");
+      expect(result["workers/trade-worker"].API_SERVICE_KEY_BINDING).toBe(
+        "api-key"
+      );
       expect(result["workers/telegram-worker"].TELEGRAM_SECRET_TOKEN).toBe(
         "tg-secret"
       );
@@ -101,9 +116,18 @@ describe("EnvService", () => {
         "mnemonic"
       );
       expect(result["workers/email-worker"]).toBeDefined();
-      expect(result["workers/email-worker"].EMAIL_HOST).toBe(
+      expect(result["workers/email-worker"].EMAIL_HOST_BINDING).toBe(
         "imap.example.com"
       );
+      expect(result["workers/dashboard"]).toBeDefined();
+      expect(result["workers/dashboard"].DASHBOARD_USER).toBe("admin");
+      expect(result["workers/dashboard"].DASHBOARD_PASS).toBe("pass");
+      expect(result["workers/dashboard"].SESSION_SECRET).toBe(
+        "secret-32-char-min-for-session"
+      );
+      expect(result["workers/dashboard"].TELEGRAM_INTERNAL_KEY).toBe(
+        "tg-int-key"
+      );
     });
   });
 
@@ -133,12 +157,12 @@ describe("EnvService", () => {
         CLOUDFLARE_API_TOKEN: "cfut_xxx",
         CLOUDFLARE_ACCOUNT_ID: "abc123",
         SUBDOMAIN_PREFIX: "myapp",
-        D1_INTERNAL_KEY: "d1-key",
         TRADE_INTERNAL_KEY: "trade-key",
         AGENT_INTERNAL_KEY: "agent-key",
         WEBHOOK_API_KEY_BINDING: "webhook-key",
         INTERNAL_KEY_BINDING: "int-key",
-        API_SERVICE_KEY: "api-key",
+        API_SERVICE_KEY_BINDING: "api-key",
+        TELEGRAM_INTERNAL_KEY: "tg-key",
         DASHBOARD_USER: "admin",
         DASHBOARD_PASS: "pass123",
         SESSION_SECRET: "a".repeat(32),
@@ -152,12 +176,11 @@ describe("EnvService", () => {
         CLOUDFLARE_API_TOKEN: "tok",
         CLOUDFLARE_ACCOUNT_ID: "id",
         SUBDOMAIN_PREFIX: "p",
-        D1_INTERNAL_KEY: "k",
         TRADE_INTERNAL_KEY: "k",
         AGENT_INTERNAL_KEY: "k",
         WEBHOOK_API_KEY_BINDING: "wk",
         INTERNAL_KEY_BINDING: "ik",
-        API_SERVICE_KEY: "ak",
+        API_SERVICE_KEY_BINDING: "ak",
         DASHBOARD_USER: "u",
         DASHBOARD_PASS: "p",
         SESSION_SECRET: "short",

package/src/services/env/env-service.ts

@@ -52,7 +52,7 @@ export class EnvService {
         hint: "Prefix for worker URLs",
       },
       {
-        name: "D1_INTERNAL_KEY",
+        name: "INTERNAL_KEY_BINDING",
         required: true,
         secret: true,
         section: "Internal Auth",
@@ -87,12 +87,19 @@ export class EnvService {
         hint: "Shared internal auth key for inter-worker communication",
       },
       {
-        name: "API_SERVICE_KEY",
+        name: "API_SERVICE_KEY_BINDING",
         required: true,
         secret: true,
         section: "Internal Auth",
         hint: "API service key for trade-worker",
       },
+      {
+        name: "TELEGRAM_INTERNAL_KEY",
+        required: true,
+        secret: true,
+        section: "Internal Auth",
+        hint: "Internal key for telegram worker auth",
+      },
       {
         name: "HA_TOKEN_BINDING",
         required: false,
@@ -101,7 +108,7 @@ export class EnvService {
         hint: "Home Assistant token for hoox",
       },
       {
-        name: "TELEGRAM_BOT_TOKEN",
+        name: "TG_BOT_TOKEN_BINDING",
         required: false,
         secret: true,
         section: "Telegram",
@@ -114,64 +121,44 @@ export class EnvService {
         section: "Telegram",
         hint: "Telegram webhook secret token",
       },
+      // AI provider keys consolidated into AGENT_INTERNAL_KEY (above)
       {
-        name: "AGENT_OPENAI_KEY",
-        required: false,
-        secret: true,
-        section: "AI Providers",
-        hint: "OpenAI API key",
-      },
-      {
-        name: "AGENT_ANTHROPIC_KEY",
-        required: false,
-        secret: true,
-        section: "AI Providers",
-        hint: "Anthropic API key",
-      },
-      {
-        name: "AGENT_GOOGLE_KEY",
-        required: false,
-        secret: true,
-        section: "AI Providers",
-        hint: "Google AI API key",
-      },
-      {
-        name: "BINANCE_API_KEY",
+        name: "BINANCE_KEY_BINDING",
         required: false,
         secret: true,
         section: "Exchanges",
         hint: "Binance API key",
       },
       {
-        name: "BINANCE_API_SECRET",
+        name: "BINANCE_SECRET_BINDING",
         required: false,
         secret: true,
         section: "Exchanges",
         hint: "Binance API secret",
       },
       {
-        name: "MEXC_API_KEY",
+        name: "MEXC_KEY_BINDING",
         required: false,
         secret: true,
         section: "Exchanges",
         hint: "MEXC API key",
       },
       {
-        name: "MEXC_API_SECRET",
+        name: "MEXC_SECRET_BINDING",
         required: false,
         secret: true,
         section: "Exchanges",
         hint: "MEXC API secret",
       },
       {
-        name: "BYBIT_API_KEY",
+        name: "BYBIT_KEY_BINDING",
         required: false,
         secret: true,
         section: "Exchanges",
         hint: "Bybit API key",
       },
       {
-        name: "BYBIT_API_SECRET",
+        name: "BYBIT_SECRET_BINDING",
         required: false,
         secret: true,
         section: "Exchanges",
@@ -179,33 +166,27 @@ export class EnvService {
       },
       // Email
       {
-        name: "EMAIL_HOST",
+        name: "EMAIL_HOST_BINDING",
         required: false,
         secret: true,
         section: "Email",
         hint: "Email IMAP server host",
       },
       {
-        name: "EMAIL_USER",
+        name: "EMAIL_USER_BINDING",
         required: false,
         secret: true,
         section: "Email",
         hint: "Email IMAP username",
       },
       {
-        name: "EMAIL_PASS",
+        name: "EMAIL_PASS_BINDING",
         required: false,
         secret: true,
         section: "Email",
         hint: "Email IMAP password",
       },
-      {
-        name: "INTERNAL_KEY",
-        required: false,
-        secret: true,
-        section: "Email",
-        hint: "Internal auth key for email-worker",
-      },
+      // INTERNAL_KEY_BINDING consolidated into INTERNAL_KEY_BINDING (above)
       // Wallet
       {
         name: "WALLET_MNEMONIC_SECRET",
@@ -322,24 +303,19 @@ export class EnvService {
         "HA_TOKEN_BINDING",
       ],
       "workers/trade-worker": [
-        "API_SERVICE_KEY",
+        "API_SERVICE_KEY_BINDING",
         "INTERNAL_KEY_BINDING",
-        "BINANCE_API_KEY",
-        "BINANCE_API_SECRET",
-        "MEXC_API_KEY",
-        "MEXC_API_SECRET",
-        "BYBIT_API_KEY",
-        "BYBIT_API_SECRET",
-      ],
-      "workers/agent-worker": [
-        "AGENT_INTERNAL_KEY",
-        "AGENT_OPENAI_KEY",
-        "AGENT_ANTHROPIC_KEY",
-        "AGENT_GOOGLE_KEY",
+        "BINANCE_KEY_BINDING",
+        "BINANCE_SECRET_BINDING",
+        "MEXC_KEY_BINDING",
+        "MEXC_SECRET_BINDING",
+        "BYBIT_KEY_BINDING",
+        "BYBIT_SECRET_BINDING",
       ],
-      "workers/d1-worker": ["D1_INTERNAL_KEY"],
+      "workers/agent-worker": ["AGENT_INTERNAL_KEY"],
+      "workers/d1-worker": ["INTERNAL_KEY_BINDING"],
       "workers/telegram-worker": [
-        "TELEGRAM_BOT_TOKEN",
+        "TG_BOT_TOKEN_BINDING",
         "TELEGRAM_SECRET_TOKEN",
       ],
       "workers/web3-wallet-worker": [
@@ -347,12 +323,22 @@ export class EnvService {
         "WALLET_PK_SECRET",
       ],
       "workers/email-worker": [
-        "EMAIL_HOST",
-        "EMAIL_USER",
-        "EMAIL_PASS",
-        "INTERNAL_KEY",
+        "EMAIL_HOST_BINDING",
+        "EMAIL_USER_BINDING",
+        "EMAIL_PASS_BINDING",
+        "INTERNAL_KEY_BINDING",
       ],
       "workers/analytics-worker": ["CLOUDFLARE_API_TOKEN"],
+      "workers/dashboard": [
+        "DASHBOARD_USER",
+        "DASHBOARD_PASS",
+        "SESSION_SECRET",
+        "INTERNAL_KEY_BINDING",
+        "AGENT_INTERNAL_KEY",
+        "TRADE_INTERNAL_KEY",
+        "TELEGRAM_INTERNAL_KEY",
+        "API_SERVICE_KEY_BINDING",
+      ],
     };
     const result: Record<string, Record<string, string>> = {};
     for (const [workerPath, varNames] of Object.entries(workerMap)) {

package/src/services/kv/kv-sync-service.ts

@@ -16,7 +16,7 @@ export class KvSyncService {
     if (namespaceId) return namespaceId;
 
     try {
-      const proc = Bun.spawn(["wrangler", "kv:namespace", "list"], {
+      const proc = Bun.spawn(["wrangler", "kv", "namespace", "list"], {
         stdout: "pipe",
         stderr: "pipe",
       });
@@ -46,7 +46,7 @@ export class KvSyncService {
 
   async list(namespaceId: string): Promise<Array<{ name: string }>> {
     const proc = Bun.spawn(
-      ["wrangler", "kv:key", "list", "--namespace-id", namespaceId],
+      ["wrangler", "kv", "key", "list", "--namespace-id", namespaceId],
       { stdout: "pipe", stderr: "pipe" }
     );
     const stdout = await new Response(proc.stdout).text();
@@ -71,7 +71,7 @@ export class KvSyncService {
 
   async get(namespaceId: string, key: string): Promise<string | null> {
     const proc = Bun.spawn(
-      ["wrangler", "kv:key", "get", "--namespace-id", namespaceId, key],
+      ["wrangler", "kv", "key", "get", "--namespace-id", namespaceId, key],
       { stdout: "pipe", stderr: "pipe" }
     );
     const stdout = await new Response(proc.stdout).text();
@@ -90,7 +90,16 @@ export class KvSyncService {
 
   async set(namespaceId: string, key: string, value: string): Promise<void> {
     const proc = Bun.spawn(
-      ["wrangler", "kv:key", "put", "--namespace-id", namespaceId, key, value],
+      [
+        "wrangler",
+        "kv",
+        "key",
+        "put",
+        "--namespace-id",
+        namespaceId,
+        key,
+        value,
+      ],
       { stdout: "pipe", stderr: "pipe" }
     );
     const exitCode = await proc.exited;
@@ -105,7 +114,7 @@ export class KvSyncService {
 
   async delete(namespaceId: string, key: string): Promise<void> {
     const proc = Bun.spawn(
-      ["wrangler", "kv:key", "delete", "--namespace-id", namespaceId, key],
+      ["wrangler", "kv", "key", "delete", "--namespace-id", namespaceId, key],
       { stdout: "pipe", stderr: "pipe" }
     );
     const exitCode = await proc.exited;

package/src/services/schema/index.ts

@@ -0,0 +1 @@
+export { SchemaService } from "./schema-service.js";