voicecc 1.1.14 → 1.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "voicecc",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "description": "Voice mode plugin for Claude Code -- hands-free interaction via ElevenLabs STT/TTS and VAD",
   "type": "module",
   "bin": {

package/server/services/tunnel.ts

@@ -6,6 +6,8 @@
  *
  * Responsibilities:
  * - Start a quick tunnel on a given port and capture the public HTTPS URL
+ * - Auto-restart the tunnel on unexpected crashes (up to MAX_RESTART_ATTEMPTS)
+ * - Log connection-level events (connected/disconnected) for observability
  * - Stop the tunnel and clear state
  * - Expose tunnel state (URL, running status, start time)
  */
@@ -18,7 +20,13 @@ import { writeEnvKey } from "./env.js";
 // ============================================================================
 
 /** Timeout for waiting for the tunnel URL to appear */
-const TUNNEL_URL_TIMEOUT_MS = 30000;
+const TUNNEL_URL_TIMEOUT_MS = 15_000;
+
+/** Maximum number of automatic restart attempts after an unexpected crash */
+const MAX_RESTART_ATTEMPTS = 5;
+
+/** Delay before attempting a restart (ms) */
+const RESTART_DELAY_MS = 3_000;
 
 // ============================================================================
 // STATE
@@ -33,6 +41,15 @@ let tunnelUrl: string | null = null;
 /** Timestamp when tunnel URL was obtained */
 let tunnelStartedAt: number | null = null;
 
+/** Port used for the current tunnel (needed for auto-restart) */
+let tunnelPort: number | null = null;
+
+/** Number of consecutive restart attempts since last successful start */
+let restartAttempts = 0;
+
+/** Whether the tunnel was intentionally stopped (skip auto-restart) */
+let manuallyStopped = false;
+
 // ============================================================================
 // MAIN HANDLERS
 // ============================================================================
@@ -50,6 +67,70 @@ export async function startTunnel(port: number): Promise<string> {
     throw new Error("Tunnel is already running");
   }
 
+  manuallyStopped = false;
+  tunnelPort = port;
+
+  const url = await createTunnel(port);
+
+  // Reset restart counter on successful start
+  restartAttempts = 0;
+
+  tunnelUrl = url;
+  tunnelStartedAt = Date.now();
+  await writeEnvKey("TWILIO_WEBHOOK_URL", url);
+  console.log(`Tunnel URL: ${url}`);
+  return url;
+}
+
+/**
+ * Stop the tunnel and clear state. Prevents auto-restart.
+ */
+export function stopTunnel(): void {
+  manuallyStopped = true;
+  if (activeTunnel) {
+    activeTunnel.stop();
+  }
+  clearTunnelState();
+}
+
+/**
+ * Return the current public tunnel URL, or null if not running.
+ *
+ * @returns The public HTTPS URL or null
+ */
+export function getTunnelUrl(): string | null {
+  return tunnelUrl;
+}
+
+/**
+ * Return the timestamp when the tunnel URL was obtained, or null.
+ *
+ * @returns Unix ms timestamp or null
+ */
+export function getTunnelStartedAt(): number | null {
+  return tunnelStartedAt;
+}
+
+/**
+ * Check whether the tunnel process is currently alive.
+ *
+ * @returns True if tunnel is running
+ */
+export function isTunnelRunning(): boolean {
+  return activeTunnel !== null;
+}
+
+// ============================================================================
+// HELPER FUNCTIONS
+// ============================================================================
+
+/**
+ * Create a new tunnel instance, wait for its URL, and attach event handlers.
+ *
+ * @param port - Local port to tunnel
+ * @returns The public HTTPS URL
+ */
+async function createTunnel(port: number): Promise<string> {
   const tunnel = Tunnel.quick(`http://localhost:${port}`);
   activeTunnel = tunnel;
 
@@ -61,15 +142,24 @@ export async function startTunnel(port: number): Promise<string> {
     console.log(`[cloudflared] ${data.trim()}`);
   });
 
