@fairfox/polly 0.53.0 → 0.54.0

package/dist/src/mesh.js

@@ -1849,8 +1849,8 @@ import {
 } from "@automerge/automerge-repo/slim";
 
 // src/shared/lib/sync-fragment.ts
-var SYNC_FRAGMENT_THRESHOLD = 64 * 1024;
-var SYNC_FRAGMENT_CHUNK_SIZE = 64 * 1024;
+var SYNC_FRAGMENT_THRESHOLD = 60 * 1024;
+var SYNC_FRAGMENT_CHUNK_SIZE = 60 * 1024;
 function serialiseSyncFragment(header, data) {
   const headerBytes = new TextEncoder().encode(JSON.stringify(header));
   const size = 4 + headerBytes.length + data.length;
@@ -1946,6 +1946,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   keyringSource;
   knownPeersRefreshTimer;
   knownPeersRefreshIntervalMs;
+  syncYieldEnabled;
+  syncFragmentChunkSize;
   presentPeers = new Set;
   localPeerId;
   RTCPeerConnectionCtor;
@@ -1973,6 +1975,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     this.knownPeers = new Set(options.knownPeerIds ?? []);
     this.keyringSource = options.keyringSource;
     this.knownPeersRefreshIntervalMs = options.knownPeersRefreshIntervalMs ?? 2000;
+    this.syncYieldEnabled = options.syncYieldEnabled ?? true;
+    this.syncFragmentChunkSize = options.syncFragmentChunkSizeOverride ?? SYNC_FRAGMENT_CHUNK_SIZE;
     this.localPeerId = options.peerId;
     const PC = options.RTCPeerConnection ?? globalThis.RTCPeerConnection;
     if (typeof PC !== "function") {
@@ -2010,7 +2014,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
           connectionState: slot.connection.connectionState,
           dataChannelState: slot.channel?.readyState ?? "no-channel",
           pendingSendCount: slot.pendingSends.length,
-          pendingRemoteIceCount: slot.pendingRemoteIce.length
+          pendingRemoteIceCount: slot.pendingRemoteIce.length,
+          inFlightSync: slot.inFlightSync ? { ...slot.inFlightSync } : undefined
         } : undefined
       });
     }
@@ -2133,15 +2138,29 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       slot.pendingSends.push(bytes);
     }
   }
-  sendBytesMaybeFragmented(channel, bytes) {
+  static SEND_YIELD_EVERY_N_FRAGMENTS = 8;
+  async sendBytesMaybeFragmented(channel, bytes) {
     if (bytes.length <= SYNC_FRAGMENT_THRESHOLD) {
       channel.send(bytes);
       return;
     }
     const id = crypto.randomUUID();
-    const fragments = chunkSyncMessage(bytes, id);
+    const fragments = chunkSyncMessage(bytes, id, this.syncFragmentChunkSize);
+    if (!this.syncYieldEnabled) {
+      for (const fragment of fragments) {
+        channel.send(fragment);
+      }
+      return;
+    }
+    let i = 0;
     for (const fragment of fragments) {
       channel.send(fragment);
+      i += 1;
+      if (i % MeshWebRTCAdapter.SEND_YIELD_EVERY_N_FRAGMENTS === 0 && i < fragments.length) {
+        await new Promise((resolve) => {
+          setTimeout(resolve, 0);
+        });
+      }
     }
   }
   handleSignal(fromPeerId, rawPayload) {
@@ -2169,7 +2188,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       channel,
       pendingSends: [],
       pendingFragments: new Map,
-      pendingRemoteIce: []
+      pendingRemoteIce: [],
+      inFlightSync: undefined
     };
     this.slots.set(targetId, slot);
     this.wireConnection(targetId, connection);
@@ -2199,7 +2219,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       channel: undefined,
       pendingSends: [],
       pendingFragments: new Map,
-      pendingRemoteIce: []
+      pendingRemoteIce: [],
+      inFlightSync: undefined
     };
     this.slots.set(fromPeerId, slot);
     this.wireConnection(fromPeerId, connection);
@@ -2310,9 +2331,56 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
         return;
       }
       const message = this.deserialiseMessage(bytes);
-      this.emit("message", message);
+      this.scheduleEmitMessage(fromPeerId, message, false);
     } catch {}
   }
