@fairfox/polly 0.55.0 → 0.57.0

package/dist/src/mesh.d.ts

@@ -21,7 +21,7 @@ export type { EncryptedEnvelope, SealedBytes, } from "./shared/lib/encryption";
 export { decrypt, decryptOrThrow, EncryptionError, encrypt, generateDocumentKey, KEY_BYTES as ENCRYPTION_KEY_BYTES, NONCE_BYTES as ENCRYPTION_NONCE_BYTES, TAG_BYTES as ENCRYPTION_TAG_BYTES, } from "./shared/lib/encryption";
 export type { KeyringStorage } from "./shared/lib/keyring-storage";
 export { deserialiseKeyring, memoryKeyringStorage, serialiseKeyring, } from "./shared/lib/keyring-storage";
-export type { CreateMeshClientOptions, MeshClient } from "./shared/lib/mesh-client";
+export type { CreateMeshClientOptions, MeshClient, MeshClientHandleSnapshot, MeshClientPeerStateSnapshot, } from "./shared/lib/mesh-client";
 export { createMeshClient } from "./shared/lib/mesh-client";
 export type { MeshKeyring, MeshNetworkAdapterOptions, } from "./shared/lib/mesh-network-adapter";
 export { DEFAULT_MESH_KEY_ID, MeshNetworkAdapter, } from "./shared/lib/mesh-network-adapter";
