cyrus-cloudflare-tunnel-client 0.2.73 → 0.2.75

package/dist/CloudflareTunnelClient.d.ts

@@ -1,29 +1,87 @@
 import { EventEmitter } from "node:events";
-import type { CloudflareTunnelClientEvents } from "./types.js";
+import { Tunnel } from "cloudflared";
+import type { CloudflareTunnelClientEvents, CloudflareTunnelRecoveryOptions } from "./types.js";
 export declare interface CloudflareTunnelClient {
     on<K extends keyof CloudflareTunnelClientEvents>(event: K, listener: CloudflareTunnelClientEvents[K]): this;
     emit<K extends keyof CloudflareTunnelClientEvents>(event: K, ...args: Parameters<CloudflareTunnelClientEvents[K]>): boolean;
 }
+/**
+ * Default recovery policy for a cloudflared child that exits after it had
+ * connected. Delays double from 1s up to a 60s cap; after 10 consecutive
+ * failed restarts the client stops retrying and stays disconnected.
+ */
+export declare const DEFAULT_TUNNEL_RECOVERY_OPTIONS: Required<CloudflareTunnelRecoveryOptions>;
+export interface CloudflareTunnelClientOptions extends CloudflareTunnelRecoveryOptions {
+    /** Creates the cloudflared Tunnel (defaults to Tunnel.withToken); test seam */
+    createTunnel?: (token: string) => Tunnel;
+}
 /**
  * Cloudflare tunnel client for establishing tunnels to local services
  * Handles ONLY tunnel establishment - HTTP handling is done by SharedApplicationServer
+ *
+ * The client is the single owner of the cloudflared child process. If a child
+ * that had connected exits unexpectedly while the client is still running, the
+ * client respawns it with bounded exponential backoff, never before the
+ * previous child's exit is confirmed. Startup failures and deliberate
+ * disconnects never trigger a respawn.
+ *
+ * Reentrancy: every state transition completes before any event is emitted,
+ * and nothing that could start work runs after an emit unless the client is
+ * still current, so listeners may call disconnect() from any event.
  */
 export declare class CloudflareTunnelClient extends EventEmitter {
-    private tunnelProcess;
+    /** The owned child; held until its exit is confirmed (or it never spawned) */
+    private tunnel;
+    /** Incremented per spawned child and on loss/disconnect; fences stale callbacks */
+    private generation;
+    /** The single pending timer: connect timeout, kill wait, or restart backoff */
+    private timer;
+    /** A lost child was killed; the restart waits for its exit */
+    private awaitingExit;
+    private pendingRestartDelay;
+    private state;
+    private startup;
+    private restartAttempts;
+    private connectedAt;
     private tunnelUrl;
     private connected;
     private connectionCount;
     private cloudflareToken;
     private localPort;
-    constructor(cloudflareToken: string, localPort: number, onReady?: (tunnelUrl: string) => void);
+    private options;
+    private createTunnel;
+    constructor(cloudflareToken: string, localPort: number, onReady?: (tunnelUrl: string) => void, options?: CloudflareTunnelClientOptions);
     /**
-     * Start the Cloudflare tunnel
+     * Start the Cloudflare tunnel. Resolves once the first connection is
+     * established; rejects if the child exits, fails to spawn, the connect
+     * timeout elapses, or disconnect() is called first. Can only be called once.
      */
     startTunnel(): Promise<void>;
     /**
-     * Wait for tunnel URL to be available
+     * Spawn a cloudflared child owned by this client and arm its connect
+     * timeout. Throws (owning nothing) if the tunnel cannot be created.
+     */
+    private spawnChild;
+    /** First connection of the current child: update state and settle startup */
+    private markConnected;
+    /**
+     * The current child is gone (exited, failed to spawn, or timed out before
+     * connecting). During startup this fails startTunnel(); afterwards it
+     * schedules a bounded restart once the child's exit is confirmed.
+     */
+    private handleChildLoss;
+    /** An owned child has actually exited (or never spawned) */
+    private releaseChild;
+    private scheduleRestart;
+    private handleKillWaitTimeout;
+    private setTimer;
+    private clearTimer;
+    /**
+     * Kill the owned child (if still alive) and release it. Only used when no
+     * further child will be spawned. Failed children are killed immediately;
+     * deliberate shutdowns get a graceful SIGINT first.
      */
-    private waitForTunnelToConnect;
+    private stopChild;
     /**
      * Get the tunnel URL
      */
@@ -33,7 +91,9 @@ export declare class CloudflareTunnelClient extends EventEmitter {
      */
     isConnected(): boolean;
     /**
-     * Disconnect and cleanup
+     * Disconnect and cleanup. Cancels any pending restart or startup and kills
+     * the owned child; the client will not respawn afterwards. Safe to call
+     * from any event listener.
      */
     disconnect(): void;
 }

package/dist/CloudflareTunnelClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareTunnelClient.d.ts","sourceRoot":"","sources":["../src/CloudflareTunnelClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAE/D,MAAM,CAAC,OAAO,WAAW,sBAAsB;IAC9C,EAAE,CAAC,CAAC,SAAS,MAAM,4BAA4B,EAC9C,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,4BAA4B,CAAC,CAAC,CAAC,GACvC,IAAI,CAAC;IACR,IAAI,CAAC,CAAC,SAAS,MAAM,4BAA4B,EAChD,KAAK,EAAE,CAAC,EACR,GAAG,IAAI,EAAE,UAAU,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC;CACX;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,YAAY;IACvD,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,SAAS,CAAS;IAE1B,YACC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EAUrC;IAED;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA8DjC;IAED;;OAEG;YACW,sBAAsB;IAYpC;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED;;OAEG;IACH,WAAW,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,UAAU,IAAI,IAAI,CASjB;CACD"}
+{"version":3,"file":"CloudflareTunnelClient.d.ts","sourceRoot":"","sources":["../src/CloudflareTunnelClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAgB,MAAM,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EACX,4BAA4B,EAC5B,+BAA+B,EAC/B,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,OAAO,WAAW,sBAAsB;IAC9C,EAAE,CAAC,CAAC,SAAS,MAAM,4BAA4B,EAC9C,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,4BAA4B,CAAC,CAAC,CAAC,GACvC,IAAI,CAAC;IACR,IAAI,CAAC,CAAC,SAAS,MAAM,4BAA4B,EAChD,KAAK,EAAE,CAAC,EACR,GAAG,IAAI,EAAE,UAAU,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC;CACX;AAED;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,+BAA+B,CAgBpF,CAAC;AAEH,MAAM,WAAW,6BAChB,SAAQ,+BAA+B;IACvC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACzC;AAeD;;;;;;;;;;;;;GAaG;AACH,qBAAa,sBAAuB,SAAQ,YAAY;IACvD,8EAA8E;IAC9E,OAAO,CAAC,MAAM,CAAuB;IACrC,mFAAmF;IACnF,OAAO,CAAC,UAAU,CAAK;IACvB,+EAA+E;IAC/E,OAAO,CAAC,KAAK,CAA+B;IAC5C,8DAA8D;IAC9D,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,OAAO,CAGC;IAChB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,YAAY,CAA4B;IAEhD,YACC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EACrC,OAAO,GAAE,6BAAkC,EAc3C;IAED;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAuCjC;IAED;;;OAGG;IACH,OAAO,CAAC,UAAU;IAgFlB,6EAA6E;IAC7E,OAAO,CAAC,aAAa;IAkBrB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAgEvB,4DAA4D;IAC5D,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,UAAU;IAOlB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAoBjB;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED;;OAEG;IACH,WAAW,IAAI,OAAO,CAErB;IAED;;;;OAIG;IACH,UAAU,IAAI,IAAI,CAiBjB;CACD"}

package/dist/CloudflareTunnelClient.js

@@ -1,93 +1,322 @@
 import { EventEmitter } from "node:events";
 import { existsSync } from "node:fs";
 import { bin, install, Tunnel } from "cloudflared";
+/**
+ * Default recovery policy for a cloudflared child that exits after it had
+ * connected. Delays double from 1s up to a 60s cap; after 10 consecutive
+ * failed restarts the client stops retrying and stays disconnected.
+ */
+export const DEFAULT_TUNNEL_RECOVERY_OPTIONS = {
+    // 120s: slow DNS resolvers (e.g. dead IPv6 nameservers ahead of the
+    // working one) can delay the first connection past 30s
+    connectTimeoutMs: 120000,
+    initialRestartDelayMs: 1000,
+    maxRestartDelayMs: 60000,
+    maxRestartAttempts: 10,
+    // A child that stayed connected this long counts as healthy, so its exit
+    // starts a fresh retry budget instead of continuing the previous one
+    stableConnectionMs: 60000,
+    // Grace period after SIGINT before SIGKILL on deliberate shutdown
+    killGraceMs: 5000,
+    // Max wait for a killed child to exit before a restart; if its exit is
+    // never confirmed, recovery stops rather than run a second child
+    killWaitMs: 10000,
+};
+const isAlive = (tunnel) => tunnel.process.pid !== undefined &&
+    tunnel.process.exitCode === null &&
+    tunnel.process.signalCode === null;
 /**
  * Cloudflare tunnel client for establishing tunnels to local services
  * Handles ONLY tunnel establishment - HTTP handling is done by SharedApplicationServer
+ *
+ * The client is the single owner of the cloudflared child process. If a child
+ * that had connected exits unexpectedly while the client is still running, the
+ * client respawns it with bounded exponential backoff, never before the
+ * previous child's exit is confirmed. Startup failures and deliberate
+ * disconnects never trigger a respawn.
+ *
+ * Reentrancy: every state transition completes before any event is emitted,
+ * and nothing that could start work runs after an emit unless the client is
+ * still current, so listeners may call disconnect() from any event.
  */
 export class CloudflareTunnelClient extends EventEmitter {
-    tunnelProcess = null;
+    /** The owned child; held until its exit is confirmed (or it never spawned) */
+    tunnel = null;
+    /** Incremented per spawned child and on loss/disconnect; fences stale callbacks */
+    generation = 0;
+    /** The single pending timer: connect timeout, kill wait, or restart backoff */
+    timer = null;
+    /** A lost child was killed; the restart waits for its exit */
+    awaitingExit = false;
+    pendingRestartDelay = 0;
+    state = "idle";
+    startup = null;
+    restartAttempts = 0;
+    connectedAt = 0;
     tunnelUrl = null;
     connected = false;
     connectionCount = 0;
     cloudflareToken;
     localPort;
-    constructor(cloudflareToken, localPort, onReady) {
+    options;
+    createTunnel;
+    constructor(cloudflareToken, localPort, onReady, options = {}) {
         super();
         this.cloudflareToken = cloudflareToken;
         this.localPort = localPort;
+        const { createTunnel, ...recovery } = options;
+        this.options = { ...DEFAULT_TUNNEL_RECOVERY_OPTIONS, ...recovery };
+        // Create tunnel with token-based authentication (no URL needed for remotely-managed tunnels)
+        this.createTunnel = createTunnel ?? ((token) => Tunnel.withToken(token));
         // Set up onReady callback if provided
         if (onReady) {
             this.on("ready", onReady);
         }
     }
     /**
-     * Start the Cloudflare tunnel
+     * Start the Cloudflare tunnel. Resolves once the first connection is
+     * established; rejects if the child exits, fails to spawn, the connect
+     * timeout elapses, or disconnect() is called first. Can only be called once.
      */
     async startTunnel() {
+        if (this.state !== "idle") {
+            throw new Error(`Cloudflare tunnel already started (state: ${this.state})`);
+        }
+        this.state = "starting";
         try {
             // Ensure cloudflared binary is installed
             if (!existsSync(bin)) {
                 await install(bin);
             }
+            if (this.state !== "starting") {
+                throw new Error("Cloudflare tunnel disconnected during startup");
+            }
             console.log(`Starting tunnel to localhost:${this.localPort}`);
-            // Create tunnel with token-based authentication (no URL needed for remotely-managed tunnels)
-            const tunnel = Tunnel.withToken(this.cloudflareToken);
-            // Listen for URL event (from ConfigHandler for token-based tunnels)
-            tunnel.on("url", (url) => {
-                // Ensure URL has protocol for token-based tunnels
-                if (!url.startsWith("http")) {
-                    url = `https://${url}`;
-                }
-                if (!this.tunnelUrl) {
-                    this.tunnelUrl = url;
-                    this.emit("ready", this.tunnelUrl);
-                }
-            });
-            // Listen for connection event (Cloudflare establishes 4 connections per tunnel)
-            tunnel.on("connected", (connection) => {
-                this.connectionCount++;
-                console.log(`Cloudflare tunnel connection ${this.connectionCount}/4 established:`, connection);
-                // Emit 'connected' event for each connection (for external listeners)
-                this.emit("connected", connection);
-                // Mark as connected on first connection, but log all 4
-                if (!this.connected) {
-                    this.connected = true;
-                    this.emit("connect");
-                }
+            await new Promise((resolve, reject) => {
+                this.startup = { resolve, reject };
+                this.spawnChild();
             });
-            // Listen for error event
-            tunnel.on("error", (error) => {
-                this.emit("error", error);
-            });
-            // Listen for exit event
-            tunnel.on("exit", (code) => {
-                this.connected = false;
-                this.connectionCount = 0; // Reset count on disconnect for fresh reconnection logs
-                this.emit("disconnect", `Tunnel process exited with code ${code}`);
-            });
-            // Wait for tunnel URL to be available (with timeout)
-            // 120s: slow DNS resolvers (e.g. dead IPv6 nameservers ahead of the
-            // working one) can delay the first connection past 30s
-            await this.waitForTunnelToConnect(120000);
         }
         catch (error) {
-            this.emit("error", error);
+            this.startup = null;
+            // Re-read state: disconnect() or a child loss may have changed it
+            const state = this.state;
+            if (state === "starting") {
+                this.state = "failed";
+                this.generation++;
+                this.clearTimer();
+                this.stopChild(true);
+            }
+            // A deliberate disconnect during startup is not an error condition
+            if (state !== "stopped") {
+                this.emit("error", error);
+            }
             throw error;
         }
     }
     /**
-     * Wait for tunnel URL to be available
+     * Spawn a cloudflared child owned by this client and arm its connect
+     * timeout. Throws (owning nothing) if the tunnel cannot be created.
+     */
+    spawnChild() {
+        const generation = ++this.generation;
+        const isCurrent = () => generation === this.generation &&
+            (this.state === "starting" ||
+                this.state === "recovering" ||
+                this.state === "running");
+        this.connectionCount = 0;
+        const tunnel = this.createTunnel(this.cloudflareToken);
+        this.tunnel = tunnel;
+        // Ownership release is not generation-gated: a killed child stays owned
+        // until it has actually exited
+        tunnel.on("exit", () => this.releaseChild(tunnel));
+        // Listen for exit event
+        tunnel.on("exit", (code, signal) => {
+            if (!isCurrent())
+                return;
+            this.handleChildLoss(`Tunnel process exited with code ${code}${signal ? ` (signal ${signal})` : ""}`);
+        });
+        // Listen for error event. Errors are informational unless the child
+        // never spawned (no pid), in which case no 'exit' will follow.
+        tunnel.on("error", (error) => {
+            const neverSpawned = tunnel.process.pid === undefined;
+            if (neverSpawned)
+                this.releaseChild(tunnel);
+            if (generation !== this.generation)
+                return;
+            if (neverSpawned && isCurrent()) {
+                this.handleChildLoss(`Tunnel process failed to start: ${error.message}`);
+            }
+            this.emit("error", error);
+        });
+        // Listen for URL event (from ConfigHandler for token-based tunnels)
+        tunnel.on("url", (url) => {
+            if (!isCurrent())
+                return;
+            // Ensure URL has protocol for token-based tunnels
+            if (!url.startsWith("http")) {
+                url = `https://${url}`;
+            }
+            if (!this.tunnelUrl) {
+                this.tunnelUrl = url;
+                this.emit("ready", this.tunnelUrl);
+            }
+        });
+        // Listen for connection event (Cloudflare establishes 4 connections per tunnel)
+        tunnel.on("connected", (connection) => {
+            if (!isCurrent())
+                return;
+            this.connectionCount++;
+            console.log(`Cloudflare tunnel connection ${this.connectionCount}/4 established:`, connection);
+            // Mark as connected on first connection, but log all 4
+            const first = !this.connected;
+            if (first) {
+                this.markConnected();
+            }
+            // Emit 'connected' event for each connection (for external listeners)
+            this.emit("connected", connection);
+            if (first && isCurrent()) {
+                this.emit("connect");
+            }
+        });
+        this.setTimer(() => {
+            this.handleChildLoss(`Timeout waiting for tunnel to connect after ${this.options.connectTimeoutMs}ms`);
+        }, this.options.connectTimeoutMs);
+    }
+    /** First connection of the current child: update state and settle startup */
+    markConnected() {
+        this.clearTimer();
+        this.connected = true;
+        this.connectedAt = Date.now();
+        const recovered = this.state === "recovering";
+        this.state = "running";
+        if (recovered) {
+            console.log(`Cloudflare tunnel recovered after ${this.restartAttempts} restart attempt(s)`);
+        }
+        const startup = this.startup;
+        this.startup = null;
+        startup?.resolve();
+    }
+    /**
+     * The current child is gone (exited, failed to spawn, or timed out before
+     * connecting). During startup this fails startTunnel(); afterwards it
+     * schedules a bounded restart once the child's exit is confirmed.
      */
-    async waitForTunnelToConnect(timeout) {
-        const startTime = Date.now();
-        while (!this.connected) {
-            if (Date.now() - startTime > timeout) {
-                throw new Error("Timeout waiting for tunnel URL");
+    handleChildLoss(reason) {
+        this.clearTimer();
+        // Fence any remaining callbacks from the lost child
+        this.generation++;
+        const wasConnected = this.connected;
+        this.connected = false;
+        this.connectionCount = 0; // Reset count on disconnect for fresh reconnection logs
+        if (this.state === "starting") {
+            this.state = "failed";
+            this.stopChild(true);
+            const startup = this.startup;
+            this.startup = null;
+            // startTunnel() reports this rejection as an 'error' event
+            startup?.reject(new Error(`Cloudflare tunnel failed to start: ${reason}`));
+            return;
+        }
+        if (wasConnected &&
+            Date.now() - this.connectedAt >= this.options.stableConnectionMs) {
+            this.restartAttempts = 0;
+        }
+        if (this.restartAttempts >= this.options.maxRestartAttempts) {
+            this.state = "failed";
+            this.stopChild(true);
+            const message = `Cloudflare tunnel recovery gave up after ${this.restartAttempts} consecutive failed restart attempts (${reason}); restart Cyrus to restore the tunnel`;
+            console.error(message);
+            if (wasConnected)
+                this.emit("disconnect", reason);
+            if (this.state === "failed")
+                this.emit("error", new Error(message));
+            return;
+        }
+        this.state = "recovering";
+        this.restartAttempts++;
+        this.pendingRestartDelay = Math.min(this.options.initialRestartDelayMs * 2 ** (this.restartAttempts - 1), this.options.maxRestartDelayMs);
+        const owned = this.tunnel;
+        if (owned && isAlive(owned)) {
+            // Never run two children: restart only after this one has exited
+            this.awaitingExit = true;
+            owned.process.kill("SIGKILL");
+            this.setTimer(() => this.handleKillWaitTimeout(owned), this.options.killWaitMs);
+        }
+        else {
+            this.tunnel = null;
+            this.scheduleRestart();
+        }
+        console.warn(`${reason}; restarting Cloudflare tunnel in ${this.pendingRestartDelay}ms (attempt ${this.restartAttempts}/${this.options.maxRestartAttempts})`);
+        if (wasConnected)
+            this.emit("disconnect", reason);
+    }
+    /** An owned child has actually exited (or never spawned) */
+    releaseChild(tunnel) {
+        if (this.tunnel !== tunnel)
+            return;
+        this.tunnel = null;
+        if (this.awaitingExit && this.state === "recovering") {
+            this.awaitingExit = false;
+            this.scheduleRestart();
+        }
+    }
+    scheduleRestart() {
+        this.setTimer(() => {
+            if (this.state !== "recovering" || this.tunnel)
+                return;
+            try {
+                this.spawnChild();
             }
-            await new Promise((resolve) => setTimeout(resolve, 100));
+            catch (error) {
+                this.handleChildLoss(`Tunnel process failed to spawn: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }, this.pendingRestartDelay);
+    }
+    handleKillWaitTimeout(tunnel) {
+        this.awaitingExit = false;
+        this.state = "failed";
+        const message = `Cloudflare tunnel recovery stopped: previous cloudflared process (pid ${tunnel.process.pid}) did not exit within ${this.options.killWaitMs}ms of SIGKILL; not starting another to avoid running two; restart Cyrus to restore the tunnel`;
+        console.error(message);
+        this.emit("error", new Error(message));
+    }
+    setTimer(callback, delay) {
+        this.clearTimer();
+        this.timer = setTimeout(() => {
+            this.timer = null;
+            callback();
+        }, delay);
+    }
+    clearTimer() {
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
         }
     }
+    /**
+     * Kill the owned child (if still alive) and release it. Only used when no
+     * further child will be spawned. Failed children are killed immediately;
+     * deliberate shutdowns get a graceful SIGINT first.
+     */
+    stopChild(force) {
+        const tunnel = this.tunnel;
+        this.tunnel = null;
+        if (!tunnel || !isAlive(tunnel))
+            return;
+        const child = tunnel.process;
+        if (force) {
+            child.kill("SIGKILL");
+            return;
+        }
+        tunnel.stop();
+        const escalation = setTimeout(() => {
+            if (isAlive(tunnel)) {
+                child.kill("SIGKILL");
+            }
+        }, this.options.killGraceMs);
+        escalation.unref();
+        child.once("exit", () => clearTimeout(escalation));
+    }
     /**
      * Get the tunnel URL
      */
@@ -101,16 +330,25 @@ export class CloudflareTunnelClient extends EventEmitter {
         return this.connected;
     }
     /**
-     * Disconnect and cleanup
+     * Disconnect and cleanup. Cancels any pending restart or startup and kills
+     * the owned child; the client will not respawn afterwards. Safe to call
+     * from any event listener.
      */
     disconnect() {
-        if (this.tunnelProcess) {
-            this.tunnelProcess.kill();
-            this.tunnelProcess = null;
-        }
+        const previousState = this.state;
+        this.state = "stopped";
+        this.generation++;
+        this.awaitingExit = false;
+        this.clearTimer();
+        this.stopChild(false);
         this.connected = false;
         this.connectionCount = 0; // Reset count on disconnect for fresh reconnection logs
-        this.emit("disconnect", "Client disconnected");
+        const startup = this.startup;
+        this.startup = null;
+        startup?.reject(new Error("Cloudflare tunnel disconnected during startup"));
+        if (previousState !== "stopped") {
+            this.emit("disconnect", "Client disconnected");
+        }
     }
 }
 //# sourceMappingURL=CloudflareTunnelClient.js.map

package/dist/CloudflareTunnelClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareTunnelClient.js","sourceRoot":"","sources":["../src/CloudflareTunnelClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CloudflareTunnelClient.js","sourceRoot":"","sources":["../src/CloudflareTunnelClient.ts"],"names":[],"mappings":"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"}

package/dist/ConfigApiClient.d.ts

@@ -16,6 +16,8 @@ export interface ConfigApiResponse {
     config?: {
         cloudflareToken: string;
         apiKey: string;
+        /** Optional hosted-managed listener port; absent preserves legacy behavior. */
+        serverPort?: number;
     };
     error?: string;
 }

package/dist/ConfigApiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigApiClient.d.ts","sourceRoot":"","sources":["../src/ConfigApiClient.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAE/D;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE;QACR,eAAe,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AAEH,qBAAa,eAAe;IAC3B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAI9B;;;;OAIG;IACH,OAAa,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyDlE;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAMnD;CACD"}
+{"version":3,"file":"ConfigApiClient.d.ts","sourceRoot":"","sources":["../src/ConfigApiClient.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAE/D;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE;QACR,eAAe,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC;QACf,+EAA+E;QAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AAEH,qBAAa,eAAe;IAC3B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAI9B;;;;OAIG;IACH,OAAa,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAiElE;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAWnD;CACD"}

package/dist/ConfigApiClient.js

@@ -40,7 +40,9 @@ export class ConfigApiClient {
             }
             // Call config API with auth key
             const url = `${ConfigApiClient.getConfigApiUrl()}?auth_key=${encodeURIComponent(authKey)}`;
-            const response = await fetch(url);
+            const response = await fetch(url, {
+                headers: { "X-Cyrus-Config-Capabilities": "self-host-port-v1" },
+            });
             if (!response.ok) {
                 const errorText = await response.text();
                 return {
@@ -63,6 +65,12 @@ export class ConfigApiClient {
                     error: "Config API response missing required fields",
                 };
             }
+            if (!ConfigApiClient.isValid(data)) {
+                return {
+                    success: false,
+                    error: "Config API response contains an invalid listener port",
+                };
+            }
             return data;
         }
         catch (error) {
@@ -84,7 +92,12 @@ export class ConfigApiClient {
     static isValid(response) {
         return (response.success &&
             !!response.config?.cloudflareToken &&
-            !!response.config?.apiKey);
+            !!response.config?.apiKey &&
+            (response.config.serverPort === undefined ||
+                (typeof response.config.serverPort === "number" &&
+                    Number.isInteger(response.config.serverPort) &&
+                    response.config.serverPort >= 1 &&
+                    response.config.serverPort <= 65535)));
     }
 }
 //# sourceMappingURL=ConfigApiClient.js.map

package/dist/ConfigApiClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigApiClient.js","sourceRoot":"","sources":["../src/ConfigApiClient.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE/D;;;GAGG;AACH,MAAM,UAAU,cAAc;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,qBAAqB,CAAC;AAC3D,CAAC;AAcD;;;GAGG;AACH,yGAAyG;AACzG,MAAM,OAAO,eAAe;IAC3B;;OAEG;IACK,MAAM,CAAC,eAAe;QAC7B,OAAO,GAAG,cAAc,EAAE,aAAa,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAe;QACrC,IAAI,CAAC;YACJ,oBAAoB;YACpB,IACC,CAAC,OAAO;gBACR,OAAO,OAAO,KAAK,QAAQ;gBAC3B,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAC1B,CAAC;gBACF,OAAO;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,sBAAsB;iBAC7B,CAAC;YACH,CAAC;YAED,gCAAgC;YAChC,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,eAAe,EAAE,aAAa,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;YAElC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACxC,OAAO;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,8BAA8B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,MAAM,SAAS,EAAE;iBAC5F,CAAC;YACH,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsB,CAAC;YAE1D,8BAA8B;YAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACnC,OAAO;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,yCAAyC;iBAC9D,CAAC;YACH,CAAC;YAED,2BAA2B;YAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACzD,OAAO;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,6CAA6C;iBACpD,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC5B,OAAO;oBACN,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,8BAA8B,KAAK,CAAC,OAAO,EAAE;iBACpD,CAAC;YACH,CAAC;YACD,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,0CAA0C;aACjD,CAAC;QACH,CAAC;IACF,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,QAA2B;QACzC,OAAO,CACN,QAAQ,CAAC,OAAO;YAChB,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe;YAClC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CACzB,CAAC;IACH,CAAC;CACD"}
+{"version":3,"file":"ConfigApiClient.js","sourceRoot":"","sources":["../src/ConfigApiClient.ts"],"names":[],"mappings":"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"}

package/dist/ConfigApiClient.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ConfigApiClient.test.d.ts.map

package/dist/ConfigApiClient.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConfigApiClient.test.d.ts","sourceRoot":"","sources":["../src/ConfigApiClient.test.ts"],"names":[],"mappings":""}

package/dist/ConfigApiClient.test.js

@@ -0,0 +1,42 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { ConfigApiClient } from "./ConfigApiClient.js";
+afterEach(() => vi.unstubAllGlobals());
+describe("hosted listener port contract", () => {
+    it.each([
+        undefined,
+        3456,
+        19119,
+        1,
+        65535,
+    ])("accepts compatible port %s", async (serverPort) => {
+        const response = {
+            success: true,
+            config: { cloudflareToken: "fixture", apiKey: "fixture", serverPort },
+        };
+        vi.stubGlobal("fetch", vi.fn().mockResolvedValue(Response.json(response)));
+        expect(ConfigApiClient.isValid(response)).toBe(true);
+        expect(await ConfigApiClient.getConfig("fixture-auth")).toEqual(response);
+        expect(fetch).toHaveBeenCalledWith(expect.any(String), {
+            headers: { "X-Cyrus-Config-Capabilities": "self-host-port-v1" },
+        });
+    });
+    it.each([
+        null,
+        0,
+        65536,
+        -1,
+        1.5,
+        "19119",
+        "19119\nOTHER=value",
+        {},
+    ])("rejects malformed port %s before auth writes", async (serverPort) => {
+        const response = {
+            success: true,
+            config: { cloudflareToken: "fixture", apiKey: "fixture", serverPort },
+        };
+        vi.stubGlobal("fetch", vi.fn().mockResolvedValue(Response.json(response)));
+        expect(ConfigApiClient.isValid(response)).toBe(false);
+        expect((await ConfigApiClient.getConfig("fixture-auth")).success).toBe(false);
+    });
+});
+//# sourceMappingURL=ConfigApiClient.test.js.map

package/dist/ConfigApiClient.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConfigApiClient.test.js","sourceRoot":"","sources":["../src/ConfigApiClient.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAEvC,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,IAAI,CAAC;QACP,SAAS;QACT,IAAI;QACJ,KAAK;QACL,CAAC;QACD,KAAK;KACL,CAAC,CAAC,4BAA4B,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE;SACrE,CAAC;QACF,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1E,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACtD,OAAO,EAAE,EAAE,6BAA6B,EAAE,mBAAmB,EAAE;SAC/D,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,IAAI,CAAC;QACP,IAAI;QACJ,CAAC;QACD,KAAK;QACL,CAAC,CAAC;QACF,GAAG;QACH,OAAO;QACP,oBAAoB;QACpB,EAAE;KACF,CAAC,CAAC,8CAA8C,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;QACvE,MAAM,QAAQ,GAAG;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE;SACrE,CAAC;QACF,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,QAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/D,MAAM,CAAC,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CACrE,KAAK,CACL,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { CloudflareTunnelClient } from "./CloudflareTunnelClient.js";
+export { CloudflareTunnelClient, type CloudflareTunnelClientOptions, } from "./CloudflareTunnelClient.js";
 export { ConfigApiClient, DEFAULT_CYRUS_APP_URL, getCyrusAppUrl, } from "./ConfigApiClient.js";
 export * from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EACN,eAAe,EACf,qBAAqB,EACrB,cAAc,GACd,MAAM,sBAAsB,CAAC;AAC9B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,sBAAsB,EACtB,KAAK,6BAA6B,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACN,eAAe,EACf,qBAAqB,EACrB,cAAc,GACd,MAAM,sBAAsB,CAAC;AAC9B,cAAc,YAAY,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-export { CloudflareTunnelClient } from "./CloudflareTunnelClient.js";
+export { CloudflareTunnelClient, } from "./CloudflareTunnelClient.js";
 export { ConfigApiClient, DEFAULT_CYRUS_APP_URL, getCyrusAppUrl, } from "./ConfigApiClient.js";
 export * from "./types.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EACN,eAAe,EACf,qBAAqB,EACrB,cAAc,GACd,MAAM,sBAAsB,CAAC;AAC9B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,sBAAsB,GAEtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACN,eAAe,EACf,qBAAqB,EACrB,cAAc,GACd,MAAM,sBAAsB,CAAC;AAC9B,cAAc,YAAY,CAAC"}

package/dist/types.d.ts

@@ -8,4 +8,23 @@ export interface CloudflareTunnelClientEvents {
     error: (error: Error) => void;
     ready: (tunnelUrl: string) => void;
 }
+/**
+ * Restart policy for a cloudflared child that exits after it had connected
+ */
+export interface CloudflareTunnelRecoveryOptions {
+    /** Max time for a spawned child to report its first connection */
+    connectTimeoutMs?: number;
+    /** Delay before the first restart attempt; doubles per consecutive failure */
+    initialRestartDelayMs?: number;
+    /** Upper bound for the restart delay */
+    maxRestartDelayMs?: number;
+    /** Consecutive failed restarts before giving up (client stays disconnected) */
+    maxRestartAttempts?: number;
+    /** Connected duration after which an exit starts a fresh retry budget */
+    stableConnectionMs?: number;
+    /** Grace period after SIGINT before SIGKILL on deliberate disconnect */
+    killGraceMs?: number;
+    /** Max wait for a killed child to exit before restarting; recovery stops if exceeded */
+    killWaitMs?: number;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC5C,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC5C,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC/C,kEAAkE;IAClE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wCAAwC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+EAA+E;IAC/E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yEAAyE;IACzE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wFAAwF;IACxF,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyrus-cloudflare-tunnel-client",
-  "version": "0.2.73",
+  "version": "0.2.75",
   "description": "Cloudflare tunnel client for receiving config updates and webhooks from cyrus-hosted",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@types/node": "^20.12.7",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "vitest": "^4.1.11"
+    "vitest": "^4.1.12"
   },
   "keywords": [
     "cloudflare",