@fairfox/polly 0.64.0 → 0.66.0

package/dist/src/mesh.js

@@ -2364,7 +2364,9 @@ function serialiseSlotView(slot) {
       selectedCandidatePair: slot.transport.selectedCandidatePair ? { ...slot.transport.selectedCandidatePair } : undefined
     } : undefined,
     lastSyncHandshakeAttempt: { ...slot.lastSyncHandshakeAttempt },
-    handles
+    handles,
+    createdAt: slot.createdAt,
+    lastInboundAt: slot.lastInboundAt
   };
 }
 function emptySyncHandshakeAttempt() {
@@ -2391,6 +2393,9 @@ var DEFAULT_ICE_SERVERS = [
   { urls: "stun:stun.l.google.com:19302" },
   { urls: "stun:stun1.l.google.com:19302" }
 ];
+var SLOT_NEVER_CONNECTED_TIMEOUT_MS = 30000;
+var SLOT_IDLE_TIMEOUT_MS = 120000;
+var SLOT_WATCHDOG_INTERVAL_MS = 5000;
 function emptyHandleSyncSnapshot() {
   return {
     lastSyncMessageOutAt: undefined,
@@ -2421,6 +2426,10 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   lastSlotInitiationDecisions = new Map;
   sweepRunCount = 0;
   lastSweepAt;
+  slotWatchdogTimer;
+  slotNeverConnectedTimeoutMs;
+  slotIdleTimeoutMs;
+  slotWatchdogIntervalMs;
   get knownPeerIds() {
     if (this.keyringSource !== undefined) {
       return [...this.keyringSource().knownPeers.keys()].filter((id) => id !== this.localPeerId);
@@ -2446,6 +2455,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     this.knownPeersRefreshIntervalMs = options.knownPeersRefreshIntervalMs ?? 2000;
     this.syncYieldEnabled = options.syncYieldEnabled ?? true;
     this.syncFragmentChunkSize = options.syncFragmentChunkSizeOverride ?? SYNC_FRAGMENT_CHUNK_SIZE;
+    this.slotNeverConnectedTimeoutMs = options.slotNeverConnectedTimeoutMs ?? SLOT_NEVER_CONNECTED_TIMEOUT_MS;
+    this.slotIdleTimeoutMs = options.slotIdleTimeoutMs ?? SLOT_IDLE_TIMEOUT_MS;
+    this.slotWatchdogIntervalMs = options.slotWatchdogIntervalMs ?? SLOT_WATCHDOG_INTERVAL_MS;
     this.localPeerId = options.peerId;
     const PC = options.RTCPeerConnection ?? globalThis.RTCPeerConnection;
     if (typeof PC !== "function") {
@@ -2603,9 +2615,11 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     this.ready = true;
     this.readyResolver?.();
     this.startKnownPeersSweep();
+    this.startSlotWatchdog();
   }
   disconnect() {
     this.stopKnownPeersSweep();
+    this.stopSlotWatchdog();
     for (const slot of this.slots.values()) {
       slot.channel?.close();
       slot.connection.close();
@@ -2636,6 +2650,70 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     clearInterval(this.knownPeersRefreshTimer);
     this.knownPeersRefreshTimer = undefined;
   }
+  tearDownWedgedSlot(peerId) {
+    const slot = this.slots.get(peerId);
+    if (!slot)
+      return;
+    this.slots.delete(peerId);
+    try {
+      slot.channel?.close();
+    } catch {}
+    try {
+      slot.connection.close();
+    } catch {}
+    this.emit("peer-disconnected", { peerId });
+  }
+  startSlotWatchdog() {
+    if (this.slotWatchdogIntervalMs <= 0)
+      return;
+    if (this.slotWatchdogTimer !== undefined)
+      return;
+    this.slotWatchdogTimer = setInterval(() => {
+      try {
+        this.sweepWedgedSlots();
+      } catch {}
+    }, this.slotWatchdogIntervalMs);
+  }
+  stopSlotWatchdog() {
+    if (this.slotWatchdogTimer === undefined)
+      return;
+    clearInterval(this.slotWatchdogTimer);
+    this.slotWatchdogTimer = undefined;
+  }
+  sweepWedgedSlots() {
+    const now = performance.now();
+    const peerIds = [...this.slots.keys()];
+    for (const peerId of peerIds) {
+      const slot = this.slots.get(peerId);
+      if (!slot)
+        continue;
+      const reason = this.classifyWedgedSlot(slot, now);
+      if (!reason)
+        continue;
+      this.lastSlotInitiationDecisions.set(peerId, {
+        decision: "rejected",
+        reason: "fatal-error",
+        error: reason,
+        at: now
+      });
+      this.tearDownWedgedSlot(peerId);
+    }
+  }
+  classifyWedgedSlot(slot, now) {
+    const state = slot.connection.connectionState;
+    const ageMs = now - slot.createdAt;
+    if (this.slotNeverConnectedTimeoutMs > 0 && (state === "new" || state === "connecting") && ageMs > this.slotNeverConnectedTimeoutMs) {
+      return `slot never reached connected (state=${state}) after ${Math.round(ageMs)}ms`;
+    }
+    if (this.slotIdleTimeoutMs > 0 && state === "connected" && slot.channel?.readyState === "open") {
+      const lastInbound = slot.lastInboundAt ?? slot.createdAt;
+      const idleMs = now - lastInbound;
+      if (idleMs > this.slotIdleTimeoutMs) {
+        return `slot idle: no inbound bytes for ${Math.round(idleMs)}ms (state=connected, dc=open)`;
+      }
+    }
+    return;
+  }
   send(message) {
     const targetId = message.targetId;
     const bytes = this.serialiseMessage(message);
@@ -2771,12 +2849,23 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       transport: undefined,
       lastDataChannelError: undefined,
       lastSyncHandshakeAttempt: emptySyncHandshakeAttempt(),
-      handles: new Map
+      handles: new Map,
+      createdAt: performance.now(),
+      lastInboundAt: undefined
     };
     this.slots.set(targetId, slot);
     this.wireConnection(targetId, connection);
     this.wireDataChannel(targetId, channel);
-    this.initiateOffer(targetId, connection);
+    this.initiateOffer(targetId, connection).catch((err) => {
+      const message = err instanceof Error ? err.message : String(err);
+      this.lastSlotInitiationDecisions.set(targetId, {
+        decision: "rejected",
+        reason: "fatal-error",
+        error: message,
+        at: performance.now()
+      });
+      this.tearDownWedgedSlot(targetId);
+    });
     return slot;
   }
   async initiateOffer(targetId, connection) {
@@ -2814,7 +2903,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       transport: undefined,
       lastDataChannelError: undefined,
       lastSyncHandshakeAttempt: emptySyncHandshakeAttempt(),
-      handles: new Map
+      handles: new Map,
+      createdAt: performance.now(),
+      lastInboundAt: undefined
     };
     this.slots.set(fromPeerId, slot);
     this.wireConnection(fromPeerId, connection);
@@ -2886,6 +2977,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       if (state === "connected") {
         this.emitPeerCandidateOnce(peerId);
       } else if (state === "disconnected" || state === "failed" || state === "closed") {
+        if (!this.slots.has(peerId))
+          return;
         this.slots.delete(peerId);
         this.emit("peer-disconnected", { peerId });
       }
@@ -2916,6 +3009,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       slot.pendingSends = [];
     };
     channel.onmessage = (event) => {
+      const liveSlot = this.slots.get(peerId);
+      if (liveSlot)
+        liveSlot.lastInboundAt = performance.now();
       const data = event.data;
       if (data instanceof ArrayBuffer) {
         this.dispatchMessage(peerId, new Uint8Array(data));
@@ -3165,14 +3261,49 @@ async function resolveIceServers(rtc) {
   }
   return rtc?.iceServers;
 }
-function buildHandleEntry(state, wire) {
+function buildHandleEntry(state, wire, syncStateView) {
   return {
     state,
     announcedToPeer: wire?.lastSyncMessageOutAt !== undefined,
     lastSyncMessageOutAt: wire?.lastSyncMessageOutAt,
     lastSyncMessageInAt: wire?.lastSyncMessageInAt,
     lastSyncMessageOutSize: wire?.lastSyncMessageOutSize,
-    lastSyncMessageOutType: wire?.lastSyncMessageOutType
+    lastSyncMessageOutType: wire?.lastSyncMessageOutType,
+    docSynchronizerExists: syncStateView.docSynchronizerExists,
+    docSynchronizerKnowsPeer: syncStateView.docSynchronizerKnowsPeer,
+    peerDocumentStatus: syncStateView.peerDocumentStatus
+  };
+}
+var EMPTY_SYNC_VIEW = {
+  docSynchronizerExists: false,
+  docSynchronizerKnowsPeer: undefined,
+  peerDocumentStatus: undefined
+};
+function getCollectionSynchronizer(repo) {
+  const sync = repo.synchronizer;
+  return sync && typeof sync === "object" ? sync : undefined;
+}
+function buildSyncView(synchronizer, docId, peerId) {
+  const docSync = synchronizer?.docSynchronizers?.[docId];
+  if (!docSync)
+    return EMPTY_SYNC_VIEW;
+  let knowsPeer;
+  try {
+    knowsPeer = typeof docSync.hasPeer === "function" ? docSync.hasPeer(peerId) : undefined;
+  } catch {
+    knowsPeer = undefined;
+  }
+  let status;
+  try {
+    const states = docSync.peerStates;
+    status = states && typeof states === "object" ? states[peerId] : undefined;
+  } catch {
+    status = undefined;
+  }
+  return {
+    docSynchronizerExists: true,
+    docSynchronizerKnowsPeer: knowsPeer,
+    peerDocumentStatus: status
   };
 }
 function stringifyHandleState(handle) {
@@ -3180,18 +3311,19 @@ function stringifyHandleState(handle) {
     return "unknown";
   return typeof handle.state === "string" ? handle.state : String(handle.state ?? "unknown");
 }
-function enrichPeerSlot(peer, knownHandleIds, repoHandles) {
+function enrichPeerSlot(peer, knownHandleIds, repoHandles, synchronizer) {
   if (!peer.slot) {
     return { ...peer, slot: undefined };
   }
+  const peerIdString = peer.peerId;
   const enriched = {};
   for (const docId of knownHandleIds) {
-    enriched[docId] = buildHandleEntry(stringifyHandleState(repoHandles[docId]), peer.slot.handles[docId]);
+    enriched[docId] = buildHandleEntry(stringifyHandleState(repoHandles[docId]), peer.slot.handles[docId], buildSyncView(synchronizer, docId, peerIdString));
   }
   for (const docId of Object.keys(peer.slot.handles)) {
     if (enriched[docId])
       continue;
-    enriched[docId] = buildHandleEntry("unknown", peer.slot.handles[docId]);
+    enriched[docId] = buildHandleEntry("unknown", peer.slot.handles[docId], buildSyncView(synchronizer, docId, peerIdString));
   }
   return { ...peer, slot: { ...peer.slot, handles: enriched } };
 }
@@ -3353,7 +3485,8 @@ async function createMeshClient(options) {
       const base = webrtcAdapter.getPeerStateSnapshot();
       const repoHandles = repo.handles;
       const knownHandleIds = Object.keys(repoHandles);
-      const enrichedPeers = base.peers.map((peer) => enrichPeerSlot(peer, knownHandleIds, repoHandles));
+      const synchronizer = getCollectionSynchronizer(repo);
+      const enrichedPeers = base.peers.map((peer) => enrichPeerSlot(peer, knownHandleIds, repoHandles, synchronizer));
       const out = {
         localPeerId: base.localPeerId,
         knownPeerIds: base.knownPeerIds,
@@ -3807,4 +3940,4 @@ export {
   $meshCounter
 };
 
-//# debugId=32FAEA2DE6283FD764756E2164756E21
+//# debugId=E998FF56BA12701D64756E2164756E21