@dxos/network-manager 0.3.9-main.14901ff → 0.3.9-main.1b9ffda

package/dist/lib/browser/{chunk-S2JHWVGQ.mjs → chunk-KGZ5C6JO.mjs}

@@ -2349,9 +2349,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 +2362,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 +2374,7 @@ var MMSTTopology = class {
   update() {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 51,
+      L: 56,
       S: this,
       A: [
         "this._controller",
@@ -2382,7 +2385,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 +2396,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 +2407,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 +2418,7 @@ var MMSTTopology = class {
   _runAlgorithm() {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 74,
+      L: 79,
       S: this,
       A: [
         "this._controller",
@@ -2424,27 +2427,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);
       }
     }
   }
@@ -2779,6 +2839,9 @@ try {
 // packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts";
 var SimplePeerTransport = class {
+  /**
+  * @params opts.config formatted as per https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/RTCPeerConnection
+  */
   constructor(params) {
     this.params = params;
     this._closed = false;
@@ -2791,13 +2854,13 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 41,
+      L: 44,
       S: this,
       C: (f, a) => f(...a)
     });
     log11("created connection", params, {
       F: __dxlog_file12,
-      L: 42,
+      L: 45,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2810,7 +2873,7 @@ var SimplePeerTransport = class {
     this._peer.on("signal", async (data) => {
       log11("signal", data, {
         F: __dxlog_file12,
-        L: 51,
+        L: 54,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2823,7 +2886,7 @@ var SimplePeerTransport = class {
     this._peer.on("connect", () => {
       log11("connected", void 0, {
         F: __dxlog_file12,
-        L: 56,
+        L: 59,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2834,7 +2897,7 @@ var SimplePeerTransport = class {
     this._peer.on("close", async () => {
       log11("closed", void 0, {
         F: __dxlog_file12,
-        L: 63,
+        L: 66,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2849,7 +2912,7 @@ var SimplePeerTransport = class {
             err
           }, {
             F: __dxlog_file12,
-            L: 74,
+            L: 77,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2858,7 +2921,7 @@ var SimplePeerTransport = class {
       } else if ("code" in err) {
         log11.info("simple-peer error", err, {
           F: __dxlog_file12,
-          L: 79,
+          L: 82,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2888,7 +2951,7 @@ var SimplePeerTransport = class {
       } else {
         log11.info("unknown peer connection error", err, {
           F: __dxlog_file12,
-          L: 105,
+          L: 108,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2902,7 +2965,7 @@ var SimplePeerTransport = class {
               stats: Object.fromEntries(stats.entries())
             }, {
               F: __dxlog_file12,
-              L: 113,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2911,7 +2974,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         log11.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 120,
+          L: 123,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2922,7 +2985,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 126,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2975,29 +3038,28 @@ 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}`;
   }
   async destroy() {
     log11("closing...", void 0, {
       F: __dxlog_file12,
-      L: 189,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
     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: 198,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3874,4 +3936,4 @@ export {
   TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-S2JHWVGQ.mjs.map
+//# sourceMappingURL=chunk-KGZ5C6JO.mjs.map