@cliftonc/cfld 0.2.1 → 0.2.2

package/README.md

@@ -1,5 +1,7 @@
 # cfld
 
+**`cfld` = cloudflare local dev.**
+
 **One command to give your localhost a permanent public HTTPS URL — no API tokens, no teardown.**
 
 `cfld` wraps [`cloudflared`](https://github.com/cloudflare/cloudflared) into a frictionless dev experience: the **same** custom URL every run (not a random `trycloudflare.com` one), authorized with a **browser login** (zero API tokens), reusing the same named tunnel and DNS record across restarts instead of churning them. It runs a **live dashboard** (URL, connection count, request/latency counters, tailing logs), **auto-reconnects** on edge blips, and **guards** against stealing a DNS record that belongs to another tunnel.

package/dist/cli.js

@@ -700,9 +700,20 @@ function startChild(options) {
   const exited = new Promise((resolve) => {
     markExited = resolve;
   });
+  const trackedPgids = /* @__PURE__ */ new Set();
+  const trackTree = () => {
+    const pid = child.pid;
+    if (pid === void 0) return;
+    for (const g of descendantPgids(pid)) {
+      if (g > 1 && g !== process.pid) trackedPgids.add(g);
+    }
+  };
+  const poll = setInterval(trackTree, options.pollTreeMs ?? 1500);
+  poll.unref();
   wireLines2(child, "stdout", options.onLine);
   wireLines2(child, "stderr", options.onLine);
   child.on("error", (err) => {
+    clearInterval(poll);
     markExited();
     if (stopped) return;
     stopped = true;
@@ -710,11 +721,18 @@ function startChild(options) {
     options.onLine?.(String(err.message ?? err), "stderr");
   });
   child.on("exit", (code, signal) => {
+    clearInterval(poll);
     markExited();
     if (stopped) return;
     stopped = true;
     options.onExit?.(code, signal);
   });
+  const signalTree = (signal) => {
+    trackTree();
+    const pid = child.pid;
+    if (pid !== void 0) trySignalGroup(pid, signal);
+    for (const g of trackedPgids) trySignalGroup(g, signal);
+  };
   return {
     exited,
     get pid() {
@@ -723,63 +741,64 @@ function startChild(options) {
     stop() {
       if (stopped) return;
       stopped = true;
-      killGroup(child, "SIGINT");
+      clearInterval(poll);
+      signalTree("SIGINT");
       const t = setTimeout(() => {
-        if (child.exitCode === null && !child.signalCode) killGroup(child, "SIGKILL");
+        if (child.exitCode === null && !child.signalCode) signalTree("SIGKILL");
       }, 4e3);
       t.unref();
     },
     kill() {
-      killGroup(child, "SIGKILL");
+      clearInterval(poll);
+      signalTree("SIGKILL");
     }
   };
 }
-function descendantPids(pid) {
+function descendantPgids(pid) {
   let out = "";
   try {
-    out = execSync("ps -A -o pid=,ppid=", { encoding: "utf8" });
+    out = execSync("ps -A -o pid=,ppid=,pgid=", { encoding: "utf8" });
   } catch {
     return [];
   }
   const childrenOf = /* @__PURE__ */ new Map();
+  const pgidOf = /* @__PURE__ */ new Map();
   for (const line of out.split("\n")) {
-    const m = line.trim().match(/^(\d+)\s+(\d+)$/);
+    const m = line.trim().match(/^(\d+)\s+(\d+)\s+(\d+)$/);
     if (!m) continue;
-    const child = Number(m[1]);
+    const proc = Number(m[1]);
     const parent = Number(m[2]);
+    pgidOf.set(proc, Number(m[3]));
     const list = childrenOf.get(parent);
-    if (list) list.push(child);
-    else childrenOf.set(parent, [child]);
+    if (list) list.push(proc);
+    else childrenOf.set(parent, [proc]);
   }
-  const found = [];
+  const pgids = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Set();
   const stack = [pid];
   while (stack.length) {
     for (const child of childrenOf.get(stack.pop()) ?? []) {
-      if (!found.includes(child)) {
-        found.push(child);
-        stack.push(child);
-      }
+      if (seen.has(child)) continue;
+      seen.add(child);
+      stack.push(child);
+      const g = pgidOf.get(child);
+      if (g !== void 0) pgids.add(g);
     }
   }
-  return found;
+  return [...pgids];
 }
-function signalPids(pids, signal) {
-  for (const pid of pids) {
-    try {
-      process.kill(pid, signal);
-    } catch {
-    }
+function trySignalGroup(pgid, signal) {
+  try {
+    process.kill(-pgid, signal);
+  } catch {
   }
 }
 function reapChild(child, graceMs = 3e3) {
-  const tree = child.pid ? descendantPids(child.pid) : [];
   child.stop();
-  signalPids(tree, "SIGINT");
   return new Promise((resolve) => {
     const done2 = () => {
       clearTimeout(grace);
       child.kill();
-      signalPids(tree, "SIGKILL");
       resolve();
     };
     const grace = setTimeout(done2, graceMs);
@@ -787,18 +806,6 @@ function reapChild(child, graceMs = 3e3) {
     child.exited.then(done2);
   });
 }
-function killGroup(child, signal) {
-  const pid = child.pid;
-  if (pid === void 0) return;
-  try {
-    process.kill(-pid, signal);
-  } catch {
-    try {
-      child.kill(signal);
-    } catch {
-    }
-  }
-}
 function wireLines2(child, stream, onLine) {
   const source = stream === "stdout" ? child.stdout : child.stderr;
   if (!source || !onLine) return;

package/package.json

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