@dxos/network-manager 0.1.35 → 0.1.36

package/dist/lib/browser/{chunk-4W77MFHZ.mjs → chunk-A2UJX3UX.mjs}

@@ -433,8 +433,8 @@ var MessageRouter = class {
 
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
 import assert4 from "@dxos/node-std/assert";
-import { Event as Event2, scheduleTask, sleep, synchronized as synchronized3 } from "@dxos/async";
-import { Context } from "@dxos/context";
+import { Event as Event2, scheduleTask as scheduleTask2, sleep, synchronized as synchronized3 } from "@dxos/async";
+import { Context as Context2 } from "@dxos/context";
 import { ErrorStream as ErrorStream2 } from "@dxos/debug";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log4, logInfo } from "@dxos/log";
@@ -443,7 +443,8 @@ import { ComplexMap as ComplexMap2, isNotNullOrUndefined } from "@dxos/util";
 
 // packages/core/mesh/network-manager/src/swarm/peer.ts
 import assert3 from "@dxos/node-std/assert";
-import { synchronized as synchronized2 } from "@dxos/async";
+import { scheduleTask, synchronized as synchronized2 } from "@dxos/async";
+import { Context } from "@dxos/context";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 var __decorate2 = function(decorators, target, key, desc) {
@@ -456,6 +457,7 @@ var __decorate2 = function(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var CONNECTION_COUNTS_STABLE_AFTER = 5e3;
 var Peer = class {
   constructor(id, topic, localPeerId, _signalMessaging, _protocolProvider, _transportFactory, _callbacks) {
     this.id = id;
@@ -465,6 +467,9 @@ var Peer = class {
     this._protocolProvider = _protocolProvider;
     this._transportFactory = _transportFactory;
     this._callbacks = _callbacks;
+    this._availableAfter = 0;
+    this.availableToConnect = true;
+    this._ctx = new Context();
     this.advertizing = false;
     this.initiating = false;
   }
@@ -481,7 +486,7 @@ var Peer = class {
           peerId: this.localPeerId
         }, {
           file: "peer.ts",
-          line: 86,
+          line: 107,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -508,7 +513,7 @@ var Peer = class {
             err
           }, {
             file: "peer.ts",
-            line: 110,
+            line: 131,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -537,7 +542,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 128,
+      line: 149,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -560,14 +565,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         file: "peer.ts",
-        line: 140,
+        line: 161,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", {}, {
           file: "peer.ts",
-          line: 142,
+          line: 163,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -587,7 +592,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 153,
+        line: 174,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -602,6 +607,7 @@ var Peer = class {
   * Either we're initiating a connection or creating one in response to an offer from the other peer.
   */
   _createConnection(initiator, sessionId) {
+    var _a;
     log3("creating connection", {
       topic: this.topic,
       peerId: this.localPeerId,
@@ -610,7 +616,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 167,
+      line: 188,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -633,9 +639,13 @@ var Peer = class {
     );
     connection._traceParent = this._traceParent;
     this._callbacks.onInitiated(connection);
+    void ((_a = this._connectionCtx) == null ? void 0 : _a.dispose());
+    this._connectionCtx = this._ctx.derive();
     connection.stateChanged.on((state) => {
       switch (state) {
         case ConnectionState.CONNECTED: {
+          this.availableToConnect = true;
+          this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
           break;
         }
@@ -647,13 +657,23 @@ var Peer = class {
             initiator
           }, {
             file: "peer.ts",
-            line: 197,
+            line: 224,
             scope: this,
             callSite: (f, a) => f(...a)
           });
           assert3(this.connection === connection, "Connection mismatch (race condition).");
+          if (this._lastConnectionTime && this._lastConnectionTime + CONNECTION_COUNTS_STABLE_AFTER < Date.now()) {
+            this._availableAfter = 0;
+          } else {
+            this.availableToConnect = false;
+            this._availableAfter = increaseInterval(this._availableAfter);
+          }
           this.connection = void 0;
           this._callbacks.onDisconnected();
+          scheduleTask(this._connectionCtx, () => {
+            this.availableToConnect = true;
+            this._callbacks.onPeerAvailable();
+          }, this._availableAfter);
           break;
         }
       }
@@ -667,7 +687,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 207,
+        line: 252,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -686,7 +706,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 223,
+      line: 268,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -696,7 +716,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 229,
+      line: 274,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -707,7 +727,7 @@ var Peer = class {
         message
       }, {
         file: "peer.ts",
-        line: 234,
+        line: 279,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -717,12 +737,13 @@ var Peer = class {
   }
   async destroy() {
     var _a;
+    await this._ctx.dispose();
     log3("Destroying peer", {
       peerId: this.id,
       topic: this.topic
     }, {
       file: "peer.ts",
-      line: 242,
+      line: 288,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -732,6 +753,18 @@ var Peer = class {
 __decorate2([
   synchronized2
 ], Peer.prototype, "destroy", null);
+var increaseInterval = (interval) => {
+  if (interval === 0) {
+    return 50;
+  } else if (interval < 500) {
+    return 500;
+  } else if (interval < 1e3) {
+    return 1e3;
+  } else if (interval < 5e3) {
+    return 5e3;
+  }
+  return 1e4;
+};
 
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
 var __decorate3 = function(decorators, target, key, desc) {
@@ -758,7 +791,7 @@ var Swarm = class {
     this._transportFactory = _transportFactory;
     this._label = _label;
     this._peers = new ComplexMap2(PublicKey4.hash);
-    this._ctx = new Context();
+    this._ctx = new Context2();
     this.connectionAdded = new Event2();
     this.disconnected = new Event2();
     this.connected = new Event2();
@@ -998,7 +1031,7 @@ var Swarm = class {
   }
   // For debug purposes
   async goOnline() {
-    this._ctx = new Context();
+    this._ctx = new Context2();
   }
   _getOrCreatePeer(peerId) {
     let peer = this._peers.get(peerId);
@@ -1027,6 +1060,9 @@ var Swarm = class {
         },
         onOffer: (remoteId) => {
           return this._topology.onOffer(remoteId);
+        },
+        onPeerAvailable: () => {
+          this._topology.update();
         }
       });
       peer._traceParent = this._instanceId;
@@ -1044,19 +1080,19 @@ var Swarm = class {
       getState: () => ({
         ownPeerId: this._ownPeerId,
         connected: Array.from(this._peers.values()).filter((peer) => peer.connection).map((peer) => peer.id),
-        candidates: Array.from(this._peers.values()).filter((peer) => !peer.connection && peer.advertizing).map((peer) => peer.id)
+        candidates: Array.from(this._peers.values()).filter((peer) => !peer.connection && peer.advertizing && peer.availableToConnect).map((peer) => peer.id)
       }),
       connect: (peer) => {
         if (this._ctx.disposed) {
           return;
         }
-        scheduleTask(this._ctx, async () => {
+        scheduleTask2(this._ctx, async () => {
           try {
             await this._initiateConnection(peer);
           } catch (err) {
             log4.warn("initiation error", err, {
               file: "swarm.ts",
-              line: 317,
+              line: 320,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1067,7 +1103,7 @@ var Swarm = class {
         if (this._ctx.disposed) {
           return;
         }
-        scheduleTask(this._ctx, async () => {
+        scheduleTask2(this._ctx, async () => {
           await this._closeConnection(peer);
           this._topology.update();
         });
@@ -1084,7 +1120,7 @@ var Swarm = class {
         remoteId
       }, {
         file: "swarm.ts",
-        line: 344,
+        line: 347,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1101,7 +1137,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 358,
+      line: 361,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1111,7 +1147,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 361,
+      line: 364,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1301,6 +1337,7 @@ var NetworkManager = class {
     this.connectionStateChanged = new Event5();
     this.topicsUpdated = new Event5();
     this._instanceId = PublicKey7.random().toHex();
+    signalManager._traceParent = this._instanceId;
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
     this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => {
@@ -1342,10 +1379,11 @@ var NetworkManager = class {
   }
   async open() {
     log6.trace("dxos.mesh.network-manager", trace3.begin({
-      id: this._instanceId
+      id: this._instanceId,
+      parentId: this._traceParent
     }), {
       file: "network-manager.ts",
-      line: 133,
+      line: 135,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1357,7 +1395,7 @@ var NetworkManager = class {
       await this.leaveSwarm(topic).catch((err) => {
         log6(err, {}, {
           file: "network-manager.ts",
-          line: 141,
+          line: 143,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1369,7 +1407,7 @@ var NetworkManager = class {
       id: this._instanceId
     }), {
       file: "network-manager.ts",
-      line: 147,
+      line: 149,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1392,7 +1430,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       file: "network-manager.ts",
-      line: 168,
+      line: 170,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1402,7 +1440,7 @@ var NetworkManager = class {
         error
       }, {
         file: "network-manager.ts",
-        line: 171,
+        line: 173,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1413,7 +1451,7 @@ var NetworkManager = class {
       peerId
     }).catch((error) => log6.catch(error, {}, {
       file: "network-manager.ts",
-      line: 175,
+      line: 177,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1425,7 +1463,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 180,
+      line: 182,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1443,7 +1481,7 @@ var NetworkManager = class {
         topic: PublicKey7.from(topic).truncate()
       }, {
         file: "network-manager.ts",
-        line: 192,
+        line: 194,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1453,7 +1491,7 @@ var NetworkManager = class {
       topic: PublicKey7.from(topic)
     }, {
       file: "network-manager.ts",
-      line: 196,
+      line: 198,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1474,7 +1512,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 210,
+      line: 212,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2098,7 +2136,7 @@ var WebRTCTransportService = class {
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
 import assert12 from "@dxos/node-std/assert";
 import { Event as Event8 } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
+import { Context as Context3 } from "@dxos/context";
 import { ErrorStream as ErrorStream5 } from "@dxos/debug";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log12 } from "@dxos/log";
@@ -2108,7 +2146,7 @@ var WebRTCTransportProxy = class {
   constructor(_params) {
     this._params = _params;
     this._proxyId = PublicKey11.random();
-    this._ctx = new Context2();
+    this._ctx = new Context3();
     this.closed = new Event8();
     this._closed = false;
     this.connected = new Event8();
@@ -2284,4 +2322,4 @@ export {
   WebRTCTransportProxyFactory,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-4W77MFHZ.mjs.map
+//# sourceMappingURL=chunk-A2UJX3UX.mjs.map