@dxos/network-manager 0.3.9-main.e6215fc → 0.3.9-main.eb5df3b

package/dist/lib/browser/{chunk-HJ6JLRZM.mjs → chunk-6B4JGIV2.mjs}

@@ -1,7 +1,18 @@
 import "@dxos/node-std/globals";
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// inject-globals:@inject-globals
 import {
-  __require
-} from "./chunk-YERMWDRB.mjs";
+  global,
+  Buffer as Buffer2,
+  process
+} from "@dxos/node-std/inject-globals";
 
 // packages/core/mesh/network-manager/src/swarm/connection.ts
 import { DeferredTask, Event, sleep, scheduleTask, scheduleTaskInterval, synchronized } from "@dxos/async";
@@ -2349,9 +2360,12 @@ import distance from "xor-distance";
 import { invariant as invariant8 } from "@dxos/invariant";
 import { log as log8 } from "@dxos/log";
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts";
+var MIN_UPDATE_INTERVAL = 1e3 * 10;
+var MAX_CHANGES_PER_UPDATE = 1;
 var MMSTTopology = class {
   constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
     this._sampleCollected = false;
+    this._lastAction = /* @__PURE__ */ new Date(0);
     this._originateConnections = originateConnections;
     this._maxPeers = maxPeers;
     this._sampleSize = sampleSize;
@@ -2359,7 +2373,7 @@ var MMSTTopology = class {
   init(controller) {
     invariant8(!this._controller, "Already initialized", {
       F: __dxlog_file9,
-      L: 46,
+      L: 51,
       S: this,
       A: [
         "!this._controller",
@@ -2371,7 +2385,7 @@ var MMSTTopology = class {
   update() {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 51,
+      L: 56,
       S: this,
       A: [
         "this._controller",
@@ -2382,7 +2396,7 @@ var MMSTTopology = class {
     if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
       log8("Running the algorithm.", void 0, {
         F: __dxlog_file9,
-        L: 55,
+        L: 60,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2393,7 +2407,7 @@ var MMSTTopology = class {
   async onOffer(peer) {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 62,
+      L: 67,
       S: this,
       A: [
         "this._controller",
@@ -2404,7 +2418,7 @@ var MMSTTopology = class {
     const accept = connected.length < this._maxPeers;
     log8(`Offer ${peer} accept=${accept}`, void 0, {
       F: __dxlog_file9,
-      L: 65,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2415,7 +2429,7 @@ var MMSTTopology = class {
   _runAlgorithm() {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 74,
+      L: 79,
       S: this,
       A: [
         "this._controller",
@@ -2424,27 +2438,84 @@ var MMSTTopology = class {
     });
     const { connected, candidates, ownPeerId } = this._controller.getState();
     if (connected.length > this._maxPeers) {
+      log8(`disconnect ${connected.length - this._maxPeers} peers.`, void 0, {
+        F: __dxlog_file9,
+        L: 85,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       const sorted = sortByXorDistance(connected, ownPeerId).reverse().slice(0, this._maxPeers - connected.length);
-      for (const peer of sorted) {
-        log8(`Disconnect ${peer}.`, void 0, {
+      invariant8(sorted.length === 0, void 0, {
+        F: __dxlog_file9,
+        L: 89,
+        S: this,
+        A: [
+          "sorted.length === 0",
+          ""
+        ]
+      });
+      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
+        log8(`want to disconnect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`, void 0, {
           F: __dxlog_file9,
-          L: 83,
+          L: 92,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      if (Date.now() - this._lastAction.getTime() > MIN_UPDATE_INTERVAL) {
+        for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
+          log8(`Disconnect ${peer}.`, void 0, {
+            F: __dxlog_file9,
+            L: 97,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this._controller.disconnect(peer);
+        }
+        this._lastAction = /* @__PURE__ */ new Date();
+      } else {
+        log8("rate limited discconnect", void 0, {
+          F: __dxlog_file9,
+          L: 102,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._controller.disconnect(peer);
       }
     } else if (connected.length < this._originateConnections) {
+      log8(`connect ${this._originateConnections - connected.length} peers.`, void 0, {
+        F: __dxlog_file9,
+        L: 106,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       const sample = candidates.sort(() => Math.random() - 0.5).slice(0, this._sampleSize);
       const sorted = sortByXorDistance(sample, ownPeerId).slice(0, this._originateConnections - connected.length);
-      for (const peer of sorted) {
-        log8(`Connect ${peer}.`, void 0, {
+      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
+        log8(`want to connect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`, void 0, {
           F: __dxlog_file9,
-          L: 91,
+          L: 111,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      if (Date.now() - this._lastAction.getTime() > MIN_UPDATE_INTERVAL) {
+        for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
+          log8(`Connect ${peer}.`, void 0, {
+            F: __dxlog_file9,
+            L: 115,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this._controller.connect(peer);
+        }
+        this._lastAction = /* @__PURE__ */ new Date();
+      } else {
+        log8("rate limited connect", void 0, {
+          F: __dxlog_file9,
+          L: 120,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._controller.connect(peer);
       }
     }
   }
@@ -2944,8 +3015,8 @@ var SimplePeerTransport = class {
     return {
       bytesSent: stats.transport.bytesSent,
       bytesReceived: stats.transport.bytesReceived,
-      packetsSent: stats.transport.messagesSent,
-      packetsReceived: stats.transport.messagesReceived,
+      packetsSent: stats.transport.packetsSent,
+      packetsReceived: stats.transport.packetsReceived,
       rawStats: stats.raw
     };
   }
@@ -2978,8 +3049,8 @@ var SimplePeerTransport = class {
     if (!rc) {
       return "unavailable";
     }
-    if (rc.relay) {
-      return `${rc.ip}:${rc.port}/${rc.protocol} relay for XXX ${rc.candidateType}`;
+    if (rc.candidateType === "relay") {
+      return `${rc.ip}:${rc.port}/${rc.protocol} relay for ${rc.relatedAddress}:${rc.relatedPort}`;
     }
     return `${rc.ip}:${rc.port}/${rc.protocol} ${rc.candidateType}`;
   }
@@ -2993,14 +3064,13 @@ var SimplePeerTransport = class {
     if (this._closed) {
       return;
     }
-    this._closed = true;
     this._disconnectStreams();
     this._peer.destroy();
     this._closed = true;
     this.closed.emit();
     log11("closed", void 0, {
       F: __dxlog_file12,
-      L: 201,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3448,17 +3518,24 @@ var LibDataChannelTransport = class {
     this._readyForCandidates = new Trigger2();
     this._writeCallback = null;
     this._peer = (async () => {
-      const { RTCPeerConnection: PeerConnection } = await import("./index.browser-O53CPVK3.mjs");
+      const { RTCPeerConnection } = (await importESM("node-datachannel/polyfill")).default;
       if (this._closed) {
         this.errors.raise(new Error("connection already closed"));
       }
-      const peer = new PeerConnection(params.webrtcConfig);
+      if (params.webrtcConfig) {
+        params.webrtcConfig.iceServers = params.webrtcConfig.iceServers ?? [];
+      } else {
+        params.webrtcConfig = {
+          iceServers: []
+        };
+      }
+      const peer = new RTCPeerConnection(params.webrtcConfig);
       peer.onicecandidateerror = (event) => {
         log14.error("peer.onicecandidateerror", {
           event
         }, {
           F: __dxlog_file15,
-          L: 53,
+          L: 61,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3470,7 +3547,7 @@ var LibDataChannelTransport = class {
           transportConnectionState: this._connected
         }, {
           F: __dxlog_file15,
-          L: 57,
+          L: 65,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3480,7 +3557,7 @@ var LibDataChannelTransport = class {
           event
         }, {
           F: __dxlog_file15,
-          L: 66,
+          L: 74,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3504,7 +3581,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 83,
+              L: 91,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3513,12 +3590,15 @@ var LibDataChannelTransport = class {
       };
       if (params.initiator) {
         peer.createOffer().then(async (offer) => {
+          if (this._closed) {
+            return;
+          }
           if (peer.connectionState !== "connecting") {
             log14.error("i am initiator but peer not in state connecting", {
               peer
             }, {
               F: __dxlog_file15,
-              L: 92,
+              L: 104,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3528,7 +3608,7 @@ var LibDataChannelTransport = class {
             offer
           }, {
             F: __dxlog_file15,
-            L: 95,
+            L: 107,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3548,7 +3628,7 @@ var LibDataChannelTransport = class {
         this.handleChannel(peer.createDataChannel(DATACHANNEL_LABEL));
         log14.debug("created data channel", void 0, {
           F: __dxlog_file15,
-          L: 104,
+          L: 116,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3561,7 +3641,7 @@ var LibDataChannelTransport = class {
             event
           }, {
             F: __dxlog_file15,
-            L: 110,
+            L: 122,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3579,7 +3659,7 @@ var LibDataChannelTransport = class {
     this._channel.onopen = () => {
       log14.debug("dataChannel.onopen", void 0, {
         F: __dxlog_file15,
-        L: 126,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3600,7 +3680,7 @@ var LibDataChannelTransport = class {
             if (this._writeCallback !== null) {
               log14.error("consumer trying to write before we're ready for more data", void 0, {
                 F: __dxlog_file15,
-                L: 143,
+                L: 155,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -3625,7 +3705,7 @@ var LibDataChannelTransport = class {
         err
       }, {
         F: __dxlog_file15,
-        L: 163,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3634,7 +3714,7 @@ var LibDataChannelTransport = class {
     this._channel.onmessage = (event) => {
       let data = event.data;
       if (data instanceof ArrayBuffer) {
-        data = Buffer.from(data);
+        data = Buffer2.from(data);
       }
       this._stream.push(data);
     };
@@ -3649,6 +3729,12 @@ var LibDataChannelTransport = class {
       return;
     }
     await this._disconnectStreams();
+    const peer = await this._peer;
+    try {
+      peer.close();
+    } catch (err) {
+      this.errors.raise(err);
+    }
     this._closed = true;
     this.closed.emit();
   }
@@ -3662,7 +3748,7 @@ var LibDataChannelTransport = class {
               peer
             }, {
               F: __dxlog_file15,
-              L: 198,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3690,7 +3776,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 209,
+              L: 227,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3710,7 +3796,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 220,
+              L: 238,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3729,7 +3815,7 @@ var LibDataChannelTransport = class {
             signal
           }, {
             F: __dxlog_file15,
-            L: 231,
+            L: 249,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3738,51 +3824,61 @@ var LibDataChannelTransport = class {
     }).catch((err) => {
       log14.catch(err, void 0, {
         F: __dxlog_file15,
-        L: 236,
+        L: 254,
         S: this,
         C: (f, a) => f(...a)
       });
     });
   }
   async getDetails() {
+    const stats = await this._getStats();
+    const rc = stats?.remoteCandidate;
+    if (!rc) {
+      return "unavailable";
+    }
+    if (rc.candidateType === "relay") {
+      return `${rc.ip}:${rc.port} relay for ${rc.relatedAddress}:${rc.relatedPort}`;
+    }
+    return `${rc.ip}:${rc.port} ${rc.candidateType}`;
+  }
+  async _getStats() {
     return this._peer.then(async (peer) => {
-      const cp = await peer.getSelectedCandidatePair();
-      if (!cp) {
-        return "unavailable";
+      const stats = await peer.getStats();
+      const statsEntries = Array.from(stats.entries());
+      const transport = statsEntries.filter((s) => s[1].type === "transport")[0][1];
+      const candidatePair = statsEntries.filter((s) => s[0] === transport.selectedCandidatePairId);
+      let selectedCandidatePair;
+      let remoteCandidate;
+      if (candidatePair.length > 0) {
+        selectedCandidatePair = candidatePair[0][1];
+        remoteCandidate = statsEntries.filter((s) => s[0] === selectedCandidatePair.remoteCandidateId)[0][1];
       }
-      return `${cp.remote.address}:${cp.remote.port}/${cp.remote.transportType} ${cp.remote.type}`;
-    }).catch((err) => {
-      log14.catch(err, void 0, {
-        F: __dxlog_file15,
-        L: 250,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return "unavailable";
+      return {
+        transport,
+        selectedCandidatePair,
+        remoteCandidate,
+        raw: Object.fromEntries(stats)
+      };
     });
   }
   async getStats() {
-    return this._peer.then((peer) => {
-      return {
-        bytesSent: peer.bytesSent(),
-        bytesReceived: peer.bytesReceived(),
-        packetsSent: 0,
-        packetsReceived: 0
-      };
-    }).catch((err) => {
-      log14.catch(err, void 0, {
-        F: __dxlog_file15,
-        L: 266,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+    const stats = await this._getStats();
+    if (!stats) {
       return {
         bytesSent: 0,
         bytesReceived: 0,
         packetsSent: 0,
-        packetsReceived: 0
+        packetsReceived: 0,
+        rawStats: {}
       };
-    });
+    }
+    return {
+      bytesSent: stats.transport.bytesSent,
+      bytesReceived: stats.transport.bytesReceived,
+      packetsSent: 0,
+      packetsReceived: 0,
+      rawStats: stats.raw
+    };
   }
   // TODO(nf): add classmethod to call node-datachannel.cleanup() when all instances have been destroyed?
   async destroy() {
@@ -3801,6 +3897,7 @@ var createLibDataChannelTransportFactory = (webrtcConfig) => ({
     webrtcConfig
   })
 });
+var importESM = Function("path", "return import(path)");
 
 // packages/core/mesh/network-manager/src/transport/tcp-transport.browser.ts
 import { Event as Event11 } from "@dxos/async";
@@ -3850,6 +3947,7 @@ var createTeleportProtocolFactory = (onConnection) => {
 };
 
 export {
+  process,
   ConnectionState,
   Connection,
   SwarmMessenger,
@@ -3877,4 +3975,4 @@ export {
   TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-HJ6JLRZM.mjs.map
+//# sourceMappingURL=chunk-6B4JGIV2.mjs.map