@iamken/cloudtunnel 0.9.0 → 0.10.1

package/dist/index.js

@@ -2,31 +2,46 @@
 import {
   listZones,
   resolveZone
-} from "./chunk-VR5RHOTJ.js";
+} from "./chunk-NB3OEY2P.js";
 import {
   createCname,
   deleteDnsRecord,
   findCname,
   isManagedDns
-} from "./chunk-LG5ST75Z.js";
+} from "./chunk-IDTF7SUY.js";
 import {
   CliError,
+  DEFAULT_API_BASE,
+  RELAY_SECRET_HEADER,
   __export,
   binDir,
   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-3KBLIPKG.js";
+  say,
+  scanCacheFile,
+  selectOne
+} from "./chunk-ZIUYW2HQ.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -36,50 +51,6 @@ 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";
 
@@ -165,6 +136,17 @@ function formatTunnelSpec(s) {
 var fqdnFor = (subdomain, zone) => subdomain === "@" ? zone : `${subdomain}.${zone}`;
 var serviceSlug = (fqdn) => fqdn.replace(/[^a-zA-Z0-9]+/g, "-");
 function buildUpArgs(p) {
+  if (p.command === "relay") {
+    return [
+      "relay",
+      p.subdomain,
+      "-d",
+      p.zone,
+      ...p.proto === "https" ? ["--proto", "https"] : [],
+      "-f",
+      "-y"
+    ];
+  }
   const spec = formatTunnelSpec({ subdomain: p.subdomain, port: p.port, host: p.host });
   return [
     "up",
@@ -572,15 +554,31 @@ function openBrowser(url) {
 }
 
 // src/config/resolve-identity.ts
-var API_BASE = "https://api.cloudflare.com/client/v4";
 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 && viaRelay) headers[RELAY_SECRET_HEADER] = secret;
   let res;
   try {
-    res = await fetch(`${API_BASE}${path}`, {
-      headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" }
+    res = await fetch(`${base}${path}`, { headers });
+  } 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}`
     });
-  } catch {
-    throw new CliError("Could not reach the Cloudflare API (network error).");
   }
   if (res.status === 401) {
     throw new CliError("Cloudflare rejected the token (invalid or expired).", {
@@ -592,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}.`);
   }
@@ -638,6 +635,22 @@ async function acquireToken(opts) {
   return { token, fromEnv: false };
 }
 async function runLoginFlow(opts = {}) {
+  if (opts.apiBase && !isHttpUrl(opts.apiBase)) {
+    throw new CliError(`Invalid --api-base "${opts.apiBase}".`, {
+      hint: "must be an http(s) URL, e.g. https://cfapi.example.com/client/v4"
+    });
+  }
+  if (opts.tokenStdin && opts.relaySecretStdin) {
+    throw new CliError("Can't read both the token and the relay secret from stdin.", {
+      hint: "run login twice, or set one via env (CLOUDFLARE_API_TOKEN / CLOUDTUNNEL_RELAY_SECRET)"
+    });
+  }
+  if (opts.apiBase) process.env.CLOUDTUNNEL_API_BASE = opts.apiBase;
+  let relaySecretInput;
+  if (opts.relaySecretStdin) {
+    relaySecretInput = await readStdin();
+    if (relaySecretInput) process.env.CLOUDTUNNEL_RELAY_SECRET = relaySecretInput;
+  }
   if (process.stdout.isTTY) clack.intro("cloudtunnel \xB7 connect to Cloudflare");
   const { token, fromEnv } = await acquireToken(opts);
   const spin = clack.spinner();
@@ -660,12 +673,29 @@ async function runLoginFlow(opts = {}) {
       defaultZone = (await selectOne("Select a default domain", zones, (z) => z.name)).name;
     }
   }
-  saveConfig({ apiToken: fromEnv ? void 0 : token, accountId: account.id, defaultZone });
+  saveConfig(buildMergedConfig(loadConfig(), {
+    token,
+    fromEnv,
+    accountId: account.id,
+    defaultZone,
+    apiBase: opts.apiBase,
+    relaySecret: relaySecretInput
+  }));
   const summary = `Logged in as ${account.name}${defaultZone ? ` \xB7 default domain ${defaultZone}` : ""}`;
   if (process.stdout.isTTY) clack.outro(summary);
   else say.ok(summary);
   if (!defaultZone) say.dim("No default domain set \u2014 pass -d <domain> on `up`, or re-run `login --zone <domain>`.");
 }
