@cliftonc/cfld 0.2.5 → 0.2.6

package/dist/cli.js

@@ -3,12 +3,12 @@
 // src/cli.ts
 import { parseArgs } from "util";
 import { readFileSync as readFileSync7, realpathSync } from "fs";
-import { dirname, join as join7 } from "path";
+import { dirname, join as join8 } from "path";
 import { fileURLToPath } from "url";
 import pc7 from "picocolors";
 
 // src/commands/run.ts
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/core/state-machine.ts
 import { existsSync as existsSync2 } from "fs";
@@ -392,6 +392,24 @@ function certHasZone(certPath) {
   const token = readCertToken(certPath);
   return Boolean(token?.zoneID);
 }
+async function certZoneName(certPath) {
+  const token = readCertToken(certPath);
+  if (!token?.zoneID || !token.apiToken) return void 0;
+  try {
+    const res = await fetch(
+      `https://api.cloudflare.com/client/v4/zones/${token.zoneID}`,
+      {
+        headers: { Authorization: `Bearer ${token.apiToken}` },
+        signal: AbortSignal.timeout(5e3)
+      }
+    );
+    if (!res.ok) return void 0;
+    const body = await res.json();
+    return body.result?.name?.toLowerCase();
+  } catch {
+    return void 0;
+  }
+}
 
 // src/core/cert-store.ts
 function ensureStoreDir() {
@@ -408,8 +426,19 @@ function listStoredZones() {
     return [];
   }
 }
