@cliftonc/cfld 0.2.6 → 0.2.7

package/dist/cli.js

@@ -3,15 +3,16 @@
 // src/cli.ts
 import { parseArgs } from "util";
 import { readFileSync as readFileSync7, realpathSync } from "fs";
-import { dirname, join as join8 } from "path";
+import { dirname as dirname2, join as join9 } from "path";
 import { fileURLToPath } from "url";
 import pc7 from "picocolors";
 
 // src/commands/run.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // src/core/state-machine.ts
-import { existsSync as existsSync2 } from "fs";
+import { copyFileSync, existsSync as existsSync2, mkdirSync as mkdirSync2, renameSync, unlinkSync } from "fs";
+import { dirname, join as join2 } from "path";
 
 // src/util/paths.ts
 import { homedir } from "os";
@@ -229,7 +230,8 @@ function cfargoTunnelUuid(target) {
 import { writeFileSync } from "fs";
 function renderIngressConfig(cfg) {
   const rules = cfg.routes.flatMap((r) => {
-    const lines = [`  - hostname: ${r.hostname}`];
+    const host = r.hostname.startsWith("*") ? JSON.stringify(r.hostname) : r.hostname;
+    const lines = [`  - hostname: ${host}`];
     if (r.path) lines.push(`    path: ${r.path}`);
     lines.push(`    service: http://localhost:${r.port}`);
     return lines;
@@ -300,15 +302,17 @@ async function reconcile(input, events = {}) {
   let created = false;
   if (existing) {
     uuid = existing.id;
-    if (!existsSync2(credentialsPath(uuid))) {
-      step2("Refetching tunnel credentials");
-      await fetchToken(tunnelName, credentialsPath(uuid), certPath);
-    }
   } else {
     step2(`Creating tunnel ${tunnelName}`);
     uuid = await createTunnel(tunnelName, certPath);
     created = true;
   }
+  if (!existsSync2(credentialsPath(uuid))) {
+    if (!adoptCredentialsBesideCert(uuid, certPath)) {
+      step2("Refetching tunnel credentials");
+      await fetchToken(tunnelName, credentialsPath(uuid), certPath);
+    }
+  }
   const prior = getEntry(tunnelName);
   const owned = /* @__PURE__ */ new Set([
     prior?.hostname,
@@ -358,9 +362,22 @@ async function reconcile(input, events = {}) {
 function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
+function adoptCredentialsBesideCert(uuid, certPath) {
+  const beside = join2(dirname(certPath), `${uuid}.json`);
+  const target = credentialsPath(uuid);
+  if (beside === target || !existsSync2(beside)) return false;
+  mkdirSync2(dirname(target), { recursive: true });
+  try {
+    renameSync(beside, target);
+  } catch {
+    copyFileSync(beside, target);
+    unlinkSync(beside);
+  }
+  return true;
+}
 
 // src/core/cert-store.ts
-import { copyFileSync, existsSync as existsSync4, mkdirSync as mkdirSync2, readdirSync } from "fs";
+import { copyFileSync as copyFileSync2, existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync } from "fs";
 
 // src/core/cert.ts
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
@@ -413,7 +430,7 @@ async function certZoneName(certPath) {
 
 // src/core/cert-store.ts
 function ensureStoreDir() {
-  mkdirSync2(certStoreDir(), { recursive: true });
+  mkdirSync3(certStoreDir(), { recursive: true });
 }
 function storedCertForZone(zone) {
   const p = certPathForZone(zone);
@@ -443,19 +460,19 @@ function resolveCert(zone) {
 function importCert(zone, fromPath = defaultCertPath()) {
   ensureStoreDir();
   const dest = certPathForZone(zone);
-  copyFileSync(fromPath, dest);
+  copyFileSync2(fromPath, dest);
   return dest;
 }
 
 // src/core/hostname.ts
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
-import { basename, join as join2 } from "path";
+import { basename, join as join3 } from "path";
 function slugify(input) {
   return input.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
 function deriveSlug(cwd, nameFlag) {
   if (nameFlag) return slugify(nameFlag);
-  const pkgPath = join2(cwd, "package.json");
+  const pkgPath = join3(cwd, "package.json");
   if (existsSync5(pkgPath)) {
     try {
       const pkg = JSON.parse(readFileSync3(pkgPath, "utf8"));
@@ -541,12 +558,12 @@ function findFreePort() {
 
 // src/core/project-config.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 function dotConfigPath(cwd) {
-  return join3(cwd, PROJECT_CONFIG_FILE);
+  return join4(cwd, PROJECT_CONFIG_FILE);
 }
 function readAuthored(cwd) {
-  const pkgPath = join3(cwd, "package.json");
+  const pkgPath = join4(cwd, "package.json");
   if (!existsSync6(pkgPath)) return void 0;
   try {
     const pkg = JSON.parse(readFileSync4(pkgPath, "utf8"));
@@ -965,8 +982,8 @@ function colorLevel(level) {
 
 // src/commands/login.ts
 import { spawn as spawn4 } from "child_process";
-import { copyFileSync as copyFileSync2, existsSync as existsSync8, mkdirSync as mkdirSync3, renameSync, rmSync } from "fs";
-import { join as join4 } from "path";
+import { copyFileSync as copyFileSync3, existsSync as existsSync8, mkdirSync as mkdirSync4, renameSync as renameSync2, rmSync } from "fs";
+import { join as join5 } from "path";
 
 // src/ui/prompts.ts
 async function clack() {
@@ -1086,7 +1103,7 @@ async function runLogin() {
   const bin = await resolveBinary();
   const def = defaultCertPath();
   const backup = existsSync8(def) ? `${def}.cfld-backup` : void 0;
-  if (backup) renameSync(def, backup);
+  if (backup) renameSync2(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");
@@ -1105,13 +1122,13 @@ async function runLogin() {
       );
     }
     if (!backup) return def;
-    mkdirSync3(cfldDir(), { recursive: true });
-    const fresh = join4(cfldDir(), "login-cert.tmp");
-    copyFileSync2(def, fresh);
+    mkdirSync4(cfldDir(), { recursive: true });
+    const fresh = join5(cfldDir(), "login-cert.tmp");
+    copyFileSync3(def, fresh);
     rmSync(def);
     return fresh;
   } finally {
-    if (backup) renameSync(backup, def);
+    if (backup) renameSync2(backup, def);
   }
 }
 function discardLoginCert(certPath) {
@@ -1212,11 +1229,11 @@ function printZeroZoneGuidance() {
 
 // src/util/gitignore.ts
 import { existsSync as existsSync9, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 function ensureGitignored(cwd, pattern) {
-  const gitignorePath = join5(cwd, ".gitignore");
+  const gitignorePath = join6(cwd, ".gitignore");
   const hasGitignore = existsSync9(gitignorePath);
-  const inRepo = hasGitignore || existsSync9(join5(cwd, ".git"));
+  const inRepo = hasGitignore || existsSync9(join6(cwd, ".git"));
   if (!inRepo) return false;
   const existing = hasGitignore ? readFileSync6(gitignorePath, "utf8") : "";
   const present = existing.split("\n").map((l) => l.trim()).includes(pattern);
@@ -1465,7 +1482,7 @@ ${opts.reason}`);
     if (!up) warn(`Nothing is listening on :${ctx.port} yet \u2014 going live anyway.`);
   }
   if (!ctx.noEnv) {
-    const { changed } = upsertEnv(join6(ctx.cwd, ".env"), ctx.envKey, url);
+    const { changed } = upsertEnv(join7(ctx.cwd, ".env"), ctx.envKey, url);
     if (changed && !dashboard) info(`Wrote ${ctx.envKey}=${url} to .env`);
   }
   if (dashboard) {
@@ -2092,9 +2109,9 @@ function resolveCurrentEntry2() {
 import pc5 from "picocolors";
 
 // src/core/service.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync4, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync5, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir2, platform } from "os";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 function serviceSlug(name) {
   return name.replace(/^cfld-/, "");
 }
@@ -2102,16 +2119,16 @@ function launchAgentLabel(name) {
   return `com.cfld.${serviceSlug(name)}`;
 }
 function launchAgentPath(name) {
-  return join7(homedir2(), "Library", "LaunchAgents", `${launchAgentLabel(name)}.plist`);
+  return join8(homedir2(), "Library", "LaunchAgents", `${launchAgentLabel(name)}.plist`);
 }
 function systemdUnitName(name) {
   return `cfld-${serviceSlug(name)}.service`;
 }
 function systemdUnitPath(name) {
-  return join7(homedir2(), ".config", "systemd", "user", systemdUnitName(name));
+  return join8(homedir2(), ".config", "systemd", "user", systemdUnitName(name));
 }
 function logDir() {
-  return join7(cfldDir(), "logs");
+  return join8(cfldDir(), "logs");
 }
 function renderLaunchAgent(spec) {
   const args = [
@@ -2125,8 +2142,8 @@ function renderLaunchAgent(spec) {
     spec.name
   ];
   const argsXml = args.map((a) => `    <string>${escapeXml(a)}</string>`).join("\n");
-  const out = join7(logDir(), `${serviceSlug(spec.name)}.out.log`);
-  const err = join7(logDir(), `${serviceSlug(spec.name)}.err.log`);
+  const out = join8(logDir(), `${serviceSlug(spec.name)}.out.log`);
+  const err = join8(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">
@@ -2191,10 +2208,10 @@ function assertSupported() {
 }
 async function installService(spec) {
   const p = assertSupported();
-  mkdirSync4(logDir(), { recursive: true });
+  mkdirSync5(logDir(), { recursive: true });
   if (p === "darwin") {
     const path = launchAgentPath(spec.name);
-    mkdirSync4(join7(homedir2(), "Library", "LaunchAgents"), { recursive: true });
+    mkdirSync5(join8(homedir2(), "Library", "LaunchAgents"), { recursive: true });
     writeFileSync6(path, renderLaunchAgent(spec), "utf8");
     await exec("launchctl", ["unload", path]);
     const res = await exec("launchctl", ["load", "-w", path]);
@@ -2206,7 +2223,7 @@ async function installService(spec) {
     }
   } else {
     const path = systemdUnitPath(spec.name);
-    mkdirSync4(join7(homedir2(), ".config", "systemd", "user"), { recursive: true });
+    mkdirSync5(join8(homedir2(), ".config", "systemd", "user"), { recursive: true });
     writeFileSync6(path, renderSystemdUnit(spec), "utf8");
     await exec("systemctl", ["--user", "daemon-reload"]);
     const res = await exec("systemctl", [
@@ -2371,8 +2388,8 @@ async function doctorCommand() {
 // src/cli.ts
 function readVersion() {
   try {
-    const here = dirname(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync7(join8(here, "../package.json"), "utf8"));
+    const here = dirname2(fileURLToPath(import.meta.url));
+    const pkg = JSON.parse(readFileSync7(join9(here, "../package.json"), "utf8"));
     return typeof pkg.version === "string" ? pkg.version : "0.0.0";
   } catch {
     return "0.0.0";

package/package.json

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