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

package/dist/lib/node/{chunk-3SCPMSHV.cjs → chunk-WUBZ4UOJ.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_3SCPMSHV_exports = {};
-__export(chunk_3SCPMSHV_exports, {
+var chunk_WUBZ4UOJ_exports = {};
+__export(chunk_WUBZ4UOJ_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
@@ -55,8 +55,8 @@ __export(chunk_3SCPMSHV_exports, {
   createSimplePeerTransportFactory: () => createSimplePeerTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_3SCPMSHV_exports);
-var import_chunk_DMWORJG3 = require("./chunk-DMWORJG3.cjs");
+module.exports = __toCommonJS(chunk_WUBZ4UOJ_exports);
+var import_chunk_JDKM4UPJ = require("./chunk-JDKM4UPJ.cjs");
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -2415,9 +2415,12 @@ var FullyConnectedTopology = class {
   }
 };
 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;
@@ -2425,7 +2428,7 @@ var MMSTTopology = class {
   init(controller) {
     (0, import_invariant8.invariant)(!this._controller, "Already initialized", {
       F: __dxlog_file9,
-      L: 46,
+      L: 51,
       S: this,
       A: [
         "!this._controller",
@@ -2437,7 +2440,7 @@ var MMSTTopology = class {
   update() {
     (0, import_invariant8.invariant)(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 51,
+      L: 56,
       S: this,
       A: [
         "this._controller",
@@ -2448,7 +2451,7 @@ var MMSTTopology = class {
     if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
       (0, import_log8.log)("Running the algorithm.", void 0, {
         F: __dxlog_file9,
-        L: 55,
+        L: 60,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2459,7 +2462,7 @@ var MMSTTopology = class {
   async onOffer(peer) {
     (0, import_invariant8.invariant)(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 62,
+      L: 67,
       S: this,
       A: [
         "this._controller",
@@ -2470,7 +2473,7 @@ var MMSTTopology = class {
     const accept = connected.length < this._maxPeers;
     (0, import_log8.log)(`Offer ${peer} accept=${accept}`, void 0, {
       F: __dxlog_file9,
-      L: 65,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2481,7 +2484,7 @@ var MMSTTopology = class {
   _runAlgorithm() {
     (0, import_invariant8.invariant)(this._controller, "Not initialized", {
       F: __dxlog_file9,
-      L: 74,
+      L: 79,
       S: this,
       A: [
         "this._controller",
@@ -2490,27 +2493,84 @@ var MMSTTopology = class {
     });
     const { connected, candidates, ownPeerId } = this._controller.getState();
     if (connected.length > this._maxPeers) {
+      (0, import_log8.log)(`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) {
-        (0, import_log8.log)(`Disconnect ${peer}.`, void 0, {
+      (0, import_invariant8.invariant)(sorted.length === 0, void 0, {
+        F: __dxlog_file9,
+        L: 89,
+        S: this,
+        A: [
+          "sorted.length === 0",
+          ""
+        ]
+      });
+      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
+        (0, import_log8.log)(`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)) {
+          (0, import_log8.log)(`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 {
+        (0, import_log8.log)("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) {
+      (0, import_log8.log)(`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) {
-        (0, import_log8.log)(`Connect ${peer}.`, void 0, {
+      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
+        (0, import_log8.log)(`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)) {
+          (0, import_log8.log)(`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 {
+        (0, import_log8.log)("rate limited connect", void 0, {
+          F: __dxlog_file9,
+          L: 120,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._controller.connect(peer);
       }
     }
   }
@@ -2811,11 +2871,14 @@ var TransportKind;
 })(TransportKind || (TransportKind = {}));
 var wrtc = null;
 try {
-  wrtc = (0, import_chunk_DMWORJG3.__require)("@koush/wrtc");
+  wrtc = (0, import_chunk_JDKM4UPJ.__require)("@koush/wrtc");
 } catch {
 }
 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;
@@ -2828,13 +2891,13 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 41,
+      L: 44,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log11.log)("created connection", params, {
       F: __dxlog_file12,
-      L: 42,
+      L: 45,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2847,7 +2910,7 @@ var SimplePeerTransport = class {
     this._peer.on("signal", async (data) => {
       (0, import_log11.log)("signal", data, {
         F: __dxlog_file12,
-        L: 51,
+        L: 54,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2860,7 +2923,7 @@ var SimplePeerTransport = class {
     this._peer.on("connect", () => {
       (0, import_log11.log)("connected", void 0, {
         F: __dxlog_file12,
-        L: 56,
+        L: 59,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2871,7 +2934,7 @@ var SimplePeerTransport = class {
     this._peer.on("close", async () => {
       (0, import_log11.log)("closed", void 0, {
         F: __dxlog_file12,
-        L: 63,
+        L: 66,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2886,7 +2949,7 @@ var SimplePeerTransport = class {
             err
           }, {
             F: __dxlog_file12,
-            L: 74,
+            L: 77,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2895,7 +2958,7 @@ var SimplePeerTransport = class {
       } else if ("code" in err) {
         import_log11.log.info("simple-peer error", err, {
           F: __dxlog_file12,
-          L: 79,
+          L: 82,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2925,7 +2988,7 @@ var SimplePeerTransport = class {
       } else {
         import_log11.log.info("unknown peer connection error", err, {
           F: __dxlog_file12,
-          L: 105,
+          L: 108,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2939,7 +3002,7 @@ var SimplePeerTransport = class {
               stats: Object.fromEntries(stats.entries())
             }, {
               F: __dxlog_file12,
-              L: 113,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2948,7 +3011,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         import_log11.log.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 120,
+          L: 123,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2959,7 +3022,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 126,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3012,29 +3075,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() {
     (0, import_log11.log)("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();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file12,
-      L: 198,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3455,7 +3517,7 @@ var LibDataChannelTransport = class {
     this._readyForCandidates = new import_async11.Trigger();
     this._writeCallback = null;
     this._peer = (async () => {
-      const { RTCPeerConnection: PeerConnection } = await import("./datachannel-ABYQKZRC.cjs");
+      const { RTCPeerConnection: PeerConnection } = await import("./datachannel-3VTTIMR5.cjs");
       if (this._closed) {
         this.errors.raise(new Error("connection already closed"));
       }
@@ -3995,4 +4057,4 @@ var createTeleportProtocolFactory = (onConnection) => {
   createSimplePeerTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-3SCPMSHV.cjs.map
+//# sourceMappingURL=chunk-WUBZ4UOJ.cjs.map