replica-bridge 0.3.14 → 0.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replica-bridge",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "description": "Lets the ChatReplica iPhone app use Codex on this computer through a relay, end-to-end encrypted.",
   "type": "module",
   "bin": {

package/src/bridge/board.js

@@ -87,8 +87,16 @@ export function boardPortFrom(env                    = process.env)         {
                                
                 
                        
+                                                                                                                
+                             
+                                                                                                                         
+                              
  
 
+/** Three missed heartbeats. */
+const DEFAULT_STREAM_IDLE_SECONDS = 45;
+const DEFAULT_STREAM_RETRY_SECONDS = 30;
+
                                             
 
 /** One subscriber and how far through the change log it has been told. */
@@ -128,10 +136,16 @@ export class BoardReader {
   /** The backend's push stream: open, unknown (try it), or not there (an older backend answers 404). */
           stream                         = null;
           streamSupported                 = null;
+  /** Not before this time (ms) after the backend refused a stream for a passing reason. */
+          streamRetryAt = 0;
+                   streamIdleMs        ;
+                   streamRetryMs        ;
 
   constructor(options               = {}) {
     this.port = options.port ?? boardPortFrom();
     this.pollMs = (options.pollSeconds ?? DEFAULT_POLL_SECONDS) * 1000;
+    this.streamIdleMs = (options.streamIdleSeconds ?? DEFAULT_STREAM_IDLE_SECONDS) * 1000;
+    this.streamRetryMs = (options.streamRetrySeconds ?? DEFAULT_STREAM_RETRY_SECONDS) * 1000;
   }
 
   /** How many phones are subscribed. */
@@ -197,6 +211,7 @@ export class BoardReader {
     this.stream?.abort();
     this.stream = null;
     this.streamSupported = null;
+    this.streamRetryAt = 0;
     this.end = null;
     this.up = null;
     this.polling = false;
@@ -237,7 +252,10 @@ export class BoardReader {
         cursor = next;
       }
     } catch {
-      sub.admitting = false; // the next read of the log tries again
+      sub.admitting = false;
+      // Try again shortly. Polling would admit it on its next read, but while the backend pushes nothing polls.
+      const retry = setTimeout(() => { if (round === this.round && this.subs.has(sub)) void this.admit(sub); }, this.pollMs);
+      retry.unref();
       return;
     }
     if (round !== this.round || !this.subs.has(sub)) return;
@@ -296,7 +314,7 @@ export class BoardReader {
     if (!up) return;
     if (items.length) this.deliver(items, end );
     for (const sub of this.subs) if (sub.cursor === null) void this.admit(sub);
-    if (this.streamSupported !== false) void this.openStream(round);
+    if (this.streamSupported !== false && Date.now() >= this.streamRetryAt) void this.openStream(round);
   }
 
   /**
@@ -307,21 +325,36 @@ export class BoardReader {
     if (this.stream || this.end === null) return;
     const controller = new AbortController();
     this.stream = controller;
+    // A backend that takes the connection and then says nothing must not hold the bridge: while a stream is open
+    // nothing polls, so silence would also hide the backend going away. Its heartbeat keeps this from firing.
+    let idle = setTimeout(() => controller.abort(), READ_TIMEOUT_MS);
+    idle.unref();
+    const heard = () => {
+      clearTimeout(idle);
+      idle = setTimeout(() => controller.abort(), this.streamIdleMs);
+      idle.unref();
+    };
     let response          ;
     try {
       response = await this.fetch(`/v1/changes/stream?after=${this.end}`, undefined, controller.signal);
     } catch {
+      clearTimeout(idle);
       if (this.stream === controller) this.stream = null;
       return;
     }
-    if (round !== this.round || this.stream !== controller) { controller.abort(); return; }
-    if (!response.ok || !(response.headers.get("content-type") ?? "").startsWith("text/event-stream") || !response.body) {
-      this.streamSupported = false;
+    if (round !== this.round || this.stream !== controller) { clearTimeout(idle); controller.abort(); return; }
+    const eventStream = (response.headers.get("content-type") ?? "").startsWith("text/event-stream");
+    if (!response.ok || !eventStream || !response.body) {
+      clearTimeout(idle);
+      // Only an older backend lacks it (404, or a 200 that is not an event stream); busy (429) or starting (5xx) passes.
+      if (response.status === 404 || (response.ok && !eventStream)) this.streamSupported = false;
+      else this.streamRetryAt = Date.now() + this.streamRetryMs;
       this.stream = null;
       controller.abort();
       return;
     }
     this.streamSupported = true;
+    heard();
     let buffer = "", pending                = [], flush                        = null;
     const send = () => {
       flush = null;
@@ -335,6 +368,7 @@ export class BoardReader {
     try {
       const decoder = new TextDecoder();
       for await (const chunk of response.body                                        ) {
+        heard();
         buffer += decoder.decode(chunk, { stream: true });
         let split        ;
         while ((split = buffer.search(/\r?\n\r?\n/)) >= 0) {
@@ -351,6 +385,7 @@ export class BoardReader {
         }
       }
     } catch { /* aborted, or the backend went away */ }
+    clearTimeout(idle);
     if (flush) { clearTimeout(flush); send(); }
     if (this.stream === controller) this.stream = null;
   }