forge-remote 0.1.21 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-remote",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Desktop relay for Forge Remote — monitor and control Claude Code sessions from your phone",
   "type": "module",
   "license": "UNLICENSED",

package/src/cli.js

@@ -140,7 +140,12 @@ program
     // Clean up any orphaned sessions from a previous relay run.
     await cleanupOrphanedSessions(desktopId);
 
-    const heartbeat = startHeartbeat(desktopId);
+    const heartbeat = startHeartbeat(desktopId, {
+      onConnectionLost: () => {
+        log.info("Re-establishing Firestore listeners...");
+        listenForCommands(desktopId);
+      },
+    });
 
     listenForCommands(desktopId);
 

package/src/desktop.js

@@ -54,17 +54,45 @@ export async function markOffline(desktopId) {
 
 /**
  * Start a heartbeat interval that updates lastHeartbeat every 30s.
+ * Also monitors Firestore connectivity — if heartbeats fail consecutively,
+ * it signals the relay to restart listeners.
  */
-export function startHeartbeat(desktopId) {
+export function startHeartbeat(desktopId, { onConnectionLost } = {}) {
+  let consecutiveFailures = 0;
+  const MAX_FAILURES = 5; // ~2.5 minutes of failures before action
+
   const interval = setInterval(async () => {
     try {
       const db = getDb();
-      await db.collection("desktops").doc(desktopId).update({
+
+      // Use a timeout to detect hung Firestore connections (e.g., stale TCP).
+      const heartbeatPromise = db.collection("desktops").doc(desktopId).update({
         lastHeartbeat: FieldValue.serverTimestamp(),
       });
+      const timeoutPromise = new Promise((_, reject) =>
+        setTimeout(
+          () => reject(new Error("Heartbeat timed out (15s)")),
+          15_000,
+        ),
+      );
+      await Promise.race([heartbeatPromise, timeoutPromise]);
+
+      if (consecutiveFailures > 0) {
+        log.info(`Heartbeat recovered after ${consecutiveFailures} failure(s)`);
+      }
+      consecutiveFailures = 0;
       log.heartbeat();
     } catch (e) {
-      log.error(`Heartbeat failed: ${e.message}`);
+      consecutiveFailures++;
+      log.error(
+        `Heartbeat failed (${consecutiveFailures}/${MAX_FAILURES}): ${e.message}`,
+      );
+
+      if (consecutiveFailures >= MAX_FAILURES && onConnectionLost) {
+        log.error("Firestore connection appears dead — triggering reconnect");
+        consecutiveFailures = 0; // Reset so it doesn't fire again immediately.
+        onConnectionLost();
+      }
     }
   }, 30_000);
 

package/src/session-manager.js

@@ -224,11 +224,26 @@ function isRateLimited() {
 // Command listeners
 // ---------------------------------------------------------------------------
 
+// Track active listener unsubscribe functions so we can tear them down
+// before re-subscribing (e.g., after a Firestore reconnect).
+let activeListenerUnsubs = [];
+
 export function listenForCommands(desktopId) {
+  // Clean up previous listeners to avoid duplicate command handling.
+  for (const unsub of activeListenerUnsubs) {
+    try {
+      unsub();
+    } catch {
+      /* already dead */
+    }
+  }
+  activeListenerUnsubs = [];
+
   const db = getDb();
 
   // Desktop-level commands (start_session, etc.).
-  db.collection("desktops")
+  const unsub1 = db
+    .collection("desktops")
     .doc(desktopId)
     .collection("commands")
     .where("status", "==", "pending")
@@ -239,15 +254,18 @@ export function listenForCommands(desktopId) {
         }
       }
     });
+  activeListenerUnsubs.push(unsub1);
 
   // Watch for existing sessions → subscribe to their commands.
-  db.collection("sessions")
+  const unsub2 = db
+    .collection("sessions")
     .where("desktopId", "==", desktopId)
     .onSnapshot((snap) => {
       for (const doc of snap.docs) {
         watchSessionCommands(doc.id);
       }
     });
+  activeListenerUnsubs.push(unsub2);
 }
 
 // ---------------------------------------------------------------------------