+  // Log connection-level events for observability
+  tunnel.on("connected", (conn: { id: string; ip: string; location: string }) => {
+    console.log(`[cloudflared] Connected: ${conn.location} (${conn.ip})`);
+  });
+  tunnel.on("disconnected", (conn: { id: string; ip: string; location: string }) => {
+    console.log(`[cloudflared] Disconnected: ${conn.location} (${conn.ip})`);
+  });
+
+  // Wait for the tunnel URL or fail
   const url = await new Promise<string>((resolve, reject) => {
     const timeout = setTimeout(() => {
       activeTunnel = null;
-      reject(new Error("Timed out waiting for tunnel URL (30s)"));
+      reject(new Error("Timed out waiting for tunnel URL (15s)"));
     }, TUNNEL_URL_TIMEOUT_MS);
 
-    tunnel.once("url", (url: string) => {
+    tunnel.once("url", (emittedUrl: string) => {
       clearTimeout(timeout);
-      resolve(url);
+      resolve(emittedUrl);
     });
 
     tunnel.once("error", (err: Error) => {
@@ -85,54 +175,64 @@ export async function startTunnel(port: number): Promise<string> {
     });
   });
 
+  // After successful start, handle unexpected exit with auto-restart
   tunnel.on("exit", () => {
-    console.log("cloudflared exited");
-    activeTunnel = null;
-    tunnelUrl = null;
+    console.log("cloudflared exited unexpectedly");
+    clearTunnelState();
+    scheduleRestart();
   });
 
-  tunnelUrl = url;
-  tunnelStartedAt = Date.now();
-  await writeEnvKey("TWILIO_WEBHOOK_URL", url);
-  console.log(`Tunnel URL: ${url}`);
   return url;
 }
 
 /**
- * Stop the tunnel and clear state.
+ * Clear all tunnel state variables.
  */
-export function stopTunnel(): void {
-  if (activeTunnel) {
-    activeTunnel.stop();
-  }
+function clearTunnelState(): void {
   activeTunnel = null;
   tunnelUrl = null;
   tunnelStartedAt = null;
 }
 
 /**
- * Return the current public tunnel URL, or null if not running.
- *
- * @returns The public HTTPS URL or null
+ * Schedule an automatic restart if the tunnel crashed unexpectedly.
+ * Skips restart if the tunnel was manually stopped or max attempts exceeded.
  */
-export function getTunnelUrl(): string | null {
-  return tunnelUrl;
-}
+function scheduleRestart(): void {
+  if (manuallyStopped) {
+    return;
+  }
 
-/**
- * Return the timestamp when the tunnel URL was obtained, or null.
- *
- * @returns Unix ms timestamp or null
- */
-export function getTunnelStartedAt(): number | null {
-  return tunnelStartedAt;
-}
+  if (tunnelPort === null) {
+    console.error("[tunnel] Cannot restart: no port configured");
+    return;
+  }
 
-/**
- * Check whether the tunnel process is currently alive.
- *
- * @returns True if tunnel is running
- */
-export function isTunnelRunning(): boolean {
-  return activeTunnel !== null;
+  restartAttempts++;
+
+  if (restartAttempts > MAX_RESTART_ATTEMPTS) {
+    console.error(`[tunnel] Giving up after ${MAX_RESTART_ATTEMPTS} restart attempts`);
+    return;
+  }
+
+  const port = tunnelPort;
+  console.log(`[tunnel] Restarting in ${RESTART_DELAY_MS / 1000}s (attempt ${restartAttempts}/${MAX_RESTART_ATTEMPTS})...`);
+
+  setTimeout(async () => {
+    if (manuallyStopped || activeTunnel) {
+      return;
+    }
+
+    try {
+      const url = await createTunnel(port);
+      restartAttempts = 0;
+      tunnelUrl = url;
+      tunnelStartedAt = Date.now();
+      await writeEnvKey("TWILIO_WEBHOOK_URL", url);
+      console.log(`[tunnel] Restarted successfully: ${url}`);
+    } catch (err) {
+      console.error(`[tunnel] Restart failed: ${err}`);
+      scheduleRestart();
+    }
+  }, RESTART_DELAY_MS);
 }