@@ -29,7 +29,7 @@ export type { MeshSignalingClientOptions, SignalingMessage as MeshSignalingMessa
 export { MeshSignalingClient } from "./shared/lib/mesh-signaling-client";
 export type { MeshStateOptions } from "./shared/lib/mesh-state";
 export { $meshCounter, $meshList, $meshState, $meshText, configureMeshState, resetMeshState, } from "./shared/lib/mesh-state";
-export type { MeshWebRTCAdapterOptions } from "./shared/lib/mesh-webrtc-adapter";
+export type { HandleSyncSnapshot, InFlightSyncSnapshot, MeshWebRTCAdapterOptions, SlotInitiationDecision, SlotInitiationRejectionReason, SweepSnapshot, SyncHandshakeAttemptSnapshot, SyncProgressEvent, TransportSnapshot, } from "./shared/lib/mesh-webrtc-adapter";
 export { DEFAULT_ICE_SERVERS, MeshWebRTCAdapter } from "./shared/lib/mesh-webrtc-adapter";
 export type { CreatePairingTokenOptions, PairingToken, } from "./shared/lib/pairing";
 export { applyPairingToken, createPairingToken, createPairingTokenWithFreshIdentity, DEFAULT_PAIRING_TTL_MS, decodePairingToken, encodePairingToken, isPairingTokenExpired, PAIRING_NONCE_BYTES, PAIRING_TOKEN_VERSION, PairingError, parsePairingToken, serialisePairingToken, } from "./shared/lib/pairing";

package/dist/src/mesh.js

@@ -1075,12 +1075,16 @@ class MeshNetworkAdapter extends NetworkAdapter {
     }
     const signed = signEnvelope(payloadToSign, message.senderId, keyring.identity.secretKey);
     const signedBytes = encodeSignedEnvelope(signed);
-    return {
+    const outer = {
       type: message.type,
       senderId: message.senderId,
       targetId: message.targetId,
       data: signedBytes
     };
+    if ("documentId" in message && message.documentId !== undefined) {
+      outer["documentId"] = message.documentId;
+    }
+    return outer;
   }
   tryUnwrap(message) {
     if (!message.data)
@@ -2033,6 +2037,10 @@ function selectActivePair(parsed) {
   return;
 }
 function serialiseSlotView(slot) {
+  const handles = {};
+  for (const [docId, snapshot] of slot.handles) {
+    handles[docId] = { ...snapshot };
+  }
   return {
     signalingState: slot.connection.signalingState,
     iceConnectionState: slot.connection.iceConnectionState,
@@ -2044,7 +2052,17 @@ function serialiseSlotView(slot) {
     transport: slot.transport ? {
       ...slot.transport,
       selectedCandidatePair: slot.transport.selectedCandidatePair ? { ...slot.transport.selectedCandidatePair } : undefined
-    } : undefined
+    } : undefined,
+    lastSyncHandshakeAttempt: { ...slot.lastSyncHandshakeAttempt },
+    handles
+  };
+}
+function emptySyncHandshakeAttempt() {
+  return {
+    dataChannelOpenedAt: undefined,
+    peerCandidateEmittedAt: undefined,
+    firstOutboundSendAt: undefined,
+    firstInboundMessageAt: undefined
   };
 }
 function buildCandidatePairView(pair, localCands, remoteCands) {
@@ -2063,6 +2081,14 @@ var DEFAULT_ICE_SERVERS = [
   { urls: "stun:stun.l.google.com:19302" },
   { urls: "stun:stun1.l.google.com:19302" }
 ];
+function emptyHandleSyncSnapshot() {
+  return {
+    lastSyncMessageOutAt: undefined,
+    lastSyncMessageInAt: undefined,
+    lastSyncMessageOutSize: undefined,
+    lastSyncMessageOutType: undefined
+  };
+}
 
 class MeshWebRTCAdapter extends NetworkAdapter2 {
   signaling;
@@ -2082,6 +2108,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   slots = new Map;
   ready = false;
   readyResolver;
+  lastSlotInitiationDecisions = new Map;
+  sweepRunCount = 0;
+  lastSweepAt;
   get knownPeerIds() {
     if (this.keyringSource !== undefined) {
       return [...this.keyringSource().knownPeers.keys()].filter((id) => id !== this.localPeerId);
@@ -2134,10 +2163,13 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     const peers = [];
     for (const peerId of allPeers) {
       const slot = this.slots.get(peerId);
+      const decision = this.snapshotInitiationDecision(peerId);
       peers.push({
         peerId,
         knownInKeyring: knownPeerSet.has(peerId),
         presentInSignalling: this.presentPeers.has(peerId),
+        slotInitiationRejectionReason: decision.reason,
+        slotInitiationDecision: decision,
         slot: slot ? serialiseSlotView(slot) : undefined
       });
     }
@@ -2145,6 +2177,12 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       localPeerId: this.localPeerId,
       knownPeerIds,
       presentPeerIds,
+      sweep: {
+        enabled: this.knownPeersRefreshTimer !== undefined,
+        intervalMs: this.knownPeersRefreshIntervalMs,
+        runCount: this.sweepRunCount,
+        lastRunAt: this.lastSweepAt
+      },
       peers
     };
   }
@@ -2152,14 +2190,27 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     this.presentPeers.add(remotePeerId);
     if (!this.shouldInitiateTo(remotePeerId))
       return;
-    this.createInitiatingSlot(remotePeerId);
+    this.tryCreateInitiatingSlot(remotePeerId);
   }
   handlePeersPresent(peerIds) {
     for (const remotePeerId of peerIds) {
       this.presentPeers.add(remotePeerId);
       if (!this.shouldInitiateTo(remotePeerId))
         continue;
+      this.tryCreateInitiatingSlot(remotePeerId);
+    }
+  }
+  tryCreateInitiatingSlot(remotePeerId) {
+    try {
       this.createInitiatingSlot(remotePeerId);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.lastSlotInitiationDecisions.set(remotePeerId, {
+        decision: "rejected",
+        reason: "fatal-error",
+        error: message,
+        at: performance.now()
+      });
     }
   }
   handlePeerLeft(remotePeerId) {
@@ -2183,25 +2234,49 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       return;
     if (!this.shouldInitiateTo(remotePeerId))
       return;
-    this.createInitiatingSlot(remotePeerId);
+    this.tryCreateInitiatingSlot(remotePeerId);
   }
   refreshKnownPeers() {
     for (const remotePeerId of this.presentPeers) {
       if (!this.shouldInitiateTo(remotePeerId))
         continue;
-      this.createInitiatingSlot(remotePeerId);
+      this.tryCreateInitiatingSlot(remotePeerId);
     }
   }
   shouldInitiateTo(remotePeerId) {
+    const reason = this.evaluateInitiation(remotePeerId);
+    this.lastSlotInitiationDecisions.set(remotePeerId, {
+      decision: reason === undefined ? "accepted" : "rejected",
+      reason,
+      error: undefined,
+      at: performance.now()
+    });
+    return reason === undefined;
+  }
+  evaluateInitiation(remotePeerId) {
     if (remotePeerId === this.localPeerId)
-      return false;
+      return "self";
     if (!this.hasKnownPeer(remotePeerId))
-      return false;
+      return "not-in-keyring";
+    if (!this.presentPeers.has(remotePeerId))
+      return "not-present";
     if (this.slots.has(remotePeerId))
-      return false;
+      return "slot-already-exists";
     if (this.localPeerId <= remotePeerId)
-      return false;
-    return true;
+      return "tie-break-other-side";
+    return;
+  }
+  snapshotInitiationDecision(remotePeerId) {
+    const cached = this.lastSlotInitiationDecisions.get(remotePeerId);
+    if (cached?.reason === "fatal-error")
+      return cached;
+    const reason = this.evaluateInitiation(remotePeerId);
+    return {
+      decision: reason === undefined ? "accepted" : "rejected",
+      reason,
+      error: undefined,
+      at: performance.now()
+    };
   }
   whenReady() {
     if (this.ready)
@@ -2238,7 +2313,11 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     if (this.knownPeersRefreshTimer !== undefined)
       return;
     this.knownPeersRefreshTimer = setInterval(() => {
-      this.refreshKnownPeers();
+      this.sweepRunCount += 1;
+      this.lastSweepAt = performance.now();
+      try {
+        this.refreshKnownPeers();
+      } catch {}
     }, this.knownPeersRefreshIntervalMs);
   }
   stopKnownPeersSweep() {
@@ -2254,6 +2333,20 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     if (!slot) {
       slot = this.createInitiatingSlot(targetId);
     }
+    if (slot.lastSyncHandshakeAttempt.firstOutboundSendAt === undefined) {
+      slot.lastSyncHandshakeAttempt.firstOutboundSendAt = performance.now();
+    }
+    const documentId = message.documentId;
+    if (typeof documentId === "string") {
+      let handleEntry = slot.handles.get(documentId);
+      if (!handleEntry) {
+        handleEntry = emptyHandleSyncSnapshot();
+        slot.handles.set(documentId, handleEntry);
+      }
+      handleEntry.lastSyncMessageOutAt = performance.now();
+      handleEntry.lastSyncMessageOutSize = bytes.length;
+      handleEntry.lastSyncMessageOutType = typeof message.type === "string" ? message.type : undefined;
+    }
     if (slot.channel && slot.channel.readyState === "open") {
       this.sendBytesMaybeFragmented(slot.channel, bytes);
     } else {
@@ -2366,7 +2459,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       pendingRemoteIce: [],
       inFlightSync: undefined,
       transport: undefined,
-      lastDataChannelError: undefined
+      lastDataChannelError: undefined,
+      lastSyncHandshakeAttempt: emptySyncHandshakeAttempt(),
+      handles: new Map
     };
     this.slots.set(targetId, slot);
     this.wireConnection(targetId, connection);
@@ -2407,7 +2502,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       pendingRemoteIce: [],
       inFlightSync: undefined,
       transport: undefined,
-      lastDataChannelError: undefined
+      lastDataChannelError: undefined,
+      lastSyncHandshakeAttempt: emptySyncHandshakeAttempt(),
+      handles: new Map
     };
     this.slots.set(fromPeerId, slot);
     this.wireConnection(fromPeerId, connection);
@@ -2477,21 +2574,32 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     connection.onconnectionstatechange = () => {
       const state = connection.connectionState;
       if (state === "connected") {
-        this.emit("peer-candidate", {
-          peerId,
-          peerMetadata: {}
-        });
+        this.emitPeerCandidateOnce(peerId);
       } else if (state === "disconnected" || state === "failed" || state === "closed") {
         this.slots.delete(peerId);
         this.emit("peer-disconnected", { peerId });
       }
     };
   }
+  emitPeerCandidateOnce(peerId) {
+    const slot = this.slots.get(peerId);
+    if (!slot)
+      return;
+    if (slot.lastSyncHandshakeAttempt.peerCandidateEmittedAt !== undefined)
+      return;
+    slot.lastSyncHandshakeAttempt.peerCandidateEmittedAt = performance.now();
+    this.emit("peer-candidate", {
+      peerId,
+      peerMetadata: {}
+    });
+  }
   wireDataChannel(peerId, channel) {
     channel.onopen = () => {
       const slot = this.slots.get(peerId);
       if (!slot)
         return;
+      slot.lastSyncHandshakeAttempt.dataChannelOpenedAt = performance.now();
+      this.emitPeerCandidateOnce(peerId);
       for (const bytes of slot.pendingSends) {
         this.sendBytesMaybeFragmented(channel, bytes);
       }
@@ -2559,6 +2667,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     } catch {}
   }
   scheduleEmitMessage(fromPeerId, message, viaFragmentPath) {
+    this.stampFirstInboundMessage(fromPeerId);
+    this.stampHandleInbound(fromPeerId, message);
     if (!this.syncYieldEnabled) {
       this.emit("message", message);
       if (viaFragmentPath) {
@@ -2582,6 +2692,28 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       }
     }, 0);
   }
+  stampFirstInboundMessage(fromPeerId) {
+    const slot = this.slots.get(fromPeerId);
+    if (!slot)
+      return;
+    if (slot.lastSyncHandshakeAttempt.firstInboundMessageAt !== undefined)
+      return;
+    slot.lastSyncHandshakeAttempt.firstInboundMessageAt = performance.now();
+  }
+  stampHandleInbound(fromPeerId, message) {
+    const documentId = message.documentId;
+    if (typeof documentId !== "string")
+      return;
+    const slot = this.slots.get(fromPeerId);
+    if (!slot)
+      return;
+    let entry = slot.handles.get(documentId);
+    if (!entry) {
+      entry = emptyHandleSyncSnapshot();
+      slot.handles.set(documentId, entry);
+    }
+    entry.lastSyncMessageInAt = performance.now();
+  }
   finishInFlightSyncApply(fromPeerId) {
     const slot = this.slots.get(fromPeerId);
     if (!slot?.inFlightSync)
@@ -2723,6 +2855,54 @@ async function resolveIceServers(rtc) {
   }
   return rtc?.iceServers;
 }
+function buildHandleEntry(state, wire) {
+  return {
+    state,
+    announcedToPeer: wire?.lastSyncMessageOutAt !== undefined,
+    lastSyncMessageOutAt: wire?.lastSyncMessageOutAt,
+    lastSyncMessageInAt: wire?.lastSyncMessageInAt,
+    lastSyncMessageOutSize: wire?.lastSyncMessageOutSize,
+    lastSyncMessageOutType: wire?.lastSyncMessageOutType
+  };
+}
+function stringifyHandleState(handle) {
+  if (handle === undefined)
+    return "unknown";
+  return typeof handle.state === "string" ? handle.state : String(handle.state ?? "unknown");
+}
+function enrichPeerSlot(peer, knownHandleIds, repoHandles) {
+  if (!peer.slot) {
+    return { ...peer, slot: undefined };
+  }
+  const enriched = {};
+  for (const docId of knownHandleIds) {
+    enriched[docId] = buildHandleEntry(stringifyHandleState(repoHandles[docId]), peer.slot.handles[docId]);
+  }
+  for (const docId of Object.keys(peer.slot.handles)) {
+    if (enriched[docId])
+      continue;
+    enriched[docId] = buildHandleEntry("unknown", peer.slot.handles[docId]);
+  }
+  return { ...peer, slot: { ...peer.slot, handles: enriched } };
+}
+function getReevaluateDocumentShare(repo) {
+  const sync = repo.synchronizer;
+  const fn = sync?.reevaluateDocumentShare;
+  if (typeof fn !== "function" || sync === undefined)
+    return;
+  return () => fn.call(sync);
+}
+function installPolly107SyncReevaluation(networkAdapter, repo) {
+  const disable = typeof process !== "undefined" && process.env?.["POLLY_107_DISABLE_FIX"] === "1";
+  if (disable)
+    return;
+  const reevaluate = getReevaluateDocumentShare(repo);
+  if (!reevaluate)
+    return;
+  networkAdapter.on("peer-candidate", () => {
+    reevaluate().catch(() => {});
+  });
+}
 async function createMeshClient(options) {
   const keyringSource = await resolveKeyringSource(options.keyring);
   const keyring = keyringSource();
@@ -2795,6 +2975,7 @@ async function createMeshClient(options) {
     ...options.repoStorage !== undefined && { storage: options.repoStorage }
   });
   configureMeshState(repo);
+  installPolly107SyncReevaluation(networkAdapter, repo);
   await signaling.connect();
   return {
     repo,
@@ -2813,10 +2994,33 @@ async function createMeshClient(options) {
           localPeerId: options.signaling.peerId,
           knownPeerIds: [],
           presentPeerIds: [],
+          sweep: {
+            enabled: false,
+            intervalMs: 0,
+            runCount: 0,
+            lastRunAt: undefined
+          },
           peers: []
         };
       }
-      return webrtcAdapter.getPeerStateSnapshot();
+      const base = webrtcAdapter.getPeerStateSnapshot();
+      const repoHandles = repo.handles;
+      const knownHandleIds = Object.keys(repoHandles);
+      const enrichedPeers = base.peers.map((peer) => enrichPeerSlot(peer, knownHandleIds, repoHandles));
+      const out = {
+        localPeerId: base.localPeerId,
+        knownPeerIds: base.knownPeerIds,
+        presentPeerIds: base.presentPeerIds,
+        sweep: base.sweep,
+        peers: enrichedPeers
+      };
+      return out;
+    },
+    reevaluateAllSync: async () => {
+      const reevaluate = getReevaluateDocumentShare(repo);
+      if (!reevaluate)
+        return;
+      await reevaluate();
     },
     refreshTransportStats: async () => {
       if (!webrtcAdapter)
@@ -3237,4 +3441,4 @@ export {
   $meshCounter
 };
 
-//# debugId=15751E988ED47F0264756E2164756E21
+//# debugId=DAB92455464EE0D864756E2164756E21