@fairfox/polly 0.56.0 → 0.58.0

package/dist/src/mesh.d.ts

@@ -21,15 +21,15 @@ 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, MeshStateModuleDiagnostics, } 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";
 export type { MeshSignalingClientOptions, SignalingMessage as MeshSignalingMessage, } from "./shared/lib/mesh-signaling-client";
 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 { InFlightSyncSnapshot, MeshWebRTCAdapterOptions, SlotInitiationDecision, SlotInitiationRejectionReason, SweepSnapshot, SyncHandshakeAttemptSnapshot, SyncProgressEvent, TransportSnapshot, } from "./shared/lib/mesh-webrtc-adapter";
+export { $meshCounter, $meshList, $meshState, $meshText, configureMeshState, getLastConfiguredRepoPeerId, getMeshStateModuleId, isMeshStateConfigured, MESH_STATE_MODULE_ID, resetMeshState, wasMeshStateResolved, } from "./shared/lib/mesh-state";
+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)
@@ -1760,16 +1764,37 @@ function fieldEquals(a, b) {
 
 // src/shared/lib/mesh-state.ts
 var defaultRepo;
+var MESH_STATE_MODULE_ID = `mesh-state-${typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID() : Math.random().toString(36).slice(2) + Date.now().toString(36)}`;
+function getMeshStateModuleId() {
+  return MESH_STATE_MODULE_ID;
+}
+var lastConfiguredRepoPeerId;
+function getLastConfiguredRepoPeerId() {
+  return lastConfiguredRepoPeerId;
+}
 function configureMeshState(repo) {
   defaultRepo = repo;
+  lastConfiguredRepoPeerId = repo.peerId;
 }
 function resetMeshState() {
   defaultRepo = undefined;
+  lastConfiguredRepoPeerId = undefined;
+}
+function isMeshStateConfigured() {
+  return defaultRepo !== undefined;
+}
+var meshStateEverResolved = false;
+function wasMeshStateResolved() {
+  return meshStateEverResolved;
 }
 function resolveRepo(option) {
+  meshStateEverResolved = true;
   const repo = option ?? defaultRepo;
   if (!repo) {
-    throw new Error("Polly $meshState: no Repo configured. Call configureMeshState(repo) at startup or pass { repo } in the primitive options.");
+    if (typeof console !== "undefined" && typeof console.warn === "function") {
+      console.warn(`[polly#107 H5] $meshState resolved against unconfigured module instance ${MESH_STATE_MODULE_ID}. If createMeshClient was called elsewhere, the consumer's wrappers and the mesh client are reaching different module instances — see polly#107.`);
+    }
+    throw new Error(`Polly $meshState: no Repo configured (module instance ${MESH_STATE_MODULE_ID}). Call configureMeshState(repo) at startup or pass { repo } in the primitive options. If you have called configureMeshState elsewhere, the most likely cause is that the call resolved to a different module instance than this one — see polly#107.`);
   }
   return repo;
 }
@@ -2033,6 +2058,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,
@@ -2045,7 +2074,8 @@ function serialiseSlotView(slot) {
       ...slot.transport,
       selectedCandidatePair: slot.transport.selectedCandidatePair ? { ...slot.transport.selectedCandidatePair } : undefined
     } : undefined,
-    lastSyncHandshakeAttempt: { ...slot.lastSyncHandshakeAttempt }
+    lastSyncHandshakeAttempt: { ...slot.lastSyncHandshakeAttempt },
+    handles
   };
 }
 function emptySyncHandshakeAttempt() {
@@ -2072,6 +2102,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;
@@ -2319,6 +2357,17 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     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 {
@@ -2432,7 +2481,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       inFlightSync: undefined,
       transport: undefined,
       lastDataChannelError: undefined,
-      lastSyncHandshakeAttempt: emptySyncHandshakeAttempt()
+      lastSyncHandshakeAttempt: emptySyncHandshakeAttempt(),
+      handles: new Map
     };
     this.slots.set(targetId, slot);
     this.wireConnection(targetId, connection);
@@ -2474,7 +2524,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       inFlightSync: undefined,
       transport: undefined,
       lastDataChannelError: undefined,
-      lastSyncHandshakeAttempt: emptySyncHandshakeAttempt()
+      lastSyncHandshakeAttempt: emptySyncHandshakeAttempt(),
+      handles: new Map
     };
     this.slots.set(fromPeerId, slot);
     this.wireConnection(fromPeerId, connection);
@@ -2638,6 +2689,7 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   }
   scheduleEmitMessage(fromPeerId, message, viaFragmentPath) {
     this.stampFirstInboundMessage(fromPeerId);
+    this.stampHandleInbound(fromPeerId, message);
     if (!this.syncYieldEnabled) {
       this.emit("message", message);
       if (viaFragmentPath) {
@@ -2669,6 +2721,20 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       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)
@@ -2810,6 +2876,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();
@@ -2882,6 +2996,7 @@ async function createMeshClient(options) {
     ...options.repoStorage !== undefined && { storage: options.repoStorage }
   });
   configureMeshState(repo);
+  installPolly107SyncReevaluation(networkAdapter, repo);
   await signaling.connect();
   return {
     repo,
@@ -2906,10 +3021,43 @@ async function createMeshClient(options) {
             runCount: 0,
             lastRunAt: undefined
           },
-          peers: []
+          peers: [],
+          meshStateModule: {
+            moduleId: getMeshStateModuleId(),
+            configured: isMeshStateConfigured(),
+            lastConfiguredRepoPeerId: getLastConfiguredRepoPeerId(),
+            wasResolved: wasMeshStateResolved()
+          },
+          repoHandleCount: Object.keys(repo.handles).length,
+          repoHandleIds: Object.keys(repo.handles)
         };
       }
-      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,
+        meshStateModule: {
+          moduleId: getMeshStateModuleId(),
+          configured: isMeshStateConfigured(),
+          lastConfiguredRepoPeerId: getLastConfiguredRepoPeerId(),
+          wasResolved: wasMeshStateResolved()
+        },
+        repoHandleCount: knownHandleIds.length,
+        repoHandleIds: knownHandleIds
+      };
+      return out;
+    },
+    reevaluateAllSync: async () => {
+      const reevaluate = getReevaluateDocumentShare(repo);
+      if (!reevaluate)
+        return;
+      await reevaluate();
     },
     refreshTransportStats: async () => {
       if (!webrtcAdapter)
@@ -3271,6 +3419,7 @@ function decodeRevocation(bytes, keyring) {
   return record;
 }
 export {
+  wasMeshStateResolved,
   verify,
   signingKeyPairFromSecret,
   sign,
@@ -3281,7 +3430,10 @@ export {
   parsePairingToken,
   memoryKeyringStorage,
   isPairingTokenExpired,
+  isMeshStateConfigured,
   isBlobRef,
+  getMeshStateModuleId,
+  getLastConfiguredRepoPeerId,
   generateSigningKeyPair,
   generateDocumentKey,
   encrypt,
@@ -3316,6 +3468,7 @@ export {
   MeshSignalingClient,
   MeshNetworkAdapter,
   MemoryBlobCache,
+  MESH_STATE_MODULE_ID,
   IndexedDBBlobCache,
   EncryptionError,
   TAG_BYTES as ENCRYPTION_TAG_BYTES,
@@ -3330,4 +3483,4 @@ export {
   $meshCounter
 };
 
-//# debugId=27D9577FC215E14564756E2164756E21
+//# debugId=23078FA0DB4C154064756E2164756E21