@iamken/cloudtunnel 0.10.0 → 0.10.1

package/README.md

@@ -159,6 +159,32 @@ returns `403` to any request missing the shared secret.
 > the auto-generated secret — set `CLOUDTUNNEL_RELAY_SECRET` yourself in scripts, or
 > read it back from `config.json`.
 
+**Debug / confirm traffic actually goes through the relay:**
+
+```bash
+# CLIENT: trace every CF API call (method · URL · status · relay|direct) to stderr
+CLOUDTUNNEL_DEBUG=1 cloudtunnel ls
+#   [cf] GET https://cfapi.you.com/client/v4/accounts?... -> 200 (relay)
+```
+
+The **relay** process logs each request it forwards (method · path · status only —
+never headers): `[relay] 200 GET /client/v4/accounts`. A rejected call is tagged
+with the reason (`secret`, `ssrf`, `bad-form`, `upstream-error`). A relay rejection
+now surfaces as `Relay rejected the request (403): …` on the client instead of a
+misleading "token" error.
+
+**Calling the relay directly** (curl / your own client) — send the CF token as usual
+plus the relay secret header:
+
+```bash
+curl https://cfapi.you.com/client/v4/accounts \
+  -H "Authorization: Bearer $CF_TOKEN" \
+  -H "X-CT-Relay-Secret: <secret>"
+```
+
+The relay validates `X-CT-Relay-Secret`, strips it, and forwards everything else to
+`https://api.cloudflare.com/client/v4/accounts`. Missing/wrong header → `403`.
+
 ---
 
 ## 🔁 Run on boot (`--service`)

package/dist/{chunk-ZTOVYAS4.js → chunk-IDTF7SUY.js}

@@ -3,7 +3,7 @@ import {
   CliError,
   cfPaginate,
   cfRequest
-} from "./chunk-HVBIMS4W.js";
+} from "./chunk-ZIUYW2HQ.js";
 
 // src/cloudflare/dns.ts
 var MANAGED_DNS_COMMENT = "managed-by:cloudtunnel";
@@ -54,4 +54,4 @@ export {
   listCargoCnames,
   deleteDnsRecord
 };
-//# sourceMappingURL=chunk-ZTOVYAS4.js.map
+//# sourceMappingURL=chunk-IDTF7SUY.js.map

package/dist/{chunk-JBKEAGXV.js → chunk-NB3OEY2P.js}

@@ -3,7 +3,7 @@ import {
   CliError,
   cfPaginate,
   cfRequest
-} from "./chunk-HVBIMS4W.js";
+} from "./chunk-ZIUYW2HQ.js";
 
 // src/cloudflare/zones.ts
 function listZones(token) {
@@ -24,4 +24,4 @@ export {
   listZones,
   resolveZone
 };
-//# sourceMappingURL=chunk-JBKEAGXV.js.map
+//# sourceMappingURL=chunk-NB3OEY2P.js.map

package/dist/{chunk-HVBIMS4W.js → chunk-ZIUYW2HQ.js}

@@ -21,6 +21,10 @@ var CliError = class extends Error {
     this.status = opts.status;
   }
 };