+function storedZoneClaiming(certPath, except) {
+  const zoneID = readCertToken(certPath)?.zoneID;
+  if (!zoneID) return void 0;
+  return listStoredZones().find(
+    (z) => z !== except && readCertToken(certPathForZone(z))?.zoneID === zoneID
+  );
+}
 function resolveCert(zone) {
-  return storedCertForZone(zone) ?? (certExists(defaultCertPath()) ? defaultCertPath() : void 0);
+  const stored = storedCertForZone(zone);
+  if (stored) return stored;
+  const def = defaultCertPath();
+  if (!certExists(def) || storedZoneClaiming(def, zone)) return void 0;
+  return def;
 }
 function importCert(zone, fromPath = defaultCertPath()) {
   ensureStoreDir();
@@ -936,7 +965,8 @@ function colorLevel(level) {
 
 // src/commands/login.ts
 import { spawn as spawn4 } from "child_process";
-import { existsSync as existsSync8 } from "fs";
+import { copyFileSync as copyFileSync2, existsSync as existsSync8, mkdirSync as mkdirSync3, renameSync, rmSync } from "fs";
+import { join as join4 } from "path";
 
 // src/ui/prompts.ts
 async function clack() {
@@ -1031,23 +1061,73 @@ function normalizeZone(input) {
   return input.trim().toLowerCase().replace(/^https?:\/\//, "").replace(/\/.*$/, "");
 }
 async function loginCommand(flags) {
-  const interactive = isInteractive();
   const haveCert = certExists(defaultCertPath());
+  let certPath = defaultCertPath();
   if (flags.reauth || !haveCert) {
-    await runLogin();
+    certPath = await runLogin();
   } else {
     info("A Cloudflare certificate already exists. Use --reauth to authorize another domain.");
   }
-  if (!certHasZone(defaultCertPath())) {
-    printZeroZoneGuidance();
+  try {
+    if (!certHasZone(certPath)) {
+      printZeroZoneGuidance();
+      throw new CfldError(
+        "Logged in, but your account has no domain to authorize.",
+        "Add a domain (see above), then run `cfld login --reauth`."
+      );
+    }
+    const zone = await saveCert(flags.zone ? normalizeZone(flags.zone) : void 0, certPath);
+    done(`Saved cert for ${zone}. You're ready \u2014 run \`cfld\`.`);
+  } finally {
+    discardLoginCert(certPath);
+  }
+}
+async function runLogin() {
+  const bin = await resolveBinary();
+  const def = defaultCertPath();
+  const backup = existsSync8(def) ? `${def}.cfld-backup` : void 0;
+  if (backup) renameSync(def, backup);
+  try {
+    step("Opening your browser to authorize with Cloudflare (no API token needed)\u2026");
+    note("  Pick the domain you want to use. Waiting for you to finish\u2026");
+    await new Promise((resolve, reject) => {
+      const child = spawn4(bin, ["tunnel", "login"], { stdio: "inherit" });
+      child.on("error", reject);
+      child.on("exit", (code) => {
+        if (code === 0 || existsSync8(def)) resolve();
+        else reject(new CfldError("Cloudflare login did not complete.", "Re-run `cfld login`."));
+      });
+    });
+    if (!existsSync8(def)) {
+      throw new CfldError(
+        "Login finished but no certificate was written.",
+        "Re-run `cfld login` and complete the browser step."
+      );
+    }
+    if (!backup) return def;
+    mkdirSync3(cfldDir(), { recursive: true });
+    const fresh = join4(cfldDir(), "login-cert.tmp");
+    copyFileSync2(def, fresh);
+    rmSync(def);
+    return fresh;
+  } finally {
+    if (backup) renameSync(backup, def);
+  }
+}
+function discardLoginCert(certPath) {
+  if (certPath !== defaultCertPath()) rmSync(certPath, { force: true });
+}
+async function saveCert(expected, certPath) {
+  const actual = await certZoneName(certPath);
+  if (expected && actual && actual !== expected) {
     throw new CfldError(
-      "Logged in, but your account has no domain to authorize.",
-      "Add a domain (see above), then run `cfld login --reauth`."
+      `You authorized ${actual} in the browser, not ${expected}.`,
+      `Run \`cfld login --reauth --zone ${expected}\` and pick ${expected} this time.`
     );
   }
-  let zone = flags.zone ? normalizeZone(flags.zone) : void 0;
+  let zone = expected ?? actual;
   if (!zone) {
-    if (!interactive) {
+    if (!isInteractive()) {
       throw new CfldError(
         "Pass --zone to record which domain this cert is for.",
         "e.g. `cfld login --zone example.com`"
@@ -1055,48 +1135,57 @@ async function loginCommand(flags) {
     }
     zone = normalizeZone(await askText("Which domain did you authorize?", "example.com"));
   }
-  importCert(zone);
-  done(`Saved cert for ${zone}. You're ready \u2014 run \`cfld\`.`);
-}
-async function runLogin() {
-  const bin = await resolveBinary();
-  step("Opening your browser to authorize with Cloudflare (no API token needed)\u2026");
-  note("  Pick the domain you want to use. Waiting for you to finish\u2026");
-  await new Promise((resolve, reject) => {
-    const child = spawn4(bin, ["tunnel", "login"], { stdio: "inherit" });
-    child.on("error", reject);
-    child.on("exit", (code) => {
-      if (code === 0 || existsSync8(defaultCertPath())) resolve();
-      else reject(new CfldError("Cloudflare login did not complete.", "Re-run `cfld login`."));
-    });
-  });
-  if (!existsSync8(defaultCertPath())) {
+  const clash = storedZoneClaiming(certPath, zone);
+  if (clash && !actual) {
     throw new CfldError(
-      "Login finished but no certificate was written.",
-      "Re-run `cfld login` and complete the browser step."
+      `That cert is for the same domain as your saved ${clash} cert, not ${zone}.`,
+      `Run \`cfld login --reauth --zone ${zone}\` and pick ${zone} in the browser.`
     );
   }
+  importCert(zone, certPath);
+  return zone;
 }
 async function ensureCert(zone, opts = { interactive: true }) {
-  const existing = resolveCert(zone);
-  if (existing) return existing;
+  const usable = await usableCert(zone);
+  if (usable) return usable;
   if (!opts.interactive) {
     throw new CfldError(
       `No Cloudflare certificate found for ${zone}.`,
-      "Run `cfld login` first (needs a browser), or set TUNNEL_ORIGIN_CERT."
+      `Run \`cfld login --reauth --zone ${zone}\` first (needs a browser), or set TUNNEL_ORIGIN_CERT.`
     );
   }
-  await runLogin();
-  if (!certHasZone(defaultCertPath())) {
-    printZeroZoneGuidance();
-    throw new CfldError(
-      "Your Cloudflare account has no domain yet, so a persistent URL isn't possible.",
-      "Add a domain (see above), then re-run. Or use `cfld --quick` for a throwaway URL now."
-    );
+  info(`No certificate for ${zone} yet \u2014 authorize it in the browser.`);
+  const fresh = await runLogin();
+  try {
+    if (!certHasZone(fresh)) {
+      printZeroZoneGuidance();
+      throw new CfldError(
+        "Your Cloudflare account has no domain yet, so a persistent URL isn't possible.",
+        "Add a domain (see above), then re-run. Or use `cfld --quick` for a throwaway URL now."
+      );
+    }
+    await saveCert(zone, fresh);
+  } finally {
+    discardLoginCert(fresh);
   }
-  const stored = importCert(zone);
   info(`Saved cert for ${zone}.`);
-  return stored;
+  return certPathForZone(zone);
+}
+async function usableCert(zone) {
+  const stored = storedCertForZone(zone);
+  if (stored) {
+    if (!storedZoneClaiming(stored, zone)) return stored;
+    const actual2 = await certZoneName(stored);
+    if (!actual2 || actual2 === zone) return stored;
+    warn(`The saved cert for ${zone} is actually for ${actual2} \u2014 discarding it.`);
+    rmSync(stored);
+  }
+  const def = defaultCertPath();
+  if (!certHasZone(def)) return void 0;
+  const actual = await certZoneName(def);
+  if (actual === zone) return importCert(zone, def);
+  if (!actual && !storedZoneClaiming(def, zone)) return def;
+  return void 0;
 }
 function printZeroZoneGuidance() {
   warn("cfld can't create a permanent custom URL yet \u2014 your account has no domains.");
@@ -1123,11 +1212,11 @@ function printZeroZoneGuidance() {
 
 // src/util/gitignore.ts
 import { existsSync as existsSync9, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 function ensureGitignored(cwd, pattern) {
-  const gitignorePath = join4(cwd, ".gitignore");
+  const gitignorePath = join5(cwd, ".gitignore");
   const hasGitignore = existsSync9(gitignorePath);
-  const inRepo = hasGitignore || existsSync9(join4(cwd, ".git"));
+  const inRepo = hasGitignore || existsSync9(join5(cwd, ".git"));
   if (!inRepo) return false;
   const existing = hasGitignore ? readFileSync6(gitignorePath, "utf8") : "";
   const present = existing.split("\n").map((l) => l.trim()).includes(pattern);
@@ -1309,7 +1398,7 @@ ${opts.reason}`);
   );
   process.once("SIGHUP", () => shutdown({ reason: "Terminal closed \u2014 stopping." }));
   if (interactive) {
-    const { startDashboard } = await import("./dashboard-ZJVAPOTE.js");
+    const { startDashboard } = await import("./dashboard-Z4AN7H5V.js");
     dashboard = startDashboard(
       {
         url,
@@ -1376,7 +1465,7 @@ ${opts.reason}`);
     if (!up) warn(`Nothing is listening on :${ctx.port} yet \u2014 going live anyway.`);
   }
   if (!ctx.noEnv) {
-    const { changed } = upsertEnv(join5(ctx.cwd, ".env"), ctx.envKey, url);
+    const { changed } = upsertEnv(join6(ctx.cwd, ".env"), ctx.envKey, url);
     if (changed && !dashboard) info(`Wrote ${ctx.envKey}=${url} to .env`);
   }
   if (dashboard) {
@@ -1553,7 +1642,7 @@ ${opts.reason ?? "Stopped ephemeral tunnel."}`);
     });
   }
   if (interactive) {
-    const { startDashboard } = await import("./dashboard-ZJVAPOTE.js");
+    const { startDashboard } = await import("./dashboard-Z4AN7H5V.js");
     dashboard = startDashboard({
       url,
       target,
@@ -1753,20 +1842,26 @@ async function setupCommand(flags) {
     );
     return;
   }
-  await runLogin();
-  if (!certHasZone(defaultCertPath())) {
-    printZeroZoneGuidance();
-    if (await askConfirm("Start a temporary quick tunnel now instead?")) {
-      await quickCommand(flags);
-      return;
+  const fresh = await runLogin();
+  let zone;
+  try {
+    if (!certHasZone(fresh)) {
+      printZeroZoneGuidance();
+      if (await askConfirm("Start a temporary quick tunnel now instead?")) {
+        await quickCommand(flags);
+        return;
+      }
+      throw new CfldError(
+        "Your Cloudflare account has no domain yet, so a persistent URL isn't possible.",
+        "Add a domain (see above), then run `cfld setup` again."
+      );
     }
-    throw new CfldError(
-      "Your Cloudflare account has no domain yet, so a persistent URL isn't possible.",
-      "Add a domain (see above), then run `cfld setup` again."
-    );
+    const detected = await certZoneName(fresh);
+    zone = await saveCert(detected ?? await askAuthorizedZone(knownZones), fresh);
+  } finally {
+    discardLoginCert(fresh);
   }
-  const zone = await askAuthorizedZone(knownZones);
-  const certPath = importCert(zone);
+  const certPath = certPathForZone(zone);
   info(`Saved cert for ${zone}.`);
   await configureProject(flags, { zone, certPath, cwd });
   await offerGoLive(flags, zone);
@@ -1997,9 +2092,9 @@ function resolveCurrentEntry2() {
 import pc5 from "picocolors";
 
 // src/core/service.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync3, rmSync, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync4, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir2, platform } from "os";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 function serviceSlug(name) {
   return name.replace(/^cfld-/, "");
 }
@@ -2007,16 +2102,16 @@ function launchAgentLabel(name) {
   return `com.cfld.${serviceSlug(name)}`;
 }
 function launchAgentPath(name) {
-  return join6(homedir2(), "Library", "LaunchAgents", `${launchAgentLabel(name)}.plist`);
+  return join7(homedir2(), "Library", "LaunchAgents", `${launchAgentLabel(name)}.plist`);
 }
 function systemdUnitName(name) {
   return `cfld-${serviceSlug(name)}.service`;
 }
 function systemdUnitPath(name) {
-  return join6(homedir2(), ".config", "systemd", "user", systemdUnitName(name));
+  return join7(homedir2(), ".config", "systemd", "user", systemdUnitName(name));
 }
 function logDir() {
-  return join6(cfldDir(), "logs");
+  return join7(cfldDir(), "logs");
 }
 function renderLaunchAgent(spec) {
   const args = [
@@ -2030,8 +2125,8 @@ function renderLaunchAgent(spec) {
     spec.name
   ];
   const argsXml = args.map((a) => `    <string>${escapeXml(a)}</string>`).join("\n");
-  const out = join6(logDir(), `${serviceSlug(spec.name)}.out.log`);
-  const err = join6(logDir(), `${serviceSlug(spec.name)}.err.log`);
+  const out = join7(logDir(), `${serviceSlug(spec.name)}.out.log`);
+  const err = join7(logDir(), `${serviceSlug(spec.name)}.err.log`);
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -2096,10 +2191,10 @@ function assertSupported() {
 }
 async function installService(spec) {
   const p = assertSupported();
-  mkdirSync3(logDir(), { recursive: true });
+  mkdirSync4(logDir(), { recursive: true });
   if (p === "darwin") {
     const path = launchAgentPath(spec.name);
-    mkdirSync3(join6(homedir2(), "Library", "LaunchAgents"), { recursive: true });
+    mkdirSync4(join7(homedir2(), "Library", "LaunchAgents"), { recursive: true });
     writeFileSync6(path, renderLaunchAgent(spec), "utf8");
     await exec("launchctl", ["unload", path]);
     const res = await exec("launchctl", ["load", "-w", path]);
@@ -2111,7 +2206,7 @@ async function installService(spec) {
     }
   } else {
     const path = systemdUnitPath(spec.name);
-    mkdirSync3(join6(homedir2(), ".config", "systemd", "user"), { recursive: true });
+    mkdirSync4(join7(homedir2(), ".config", "systemd", "user"), { recursive: true });
     writeFileSync6(path, renderSystemdUnit(spec), "utf8");
     await exec("systemctl", ["--user", "daemon-reload"]);
     const res = await exec("systemctl", [
@@ -2134,13 +2229,13 @@ async function uninstallService(name) {
     const path = launchAgentPath(name);
     if (existsSync10(path)) {
       await exec("launchctl", ["unload", "-w", path]);
-      rmSync(path, { force: true });
+      rmSync2(path, { force: true });
     }
   } else {
     const unit = systemdUnitName(name);
     await exec("systemctl", ["--user", "disable", "--now", unit]);
     const path = systemdUnitPath(name);
-    if (existsSync10(path)) rmSync(path, { force: true });
+    if (existsSync10(path)) rmSync2(path, { force: true });
     await exec("systemctl", ["--user", "daemon-reload"]);
   }
 }
@@ -2260,6 +2355,14 @@ async function doctorCommand() {
   const zones = listStoredZones();
   if (zones.length) out(`  ${ok} cert store: ${zones.join(", ")}`);
   else out(`  ${pc6.dim("\xB7")} cert store empty`);
+  for (const zone of zones) {
+    const actual = await certZoneName(certPathForZone(zone));
+    if (actual && actual !== zone) {
+      out(
+        `  ${bad} ${zone}.pem is really a cert for ${actual} \u2014 fix with \`cfld login --reauth --zone ${zone}\``
+      );
+    }
+  }
   const entries = listEntries();
   out(`  ${ok} registry: ${entries.length} tunnel(s)`);
   out("");
@@ -2269,7 +2372,7 @@ async function doctorCommand() {
 function readVersion() {
   try {
     const here = dirname(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync7(join7(here, "../package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync7(join8(here, "../package.json"), "utf8"));
     return typeof pkg.version === "string" ? pkg.version : "0.0.0";
   } catch {
     return "0.0.0";

package/dist/{dashboard-ZJVAPOTE.js → dashboard-Z4AN7H5V.js}

@@ -94,7 +94,12 @@ function LogColumn({
       borderLeft: Boolean(divider),
       children: [
         title ? /* @__PURE__ */ jsx(Text, { color: titleColor, bold: true, wrap: "truncate-end", children: title }) : null,
-        /* @__PURE__ */ jsx(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "flex-end", overflow: "hidden", children: lines.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: placeholder }) : lines.slice(-rows).map((line, i) => /* @__PURE__ */ jsx(Text, { wrap: "truncate-end", children: line }, i)) })
+        /* @__PURE__ */ jsx(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "flex-end", overflow: "hidden", children: lines.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: placeholder }) : (
+          // Wrap rather than truncate so long lines (e.g. magic-link / OAuth
+          // URLs) stay fully visible and selectable instead of ending in "…".
+          // The bottom-pinned box clips older wrapped lines off the top.
+          lines.slice(-rows).map((line, i) => /* @__PURE__ */ jsx(Text, { wrap: "wrap", children: line }, i))
+        ) })
       ]
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cliftonc/cfld",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Zero-token, persistent Cloudflare tunnel CLI for local dev — same public HTTPS URL every run.",
   "type": "module",
   "bin": {