+function buildMergedConfig(prev, args) {
+  return {
+    ...prev,
+    apiToken: args.fromEnv ? void 0 : args.token,
+    accountId: args.accountId,
+    defaultZone: args.defaultZone ?? prev.defaultZone,
+    apiBase: args.apiBase ?? prev.apiBase,
+    relaySecret: args.relaySecret ?? prev.relaySecret
+  };
+}
 function showStatus() {
   const config = loadConfig();
   const token = process.env.CLOUDFLARE_API_TOKEN ?? config.apiToken;
@@ -677,10 +707,14 @@ function showStatus() {
   say.info(`Token:   ${redactToken(token)} (${source})`);
   say.info(`Account: ${config.accountId ?? "(from env / unresolved)"}`);
   say.info(`Domain:  ${config.defaultZone ?? "(none)"}`);
+  const baseSrc = process.env.CLOUDTUNNEL_API_BASE ? "env" : config.apiBase ? "config" : "default";
+  say.info(`Base:    ${getApiBase()} (${baseSrc})`);
+  const secretSrc = process.env.CLOUDTUNNEL_RELAY_SECRET ? "env" : config.relaySecret ? "config" : void 0;
+  say.info(`Relay secret: ${secretSrc ? `set (${secretSrc})` : "(none)"}`);
   say.dim(`Config:  ${configFile}`);
 }
 function registerLogin(program) {
-  program.command("login").description("Authenticate with Cloudflare (paste a token once; account + domain auto-resolved)").option("--token-stdin", "read the API token from stdin (scriptable, avoids shell history)").option("--token <token>", "[discouraged] token as an argument (leaks into shell history)").option("--account <id>", "Cloudflare account id (auto-resolved when you have one account)").option("--zone <domain>", "default domain for new tunnels (auto-resolved when you have one)").option("--status", "show current identity (redacted) and exit").action(async (opts) => {
+  program.command("login").description("Authenticate with Cloudflare (paste a token once; account + domain auto-resolved)").option("--token-stdin", "read the API token from stdin (scriptable, avoids shell history)").option("--token <token>", "[discouraged] token as an argument (leaks into shell history)").option("--account <id>", "Cloudflare account id (auto-resolved when you have one account)").option("--zone <domain>", "default domain for new tunnels (auto-resolved when you have one)").option("--api-base <url>", "route the CF API through a relay (when api.cloudflare.com is blocked)").option("--relay-secret-stdin", "read the relay shared secret from stdin (pairs with --api-base)").option("--status", "show current identity (redacted) and exit").action(async (opts) => {
     if (opts.status) return showStatus();
     await runLoginFlow(opts);
   });
@@ -1301,8 +1335,8 @@ async function resolveRemoteTarget(cf, target) {
   }
   const tunnel = matches[0];
   if (!tunnel) return null;
-  const { listCargoCnames } = await import("./dns-C7WXQOED.js");
-  const { listZones: listZones3 } = await import("./zones-KPRAW4JL.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 };
@@ -1339,8 +1373,8 @@ async function listAll(cf, opts = {}) {
     };
   });
   if (opts.all) {
-    const { listCargoCnames } = await import("./dns-C7WXQOED.js");
-    const { listZones: listZones3 } = await import("./zones-KPRAW4JL.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)) {
@@ -1433,6 +1467,17 @@ async function startTunnels(cf, bin, items, opts = {}) {
   say.dim("Ctrl-C stops and releases them.");
 }
 
+// src/core/resolve-domain.ts
+async function resolveDomain(cf, opts, creds) {
+  if (opts.domain) return opts.domain;
+  const zones = await listZones(cf.token);
+  if (zones.length === 0) throw new CliError("No domains found in this Cloudflare account.");
+  if (zones.length === 1) return zones[0].name;
+  if (process.stdin.isTTY) return (await selectOne("Choose a domain", zones, (z) => z.name)).name;
+  if (creds.defaultZone) return creds.defaultZone;
+  throw new CliError("Multiple domains in this account \u2014 pick one.", { hint: "pass -d <domain>" });
+}
+
 // src/core/transport-protocol.ts
 function parseTransportProtocol(value) {
   if (value === "auto" || value === "http2" || value === "quic") return value;
@@ -1461,15 +1506,6 @@ async function promptPort() {
   );
   return Number(input);
 }
-async function resolveDomain(cf, opts, creds) {
-  if (opts.domain) return opts.domain;
-  const zones = await listZones(cf.token);
-  if (zones.length === 0) throw new CliError("No domains found in this Cloudflare account.");
-  if (zones.length === 1) return zones[0].name;
-  if (process.stdin.isTTY) return (await selectOne("Choose a domain", zones, (z) => z.name)).name;
-  if (creds.defaultZone) return creds.defaultZone;
-  throw new CliError("Multiple domains in this account \u2014 pick one.", { hint: "pass -d <domain>" });
-}
 async function resolveSpecSubdomain(spec, opts) {
   if (spec.subdomain !== void 0) return spec.subdomain;
   if (opts.yes || !process.stdin.isTTY) return void 0;
@@ -1673,6 +1709,182 @@ function registerLogs(program) {
   });
 }
 
+// src/commands/relay.ts
+import { openSync as openSync3 } from "fs";
+import { spawn as spawn3 } from "child_process";
+import { join as join8 } from "path";
+import pc from "picocolors";
+
+// src/core/api-proxy-server.ts
+import http from "http";
+var DEFAULT_UPSTREAM = "https://api.cloudflare.com";
+var SECRET_HEADER_LC = RELAY_SECRET_HEADER.toLowerCase();
+var HOP_BY_HOP = /* @__PURE__ */ new Set([
+  "connection",
+  "keep-alive",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailer",
+  "transfer-encoding",
+  "upgrade",
+  "host",
+  "content-length"
+]);
+function send(res, code, body) {
+  res.writeHead(code, { "content-type": "application/json" });
+  res.end(body === void 0 ? "" : JSON.stringify(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" });
+      else res.end();
+    });
+  });
+  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";
+    let body;
+    if (hasBody) {
+      const chunks = [];
+      for await (const c of req) chunks.push(c);
+      body = chunks.length ? Buffer.concat(chunks) : void 0;
+    }
+    const headers = {};
+    for (const [k, v] of Object.entries(req.headers)) {
+      if (v === void 0) continue;
+      const lk = k.toLowerCase();
+      if (HOP_BY_HOP.has(lk) || lk === SECRET_HEADER_LC) continue;
+      headers[k] = Array.isArray(v) ? v.join(", ") : v;
+    }
+    let up;
+    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"
+    };
+    const retryAfter = up.headers.get("retry-after");
+    if (retryAfter) outHeaders["retry-after"] = retryAfter;
+    res.writeHead(up.status, outHeaders);
+    res.end(Buffer.from(await up.arrayBuffer()));
+  }
+  return new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const port = server.address().port;
+      resolve({
+        port,
+        url: `http://127.0.0.1:${port}`,
+        close: () => new Promise((res) => server.close(() => res()))
+      });
+    });
+  });
+}
+
+// src/commands/relay.ts
+var DEFAULT_SUB = "cfapi";
+function fqdnFor2(sub, domain) {
+  return sub === "@" ? domain : `${sub}.${domain}`;
+}
+function spawnDetachedRelay(sub, domain) {
+  const script = process.argv[1];
+  if (!script) throw new CliError("Cannot resolve the cloudtunnel executable path.");
+  ensureDirs();
+  const logFile = join8(logDir, `relay-${sub === "@" ? "root" : sub}.log`);
+  const fd = openSync3(logFile, "a", 384);
+  const args = [script, "relay", sub, "-d", domain, "-f", "-y"];
+  const child = spawn3(process.execPath, args, { detached: true, stdio: ["ignore", fd, fd] });
+  child.unref();
+}
+function relayReadyLines(fqdn, secret, tty) {
+  const url = `https://${fqdn}`;
+  if (!tty) return [`relay ready at ${url}`];
+  const base = `${url}/client/v4`;
+  return [
+    `URL     ${pc.green(url)}`,
+    `Secret  ${pc.bold(secret)}  ${pc.dim("(store it \u2014 the client needs it, shown once)")}`,
+    "",
+    pc.bold("On the blocked client:"),
+    `  export CLOUDTUNNEL_API_BASE=${base}`,
+    `  export CLOUDTUNNEL_RELAY_SECRET=${secret}`,
+    `  printf %s "$CF_TOKEN" | cloudtunnel login --token-stdin`,
+    pc.dim("  (mint the CF token on an unblocked host \u2014 dash.cloudflare.com is blocked too)")
+  ];
+}
+function printRelayReady(fqdn, secret, kind) {
+  const tty = !!process.stdout.isTTY;
+  const lines = relayReadyLines(fqdn, secret, tty);
+  if (tty) note(lines.join("\n"), "relay ready");
+  else say.dim(lines[0]);
+  if (tty && kind === "detach") say.dim("  \u2192 running in background \xB7 stop with: cloudtunnel delete " + fqdn);
+  if (tty && kind === "service") say.dim("  \u2192 boot service installed \xB7 view: cloudtunnel ls \xB7 remove: cloudtunnel delete " + fqdn);
+}
+async function runRelay(sub, opts) {
+  const creds = await ensureAuth();
+  const cf = resolveCf();
+  const domain = await resolveDomain(cf, opts, creds);
+  const fqdn = fqdnFor2(sub, domain);
+  if (opts.service) {
+    assertServiceSupported();
+    const secret2 = ensureRelaySecret();
+    installServiceForSpec({ command: "relay", subdomain: sub, port: 0, zone: domain, proto: "http" });
+    printRelayReady(fqdn, secret2, "service");
+    return;
+  }
+  if (opts.detach) {
+    const secret2 = ensureRelaySecret();
+    spawnDetachedRelay(sub, domain);
+    printRelayReady(fqdn, secret2, "detach");
+    return;
+  }
+  const bin = await ensureCloudflared();
+  const secret = ensureRelaySecret();
+  const proxy = await startProxy({ secret, log: (line) => say.dim(line) });
+  const item = {
+    port: proxy.port,
+    proto: "http",
+    name: sub,
+    zone: domain,
+    defaultZone: creds.defaultZone,
+    force: opts.force,
+    yes: opts.yes
+  };
+  await startTunnels(cf, bin, [item], {});
+  printRelayReady(fqdn, secret, "foreground");
+}
+function registerRelay(program) {
+  program.command("relay [subdomain]").description("Expose a locked Cloudflare-API reverse proxy via a tunnel (for clients that can't reach api.cloudflare.com directly)").option("-d, --domain <domain>", "domain for the relay subdomain (prompted from a list if unset)").option("--detach", "run the relay in the background").option("--service", "register the relay as a boot service (systemd \xB7 launchd \xB7 Task Scheduler)").option("-f, --force", "replace a non-tunnel DNS record occupying the hostname").option("-y, --yes", "don't prompt before replacing an existing record").action((subdomain, opts) => runRelay(subdomain ?? DEFAULT_SUB, opts));
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
@@ -1690,7 +1902,7 @@ function buildProgram() {
       ""
     ].join("\n")
   );
-  for (const register of [registerLogin, registerUp, registerLs, registerDelete, registerLogs]) {
+  for (const register of [registerLogin, registerUp, registerLs, registerDelete, registerLogs, registerRelay]) {
     register(program);
   }
   return program;