@jango-blockchained/hoox-cli 0.3.4 → 0.3.5

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

@@ -18,25 +18,15 @@ import {
   formatError,
   formatTable,
   formatJson,
+  getFormatOptions,
 } from "../../utils/formatters.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
 import type { FormatOptions } from "../../utils/formatters.js";
 
-function getFormatOptions(cmd: Command): FormatOptions {
-  const rootCmd = cmd.parent?.parent as Command | undefined;
-  return {
-    json: Boolean(rootCmd?.optsWithGlobals()?.json),
-    quiet: Boolean(rootCmd?.optsWithGlobals()?.quiet),
-  };
-}
-
 /**
  * Resolve database name from config or --database flag.
  */
-async function resolveDb(
-  cmd: Command,
-  svc: DbService,
-): Promise<string> {
+async function resolveDb(cmd: Command, svc: DbService): Promise<string> {
   const opts = cmd.optsWithGlobals<{ database?: string }>();
   return await svc.resolveDbName(opts.database);
 }
@@ -49,13 +39,13 @@ async function handleApply(
   opts: FormatOptions,
   dbName: string,
   remote: boolean,
-  file?: string,
+  file?: string
 ): Promise<void> {
   const svc = new DbService();
   const output = await svc.apply(dbName, remote, file);
   formatSuccess(
     `Schema applied to ${dbName}${remote ? " (remote)" : " (local)"}`,
-    opts,
+    opts
   );
   if (!opts.quiet && output) {
     process.stdout.write(`${output}\n`);
@@ -69,13 +59,13 @@ async function handleApply(
 async function handleMigrate(
   opts: FormatOptions,
   dbName: string,
-  remote: boolean,
+  remote: boolean
 ): Promise<void> {
   const svc = new DbService();
   const output = await svc.migrate(dbName, remote);
   formatSuccess(
     `Migrations applied to ${dbName}${remote ? " (remote)" : " (local)"}`,
-    opts,
+    opts
   );
   if (!opts.quiet && output) {
     process.stdout.write(`${output}\n`);
@@ -89,7 +79,7 @@ async function handleMigrate(
 async function handleList(
   opts: FormatOptions,
   dbName: string,
-  remote: boolean,
+  remote: boolean
 ): Promise<void> {
   const svc = new DbService();
   const tables = await svc.listTables(dbName, remote);
@@ -114,7 +104,7 @@ async function handleQuery(
   opts: FormatOptions,
   dbName: string,
   sql: string,
-  remote: boolean,
+  remote: boolean
 ): Promise<void> {
   const svc = new DbService();
   const output = await svc.query(dbName, sql, remote);
@@ -139,7 +129,7 @@ async function handleQuery(
 async function handleExport(
   opts: FormatOptions,
   dbName: string,
-  outputPath?: string,
+  outputPath?: string
 ): Promise<void> {
   const svc = new DbService();
   const path = await svc.export(dbName, outputPath);
@@ -153,7 +143,7 @@ async function handleExport(
 async function handleReset(
   opts: FormatOptions,
   dbName: string,
-  confirmed: boolean,
+  confirmed: boolean
 ): Promise<void> {
   if (!confirmed) {
     const answer = await p.confirm({
@@ -204,7 +194,7 @@ EXAMPLES:
   hoox db list
   hoox db query "SELECT * FROM trade_signals LIMIT 5"
   hoox db export
-  hoox db reset`,
+  hoox db reset`
     )
     .option("--database <name>", "Database name (auto-detected if omitted)")
     .option("--remote", "Operate on production (remote) database");
@@ -219,7 +209,9 @@ EXAMPLES:
       try {
         const svc = new DbService();
         const dbName = await resolveDb(cmd, svc);
-        const remote = Boolean(cmd.optsWithGlobals<{ remote?: boolean }>().remote);
+        const remote = Boolean(
+          cmd.optsWithGlobals<{ remote?: boolean }>().remote
+        );
         await handleApply(opts, dbName, remote, options.file);
       } catch (err) {
         formatError(err instanceof Error ? err : String(err), opts);
@@ -236,7 +228,9 @@ EXAMPLES:
       try {
         const svc = new DbService();
         const dbName = await resolveDb(cmd, svc);
-        const remote = Boolean(cmd.optsWithGlobals<{ remote?: boolean }>().remote);
+        const remote = Boolean(
+          cmd.optsWithGlobals<{ remote?: boolean }>().remote
+        );
         await handleMigrate(opts, dbName, remote);
       } catch (err) {
         formatError(err instanceof Error ? err : String(err), opts);
@@ -253,7 +247,9 @@ EXAMPLES:
       try {
         const svc = new DbService();
         const dbName = await resolveDb(cmd, svc);
-        const remote = Boolean(cmd.optsWithGlobals<{ remote?: boolean }>().remote);
+        const remote = Boolean(
+          cmd.optsWithGlobals<{ remote?: boolean }>().remote
+        );
         await handleList(opts, dbName, remote);
       } catch (err) {
         formatError(err instanceof Error ? err : String(err), opts);
@@ -270,7 +266,9 @@ EXAMPLES:
       try {
         const svc = new DbService();
         const dbName = await resolveDb(cmd, svc);
-        const remote = Boolean(cmd.optsWithGlobals<{ remote?: boolean }>().remote);
+        const remote = Boolean(
+          cmd.optsWithGlobals<{ remote?: boolean }>().remote
+        );
         await handleQuery(opts, dbName, sql, remote);
       } catch (err) {
         formatError(err instanceof Error ? err : String(err), opts);

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

@@ -16,6 +16,7 @@ import {
   formatSuccess,
   formatError,
   type FormatOptions,
+  getFormatOptions,
 } from "../../utils/formatters.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
 import type { DeployResult } from "./types.js";
@@ -106,14 +107,6 @@ async function promptRebuildDecision(buildInfo: {
   return choice as "rebuild" | "deploy";
 }
 
-/**
- * Build the format options for output, reading global --json / --quiet flags.
- */
-function getFormatOptions(cmd: Command) {
-  const opts = cmd.optsWithGlobals();
-  return { json: Boolean(opts.json), quiet: Boolean(opts.quiet) };
-}
-
 /**
  * Deploy a single worker via CloudflareService.deploy().
  * Returns a DeployResult summarizing the outcome.
@@ -137,17 +130,17 @@ async function deploySingle(
   const result = await cf.deploy(workerConfig.path, env);
 
   if (result.ok) {
-    const rawLine = result.data.rawOutput
+    const rawLine = result.value.rawOutput
       ?.split("\n")
       .find((l) => l.trim())
       ?.trim();
     return {
       worker: workerName,
-      url: result.data.url,
+      url: result.value.url,
       success: true,
-      size: result.data.size,
-      startupTime: result.data.startupTime,
-      versionId: result.data.versionId,
+      size: result.value.size,
+      startupTime: result.value.startupTime,
+      versionId: result.value.versionId,
       rawOutput: rawLine,
     };
   }
@@ -242,7 +235,9 @@ async function deployAll(
         log.step(`  ${theme.dim("Startup:")} ${result.startupTime}`);
       }
       if (result.versionId) {
-        log.step(`  ${theme.dim("Version:")} ${result.versionId.slice(0, 8)}...`);
+        log.step(
+          `  ${theme.dim("Version:")} ${result.versionId.slice(0, 8)}...`
+        );
       }
       if (
         !result.url &&
@@ -267,7 +262,9 @@ async function deployAll(
   const succeeded = results.filter((r) => r.success).length;
   const failed = results.filter((r) => !r.success).length;
   if (failed > 0) {
-    log.warn(`Summary: ${succeeded}/${allItems.length} deployed (${failed} failed)`);
+    log.warn(
+      `Summary: ${succeeded}/${allItems.length} deployed (${failed} failed)`
+    );
   }
 
   return results;
@@ -532,7 +529,7 @@ async function doTelegramWebhook(
   fmt: FormatOptions,
   token?: string,
   secretToken?: string,
-  subdomain?: string,
+  subdomain?: string
 ): Promise<void> {
   try {
     // Resolve subdomain from flag or config
@@ -551,7 +548,13 @@ async function doTelegramWebhook(
       botToken = envVars["TELEGRAM_BOT_TOKEN"];
     }
     if (!botToken) {
-      formatError(new CLIError("Telegram bot token not found. Provide --token or set TELEGRAM_BOT_TOKEN in .env.local", ExitCode.ERROR), fmt);
+      formatError(
+        new CLIError(
+          "Telegram bot token not found. Provide --token or set TELEGRAM_BOT_TOKEN in .env.local",
+          ExitCode.ERROR
+        ),
+        fmt
+      );
       process.exitCode = ExitCode.ERROR;
       return;
     }
@@ -563,7 +566,13 @@ async function doTelegramWebhook(
       webhookSecret = envVars["TELEGRAM_SECRET_TOKEN"];
     }
     if (!webhookSecret) {
-      formatError(new CLIError("Telegram secret token not found. Provide --secret-token or set TELEGRAM_SECRET_TOKEN in .env.local", ExitCode.ERROR), fmt);
+      formatError(
+        new CLIError(
+          "Telegram secret token not found. Provide --secret-token or set TELEGRAM_SECRET_TOKEN in .env.local",
+          ExitCode.ERROR
+        ),
+        fmt
+      );
       process.exitCode = ExitCode.ERROR;
       return;
     }
@@ -576,19 +585,34 @@ async function doTelegramWebhook(
     if (info.ok && info.url) {
       process.stdout.write(`${theme.dim("Current webhook:")} ${info.url}\n`);
       if (info.pending_update_count !== undefined) {
-        process.stdout.write(`${theme.dim("Pending updates:")} ${info.pending_update_count}\n`);
+        process.stdout.write(
+          `${theme.dim("Pending updates:")} ${info.pending_update_count}\n`
+        );
       }
     }
 
     // Set webhook
-    process.stdout.write(`${theme.info("Setting webhook to:")} ${webhookUrl}\n`);
-    const result = await telegram.setWebhook(botToken, webhookUrl, webhookSecret);
+    process.stdout.write(
+      `${theme.info("Setting webhook to:")} ${webhookUrl}\n`
+    );
+    const result = await telegram.setWebhook(
+      botToken,
+      webhookUrl,
+      webhookSecret
+    );
 
     if (result.ok) {
       formatSuccess("Telegram webhook set successfully", fmt);
-      if (result.description) process.stdout.write(`  ${theme.dim(result.description)}\n`);
+      if (result.description)
+        process.stdout.write(`  ${theme.dim(result.description)}\n`);
     } else {
-      formatError(new CLIError(`Telegram webhook failed: ${result.error || result.description || "Unknown error"}`, ExitCode.ERROR), fmt);
+      formatError(
+        new CLIError(
+          `Telegram webhook failed: ${result.error || result.description || "Unknown error"}`,
+          ExitCode.ERROR
+        ),
+        fmt
+      );
       process.exitCode = ExitCode.ERROR;
     }
   } catch (err) {
@@ -610,12 +634,28 @@ async function doUpdateInternalUrls(fmt: FormatOptions): Promise<void> {
     const workers = config.listEnabledWorkers();
 
     // Try pages/dashboard first, fall back to workers/dashboard
-    let filePath = resolve(process.cwd(), "pages", "dashboard", "wrangler.jsonc");
+    let filePath = resolve(
+      process.cwd(),
+      "pages",
+      "dashboard",
+      "wrangler.jsonc"
+    );
     if (!existsSync(filePath)) {
-      filePath = resolve(process.cwd(), "workers", "dashboard", "wrangler.jsonc");
+      filePath = resolve(
+        process.cwd(),
+        "workers",
+        "dashboard",
+        "wrangler.jsonc"
+      );
     }
     if (!existsSync(filePath)) {
-      formatError(new CLIError("Dashboard wrangler.jsonc not found (checked pages/dashboard and workers/dashboard)", ExitCode.ERROR), fmt);
+      formatError(
+        new CLIError(
+          "Dashboard wrangler.jsonc not found (checked pages/dashboard and workers/dashboard)",
+          ExitCode.ERROR
+        ),
+        fmt
+      );
       process.exitCode = ExitCode.ERROR;
       return;
     }
@@ -624,7 +664,13 @@ async function doUpdateInternalUrls(fmt: FormatOptions): Promise<void> {
     const errors: jsonc.ParseError[] = [];
     const parsed = jsonc.parse(content, errors) as Record<string, unknown>;
     if (errors.length > 0) {
-      formatError(new CLIError("Invalid JSONC in dashboard wrangler.jsonc", ExitCode.ERROR), fmt);
+      formatError(
+        new CLIError(
+          "Invalid JSONC in dashboard wrangler.jsonc",
+          ExitCode.ERROR
+        ),
+        fmt
+      );
       process.exitCode = ExitCode.ERROR;
       return;
     }
@@ -637,7 +683,9 @@ async function doUpdateInternalUrls(fmt: FormatOptions): Promise<void> {
       const newUrl = `https://${name}.${prefix}.workers.dev`;
       if (vars[key] !== newUrl) {
         if (!fmt.quiet) {
-          process.stdout.write(`  ${theme.info("→")} ${key}: ${vars[key] ?? "(not set)"} ${theme.dim("→")} ${newUrl}\n`);
+          process.stdout.write(
+            `  ${theme.info("→")} ${key}: ${vars[key] ?? "(not set)"} ${theme.dim("→")} ${newUrl}\n`
+          );
         }
         vars[key] = newUrl;
         changesCount++;
@@ -653,7 +701,10 @@ async function doUpdateInternalUrls(fmt: FormatOptions): Promise<void> {
       formattingOptions: { tabSize: 2, insertSpaces: true },
     });
     writeFileSync(filePath, jsonc.applyEdits(content, edits), "utf-8");
-    formatSuccess(`Updated ${changesCount} service URL(s) in dashboard wrangler.jsonc`, fmt);
+    formatSuccess(
+      `Updated ${changesCount} service URL(s) in dashboard wrangler.jsonc`,
+      fmt
+    );
   } catch (err) {
     formatError(err instanceof Error ? err.message : String(err), fmt);
     process.exitCode = ExitCode.ERROR;
@@ -666,7 +717,8 @@ async function doUpdateInternalUrls(fmt: FormatOptions): Promise<void> {
 
 async function doKvConfig(fmt: FormatOptions): Promise<void> {
   try {
-    const { KvSyncService } = await import("../../services/kv/kv-sync-service.js");
+    const { KvSyncService } =
+      await import("../../services/kv/kv-sync-service.js");
     const kvSync = new KvSyncService();
 
     process.stdout.write(`${theme.info("Resolving CONFIG_KV namespace...")}\n`);
@@ -679,7 +731,9 @@ async function doKvConfig(fmt: FormatOptions): Promise<void> {
       const value = entry.default;
       if (!value || value === "") {
         if (!fmt.quiet) {
-          process.stdout.write(`  ${theme.dim("·")} ${entry.key} ${theme.dim("(no default, skipping)")}\n`);
+          process.stdout.write(
+            `  ${theme.dim("·")} ${entry.key} ${theme.dim("(no default, skipping)")}\n`
+          );
         }
         continue;
       }
@@ -690,7 +744,9 @@ async function doKvConfig(fmt: FormatOptions): Promise<void> {
         }
         setCount++;
       } catch (err) {
-        process.stdout.write(`  ${theme.error("✗")} ${entry.key}: ${err instanceof Error ? err.message : String(err)}\n`);
+        process.stdout.write(
+          `  ${theme.error("✗")} ${entry.key}: ${err instanceof Error ? err.message : String(err)}\n`
+        );
         errorCount++;
       }
     }
@@ -756,22 +812,33 @@ EXAMPLES:
     )
     .option("--env <env>", "Cloudflare environment (e.g. production, staging)")
     .option("--rebuild", "Force rebuild of dashboard before deploying")
-    .option("--auto", "Skip dashboard rebuild prompt, use existing build if available")
-    .action(async (options: { env?: string; rebuild?: boolean; auto?: boolean }) => {
-      const fmt = getFormatOptions(program);
-      try {
-        const configService = new ConfigService();
-        await configService.load();
-        const cf = new CloudflareService();
-
-        // Deploy all (workers + dashboard) in one go
-        await deployAll(configService, cf, options.env, options.rebuild ?? false, options.auto ?? false);
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        formatError(message, fmt);
-        process.exitCode = ExitCode.ERROR;
+    .option(
+      "--auto",
+      "Skip dashboard rebuild prompt, use existing build if available"
+    )
+    .action(
+      async (options: { env?: string; rebuild?: boolean; auto?: boolean }) => {
+        const fmt = getFormatOptions(program);
+        try {
+          const configService = new ConfigService();
+          await configService.load();
+          const cf = new CloudflareService();
+
+          // Deploy all (workers + dashboard) in one go
+          await deployAll(
+            configService,
+            cf,
+            options.env,
+            options.rebuild ?? false,
+            options.auto ?? false
+          );
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          formatError(message, fmt);
+          process.exitCode = ExitCode.ERROR;
+        }
       }
-    });
+    );
 
   // -- deploy workers ------------------------------------------------------
   deployCmd
@@ -1007,11 +1074,25 @@ EXAMPLES:
     )
     .option("--token <token>", "Telegram bot token (from @BotFather)")
     .option("--secret-token <secret>", "Telegram webhook secret token")
-    .option("--subdomain <prefix>", "Worker subdomain prefix (default: from config)")
-    .action(async (options: { token?: string; secretToken?: string; subdomain?: string }) => {
-      const fmt = getFormatOptions(program);
-      await doTelegramWebhook(fmt, options.token, options.secretToken, options.subdomain);
-    });
+    .option(
+      "--subdomain <prefix>",
+      "Worker subdomain prefix (default: from config)"
+    )
+    .action(
+      async (options: {
+        token?: string;
+        secretToken?: string;
+        subdomain?: string;
+      }) => {
+        const fmt = getFormatOptions(program);
+        await doTelegramWebhook(
+          fmt,
+          options.token,
+          options.secretToken,
+          options.subdomain
+        );
+      }
+    );
 
   // -- deploy update-internal-urls ---------------------------------------
 

package/src/commands/deploy/telegram-service.ts

@@ -11,7 +11,7 @@ export class TelegramService {
   async setWebhook(
     botToken: string,
     webhookUrl: string,
-    secretToken: string,
+    secretToken: string
   ): Promise<{ ok: boolean; description?: string; error?: string }> {
     try {
       const url = `https://api.telegram.org/bot${botToken}/setWebhook`;
@@ -20,10 +20,16 @@ export class TelegramService {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ url: webhookUrl, secret_token: secretToken }),
       });
-      const data = (await response.json()) as { ok: boolean; description?: string };
+      const data = (await response.json()) as {
+        ok: boolean;
+        description?: string;
+      };
       return { ok: data.ok, description: data.description };
     } catch (err) {
-      return { ok: false, error: err instanceof Error ? err.message : String(err) };
+      return {
+        ok: false,
+        error: err instanceof Error ? err.message : String(err),
+      };
     }
   }
 
@@ -39,10 +45,16 @@ export class TelegramService {
     error?: string;
   }> {
     try {
-      const response = await fetch(`https://api.telegram.org/bot${botToken}/getWebhookInfo`);
+      const response = await fetch(
+        `https://api.telegram.org/bot${botToken}/getWebhookInfo`
+      );
       const data = (await response.json()) as {
         ok: boolean;
-        result?: { url: string; has_custom_certificate: boolean; pending_update_count: number };
+        result?: {
+          url: string;
+          has_custom_certificate: boolean;
+          pending_update_count: number;
+        };
         description?: string;
       };
       if (data.ok && data.result) {
@@ -55,7 +67,10 @@ export class TelegramService {
       }
       return { ok: false, error: data.description };
     } catch (err) {
-      return { ok: false, error: err instanceof Error ? err.message : String(err) };
+      return {
+        ok: false,
+        error: err instanceof Error ? err.message : String(err),
+      };
     }
   }
 }

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

@@ -14,22 +14,13 @@ import { ConfigService } from "../../services/config/index.js";
 import { CloudflareService } from "../../services/cloudflare/index.js";
 import { PrerequisitesService } from "../../services/prerequisites/index.js";
 import { DockerService } from "../../services/docker/index.js";
-import { formatSuccess, formatError } from "../../utils/formatters.js";
+import {
+  formatSuccess,
+  formatError,
+  getFormatOptions,
+} from "../../utils/formatters.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
 
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-/**
- * Build the format options for output, reading global --json / --quiet flags.
- * Uses `optsWithGlobals()` to include options inherited from the top-level program.
- */
-function getFormatOptions(cmd: Command) {
-  const opts = cmd.optsWithGlobals();
-  return { json: Boolean(opts.json), quiet: Boolean(opts.quiet) };
-}
-
 // ---------------------------------------------------------------------------
 // Command registration
 // ---------------------------------------------------------------------------
@@ -233,7 +224,7 @@ EXAMPLES:
             failed++;
           } else {
             formatSuccess(
-              `Worker "${name}" running on http://localhost:${result.data.port}`,
+              `Worker "${name}" running on http://localhost:${result.value.port}`,
               fmt
             );
             started++;
@@ -339,7 +330,7 @@ EXAMPLES:
           }
 
           formatSuccess(
-            `Worker "${name}" running on http://localhost:${result.data.port}`,
+            `Worker "${name}" running on http://localhost:${result.value.port}`,
             fmt
           );
         } catch (err) {

package/src/commands/infra/infra-command.test.ts

@@ -55,8 +55,8 @@ function captureStdout(): { output: () => string; restore: () => void } {
 // ---------------------------------------------------------------------------
 
 /** Successful wrangler result with data. */
-function okResult<T>(data: T): WranglerResult<T> {
-  return { ok: true, data } as WranglerResult<T>;
+function okResult<T>(value: T): WranglerResult<T> {
+  return { ok: true, value } as WranglerResult<T>;
 }
 
 /** Failed wrangler result with error message. */