@tridha643/hestia 1.1.0 → 1.2.0

package/dist/daemon.js

@@ -6947,7 +6947,7 @@ var require_public_api = __commonJS((exports) => {
 // packages/engine/src/daemon/main.ts
 import { chmodSync as chmodSync6, rmSync as rmSync11 } from "fs";
 import { randomBytes } from "crypto";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 
 // packages/session-broker-core/src/limits.ts
 var MAX_HTTP_BODY_BYTES = 4 * 1024 * 1024;
@@ -8221,7 +8221,7 @@ function clearState(worktreeRoot, project) {
 import { existsSync as existsSync21, rmSync as rmSync10 } from "fs";
 import { execFile as execFile10 } from "child_process";
 import { promisify as promisify9 } from "util";
-import { join as join23, resolve as resolve2 } from "path";
+import { join as join24, resolve as resolve2 } from "path";
 import { createHash as createHash7 } from "crypto";
 import { resolve4, resolve6, resolveCname } from "dns/promises";
 
@@ -11579,7 +11579,86 @@ import {
   readFileSync as readFileSync17,
   readdirSync as readdirSync7
 } from "fs";
+import { join as join22 } from "path";
+
+// packages/engine/src/tunnel/orphans.ts
+import { execFileSync as execFileSync4 } from "child_process";
 import { join as join21 } from "path";
+function hestiaTunnelMarker(uuid) {
+  return join21(hestiaHome(), "tunnel", uuid);
+}
+function parseLocalHestiaConnectors(psOutput, marker) {
+  const rows = [];
+  for (const line of psOutput.split(`
+`)) {
+    const trimmed = line.trim();
+    if (trimmed === "")
+      continue;
+    const m = trimmed.match(/^(\d+)\s+(\d+)\s+(.*)$/);
+    if (m === null)
+      continue;
+    const command = m[3];
+    if (!command.includes(marker))
+      continue;
+    if (!/(^|[\/\s])cloudflared(\s|$)/.test(command))
+      continue;
+    rows.push({ pid: Number(m[1]), pgid: Number(m[2]), command });
+  }
+  return rows;
+}
+function listLocalHestiaConnectors(uuid) {
+  let out;
+  try {
+    out = execFileSync4("ps", ["-Ao", "pid=,pgid=,command="], {
+      encoding: "utf8",
+      maxBuffer: 16 * 1024 * 1024,
+      env: { ...process.env, LC_ALL: "C", LANG: "C" }
+    });
+  } catch {
+    return [];
+  }
+  return parseLocalHestiaConnectors(out, hestiaTunnelMarker(uuid));
+}
+var REAP_GRACE_MS = 5000;
+var REAP_POLL_MS = 100;
+async function reapOrphanConnectors(uuid, keep) {
+  const procs = listLocalHestiaConnectors(uuid).filter((p) => {
+    if (keep === undefined)
+      return true;
+    return p.pgid !== keep.pgid && p.pid !== keep.pid;
+  });
+  if (procs.length === 0)
+    return { reapedGroups: 0, pids: [] };
+  const groups = new Set(procs.map((p) => p.pgid));
+  const pids = procs.map((p) => p.pid);
+  for (const pgid of groups) {
+    try {
+      process.kill(-pgid, "SIGTERM");
+    } catch {}
+  }
+  const deadline = Date.now() + REAP_GRACE_MS;
+  while (Date.now() < deadline) {
+    const still = listLocalHestiaConnectors(uuid).filter((p) => {
+      if (keep === undefined)
+        return true;
+      return p.pgid !== keep.pgid && p.pid !== keep.pid;
+    });
+    if (still.length === 0)
+      return { reapedGroups: groups.size, pids };
+    await new Promise((r) => setTimeout(r, REAP_POLL_MS));
+  }
+  for (const p of listLocalHestiaConnectors(uuid)) {
+    if (keep !== undefined && (p.pgid === keep.pgid || p.pid === keep.pid))
+      continue;
+    try {
+      process.kill(-p.pgid, "SIGKILL");
+    } catch {}
+    try {
+      process.kill(p.pid, "SIGKILL");
+    } catch {}
+  }
+  return { reapedGroups: groups.size, pids };
+}
 
 // packages/engine/src/tunnel/verify.ts
 var POLL_MS4 = 300;
@@ -11627,13 +11706,13 @@ async function quickTunnelUrl(metricsPort, timeoutMs) {
 var CONNECTOR = "connector";
 var READY_TIMEOUT_MS2 = 30000;
 function tunnelDir(uuid) {
-  return join21(hestiaHome(), "tunnel", uuid);
+  return join22(hestiaHome(), "tunnel", uuid);
 }
 function configPath(uuid) {
-  return join21(tunnelDir(uuid), "config.yml");
+  return join22(tunnelDir(uuid), "config.yml");
 }
 function adoptedMarker(uuid) {
-  return join21(tunnelDir(uuid), "adopted.json");
+  return join22(tunnelDir(uuid), "adopted.json");
 }
 function isAdopted(uuid) {
   return existsSync19(adoptedMarker(uuid));
@@ -11652,10 +11731,10 @@ function readAdopted(uuid) {
     return { uuid, name: marker.name, credFile: marker.credFile, reconstructed: false };
   }
   let name;
-  const stacksDir = join21(hestiaHome(), "stacks");
+  const stacksDir = join22(hestiaHome(), "stacks");
   if (existsSync19(stacksDir)) {
     for (const project of readdirSync7(stacksDir)) {
-      const sp = join21(stacksDir, project, "stack.json");
+      const sp = join22(stacksDir, project, "stack.json");
       if (!existsSync19(sp))
         continue;
       try {
@@ -11675,19 +11754,19 @@ function readAdopted(uuid) {
   };
 }
 function listAdopted() {
-  const root = join21(hestiaHome(), "tunnel");
+  const root = join22(hestiaHome(), "tunnel");
   if (!existsSync19(root))
     return [];
   return readdirSync7(root).filter((uuid) => isAdopted(uuid));
 }
 function collectDynamicRules(uuid) {
-  const stacksDir = join21(hestiaHome(), "stacks");
+  const stacksDir = join22(hestiaHome(), "stacks");
   const rules = [];
   const dropped = [];
   if (!existsSync19(stacksDir))
     return { rules, dropped };
   for (const project of readdirSync7(stacksDir)) {
-    const p = join21(stacksDir, project, "stack.json");
+    const p = join22(stacksDir, project, "stack.json");
     if (!existsSync19(p))
       continue;
     let record;
@@ -11732,6 +11811,10 @@ async function reconcileTunnel(ref, opts) {
     });
     const pf = readPidfile(dir, CONNECTOR);
     const live = pf !== null && isLive(pf);
+    const { reapedGroups } = await reapOrphanConnectors(ref.uuid, live ? pf : undefined);
+    if (reapedGroups > 0) {
+      warnings.push(`reaped ${reapedGroups} orphan hestia connector process group(s) for this tunnel`);
+    }
     const currentConfig = existsSync19(cfgPath) ? readFileSync17(cfgPath, "utf8") : null;
     if (live && currentConfig === nextConfig) {
       return { restarted: false, metricsPort: pf.port, ready: true, warnings };
@@ -12439,7 +12522,7 @@ class SharedArbiter {
 import { execFile as execFile9 } from "child_process";
 import { promisify as promisify8 } from "util";
 import { existsSync as existsSync20, readFileSync as readFileSync18, readdirSync as readdirSync8 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 var pexec8 = promisify8(execFile9);
 var DEFAULT_REFRESH_MS = 1000;
 var DEFAULT_HEARTBEAT_MS = 15000;
@@ -12486,11 +12569,11 @@ class LatestFleetChannel {
 function readManagedMirrors() {
   const records = [];
   const warnings = [];
-  const stacksDirectory = join22(hestiaHome(), "stacks");
+  const stacksDirectory = join23(hestiaHome(), "stacks");
   if (!existsSync20(stacksDirectory))
     return { records, warnings };
   for (const project of readdirSync8(stacksDirectory).sort()) {
-    const path = join22(stacksDirectory, project, "stack.json");
+    const path = join23(stacksDirectory, project, "stack.json");
     try {
       const source = readFileSync18(path);
       if (source.byteLength > MAX_MIRROR_BYTES2) {
@@ -12968,7 +13051,7 @@ async function assertHestiaStateIgnored(worktreeRoot) {
   try {
     await pexec9("git", ["-C", worktreeRoot, "check-ignore", "-q", ".hestia/"], { timeout: 5000 });
   } catch {
-    throw new HestiaError("state-not-ignored", `.hestia is not ignored in ${worktreeRoot}; add the line ".hestia/" to ${join23(worktreeRoot, ".gitignore")}`, { remedy: `.hestia/`, path: join23(worktreeRoot, ".gitignore") });
+    throw new HestiaError("state-not-ignored", `.hestia is not ignored in ${worktreeRoot}; add the line ".hestia/" to ${join24(worktreeRoot, ".gitignore")}`, { remedy: `.hestia/`, path: join24(worktreeRoot, ".gitignore") });
   }
 }
 async function prepareCompose(worktreeRoot, project, repo, branch, opts, configuredBaseFile) {
@@ -12985,7 +13068,7 @@ async function prepareCompose(worktreeRoot, project, repo, branch, opts, configu
     services
   });
   ensureDir(hestiaDir(worktreeRoot));
-  const overridePath = join23(hestiaDir(worktreeRoot), OVERRIDE_FILE);
+  const overridePath = join24(hestiaDir(worktreeRoot), OVERRIDE_FILE);
   writeAtomicTextFile(overridePath, yaml);
   return {
     ctx: {
@@ -13018,7 +13101,7 @@ function writeDockerfileComposeModel(worktreeRoot, workloads, conventionalCompos
     ...conventionalComposeFile === undefined ? {} : { include: [{ path: conventionalComposeFile }] },
     services
   };
-  const path = join23(hestiaDir(worktreeRoot), DOCKERFILE_COMPOSE_FILE);
+  const path = join24(hestiaDir(worktreeRoot), DOCKERFILE_COMPOSE_FILE);
   writeAtomicTextFile(path, $stringify(model));
   return path;
 }
@@ -13038,7 +13121,7 @@ function freshRecord(project, repoId, repo, branch, worktree) {
   };
 }
 function assertCurrentStackIdentity(record, current) {
-  const path = join23(hestiaDir(current.worktreeRoot), "stack.json");
+  const path = join24(hestiaDir(current.worktreeRoot), "stack.json");
   assertMutableStackRecord(record, path);
   const matches = record.repoId === current.repoId && record.repo === current.repo && record.branch === current.branch && resolve2(record.worktree) === resolve2(current.worktreeRoot) && record.project === projectName(current.repoId, current.repo, current.branch, current.worktreeRoot);
   if (!matches) {
@@ -13218,7 +13301,7 @@ function matchesExpectedStack(record, expected) {
   return record !== null && (record.repoId === undefined || record.repoId === expected.repoId) && record.worktree === expected.worktree && record.createdAt === expected.createdAt;
 }
 function projectMutationRoot(project) {
-  return join23(hestiaHome(), "project-locks", project);
+  return join24(hestiaHome(), "project-locks", project);
 }
 async function assertNamedTunnelDns(hostname, tunnelUuid) {
   const expected = `${tunnelUuid}.cfargotunnel.com`;
@@ -13825,7 +13908,7 @@ class ComposeEngine {
       const composeFile = record?.composeFile ?? tryLoadConfig(worktreeRoot)?.composeFile;
       if (composeFile !== undefined) {
         const project2 = record?.project ?? projectName(repoId, repo, branch, worktreeRoot);
-        const overrideFile = record?.overrideFile ?? join23(hestiaDir(worktreeRoot), OVERRIDE_FILE);
+        const overrideFile = record?.overrideFile ?? join24(hestiaDir(worktreeRoot), OVERRIDE_FILE);
         if (existsSync21(overrideFile)) {
           await composeDown({ project: project2, baseFile: composeFile, overrideFile, cwd: worktreeRoot }, opts?.destroy ?? false);
         } else if (record?.composeFile !== undefined) {
@@ -14058,7 +14141,7 @@ class ComposeEngine {
         const alias = selection.endpoint.alias ?? selection.endpoint.name;
         const authority = internalEndpointAuthority(record.project, alias);
         const name = `aux-quick-${createHash7("sha256").update(alias).digest("hex").slice(0, 10)}`;
-        const quickCfg = join23(hestiaDir(worktreeRoot), `quick-${name}.yml`);
+        const quickCfg = join24(hestiaDir(worktreeRoot), `quick-${name}.yml`);
         writeAtomicTextFile(quickCfg, `ingress:
   - service: ${JSON.stringify(`unix:${publicGatewaySocketPath()}`)}
 ` + `    originRequest:
@@ -14454,8 +14537,13 @@ function startDuties(admission, opts) {
       for (const uuid of listAdopted()) {
         try {
           const pf = connectorPidfile(uuid);
-          if (pf !== null && isLive(pf))
+          if (pf !== null && isLive(pf)) {
+            const { reapedGroups } = await reapOrphanConnectors(uuid, pf);
+            if (reapedGroups > 0) {
+              log(`sweep: reaped ${reapedGroups} orphan connector group(s) for ${uuid}`);
+            }
             continue;
+          }
           const ref = readAdopted(uuid);
           if (ref === null)
             continue;
@@ -14465,6 +14553,11 @@ function startDuties(admission, opts) {
           const outcome = await reconcileTunnel(ref);
           if (outcome.restarted) {
             log(`sweep: connector for ${ref.name} (${uuid}) revived (ready=${outcome.ready})`);
+          } else {
+            for (const w of outcome.warnings) {
+              if (w.includes("reaped"))
+                log(`sweep: ${w}`);
+            }
           }
         } catch (err) {
           log(`sweep: connector revival for ${uuid} failed: ${err.message}`);
@@ -14536,11 +14629,11 @@ async function main() {
         port: "none",
         backend: "proc"
       }),
-      logPath: join24(root, "daemon.log"),
+      logPath: join25(root, "daemon.log"),
       signal: "term",
       backend: "proc"
     });
-    writeAtomicJsonFile(join24(root, "daemon.json"), {
+    writeAtomicJsonFile(join25(root, "daemon.json"), {
       schemaVersion: STATE_SCHEMA_VERSION,
       pid: process.pid,
       port: server.port,
@@ -14556,7 +14649,7 @@ async function main() {
       fleet.stop();
       localRouter.stop();
       removePidfile(root, PIDFILE_NAME2);
-      rmSync11(join24(root, "daemon.json"), { force: true });
+      rmSync11(join25(root, "daemon.json"), { force: true });
       server.stop(true);
       process.exit(0);
     };
@@ -14571,4 +14664,4 @@ async function main() {
 }
 main();
 
-//# debugId=9176C6E8002FF49E64756E2164756E21
+//# debugId=E5997ABC0405B8AE64756E2164756E21