+function fetchErrorReason(err) {
+  const cause = err?.cause;
+  return cause?.code ?? cause?.message ?? err?.message ?? "unknown";
+}
 function reportError(err) {
   if (err instanceof CliError) {
     console.error(pc.red(`\u2717 ${err.message}`));
@@ -33,6 +37,55 @@ function reportError(err) {
   return 1;
 }
 
+// src/ui/output.ts
+import pc2 from "picocolors";
+import Table from "cli-table3";
+import { cancel, confirm as clackConfirm, intro, isCancel, note, outro, select, spinner } from "@clack/prompts";
+async function confirm(message) {
+  const answer = await clackConfirm({ message });
+  return !isCancel(answer) && answer === true;
+}
+function redactToken(token) {
+  if (!token) return "";
+  const last4 = token.length > 4 ? token.slice(-4) : token;
+  return `\u2022\u2022\u2022\u2022${last4}`;
+}
+var say = {
+  info: (msg) => console.log(msg),
+  ok: (msg) => console.log(pc2.green(`\u2713 ${msg}`)),
+  warn: (msg) => console.warn(pc2.yellow(`! ${msg}`)),
+  dim: (msg) => console.log(pc2.dim(msg)),
+  step: (msg) => console.log(pc2.cyan(`\u2192 ${msg}`)),
+  // Opt-in request/diagnostic trace. Gated by CLOUDTUNNEL_DEBUG and written to
+  // STDERR so it never mixes into command stdout. Never pass a secret/token here.
+  debug: (msg) => {
+    if (process.env.CLOUDTUNNEL_DEBUG) console.error(pc2.dim(msg));
+  }
+};
+var dim = (s) => pc2.dim(s);
+function formatRoute(host, target) {
+  return `${pc2.green(pc2.bold(`https://${host}`))}  ${pc2.dim("\u2192")}  ${pc2.cyan(target)}`;
+}
+function printTable(head, rows) {
+  const table = new Table({
+    head: head.map((h) => pc2.bold(h)),
+    style: { head: [], border: [] }
+  });
+  for (const row of rows) table.push(row);
+  console.log(table.toString());
+}
+async function selectOne(message, items, label) {
+  const value = await select({
+    message,
+    options: items.map((item, i) => ({ value: String(i), label: label(item) }))
+  });
+  if (isCancel(value)) {
+    cancel("Cancelled.");
+    throw new CliError("Cancelled.", { exitCode: 130 });
+  }
+  return items[Number(value)];
+}
+
 // src/config/store.ts
 import { chmodSync, readFileSync, writeFileSync } from "fs";
 
@@ -82,8 +135,13 @@ function getCredentials() {
 // src/config/api-base.ts
 var DEFAULT_API_BASE = "https://api.cloudflare.com/client/v4";
 function getApiBase() {
-  const raw = process.env.CLOUDTUNNEL_API_BASE?.trim() || loadConfig().apiBase || DEFAULT_API_BASE;
-  return raw.replace(/\/+$/, "");
+  const raw = (process.env.CLOUDTUNNEL_API_BASE?.trim() || loadConfig().apiBase || DEFAULT_API_BASE).replace(/\/+$/, "");
+  if (!isHttpUrl(raw)) {
+    throw new CliError(`Invalid Cloudflare API base "${raw}".`, {
+      hint: "CLOUDTUNNEL_API_BASE must be a full http(s) URL, e.g. https://cfapi.example.com/client/v4"
+    });
+  }
+  return raw;
 }
 function isHttpUrl(s) {
   try {
@@ -124,12 +182,13 @@ function resolveCf() {
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 async function cfRequest(token, method, path, body) {
   const base = getApiBase();
+  const viaRelay = base !== DEFAULT_API_BASE;
   const secret = getRelaySecret();
   const headers = {
     Authorization: `Bearer ${token}`,
     "Content-Type": "application/json"
   };
-  if (secret && base !== DEFAULT_API_BASE) headers[RELAY_SECRET_HEADER] = secret;
+  if (secret && viaRelay) headers[RELAY_SECRET_HEADER] = secret;
   for (let attempt = 0; ; attempt++) {
     let res;
     try {
@@ -138,9 +197,14 @@ async function cfRequest(token, method, path, body) {
         headers,
         body: body === void 0 ? void 0 : JSON.stringify(body)
       });
-    } catch {
-      throw new CliError("Could not reach the Cloudflare API (network error).");
+    } catch (err) {
+      const reason = fetchErrorReason(err);
+      say.debug(`[cf] ${method} ${base}${path} -> network error: ${reason}${viaRelay ? " (relay)" : ""}`);
+      throw new CliError(`Could not reach the Cloudflare API (${reason})${viaRelay ? ` via relay ${base}` : ""}.`, {
+        hint: viaRelay ? "is the relay tunnel up and the base URL correct? run with CLOUDTUNNEL_DEBUG=1" : void 0
+      });
     }
+    say.debug(`[cf] ${method} ${base}${path} -> ${res.status}${viaRelay ? " (relay)" : ""}`);
     if (RETRYABLE.has(res.status) && attempt < MAX_ATTEMPTS) {
       const retryAfter = Number(res.headers.get("retry-after")) || 0;
       await sleep(retryAfter > 0 ? retryAfter * 1e3 : 2 ** attempt * 500);
@@ -148,6 +212,12 @@ async function cfRequest(token, method, path, body) {
     }
     const env = await res.json().catch(() => ({}));
     if (!res.ok || !env.success) {
+      if (viaRelay && env.error && !env.errors) {
+        throw new CliError(`Relay rejected the request (${res.status}): ${env.error}.`, {
+          status: res.status,
+          hint: res.status === 403 ? "does CLOUDTUNNEL_RELAY_SECRET match the relay's secret?" : `relay base: ${base}`
+        });
+      }
       const msg = env.errors?.[0]?.message ?? `HTTP ${res.status}`;
       throw new CliError(`Cloudflare API error: ${msg}`, { status: res.status });
     }
@@ -172,6 +242,7 @@ async function cfPaginate(token, basePath) {
 export {
   __export,
   CliError,
+  fetchErrorReason,
   reportError,
   configFile,
   registryFile,
@@ -180,6 +251,14 @@ export {
   binDir,
   logDir,
   ensureDirs,
+  note,
+  confirm,
+  redactToken,
+  say,
+  dim,
+  formatRoute,
+  printTable,
+  selectOne,
   loadConfig,
   saveConfig,
   getCredentials,
@@ -193,4 +272,4 @@ export {
   cfRequest,
   cfPaginate
 };
-//# sourceMappingURL=chunk-HVBIMS4W.js.map
+//# sourceMappingURL=chunk-ZIUYW2HQ.js.map

package/dist/chunk-ZIUYW2HQ.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/ui/errors.ts","../src/ui/output.ts","../src/config/store.ts","../src/config/paths.ts","../src/config/api-base.ts","../src/config/relay-secret.ts","../src/cloudflare/client.ts"],"sourcesContent":["import pc from \"picocolors\";\n\n/**\n * A user-facing CLI error. The message is printed as-is (no stack trace) and\n * `exitCode` drives the process exit code. Use `hint` to tell the user exactly\n * which command to run next — every error should be actionable.\n */\nexport class CliError extends Error {\n  readonly exitCode: number;\n  readonly hint?: string;\n  /** HTTP status when this wraps a Cloudflare API error (lets callers tell a\n   * genuine 404 \"already gone\" from a transient failure). */\n  readonly status?: number;\n\n  constructor(message: string, opts: { exitCode?: number; hint?: string; status?: number } = {}) {\n    super(message);\n    this.name = \"CliError\";\n    this.exitCode = opts.exitCode ?? 1;\n    this.hint = opts.hint;\n    this.status = opts.status;\n  }\n}\n\n/**\n * Best-effort concise reason from a thrown `fetch`/undici error. Node's fetch\n * throws a generic `TypeError: fetch failed` and buries the real cause (DNS,\n * refused, TLS, timeout, bad URL) in `.cause` — surface it so \"network error\"\n * becomes actionable (e.g. `ENOTFOUND`, `ECONNREFUSED`, `UND_ERR_CONNECT_TIMEOUT`,\n * `self-signed certificate`, `Invalid URL`).\n */\nexport function fetchErrorReason(err: unknown): string {\n  const cause = (err as { cause?: { code?: string; message?: string } })?.cause;\n  return cause?.code ?? cause?.message ?? (err as Error)?.message ?? \"unknown\";\n}\n\n/** Print an error and return the exit code. Known CliErrors print cleanly; the\n * rest print their message plus a note that it was unexpected. */\nexport function reportError(err: unknown): number {\n  if (err instanceof CliError) {\n    console.error(pc.red(`✗ ${err.message}`));\n    if (err.hint) console.error(pc.dim(`  → ${err.hint}`));\n    return err.exitCode;\n  }\n  const message = err instanceof Error ? err.message : String(err);\n  console.error(pc.red(`✗ ${message}`));\n  console.error(pc.dim(\"  (unexpected error — please report if this persists)\"));\n  return 1;\n}\n","import pc from \"picocolors\";\nimport Table from \"cli-table3\";\nimport { cancel, confirm as clackConfirm, intro, isCancel, note, outro, select, spinner } from \"@clack/prompts\";\nimport { CliError } from \"./errors.js\";\n\n// Re-export the clack primitives used to build modern multi-step flows.\nexport { intro, note, outro, spinner };\n\n/** Yes/no prompt (TTY). Cancel (Ctrl-C) counts as \"no\". */\nexport async function confirm(message: string): Promise<boolean> {\n  const answer = await clackConfirm({ message });\n  return !isCancel(answer) && answer === true;\n}\n\n/** Redact a secret to `••••{last4}` so tokens never appear in output/logs. */\nexport function redactToken(token: string): string {\n  if (!token) return \"\";\n  const last4 = token.length > 4 ? token.slice(-4) : token;\n  return `••••${last4}`;\n}\n\n// Lightweight one-off lines for non-flow commands (ls, zones, status, …).\nexport const say = {\n  info: (msg: string) => console.log(msg),\n  ok: (msg: string) => console.log(pc.green(`✓ ${msg}`)),\n  warn: (msg: string) => console.warn(pc.yellow(`! ${msg}`)),\n  dim: (msg: string) => console.log(pc.dim(msg)),\n  step: (msg: string) => console.log(pc.cyan(`→ ${msg}`)),\n  // Opt-in request/diagnostic trace. Gated by CLOUDTUNNEL_DEBUG and written to\n  // STDERR so it never mixes into command stdout. Never pass a secret/token here.\n  debug: (msg: string) => {\n    if (process.env.CLOUDTUNNEL_DEBUG) console.error(pc.dim(msg));\n  },\n};\n\nexport const dim = (s: string): string => pc.dim(s);\n\n/** Format a live tunnel as `https://host  →  proto://localhost:port`. */\nexport function formatRoute(host: string, target: string): string {\n  return `${pc.green(pc.bold(`https://${host}`))}  ${pc.dim(\"→\")}  ${pc.cyan(target)}`;\n}\n\n/** Render a simple table. `head` = column titles, `rows` = string cells. */\nexport function printTable(head: string[], rows: string[][]): void {\n  const table = new Table({\n    head: head.map((h) => pc.bold(h)),\n    style: { head: [], border: [] },\n  });\n  for (const row of rows) table.push(row);\n  console.log(table.toString());\n}\n\n/**\n * Modern arrow-key single-select (↑/↓ to move, Enter to choose). Callers must\n * guard non-TTY before calling. Ctrl-C cancels cleanly (exit 130).\n */\nexport async function selectOne<T>(\n  message: string,\n  items: T[],\n  label: (item: T) => string,\n): Promise<T> {\n  // Use the item index as the (primitive) option value to avoid clack's\n  // conditional Option<T> type fighting the generic, then map back.\n  const value = await select({\n    message,\n    options: items.map((item, i) => ({ value: String(i), label: label(item) })),\n  });\n  if (isCancel(value)) {\n    cancel(\"Cancelled.\");\n    throw new CliError(\"Cancelled.\", { exitCode: 130 });\n  }\n  return items[Number(value)]!;\n}\n","import { chmodSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { CliError } from \"../ui/errors.js\";\nimport { configFile, ensureDirs } from \"./paths.js\";\n\nexport interface CloudtunnelConfig {\n  apiToken?: string;\n  accountId?: string;\n  defaultZone?: string;\n  /** Override the Cloudflare API base — point at a relay when the direct control\n   * plane is blocked. See `config/api-base.ts`. */\n  apiBase?: string;\n  /** Shared secret required by / sent to the relay proxy. See `config/relay-secret.ts`. */\n  relaySecret?: string;\n}\n\nexport interface Credentials {\n  apiToken: string;\n  accountId?: string;\n  defaultZone?: string;\n}\n\n/** Read config.json (missing/invalid → empty config, never throws). */\nexport function loadConfig(): CloudtunnelConfig {\n  try {\n    return JSON.parse(readFileSync(configFile, \"utf8\")) as CloudtunnelConfig;\n  } catch {\n    return {};\n  }\n}\n\n/** Persist config.json with owner-only perms (0600). */\nexport function saveConfig(config: CloudtunnelConfig): void {\n  ensureDirs();\n  writeFileSync(configFile, JSON.stringify(config, null, 2), { mode: 0o600 });\n  chmodSync(configFile, 0o600); // enforce even if the file pre-existed\n}\n\n/**\n * Resolve credentials: env vars override the config file. Throws an actionable\n * CliError if no API token is available anywhere.\n */\nexport function getCredentials(): Credentials {\n  const config = loadConfig();\n  const apiToken = process.env.CLOUDFLARE_API_TOKEN ?? config.apiToken;\n  const accountId = process.env.CLOUDFLARE_ACCOUNT_ID ?? config.accountId;\n  if (!apiToken) {\n    throw new CliError(\"Not authenticated with Cloudflare.\", {\n      hint: \"run `cloudtunnel login` (or set CLOUDFLARE_API_TOKEN)\",\n    });\n  }\n  return { apiToken, accountId, defaultZone: config.defaultZone };\n}\n","import envPaths from \"env-paths\";\nimport { mkdirSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\n// `~/.config/cloudtunnel/` (XDG). suffix:'' avoids env-paths' default \"-nodejs\".\nconst paths = envPaths(\"cloudtunnel\", { suffix: \"\" });\n\nexport const configDir = paths.config;\nexport const configFile = join(configDir, \"config.json\");\nexport const registryFile = join(configDir, \"tunnels.json\");\nexport const scanCacheFile = join(configDir, \"unmanaged-scan.json\");\nexport const profilesFile = join(configDir, \"profiles.json\");\nexport const binDir = join(configDir, \"bin\");\nexport const logDir = join(configDir, \"logs\");\n\n/** Create the app dirs with owner-only perms (secrets live here). Idempotent. */\nexport function ensureDirs(): void {\n  for (const dir of [configDir, binDir, logDir]) {\n    mkdirSync(dir, { recursive: true, mode: 0o700 });\n  }\n}\n","import { CliError } from \"../ui/errors.js\";\nimport { loadConfig } from \"./store.js\";\n\n/** Default Cloudflare management API base — no trailing slash (callers append a\n * path that starts with `/`). */\nexport const DEFAULT_API_BASE = \"https://api.cloudflare.com/client/v4\";\n\n/**\n * Resolve the Cloudflare API base URL. Precedence: env `CLOUDTUNNEL_API_BASE` →\n * `config.apiBase` → default. A trailing slash is stripped so `${base}${path}`\n * (path starts `/`) never yields `//…`.\n *\n * Point this at a relay's `https://<relay>/client/v4` when the direct control\n * plane (api.cloudflare.com) is blocked but a data-plane tunnel to the relay is\n * not — every management call then rides the tunnel instead of hitting CF direct.\n */\nexport function getApiBase(): string {\n  // `||` (not `??`) so an empty/whitespace env or config value falls through\n  // instead of yielding a broken \"\" base.\n  const raw = (process.env.CLOUDTUNNEL_API_BASE?.trim() || loadConfig().apiBase || DEFAULT_API_BASE).replace(/\\/+$/, \"\");\n  // Fail fast on a malformed base (e.g. a scheme-less host set via env) with a\n  // clear message instead of a cryptic `fetch` \"network error\" later.\n  if (!isHttpUrl(raw)) {\n    throw new CliError(`Invalid Cloudflare API base \"${raw}\".`, {\n      hint: \"CLOUDTUNNEL_API_BASE must be a full http(s) URL, e.g. https://cfapi.example.com/client/v4\",\n    });\n  }\n  return raw;\n}\n\n/** True if `s` parses as an http(s) URL — validates `login --api-base`. */\nexport function isHttpUrl(s: string): boolean {\n  try {\n    const u = new URL(s);\n    return u.protocol === \"http:\" || u.protocol === \"https:\";\n  } catch {\n    return false;\n  }\n}\n","import { randomBytes } from \"node:crypto\";\nimport { loadConfig, saveConfig } from \"./store.js\";\n\n/** Header the CLIENT sends and the RELAY requires — the relay's shared secret.\n * Single source of truth, imported by both the client transport and the relay\n * proxy so the two sides can never drift. */\nexport const RELAY_SECRET_HEADER = \"X-CT-Relay-Secret\";\n\n/**\n * The relay shared secret, if configured. Precedence: env\n * `CLOUDTUNNEL_RELAY_SECRET` → `config.relaySecret` → undefined. The CLIENT\n * attaches it to every CF API call; the RELAY rejects calls that lack it.\n */\nexport function getRelaySecret(): string | undefined {\n  return process.env.CLOUDTUNNEL_RELAY_SECRET ?? loadConfig().relaySecret;\n}\n\n/**\n * Return the relay secret, generating + persisting one on first use so a restart\n * or boot service keeps the same value (a changed secret would break the client).\n * Persisted to 0600 config via a MERGE-save (never clobbers apiToken/apiBase).\n * An env-provided secret is returned as-is — env stays the source of truth and\n * nothing is written.\n */\nexport function ensureRelaySecret(): string {\n  const existing = getRelaySecret();\n  if (existing) return existing;\n  const secret = randomBytes(24).toString(\"base64url\"); // 192-bit, url-safe\n  const prev = loadConfig();\n  saveConfig({ ...prev, relaySecret: secret });\n  return secret;\n}\n","import { CliError, fetchErrorReason } from \"../ui/errors.js\";\nimport { say } from \"../ui/output.js\";\nimport { getCredentials } from \"../config/store.js\";\nimport { getApiBase, DEFAULT_API_BASE } from \"../config/api-base.js\";\nimport { RELAY_SECRET_HEADER, getRelaySecret } from \"../config/relay-secret.js\";\n\nconst RETRYABLE = new Set([429, 500, 502, 503, 504]);\nconst MAX_ATTEMPTS = 4;\n\n/** Resolved Cloudflare context for account-scoped calls. */\nexport interface Cf {\n  token: string;\n  accountId: string;\n}\n\ninterface CfEnvelope<T> {\n  success: boolean;\n  result: T;\n  result_info?: { page: number; total_pages?: number; per_page: number; count: number };\n  errors?: { message: string }[];\n}\n\n/** Token + account id required for tunnel ops. Throws actionably if unresolved. */\nexport function resolveCf(): Cf {\n  const creds = getCredentials();\n  if (!creds.accountId) {\n    throw new CliError(\"No Cloudflare account id resolved.\", {\n      hint: \"run `cloudtunnel login` (or set CLOUDFLARE_ACCOUNT_ID)\",\n    });\n  }\n  return { token: creds.apiToken, accountId: creds.accountId };\n}\n\nconst sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));\n\n/**\n * Single Cloudflare API call with backoff on 429/5xx (honors Retry-After).\n * Errors are sanitized — the bearer token is only ever sent in the header and\n * never appears in a thrown message.\n */\nexport async function cfRequest<T>(\n  token: string,\n  method: string,\n  path: string,\n  body?: unknown,\n): Promise<CfEnvelope<T>> {\n  // Base + relay secret resolved once per call (env → config → default). The\n  // secret header rides only when the base is actually a relay (non-default), so\n  // it's never sent to api.cloudflare.com; unset base ⇒ identical to today.\n  const base = getApiBase();\n  const viaRelay = base !== DEFAULT_API_BASE;\n  const secret = getRelaySecret();\n  const headers: Record<string, string> = {\n    Authorization: `Bearer ${token}`,\n    \"Content-Type\": \"application/json\",\n  };\n  if (secret && viaRelay) headers[RELAY_SECRET_HEADER] = secret;\n  for (let attempt = 0; ; attempt++) {\n    let res: Response;\n    try {\n      res = await fetch(`${base}${path}`, {\n        method,\n        headers,\n        body: body === undefined ? undefined : JSON.stringify(body),\n      });\n    } catch (err) {\n      const reason = fetchErrorReason(err);\n      say.debug(`[cf] ${method} ${base}${path} -> network error: ${reason}${viaRelay ? \" (relay)\" : \"\"}`);\n      throw new CliError(`Could not reach the Cloudflare API (${reason})${viaRelay ? ` via relay ${base}` : \"\"}.`, {\n        hint: viaRelay ? \"is the relay tunnel up and the base URL correct? run with CLOUDTUNNEL_DEBUG=1\" : undefined,\n      });\n    }\n    say.debug(`[cf] ${method} ${base}${path} -> ${res.status}${viaRelay ? \" (relay)\" : \"\"}`);\n    if (RETRYABLE.has(res.status) && attempt < MAX_ATTEMPTS) {\n      const retryAfter = Number(res.headers.get(\"retry-after\")) || 0;\n      await sleep(retryAfter > 0 ? retryAfter * 1000 : 2 ** attempt * 500);\n      continue;\n    }\n    const env = (await res.json().catch(() => ({}))) as CfEnvelope<T> & { error?: string };\n    if (!res.ok || !env.success) {\n      // A relay rejects with its own `{error}` shape (not CF's `{errors}`) — surface\n      // it so a relay/secret failure isn't misread as a Cloudflare API error.\n      if (viaRelay && env.error && !env.errors) {\n        throw new CliError(`Relay rejected the request (${res.status}): ${env.error}.`, {\n          status: res.status,\n          hint: res.status === 403 ? \"does CLOUDTUNNEL_RELAY_SECRET match the relay's secret?\" : `relay base: ${base}`,\n        });\n      }\n      const msg = env.errors?.[0]?.message ?? `HTTP ${res.status}`;\n      throw new CliError(`Cloudflare API error: ${msg}`, { status: res.status });\n    }\n    return env;\n  }\n}\n\n/**\n * Fetch every page of a list endpoint. Robust when `total_pages` is absent:\n * stops when a page returns fewer than per_page items.\n */\nexport async function cfPaginate<T>(token: string, basePath: string): Promise<T[]> {\n  const sep = basePath.includes(\"?\") ? \"&\" : \"?\";\n  const out: T[] = [];\n  for (let page = 1; ; page++) {\n    const env = await cfRequest<T[]>(token, \"GET\", `${basePath}${sep}per_page=50&page=${page}`);\n    const items = env.result ?? [];\n    out.push(...items);\n    const perPage = env.result_info?.per_page ?? 50;\n    const totalPages = env.result_info?.total_pages;\n    const more = totalPages ? page < totalPages : items.length === perPage;\n    if (items.length === 0 || !more) break;\n  }\n  return out;\n}\n"],"mappings":"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","names":["pc","pc"]}

package/dist/{dns-43EGJW7E.js → dns-2F5SYQNX.js}

@@ -7,8 +7,8 @@ import {
   findCname,
   isManagedDns,
   listCargoCnames
-} from "./chunk-ZTOVYAS4.js";
-import "./chunk-HVBIMS4W.js";
+} from "./chunk-IDTF7SUY.js";
+import "./chunk-ZIUYW2HQ.js";
 export {
   MANAGED_DNS_COMMENT,
   cargoTarget,
@@ -18,4 +18,4 @@ export {
   isManagedDns,
   listCargoCnames
 };
-//# sourceMappingURL=dns-43EGJW7E.js.map
+//# sourceMappingURL=dns-2F5SYQNX.js.map

package/dist/index.js

@@ -2,13 +2,13 @@
 import {
   listZones,
   resolveZone
-} from "./chunk-JBKEAGXV.js";
+} from "./chunk-NB3OEY2P.js";
 import {
   createCname,
   deleteDnsRecord,
   findCname,
   isManagedDns
-} from "./chunk-ZTOVYAS4.js";
+} from "./chunk-IDTF7SUY.js";
 import {
   CliError,
   DEFAULT_API_BASE,
@@ -18,74 +18,39 @@ import {
   cfPaginate,
   cfRequest,
   configFile,
+  confirm,
+  dim,
   ensureDirs,
   ensureRelaySecret,
+  fetchErrorReason,
+  formatRoute,
   getApiBase,
   getCredentials,
   getRelaySecret,
   isHttpUrl,
   loadConfig,
   logDir,
+  note,
+  printTable,
   profilesFile,
+  redactToken,
   registryFile,
   reportError,
   resolveCf,
   saveConfig,
-  scanCacheFile
-} from "./chunk-HVBIMS4W.js";
+  say,
+  scanCacheFile,
+  selectOne
+} from "./chunk-ZIUYW2HQ.js";
 
 // src/index.ts
 import { Command } from "commander";
 import { createRequire } from "module";
-import pc3 from "picocolors";
+import pc2 from "picocolors";
 
 // src/config/legacy-migrate.ts
 import { existsSync as existsSync3, readFileSync, renameSync, writeFileSync as writeFileSync4 } from "fs";
 
-// src/ui/output.ts
-import pc from "picocolors";
-import Table from "cli-table3";
-import { cancel, confirm as clackConfirm, intro, isCancel, note, outro, select, spinner } from "@clack/prompts";
-async function confirm(message) {
-  const answer = await clackConfirm({ message });
-  return !isCancel(answer) && answer === true;
-}
-function redactToken(token) {
-  if (!token) return "";
-  const last4 = token.length > 4 ? token.slice(-4) : token;
-  return `\u2022\u2022\u2022\u2022${last4}`;
-}
-var say = {
-  info: (msg) => console.log(msg),
-  ok: (msg) => console.log(pc.green(`\u2713 ${msg}`)),
-  warn: (msg) => console.warn(pc.yellow(`! ${msg}`)),
-  dim: (msg) => console.log(pc.dim(msg)),
-  step: (msg) => console.log(pc.cyan(`\u2192 ${msg}`))
-};
-var dim = (s) => pc.dim(s);
-function formatRoute(host, target) {
-  return `${pc.green(pc.bold(`https://${host}`))}  ${pc.dim("\u2192")}  ${pc.cyan(target)}`;
-}
-function printTable(head, rows) {
-  const table = new Table({
-    head: head.map((h) => pc.bold(h)),
-    style: { head: [], border: [] }
-  });
-  for (const row of rows) table.push(row);
-  console.log(table.toString());
-}
-async function selectOne(message, items, label4) {
-  const value = await select({
-    message,
-    options: items.map((item, i) => ({ value: String(i), label: label4(item) }))
-  });
-  if (isCancel(value)) {
-    cancel("Cancelled.");
-    throw new CliError("Cancelled.", { exitCode: 130 });
-  }
-  return items[Number(value)];
-}
-
 // src/core/service.ts
 import { join as join5 } from "path";
 
@@ -591,17 +556,29 @@ function openBrowser(url) {
 // src/config/resolve-identity.ts
 async function cfGet(path, token) {
   const base = getApiBase();
+  const viaRelay = base !== DEFAULT_API_BASE;
   const secret = getRelaySecret();
   const headers = {
     Authorization: `Bearer ${token}`,
     "Content-Type": "application/json"
   };
-  if (secret && base !== DEFAULT_API_BASE) headers[RELAY_SECRET_HEADER] = secret;
+  if (secret && viaRelay) headers[RELAY_SECRET_HEADER] = secret;
   let res;
   try {
     res = await fetch(`${base}${path}`, { headers });
-  } catch {
-    throw new CliError("Could not reach the Cloudflare API (network error).");
+  } catch (err) {
+    const reason = fetchErrorReason(err);
+    say.debug(`[cf] GET ${base}${path} -> network error: ${reason}${viaRelay ? " (relay)" : ""}`);
+    throw new CliError(`Could not reach the Cloudflare API (${reason})${viaRelay ? ` via relay ${base}` : ""}.`, {
+      hint: viaRelay ? "is the relay tunnel up and the base URL correct? run with CLOUDTUNNEL_DEBUG=1" : void 0
+    });
+  }
+  say.debug(`[cf] GET ${base}${path} -> ${res.status}${viaRelay ? " (relay)" : ""}`);
+  const body = await res.json().catch(() => ({}));
+  if (viaRelay && !res.ok && body.error && !body.errors) {
+    throw new CliError(`Relay rejected the request (${res.status}): ${body.error}.`, {
+      hint: res.status === 403 ? "does CLOUDTUNNEL_RELAY_SECRET match the relay's secret?" : `relay base: ${base}`
+    });
   }
   if (res.status === 401) {
     throw new CliError("Cloudflare rejected the token (invalid or expired).", {
@@ -613,7 +590,6 @@ async function cfGet(path, token) {
       hint: `token needs: ${REQUIRED_SCOPES.join(", ")}`
     });
   }
-  const body = await res.json().catch(() => ({}));
   if (!res.ok || !body.success) {
     throw new CliError(`Cloudflare API error (${res.status}) on ${path}.`);
   }
@@ -1359,8 +1335,8 @@ async function resolveRemoteTarget(cf, target) {
   }
   const tunnel = matches[0];
   if (!tunnel) return null;
-  const { listCargoCnames } = await import("./dns-43EGJW7E.js");
-  const { listZones: listZones3 } = await import("./zones-QZPJFIDD.js");
+  const { listCargoCnames } = await import("./dns-2F5SYQNX.js");
+  const { listZones: listZones3 } = await import("./zones-PCUEPXHD.js");
   for (const zone of await listZones3(cf.token)) {
     const rec = (await listCargoCnames(cf.token, zone.id)).find((r) => tunnelIdFromCname2(r.content) === tunnel.id);
     if (rec) return { tunnel, fqdn: rec.name };
@@ -1397,8 +1373,8 @@ async function listAll(cf, opts = {}) {
     };
   });
   if (opts.all) {
-    const { listCargoCnames } = await import("./dns-43EGJW7E.js");
-    const { listZones: listZones3 } = await import("./zones-QZPJFIDD.js");
+    const { listCargoCnames } = await import("./dns-2F5SYQNX.js");
+    const { listZones: listZones3 } = await import("./zones-PCUEPXHD.js");
     const tracked = new Set(entries.map(entryFqdn));
     const unmanaged = [];
     for (const zone of await listZones3(cf.token)) {
@@ -1737,7 +1713,7 @@ function registerLogs(program) {
 import { openSync as openSync3 } from "fs";
 import { spawn as spawn3 } from "child_process";
 import { join as join8 } from "path";
-import pc2 from "picocolors";
+import pc from "picocolors";
 
 // src/core/api-proxy-server.ts
 import http from "http";
@@ -1762,6 +1738,8 @@ function send(res, code, body) {
 function startProxy(opts) {
   const upstream = opts.upstream ?? DEFAULT_UPSTREAM;
   const upstreamOrigin = new URL(upstream).origin;
+  const log = opts.log ?? (() => {
+  });
   const server = http.createServer((req, res) => {
     handle(req, res).catch(() => {
       if (!res.headersSent) send(res, 500, { error: "relay internal error" });
@@ -1769,19 +1747,24 @@ function startProxy(opts) {
     });
   });
   async function handle(req, res) {
+    const trace = (status, note4) => log(`[relay] ${status} ${req.method} ${req.url ?? "-"}${note4 ? " " + note4 : ""}`);
     if (req.method === "CONNECT" || !req.url || !req.url.startsWith("/")) {
+      trace(400, "bad-form");
       return send(res, 400, { error: "origin-form request required" });
     }
     let target;
     try {
       target = new URL(req.url, upstream);
     } catch {
+      trace(400, "bad-path");
       return send(res, 400, { error: "bad request path" });
     }
     if (target.origin !== upstreamOrigin) {
+      trace(400, "ssrf");
       return send(res, 400, { error: "path escapes upstream" });
     }
     if (req.headers[SECRET_HEADER_LC] !== opts.secret) {
+      trace(403, "secret");
       return send(res, 403, { error: "relay secret missing or invalid" });
     }
     const hasBody = req.method !== "GET" && req.method !== "HEAD";
@@ -1802,8 +1785,10 @@ function startProxy(opts) {
     try {
       up = await fetch(target.href, { method: req.method, headers, body, redirect: "manual" });
     } catch {
+      trace(502, "upstream-error");
       return send(res, 502, { error: "relay upstream unreachable" });
     }
+    trace(up.status);
     const outHeaders = {
       "content-type": up.headers.get("content-type") ?? "application/json"
     };
@@ -1845,14 +1830,14 @@ function relayReadyLines(fqdn, secret, tty) {
   if (!tty) return [`relay ready at ${url}`];
   const base = `${url}/client/v4`;
   return [
-    `URL     ${pc2.green(url)}`,
-    `Secret  ${pc2.bold(secret)}  ${pc2.dim("(store it \u2014 the client needs it, shown once)")}`,
+    `URL     ${pc.green(url)}`,
+    `Secret  ${pc.bold(secret)}  ${pc.dim("(store it \u2014 the client needs it, shown once)")}`,
     "",
-    pc2.bold("On the blocked client:"),
+    pc.bold("On the blocked client:"),
     `  export CLOUDTUNNEL_API_BASE=${base}`,
     `  export CLOUDTUNNEL_RELAY_SECRET=${secret}`,
     `  printf %s "$CF_TOKEN" | cloudtunnel login --token-stdin`,
-    pc2.dim("  (mint the CF token on an unblocked host \u2014 dash.cloudflare.com is blocked too)")
+    pc.dim("  (mint the CF token on an unblocked host \u2014 dash.cloudflare.com is blocked too)")
   ];
 }
 function printRelayReady(fqdn, secret, kind) {
@@ -1883,7 +1868,7 @@ async function runRelay(sub, opts) {
   }
   const bin = await ensureCloudflared();
   const secret = ensureRelaySecret();
-  const proxy = await startProxy({ secret });
+  const proxy = await startProxy({ secret, log: (line) => say.dim(line) });
   const item = {
     port: proxy.port,
     proto: "http",
@@ -1909,11 +1894,11 @@ function buildProgram() {
   program.addHelpText(
     "before",
     [
-      pc3.bold("Quickstart:"),
-      `  ${pc3.cyan("cloudtunnel login")}       once \u2014 paste a token (or set CLOUDFLARE_API_TOKEN)`,
-      `  ${pc3.cyan("cloudtunnel 8080")}        your local :8080 goes live at an HTTPS URL`,
-      `  ${pc3.cyan("cloudtunnel api:8080")}    api.<domain> \u2192 localhost:8080`,
-      `  ${pc3.cyan("cloudtunnel ls")}          list tunnels   ${pc3.dim("\xB7")}   ${pc3.cyan("cloudtunnel delete <#>")}   remove one`,
+      pc2.bold("Quickstart:"),
+      `  ${pc2.cyan("cloudtunnel login")}       once \u2014 paste a token (or set CLOUDFLARE_API_TOKEN)`,
+      `  ${pc2.cyan("cloudtunnel 8080")}        your local :8080 goes live at an HTTPS URL`,
+      `  ${pc2.cyan("cloudtunnel api:8080")}    api.<domain> \u2192 localhost:8080`,
+      `  ${pc2.cyan("cloudtunnel ls")}          list tunnels   ${pc2.dim("\xB7")}   ${pc2.cyan("cloudtunnel delete <#>")}   remove one`,
       ""
     ].join("\n")
   );