@fairfox/polly 0.51.0 → 0.53.0

package/dist/src/mesh.js

@@ -1943,6 +1943,9 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   iceServers;
   dataChannelLabel;
   knownPeers;
+  keyringSource;
+  knownPeersRefreshTimer;
+  knownPeersRefreshIntervalMs;
   presentPeers = new Set;
   localPeerId;
   RTCPeerConnectionCtor;
@@ -1950,8 +1953,17 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   ready = false;
   readyResolver;
   get knownPeerIds() {
+    if (this.keyringSource !== undefined) {
+      return [...this.keyringSource().knownPeers.keys()].filter((id) => id !== this.localPeerId);
+    }
     return [...this.knownPeers];
   }
+  hasKnownPeer(remotePeerId) {
+    if (this.keyringSource !== undefined) {
+      return this.keyringSource().knownPeers.has(remotePeerId);
+    }
+    return this.knownPeers.has(remotePeerId);
+  }
   onBlobMessage;
   constructor(options) {
     super();
@@ -1959,6 +1971,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     this.iceServers = options.iceServers ?? DEFAULT_ICE_SERVERS;
     this.dataChannelLabel = options.dataChannelLabel ?? "polly-mesh";
     this.knownPeers = new Set(options.knownPeerIds ?? []);
+    this.keyringSource = options.keyringSource;
+    this.knownPeersRefreshIntervalMs = options.knownPeersRefreshIntervalMs ?? 2000;
     this.localPeerId = options.peerId;
     const PC = options.RTCPeerConnection ?? globalThis.RTCPeerConnection;
     if (typeof PC !== "function") {
@@ -1972,6 +1986,41 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   peerSlotCount() {
     return this.slots.size;
   }
+  getPeerStateSnapshot() {
+    const knownPeerIds = this.knownPeerIds;
+    const presentPeerIds = [...this.presentPeers];
+    const knownPeerSet = new Set(knownPeerIds);
+    const allPeers = new Set;
+    for (const id of knownPeerIds)
+      allPeers.add(id);
+    for (const id of presentPeerIds)
+      allPeers.add(id);
+    for (const id of this.slots.keys())
+      allPeers.add(id);
+    const peers = [];
+    for (const peerId of allPeers) {
+      const slot = this.slots.get(peerId);
+      peers.push({
+        peerId,
+        knownInKeyring: knownPeerSet.has(peerId),
+        presentInSignalling: this.presentPeers.has(peerId),
+        slot: slot ? {
+          signalingState: slot.connection.signalingState,
+          iceConnectionState: slot.connection.iceConnectionState,
+          connectionState: slot.connection.connectionState,
+          dataChannelState: slot.channel?.readyState ?? "no-channel",
+          pendingSendCount: slot.pendingSends.length,
+          pendingRemoteIceCount: slot.pendingRemoteIce.length
+        } : undefined
+      });
+    }
+    return {
+      localPeerId: this.localPeerId,
+      knownPeerIds,
+      presentPeerIds,
+      peers
+    };
+  }
   handlePeerJoined(remotePeerId) {
     this.presentPeers.add(remotePeerId);
     if (!this.shouldInitiateTo(remotePeerId))
@@ -1998,19 +2047,28 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
   addKnownPeer(remotePeerId) {
     if (remotePeerId === this.localPeerId)
       return;
-    if (this.knownPeers.has(remotePeerId))
-      return;
-    this.knownPeers.add(remotePeerId);
+    if (this.keyringSource === undefined) {
+      if (this.knownPeers.has(remotePeerId))
+        return;
+      this.knownPeers.add(remotePeerId);
+    }
     if (!this.presentPeers.has(remotePeerId))
       return;
     if (!this.shouldInitiateTo(remotePeerId))
       return;
     this.createInitiatingSlot(remotePeerId);
   }
+  refreshKnownPeers() {
+    for (const remotePeerId of this.presentPeers) {
+      if (!this.shouldInitiateTo(remotePeerId))
+        continue;
+      this.createInitiatingSlot(remotePeerId);
+    }
+  }
   shouldInitiateTo(remotePeerId) {
     if (remotePeerId === this.localPeerId)
       return false;
-    if (!this.knownPeers.has(remotePeerId))
+    if (!this.hasKnownPeer(remotePeerId))
       return false;
     if (this.slots.has(remotePeerId))
       return false;
@@ -2032,8 +2090,10 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     }
     this.ready = true;
     this.readyResolver?.();
+    this.startKnownPeersSweep();
   }
   disconnect() {
+    this.stopKnownPeersSweep();
     for (const slot of this.slots.values()) {
       slot.channel?.close();
       slot.connection.close();
@@ -2043,6 +2103,23 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     this.ready = false;
     this.emit("close");
   }
+  startKnownPeersSweep() {
+    if (this.keyringSource === undefined)
+      return;
+    if (this.knownPeersRefreshIntervalMs <= 0)
+      return;
+    if (this.knownPeersRefreshTimer !== undefined)
+      return;
+    this.knownPeersRefreshTimer = setInterval(() => {
+      this.refreshKnownPeers();
+    }, this.knownPeersRefreshIntervalMs);
+  }
+  stopKnownPeersSweep() {
+    if (this.knownPeersRefreshTimer === undefined)
+      return;
+    clearInterval(this.knownPeersRefreshTimer);
+    this.knownPeersRefreshTimer = undefined;
+  }
   send(message) {
     const targetId = message.targetId;
     const bytes = this.serialiseMessage(message);
@@ -2091,7 +2168,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       connection,
       channel,
       pendingSends: [],
-      pendingFragments: new Map
+      pendingFragments: new Map,
+      pendingRemoteIce: []
     };
     this.slots.set(targetId, slot);
     this.wireConnection(targetId, connection);
@@ -2120,7 +2198,8 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       connection,
       channel: undefined,
       pendingSends: [],
-      pendingFragments: new Map
+      pendingFragments: new Map,
+      pendingRemoteIce: []
     };
     this.slots.set(fromPeerId, slot);
     this.wireConnection(fromPeerId, connection);
@@ -2129,6 +2208,7 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
       this.wireDataChannel(fromPeerId, event.channel);
     };
     await connection.setRemoteDescription(sdp);
+    await this.flushPendingRemoteIce(slot);
     const answer = await connection.createAnswer();
     await connection.setLocalDescription(answer);
     this.signaling.sendSignal(fromPeerId, {
@@ -2143,15 +2223,31 @@ class MeshWebRTCAdapter extends NetworkAdapter2 {
     if (slot.connection.signalingState !== "have-local-offer")
       return;
     await slot.connection.setRemoteDescription(sdp);
+    await this.flushPendingRemoteIce(slot);
   }
   async handleIceCandidate(fromPeerId, candidate) {
     const slot = this.slots.get(fromPeerId);
     if (!slot)
       return;
+    if (slot.connection.remoteDescription === null) {
+      slot.pendingRemoteIce.push(candidate);
+      return;
+    }
     try {
       await slot.connection.addIceCandidate(candidate);
     } catch {}
   }
+  async flushPendingRemoteIce(slot) {
+    if (slot.pendingRemoteIce.length === 0)
+      return;
+    const queued = slot.pendingRemoteIce;
+    slot.pendingRemoteIce = [];
+    for (const candidate of queued) {
+      try {
+        await slot.connection.addIceCandidate(candidate);
+      } catch {}
+    }
+  }
   wireConnection(peerId, connection) {
     connection.onicecandidate = (event) => {
       if (event.candidate) {
@@ -2313,12 +2409,16 @@ async function createMeshClient(options) {
     signaling: undefined,
     peerId: options.signaling.peerId,
     knownPeerIds,
+    keyringSource,
     ...resolvedIceServers !== undefined && { iceServers: resolvedIceServers },
     ...options.rtc?.dataChannelLabel !== undefined && {
       dataChannelLabel: options.rtc.dataChannelLabel
     },
     ...options.rtc?.RTCPeerConnection !== undefined && {
       RTCPeerConnection: options.rtc.RTCPeerConnection
+    },
+    ...options.rtc?.knownPeersRefreshIntervalMs !== undefined && {
+      knownPeersRefreshIntervalMs: options.rtc.knownPeersRefreshIntervalMs
     }
   };
   let webrtcAdapter;
@@ -2365,6 +2465,20 @@ async function createMeshClient(options) {
     signaling,
     networkAdapter,
     webrtcAdapter,
+    refreshKnownPeers: () => {
+      webrtcAdapter?.refreshKnownPeers();
+    },
+    getPeerStateSnapshot: () => {
+      if (!webrtcAdapter) {
+        return {
+          localPeerId: options.signaling.peerId,
+          knownPeerIds: [],
+          presentPeerIds: [],
+          peers: []
+        };
+      }
+      return webrtcAdapter.getPeerStateSnapshot();
+    },
     close: async () => {
       signaling.close();
       webrtcAdapter?.disconnect();
@@ -2779,4 +2893,4 @@ export {
   $meshCounter
 };
 
-//# debugId=FD1853161F9E945F64756E2164756E21
+//# debugId=51457A626E5A2F2B64756E2164756E21