@muhkoo/connect 0.10.2-alpha.0 → 0.10.4-alpha.0

package/dist/browser/index.js

@@ -5057,7 +5057,7 @@ function base64UrlDecode(s) {
  * expect (and isn't serving a stale cached bundle). Keep this in sync with
  * `package.json` `version`.
  */
-const VERSION = "0.10.1-alpha.0";
+const VERSION = "0.10.4-alpha.0";
 
 /**
  * `HttpClient` — the one place the unified {@link Client} talks to the
@@ -8812,14 +8812,20 @@ class WebRtcTransport {
     offSignal;
     iceServers;
     maxPeers;
+    debug;
     nextMsgId = 1;
     constructor(signaler, myId, opts = {}) {
         this.signaler = signaler;
         this.myId = myId;
         this.iceServers = opts.iceServers ?? DEFAULT_ICE;
         this.maxPeers = opts.maxPeers ?? 8;
+        this.debug = opts.debug ?? false;
         this.offSignal = this.signaler.onSignal((from, kind, data) => this.onSignal(from, kind, data));
     }
+    log(...a) {
+        if (this.debug)
+            console.info("[muhkoo:p2p]", ...a);
+    }
     peers() {
         return [...this.conns].filter(([, c]) => c.dc?.readyState === "open").map(([id]) => id);
     }
@@ -8870,19 +8876,42 @@ class WebRtcTransport {
     // -- internals -----------------------------------------------------------
     newPc(peerId) {
         const pc = new RTCPeerConnection({ iceServers: this.iceServers });
-        const conn = { pc, reasm: new Map() };
+        const conn = { pc, reasm: new Map(), remoteSet: false, pendingIce: [] };
         this.conns.set(peerId, conn);
+        const short = String(peerId).slice(0, 8);
         pc.onicecandidate = (e) => {
-            if (e.candidate)
+            if (e.candidate) {
+                this.log(`${short} local candidate ${e.candidate.type ?? "?"} ${(e.candidate.address ?? e.candidate.candidate).toString().slice(0, 40)}`);
                 this.signaler.send(peerId, "ice", e.candidate.toJSON());
+            }
         };
         pc.onconnectionstatechange = () => {
+            this.log(`${short} connection=${pc.connectionState}`);
             if (["failed", "closed", "disconnected"].includes(pc.connectionState))
                 this.drop(peerId);
         };
+        if (this.debug) {
+            pc.oniceconnectionstatechange = () => this.log(`${short} ice=${pc.iceConnectionState}`);
+            pc.onicegatheringstatechange = () => this.log(`${short} gathering=${pc.iceGatheringState}`);
+        }
         pc.ondatachannel = (e) => this.bindChannel(peerId, conn, e.channel);
         return conn;
     }
+    /** Mark a peer's remote description as set and apply any ICE candidates that
+     *  arrived before it (dropping them, the old behavior, breaks LAN dials). */
+    async markRemoteSet(conn) {
+        conn.remoteSet = true;
+        const pending = conn.pendingIce;
+        conn.pendingIce = [];
+        for (const cand of pending) {
+            try {
+                await conn.pc.addIceCandidate(cand);
+            }
+            catch { /* stale/duplicate */ }
+        }
+        if (pending.length)
+            this.log(`flushed ${pending.length} queued ICE candidate(s)`);
+    }
     async initiate(peerId) {
         const conn = this.newPc(peerId);
         const dc = conn.pc.createDataChannel("blocks");
@@ -8904,22 +8933,32 @@ class WebRtcTransport {
                 return; // mesh cap
             const conn = this.conns.get(from) ?? this.newPc(from);
             await conn.pc.setRemoteDescription(data);
+            await this.markRemoteSet(conn);
             const answer = await conn.pc.createAnswer();
             await conn.pc.setLocalDescription(answer);
             this.signaler.send(from, "answer", answer);
         }
         else if (kind === "answer") {
             const conn = this.conns.get(from);
-            if (conn)
+            if (conn) {
                 await conn.pc.setRemoteDescription(data);
+                await this.markRemoteSet(conn);
+            }
         }
         else if (kind === "ice") {
             const conn = this.conns.get(from);
             if (conn && data) {
+                // Queue candidates that arrive before setRemoteDescription — adding
+                // them early throws and (previously) dropped them, which killed the
+                // connection on fast LANs where ICE beats the SDP answer.
+                if (!conn.remoteSet) {
+                    conn.pendingIce.push(data);
+                    return;
+                }
                 try {
                     await conn.pc.addIceCandidate(data);
                 }
-                catch { /* pre-SRD race */ }
+                catch { /* stale */ }
             }
         }
         else if (kind === "bye") {
@@ -9388,6 +9427,7 @@ class PeerNetwork {
                 new WebRtcTransport(this.signaler, opts.myId, {
                     iceServers: opts.iceServers,
                     maxPeers: opts.maxPeers,
+                    debug: opts.debug,
                 });
         this.host = buildEngineHost(opts);
         // Wire transport ⇄ engine, demuxing block (engine) from gossip (app).