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

package/dist/lib/node/{chunk-XZF4MAFB.cjs → chunk-Y2B5BDRH.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_XZF4MAFB_exports = {};
-__export(chunk_XZF4MAFB_exports, {
+var chunk_Y2B5BDRH_exports = {};
+__export(chunk_Y2B5BDRH_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
@@ -55,8 +55,7 @@ __export(chunk_XZF4MAFB_exports, {
   createSimplePeerTransportFactory: () => createSimplePeerTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_XZF4MAFB_exports);
-var import_chunk_JDKM4UPJ = require("./chunk-JDKM4UPJ.cjs");
+module.exports = __toCommonJS(chunk_Y2B5BDRH_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -153,6 +152,13 @@ var import_async12 = require("@dxos/async");
 var import_debug8 = require("@dxos/debug");
 var import_log15 = require("@dxos/log");
 var import_teleport = require("@dxos/teleport");
+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');
+});
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -2415,9 +2421,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 +2434,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 +2446,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 +2457,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 +2468,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 +2479,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 +2490,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 +2499,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,7 +2877,7 @@ var TransportKind;
 })(TransportKind || (TransportKind = {}));
 var wrtc = null;
 try {
-  wrtc = (0, import_chunk_JDKM4UPJ.__require)("@koush/wrtc");
+  wrtc = __require("@koush/wrtc");
 } catch {
 }
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts";
@@ -2981,8 +3047,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
     };
   }
@@ -3015,8 +3081,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}`;
   }
@@ -3030,14 +3096,13 @@ var SimplePeerTransport = class {
     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: 201,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3458,17 +3523,24 @@ var LibDataChannelTransport = class {
     this._readyForCandidates = new import_async11.Trigger();
     this._writeCallback = null;
     this._peer = (async () => {
-      const { RTCPeerConnection: PeerConnection } = await import("./datachannel-3VTTIMR5.cjs");
+      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) => {
         import_log14.log.error("peer.onicecandidateerror", {
           event
         }, {
           F: __dxlog_file15,
-          L: 53,
+          L: 61,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3480,7 +3552,7 @@ var LibDataChannelTransport = class {
           transportConnectionState: this._connected
         }, {
           F: __dxlog_file15,
-          L: 57,
+          L: 65,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3490,7 +3562,7 @@ var LibDataChannelTransport = class {
           event
         }, {
           F: __dxlog_file15,
-          L: 66,
+          L: 74,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3514,7 +3586,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 83,
+              L: 91,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3523,12 +3595,15 @@ var LibDataChannelTransport = class {
       };
       if (params.initiator) {
         peer.createOffer().then(async (offer) => {
+          if (this._closed) {
+            return;
+          }
           if (peer.connectionState !== "connecting") {
             import_log14.log.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)
             });
@@ -3538,7 +3613,7 @@ var LibDataChannelTransport = class {
             offer
           }, {
             F: __dxlog_file15,
-            L: 95,
+            L: 107,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3558,7 +3633,7 @@ var LibDataChannelTransport = class {
         this.handleChannel(peer.createDataChannel(DATACHANNEL_LABEL));
         import_log14.log.debug("created data channel", void 0, {
           F: __dxlog_file15,
-          L: 104,
+          L: 116,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3571,7 +3646,7 @@ var LibDataChannelTransport = class {
             event
           }, {
             F: __dxlog_file15,
-            L: 110,
+            L: 122,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3589,7 +3664,7 @@ var LibDataChannelTransport = class {
     this._channel.onopen = () => {
       import_log14.log.debug("dataChannel.onopen", void 0, {
         F: __dxlog_file15,
-        L: 126,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3610,7 +3685,7 @@ var LibDataChannelTransport = class {
             if (this._writeCallback !== null) {
               import_log14.log.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)
               });
@@ -3635,7 +3710,7 @@ var LibDataChannelTransport = class {
         err
       }, {
         F: __dxlog_file15,
-        L: 163,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3659,6 +3734,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();
   }
@@ -3672,7 +3753,7 @@ var LibDataChannelTransport = class {
               peer
             }, {
               F: __dxlog_file15,
-              L: 198,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3700,7 +3781,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 209,
+              L: 227,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3720,7 +3801,7 @@ var LibDataChannelTransport = class {
               err
             }, {
               F: __dxlog_file15,
-              L: 220,
+              L: 238,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3739,7 +3820,7 @@ var LibDataChannelTransport = class {
             signal
           }, {
             F: __dxlog_file15,
-            L: 231,
+            L: 249,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3748,51 +3829,61 @@ var LibDataChannelTransport = class {
     }).catch((err) => {
       import_log14.log.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) => {
-      import_log14.log.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) => {
-      import_log14.log.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() {
@@ -3811,6 +3902,7 @@ var createLibDataChannelTransportFactory = (webrtcConfig) => ({
     webrtcConfig
   })
 });
+var importESM = Function("path", "return import(path)");
 var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/tcp-transport.ts";
 var TcpTransportFactory = {
   createTransport: (params) => new TcpTransport(params)
@@ -3998,4 +4090,4 @@ var createTeleportProtocolFactory = (onConnection) => {
   createSimplePeerTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-XZF4MAFB.cjs.map
+//# sourceMappingURL=chunk-Y2B5BDRH.cjs.map