+  scheduleEmitMessage(fromPeerId, message, viaFragmentPath) {
+    if (!this.syncYieldEnabled) {
+      this.emit("message", message);
+      if (viaFragmentPath) {
+        this.finishInFlightSyncApply(fromPeerId);
+      }
+      return;
+    }
+    if (viaFragmentPath) {
+      const slot = this.slots.get(fromPeerId);
+      if (slot?.inFlightSync) {
+        slot.inFlightSync.applyBacklog += 1;
+      }
+    }
+    setTimeout(() => {
+      try {
+        this.emit("message", message);
+      } finally {
+        if (viaFragmentPath) {
+          this.finishInFlightSyncApply(fromPeerId);
+        }
+      }
+    }, 0);
+  }
+  finishInFlightSyncApply(fromPeerId) {
+    const slot = this.slots.get(fromPeerId);
+    if (!slot?.inFlightSync)
+      return;
+    slot.inFlightSync.applyBacklog = Math.max(0, slot.inFlightSync.applyBacklog - 1);
+    this.emitSyncProgress(fromPeerId, "dispatch-applied", 0);
+    if (slot.inFlightSync.applyBacklog === 0 && slot.pendingFragments.size === 0) {
+      slot.inFlightSync = undefined;
+    }
+  }
+  emitSyncProgress(fromPeerId, kind, bytesDelta) {
+    const slot = this.slots.get(fromPeerId);
+    const inFlightSync = slot?.inFlightSync;
+    this.emit("sync-progress", {
+      peerId: fromPeerId,
+      kind,
+      bytesDelta,
+      chunksReceived: inFlightSync?.chunksReceived ?? 0,
+      bytesReceived: inFlightSync?.bytesReceived ?? 0,
+      applyBacklog: inFlightSync?.applyBacklog ?? 0,
+      at: performance.now()
+    });
+  }
   handleSyncFragment(fromPeerId, bytes) {
     const parsed = parseSyncFragment(bytes);
     if (!parsed)
@@ -2327,11 +2395,46 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       slot.pendingFragments.set(header.id, entry);
     }
     entry.chunks.set(header.index, data.slice());
+    if (!slot.inFlightSync) {
+      slot.inFlightSync = {
+        chunksReceived: 0,
+        bytesReceived: 0,
+        lastChunkAt: performance.now(),
+        applyBacklog: 0
+      };
+    }
+    slot.inFlightSync.chunksReceived += 1;
+    slot.inFlightSync.bytesReceived += data.byteLength;
+    slot.inFlightSync.lastChunkAt = performance.now();
+    this.emitSyncProgress(fromPeerId, "fragment-received", data.byteLength);
     if (entry.chunks.size < entry.total)
       return;
     slot.pendingFragments.delete(header.id);
     const reassembled = reassembleSyncFragments(entry.chunks, entry.total);
-    this.dispatchMessage(fromPeerId, reassembled);
+    if (!this.syncYieldEnabled) {
+      this.dispatchReassembled(fromPeerId, reassembled);
+      return;
+    }
+    setTimeout(() => {
+      this.dispatchReassembled(fromPeerId, reassembled);
+    }, 0);
+  }
+  dispatchReassembled(fromPeerId, bytes) {
+    try {
+      if (this.onBlobMessage && isBlobMessageType(bytes)) {
+        const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+        const headerLen = view.getUint32(0, false);
+        const header = JSON.parse(new TextDecoder().decode(bytes.subarray(4, 4 + headerLen)));
+        const data = bytes.subarray(4 + headerLen);
+        this.onBlobMessage(fromPeerId, header, data);
+        this.finishInFlightSyncApply(fromPeerId);
+        return;
+      }
+      const message = this.deserialiseMessage(bytes);
+      this.scheduleEmitMessage(fromPeerId, message, true);
+    } catch {
+      this.finishInFlightSyncApply(fromPeerId);
+    }
   }
   get connectedPeerIds() {
     const ids = [];
@@ -2419,6 +2522,12 @@ async function createMeshClient(options) {
     },
     ...options.rtc?.knownPeersRefreshIntervalMs !== undefined && {
       knownPeersRefreshIntervalMs: options.rtc.knownPeersRefreshIntervalMs
+    },
+    ...options.rtc?.syncYieldEnabled !== undefined && {
+      syncYieldEnabled: options.rtc.syncYieldEnabled
+    },
+    ...options.rtc?.syncFragmentChunkSizeOverride !== undefined && {
+      syncFragmentChunkSizeOverride: options.rtc.syncFragmentChunkSizeOverride
     }
   };
   let webrtcAdapter;
@@ -2893,4 +3002,4 @@ export {
   $meshCounter
 };
 
-//# debugId=51457A626E5A2F2B64756E2164756E21
+//# debugId=18409B674B254AA864756E2164756E21