@iamken/cloudtunnel 0.11.4 → 0.11.5

package/dist/index.js

@@ -247,11 +247,13 @@ function assertSupported() {
 }
 function install(d) {
   assertSupported();
-  const tmp = join2(tmpdir(), label(d.fqdn));
+  const name = label(d.fqdn);
+  const tmp = join2(tmpdir(), name);
   writeFileSync(tmp, buildUnit(d), { mode: 420 });
   privileged(["install", "-m", "0644", tmp, unitPath(d.fqdn)]);
   privileged(["systemctl", "daemon-reload"]);
-  privileged(["systemctl", "enable", "--now", label(d.fqdn)]);
+  privileged(["systemctl", "enable", name]);
+  privileged(["systemctl", "restart", name]);
 }
 function uninstall(fqdn) {
   try {
@@ -389,7 +391,7 @@ function buildTaskXml(d) {
     "    <ExecutionTimeLimit>PT0S</ExecutionTimeLimit>",
     "    <RestartOnFailure><Interval>PT1M</Interval><Count>999</Count></RestartOnFailure>",
     "    <Enabled>true</Enabled>",
-    "  </Settings>",
+    "</Settings>",
     '  <Actions Context="Author">',
     `    <Exec><Command>${xml2(d.nodePath)}</Command><Arguments>${xml2(args)}</Arguments></Exec>`,
     "  </Actions>",
@@ -409,9 +411,11 @@ function assertSupported3() {
 }
 function install3(d) {
   const file = join4(tmpdir2(), `${d.slug}.task.xml`);
+  const name = label3(d.fqdn);
   writeFileSync3(file, "\uFEFF" + buildTaskXml(d), { encoding: "utf16le" });
-  execFileSync3("schtasks", ["/Create", "/TN", label3(d.fqdn), "/XML", file, "/F"], { stdio: "inherit" });
-  schtasks(["/Run", "/TN", label3(d.fqdn)]);
+  schtasks(["/End", "/TN", name]);
+  execFileSync3("schtasks", ["/Create", "/TN", name, "/XML", file, "/F"], { stdio: "inherit" });
+  schtasks(["/Run", "/TN", name]);
 }
 function uninstall3(fqdn) {
   schtasks(["/Delete", "/TN", label3(fqdn), "/F"]);
@@ -941,6 +945,103 @@ function extractTgz(bytes) {
   });
 }
 
+// src/cloudflare/tunnels.ts
+var MANAGED_TUNNEL_PREFIX = "ct-";
+function isManagedTunnel(tunnel) {
+  return tunnel.name.startsWith(MANAGED_TUNNEL_PREFIX);
+}
+async function createTunnel(cf, name) {
+  const env = await cfRequest(cf.token, "POST", `/accounts/${cf.accountId}/cfd_tunnel`, {
+    name,
+    config_src: "cloudflare"
+  });
+  return env.result;
+}
+function listTunnels(cf) {
+  return cfPaginate(cf.token, `/accounts/${cf.accountId}/cfd_tunnel?is_deleted=false`);
+}
+async function getTunnel(cf, id) {
+  return (await cfRequest(cf.token, "GET", `/accounts/${cf.accountId}/cfd_tunnel/${id}`)).result;
+}
+async function deleteTunnel(cf, id) {
+  await cfRequest(cf.token, "DELETE", `/accounts/${cf.accountId}/cfd_tunnel/${id}`);
+}
+async function cleanupConnections(cf, id) {
+  await cfRequest(cf.token, "DELETE", `/accounts/${cf.accountId}/cfd_tunnel/${id}/connections`);
+}
+async function deleteTunnelWithConnections(cf, id) {
+  try {
+    await deleteTunnel(cf, id);
+  } catch (err) {
+    if (err instanceof CliError && /active connections/i.test(err.message)) {
+      await cleanupConnections(cf, id);
+      await deleteTunnel(cf, id);
+    } else {
+      throw err;
+    }
+  }
+}
+async function getTunnelToken(cf, id) {
+  return (await cfRequest(cf.token, "GET", `/accounts/${cf.accountId}/cfd_tunnel/${id}/token`)).result;
+}
+async function putIngress(cf, id, ingress) {
+  await cfRequest(cf.token, "PUT", `/accounts/${cf.accountId}/cfd_tunnel/${id}/configurations`, {
+    config: { ingress }
+  });
+}
+async function getConnections(cf, id) {
+  const env = await cfRequest(
+    cf.token,
+    "GET",
+    `/accounts/${cf.accountId}/cfd_tunnel/${id}/connections`
+  );
+  return env.result ?? [];
+}
+
+// src/connector/health.ts
+var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+async function waitHealthy(cf, tunnelId, opts = {}) {
+  const deadline = Date.now() + (opts.timeoutMs ?? 3e4);
+  while (Date.now() < deadline) {
+    if (opts.signal?.aborted) return "dead";
+    try {
+      const connections = await getConnections(cf, tunnelId);
+      if (connections.length > 0) return "healthy";
+    } catch {
+    }
+    await sleep(2e3);
+  }
+  return opts.signal?.aborted ? "dead" : "provisioning";
+}
+function extractMetricsPort(log) {
+  const matches = [...log.matchAll(/Starting metrics server on 127\.0\.0\.1:(\d+)\/metrics/g)];
+  if (!matches.length) return void 0;
+  const last = matches[matches.length - 1];
+  const port = Number(last?.[1]);
+  return Number.isInteger(port) && port > 0 && port <= 65535 ? port : void 0;
+}
+async function checkLocalReady(port, opts = {}) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? 2e3);
+  try {
+    const res = await fetch(`http://127.0.0.1:${port}/ready`, { signal: controller.signal });
+    if (!res.ok) return { healthy: false, readyConnections: 0, status: res.status };
+    const data = await res.json().catch(() => ({}));
+    const readyConnections = Number(data.readyConnections) || 0;
+    return { healthy: readyConnections > 0, readyConnections, status: res.status };
+  } catch {
+    return { healthy: false, readyConnections: 0 };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function probeEntryState(entry, gone) {
+  if (gone || entry.state !== "running" || !entry.pid) return "down";
+  if (!entry.metricsPort) return "up";
+  const ready = await checkLocalReady(entry.metricsPort, { timeoutMs: 300 });
+  return ready.healthy ? "up" : "reconnecting";
+}
+
 // src/core/up-runner.ts
 import { join as join7 } from "path";
 import { readFileSync as readFileSync6, existsSync as existsSync7 } from "fs";
@@ -1084,7 +1185,7 @@ async function reconcile() {
 }
 
 // src/connector/process.ts
-var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 function startConnector(opts) {
   const args = ["tunnel", "--metrics", "127.0.0.1:0", "run"];
   if (opts.protocol) args.push("--protocol", opts.protocol);
@@ -1116,7 +1217,7 @@ async function stopConnector(entry) {
   } catch {
     return false;
   }
-  await sleep(3e3);
+  await sleep2(3e3);
   if (await isOurConnector(entry)) {
     try {
       process.kill(pid, "SIGKILL");
@@ -1126,103 +1227,6 @@ async function stopConnector(entry) {
   return true;
 }
 
-// src/cloudflare/tunnels.ts
-var MANAGED_TUNNEL_PREFIX = "ct-";
-function isManagedTunnel(tunnel) {
-  return tunnel.name.startsWith(MANAGED_TUNNEL_PREFIX);
-}
-async function createTunnel(cf, name) {
-  const env = await cfRequest(cf.token, "POST", `/accounts/${cf.accountId}/cfd_tunnel`, {
-    name,
-    config_src: "cloudflare"
-  });
-  return env.result;
-}
-function listTunnels(cf) {
-  return cfPaginate(cf.token, `/accounts/${cf.accountId}/cfd_tunnel?is_deleted=false`);
-}
-async function getTunnel(cf, id) {
-  return (await cfRequest(cf.token, "GET", `/accounts/${cf.accountId}/cfd_tunnel/${id}`)).result;
-}
-async function deleteTunnel(cf, id) {
-  await cfRequest(cf.token, "DELETE", `/accounts/${cf.accountId}/cfd_tunnel/${id}`);
-}
-async function cleanupConnections(cf, id) {
-  await cfRequest(cf.token, "DELETE", `/accounts/${cf.accountId}/cfd_tunnel/${id}/connections`);
-}
-async function deleteTunnelWithConnections(cf, id) {
-  try {
-    await deleteTunnel(cf, id);
-  } catch (err) {
-    if (err instanceof CliError && /active connections/i.test(err.message)) {
-      await cleanupConnections(cf, id);
-      await deleteTunnel(cf, id);
-    } else {
-      throw err;
-    }
-  }
-}
-async function getTunnelToken(cf, id) {
-  return (await cfRequest(cf.token, "GET", `/accounts/${cf.accountId}/cfd_tunnel/${id}/token`)).result;
-}
-async function putIngress(cf, id, ingress) {
-  await cfRequest(cf.token, "PUT", `/accounts/${cf.accountId}/cfd_tunnel/${id}/configurations`, {
-    config: { ingress }
-  });
-}
-async function getConnections(cf, id) {
-  const env = await cfRequest(
-    cf.token,
-    "GET",
-    `/accounts/${cf.accountId}/cfd_tunnel/${id}/connections`
-  );
-  return env.result ?? [];
-}
-
-// src/connector/health.ts
-var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
-async function waitHealthy(cf, tunnelId, opts = {}) {
-  const deadline = Date.now() + (opts.timeoutMs ?? 3e4);
-  while (Date.now() < deadline) {
-    if (opts.signal?.aborted) return "dead";
-    try {
-      const connections = await getConnections(cf, tunnelId);
-      if (connections.length > 0) return "healthy";
-    } catch {
-    }
-    await sleep2(2e3);
-  }
-  return opts.signal?.aborted ? "dead" : "provisioning";
-}
-function extractMetricsPort(log) {
-  const matches = [...log.matchAll(/Starting metrics server on 127\.0\.0\.1:(\d+)\/metrics/g)];
-  if (!matches.length) return void 0;
-  const last = matches[matches.length - 1];
-  const port = Number(last?.[1]);
-  return Number.isInteger(port) && port > 0 && port <= 65535 ? port : void 0;
-}
-async function checkLocalReady(port, opts = {}) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? 2e3);
-  try {
-    const res = await fetch(`http://127.0.0.1:${port}/ready`, { signal: controller.signal });
-    if (!res.ok) return { healthy: false, readyConnections: 0, status: res.status };
-    const data = await res.json().catch(() => ({}));
-    const readyConnections = Number(data.readyConnections) || 0;
-    return { healthy: readyConnections > 0, readyConnections, status: res.status };
-  } catch {
-    return { healthy: false, readyConnections: 0 };
-  } finally {
-    clearTimeout(timer);
-  }
-}
-async function probeEntryState(entry, gone) {
-  if (gone || entry.state !== "running" || !entry.pid) return "down";
-  if (!entry.metricsPort) return "up";
-  const ready = await checkLocalReady(entry.metricsPort, { timeoutMs: 300 });
-  return ready.healthy ? "up" : "reconnecting";
-}
-
 // src/core/orchestrator-create.ts
 import { randomInt as randomInt2 } from "crypto";
 
@@ -1309,9 +1313,14 @@ async function createTunnelSubdomain(cf, opts) {
         throw new CliError("Cancelled.", { exitCode: 130 });
       }
     }
+    const prev = getEntry(host.hostname);
+    if (prev) await stopConnector(prev);
     for (const rec of existingList) {
       await releaseHostname(cf, zone.id, rec);
     }
+  } else {
+    const prev = getEntry(host.hostname);
+    if (prev) await stopConnector(prev);
   }
   await upsertEntry(host.hostname, {
     subdomain: host.subdomain,
@@ -1320,7 +1329,9 @@ async function createTunnelSubdomain(cf, opts) {
     port: opts.port,
     proto: opts.proto,
     host: opts.host,
-    state: "provisioning"
+    state: "provisioning",
+    pid: void 0,
+    metricsPort: void 0
   });
   let tunnelId;
   let dnsRecordId;
@@ -1857,7 +1868,7 @@ async function runUp(specArgs, opts) {
   }
   await startTunnels(cf, bin, items, { detach: opts.detach, protocol, keepAlive: opts.keepAlive });
 }
-var SERVICE_UP_TIMEOUT_MS = 2e4;
+var SERVICE_UP_TIMEOUT_MS = 3e4;
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function registerServices(cf, items, domain, proto, protocol) {
   assertServiceSupported();
@@ -1869,6 +1880,7 @@ async function registerServices(cf, items, domain, proto, protocol) {
   for (const item of items) {
     const subdomain = item.name;
     const fqdn = subdomain === "@" ? domain : `${subdomain}.${domain}`;
+    await patchEntry(fqdn, { state: "provisioning", pid: void 0, metricsPort: void 0 });
     installServiceForSpec({ subdomain, port: item.port, host: item.host, zone: domain, proto, protocol });
     fqdns.push(fqdn);
   }
@@ -1893,11 +1905,21 @@ async function waitServicesUp(fqdns, timeoutMs) {
   while (pending.size > 0) {
     for (const fqdn of [...pending]) {
       const entry = getEntry(fqdn);
-      if (entry?.state === "running" && entry.pid) pending.delete(fqdn);
+      if (entry?.state === "running" && entry.pid && await isOurConnector(entry)) {
+        if (!entry.metricsPort || (await checkLocalReady(entry.metricsPort, { timeoutMs: 500 })).healthy) {
+          pending.delete(fqdn);
+        }
+      }
     }
     if (pending.size === 0 || Date.now() >= deadline) break;
     await delay(500);
   }
+  for (const fqdn of [...pending]) {
+    const entry = getEntry(fqdn);
+    if (entry?.state === "running" && entry.pid && await isOurConnector(entry)) {
+      pending.delete(fqdn);
+    }
+  }
   return [...pending];
 }
 function registerUp(program) {