@dxos/network-manager 0.1.56-main.c787da3 → 0.1.56-main.e47dfd1

package/dist/lib/node/testing/index.cjs

@@ -38,28 +38,28 @@ __export(testing_exports, {
 module.exports = __toCommonJS(testing_exports);
 
 // packages/core/mesh/network-manager/src/testing/test-builder.ts
-var import_keys13 = require("@dxos/keys");
+var import_keys14 = require("@dxos/keys");
 var import_messaging2 = require("@dxos/messaging");
 var import_protocols6 = require("@dxos/protocols");
 var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
 var import_rpc = require("@dxos/rpc");
-var import_util10 = require("@dxos/util");
+var import_util11 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/network-manager.ts
 var import_tiny_invariant5 = __toESM(require("tiny-invariant"));
-var import_async6 = require("@dxos/async");
-var import_keys7 = require("@dxos/keys");
-var import_log6 = require("@dxos/log");
+var import_async7 = require("@dxos/async");
+var import_keys8 = require("@dxos/keys");
+var import_log7 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_protocols4 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
-var import_util5 = require("@dxos/util");
+var import_util6 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/connection-log.ts
-var import_async5 = require("@dxos/async");
+var import_async6 = require("@dxos/async");
 var import_debug3 = require("@dxos/debug");
-var import_keys6 = require("@dxos/keys");
-var import_util4 = require("@dxos/util");
+var import_keys7 = require("@dxos/keys");
+var import_util5 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/swarm/connection.ts
 var import_tiny_invariant = __toESM(require("tiny-invariant"));
@@ -151,14 +151,13 @@ var Connection = class {
   /**
   * Create an underlying transport and prepares it for the connection.
   */
-  // TODO(burdon): Make async?
-  openConnection() {
+  async openConnection() {
     (0, import_tiny_invariant.default)(this._state === ConnectionState.INITIAL, "Invalid state.");
     import_log.log.trace("dxos.mesh.connection.open-connection", import_protocols.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 115,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -169,7 +168,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 126,
+        L: 125,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -201,7 +200,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 159,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -217,7 +216,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 171,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -226,7 +225,7 @@ var Connection = class {
     } catch (err) {
       import_log.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 177,
+        L: 176,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -236,7 +235,7 @@ var Connection = class {
     } catch (err) {
       import_log.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 184,
+        L: 183,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -245,7 +244,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 187,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -285,7 +284,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 221,
+        L: 220,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -301,7 +300,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 232,
+        L: 231,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -324,7 +323,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 246,
+          L: 245,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -337,7 +336,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 250,
+          L: 249,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -352,7 +351,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 257,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -567,6 +566,7 @@ var SwarmMessenger = class {
 var import_tiny_invariant3 = __toESM(require("tiny-invariant"));
 var import_async2 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
+var import_errors2 = require("@dxos/errors");
 var import_keys3 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
 function _ts_decorate2(decorators, target, key, desc) {
@@ -582,13 +582,14 @@ function _ts_decorate2(decorators, target, key, desc) {
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
 var CONNECTION_COUNTS_STABLE_AFTER = 5e3;
 var Peer = class {
-  constructor(id, topic, localPeerId, _signalMessaging, _protocolProvider, _transportFactory, _callbacks) {
+  constructor(id, topic, localPeerId, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
     this.id = id;
     this.topic = topic;
     this.localPeerId = localPeerId;
     this._signalMessaging = _signalMessaging;
     this._protocolProvider = _protocolProvider;
     this._transportFactory = _transportFactory;
+    this._connectionLimiter = _connectionLimiter;
     this._callbacks = _callbacks;
     this._availableAfter = 0;
     this.availableToConnect = true;
@@ -600,16 +601,18 @@ var Peer = class {
   * Respond to remote offer.
   */
   async onOffer(message) {
+    var _a2;
     const remoteId = message.author;
     if (this.connection || this.initiating) {
       if (remoteId.toHex() < this.localPeerId.toHex()) {
-        (0, import_log3.log)("closing local connection and accepting remote peer's offer", {
-          id: this.id,
+        (0, import_log3.log)("close local connection", {
+          localPeerId: this.id,
           topic: this.topic,
-          peerId: this.localPeerId
+          remotePeerId: this.localPeerId,
+          sessionId: (_a2 = this.connection) == null ? void 0 : _a2.sessionId
         }, {
           F: __dxlog_file3,
-          L: 105,
+          L: 107,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -627,19 +630,22 @@ var Peer = class {
         (0, import_tiny_invariant3.default)(message.sessionId);
         const connection = this._createConnection(false, message.sessionId);
         try {
-          connection.openConnection();
+          await this._connectionLimiter.connecting(message.sessionId);
+          await connection.openConnection();
         } catch (err) {
-          import_log3.log.warn("connection error", {
-            topic: this.topic,
-            peerId: this.localPeerId,
-            remoteId: this.id,
-            err
-          }, {
-            F: __dxlog_file3,
-            L: 129,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          if (!(err instanceof import_errors2.CancelledError)) {
+            import_log3.log.warn("connection error", {
+              topic: this.topic,
+              peerId: this.localPeerId,
+              remoteId: this.id,
+              err
+            }, {
+              F: __dxlog_file3,
+              L: 135,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
           await this.closeConnection();
         }
         return {
@@ -665,13 +671,14 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 147,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
     const connection = this._createConnection(true, sessionId);
     this.initiating = true;
     try {
+      await this._connectionLimiter.connecting(sessionId);
       const answer = await this._signalMessaging.offer({
         author: this.localPeerId,
         recipient: this.id,
@@ -688,14 +695,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 159,
+        L: 170,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         (0, import_log3.log)("ignoring response", void 0, {
           F: __dxlog_file3,
-          L: 161,
+          L: 172,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -705,7 +712,7 @@ var Peer = class {
         this._callbacks.onRejected();
         return;
       }
-      connection.openConnection();
+      await connection.openConnection();
       this._callbacks.onAccepted();
     } catch (err) {
       (0, import_log3.log)("initiation error", {
@@ -715,7 +722,7 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 172,
+        L: 183,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -739,7 +746,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 186,
+      L: 197,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -769,6 +776,7 @@ var Peer = class {
           this.availableToConnect = true;
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
+          this._connectionLimiter.doneConnecting(sessionId);
           break;
         }
         case ConnectionState.CLOSED: {
@@ -779,7 +787,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 221,
+            L: 234,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -792,6 +800,7 @@ var Peer = class {
           }
           this.connection = void 0;
           this._callbacks.onDisconnected();
+          this._connectionLimiter.doneConnecting(sessionId);
           (0, import_async2.scheduleTask)(this._connectionCtx, () => {
             this.availableToConnect = true;
             this._callbacks.onPeerAvailable();
@@ -809,7 +818,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 249,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -828,7 +837,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 265,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -838,7 +847,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 271,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -849,7 +858,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 276,
+        L: 290,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -865,7 +874,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 285,
+      L: 300,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -905,7 +914,7 @@ var getClassName = (obj) => Object.getPrototypeOf(obj).constructor.name;
 var Swarm = class {
   // TODO(burdon): Swarm => Peer.create/destroy =< Connection.open/close
   // TODO(burdon): Split up properties.
-  constructor(_topic, _ownPeerId, _topology, _protocolProvider, _messenger, _transportFactory, _label) {
+  constructor(_topic, _ownPeerId, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter) {
     this._topic = _topic;
     this._ownPeerId = _ownPeerId;
     this._topology = _topology;
@@ -913,6 +922,7 @@ var Swarm = class {
     this._messenger = _messenger;
     this._transportFactory = _transportFactory;
     this._label = _label;
+    this._connectionLimiter = _connectionLimiter;
     this._peers = new import_util2.ComplexMap(import_keys4.PublicKey.hash);
     this._ctx = new import_context4.Context();
     this._listeningHandle = void 0;
@@ -929,7 +939,7 @@ var Swarm = class {
       }
     }), {
       F: __dxlog_file4,
-      L: 86,
+      L: 88,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -937,7 +947,7 @@ var Swarm = class {
       peerId: _ownPeerId
     }, {
       F: __dxlog_file4,
-      L: 90,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -952,7 +962,7 @@ var Swarm = class {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 99,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -982,7 +992,7 @@ var Swarm = class {
           err
         }, {
           F: __dxlog_file4,
-          L: 133,
+          L: 135,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -993,7 +1003,7 @@ var Swarm = class {
     var _a2;
     (0, import_log4.log)("destroying...", void 0, {
       F: __dxlog_file4,
-      L: 139,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1004,7 +1014,7 @@ var Swarm = class {
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     (0, import_log4.log)("destroyed", void 0, {
       F: __dxlog_file4,
-      L: 146,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1019,7 +1029,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       F: __dxlog_file4,
-      L: 154,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1034,14 +1044,14 @@ var Swarm = class {
       swarmEvent
     }, {
       F: __dxlog_file4,
-      L: 167,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       (0, import_log4.log)("swarm event ignored for disposed swarm", void 0, {
         F: __dxlog_file4,
-        L: 170,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1053,7 +1063,7 @@ var Swarm = class {
         peerId
       }, {
         F: __dxlog_file4,
-        L: 176,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1068,7 +1078,7 @@ var Swarm = class {
         if (((_a2 = peer.connection) == null ? void 0 : _a2.state) !== ConnectionState.CONNECTED) {
           void this._destroyPeer(peer.id).catch((err) => import_log4.log.catch(err, void 0, {
             F: __dxlog_file4,
-            L: 187,
+            L: 189,
             S: this,
             C: (f, a) => f(...a)
           }));
@@ -1083,14 +1093,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file4,
-      L: 197,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       (0, import_log4.log)("ignored for disposed swarm", void 0, {
         F: __dxlog_file4,
-        L: 199,
+        L: 201,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1104,7 +1114,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file4,
-        L: 206,
+        L: 208,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1117,7 +1127,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file4,
-        L: 210,
+        L: 212,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1136,14 +1146,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file4,
-      L: 222,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       import_log4.log.info("ignored for offline swarm", void 0, {
         F: __dxlog_file4,
-        L: 224,
+        L: 225,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1169,7 +1179,7 @@ var Swarm = class {
   _getOrCreatePeer(peerId) {
     let peer = this._peers.get(peerId);
     if (!peer) {
-      peer = new Peer(peerId, this._topic, this._ownPeerId, this._swarmMessenger, this._protocolProvider, this._transportFactory, {
+      peer = new Peer(peerId, this._topic, this._ownPeerId, this._swarmMessenger, this._protocolProvider, this._transportFactory, this._connectionLimiter, {
         onInitiated: (connection) => {
           this.connectionAdded.emit(connection);
         },
@@ -1224,7 +1234,7 @@ var Swarm = class {
           } catch (err) {
             (0, import_log4.log)("initiation error", err, {
               F: __dxlog_file4,
-              L: 327,
+              L: 329,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1252,7 +1262,7 @@ var Swarm = class {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 354,
+        L: 356,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1269,7 +1279,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 368,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1279,7 +1289,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 371,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1307,9 +1317,6 @@ _ts_decorate3([
 _ts_decorate3([
   import_async3.synchronized
 ], Swarm.prototype, "onOffer", null);
-_ts_decorate3([
-  import_async3.synchronized
-], Swarm.prototype, "onSignal", null);
 _ts_decorate3([
   import_async3.synchronized
 ], Swarm.prototype, "goOffline", null);
@@ -1388,6 +1395,87 @@ var SwarmMapper = class {
   }
 };
 
+// packages/core/mesh/network-manager/src/swarm/connection-limiter.ts
+var import_async5 = require("@dxos/async");
+var import_context5 = require("@dxos/context");
+var import_errors3 = require("@dxos/errors");
+var import_keys6 = require("@dxos/keys");
+var import_log6 = require("@dxos/log");
+var import_util4 = require("@dxos/util");
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
+var MAX_CONCURRENT_INITIATING_CONNECTIONS = 3;
+var ConnectionLimiter = class {
+  constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
+    this._ctx = new import_context5.Context();
+    /**
+    * Queue of promises to resolve when initiating connections amount is below the limit.
+    */
+    this._waitingPromises = new import_util4.ComplexMap(import_keys6.PublicKey.hash);
+    this.resolveWaitingPromises = new import_async5.DeferredTask(this._ctx, async () => {
+      Array.from(this._waitingPromises.values()).slice(0, this._maxConcurrentInitConnections).forEach(({ resolve }) => {
+        resolve();
+      });
+    });
+    this._maxConcurrentInitConnections = maxConcurrentInitConnections;
+  }
+  /**
+  * @returns Promise that resolves in queue when connections amount with 'CONNECTING' state is below the limit.
+  */
+  async connecting(sessionId) {
+    (0, import_log6.invariant)(!this._waitingPromises.has(sessionId), "Peer is already waiting for connection", {
+      F: __dxlog_file6,
+      L: 47,
+      S: this,
+      A: [
+        "!this._waitingPromises.has(sessionId)",
+        "'Peer is already waiting for connection'"
+      ]
+    });
+    (0, import_log6.log)("waiting", {
+      sessionId
+    }, {
+      F: __dxlog_file6,
+      L: 48,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await new Promise((resolve, reject) => {
+      this._waitingPromises.set(sessionId, {
+        resolve,
+        reject
+      });
+      this.resolveWaitingPromises.schedule();
+    });
+    (0, import_log6.log)("allow", {
+      sessionId
+    }, {
+      F: __dxlog_file6,
+      L: 56,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  /**
+  * Rejects promise returned by `connecting` method.
+  */
+  doneConnecting(sessionId) {
+    (0, import_log6.log)("done", {
+      sessionId
+    }, {
+      F: __dxlog_file6,
+      L: 63,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (!this._waitingPromises.has(sessionId)) {
+      return;
+    }
+    this._waitingPromises.get(sessionId).reject(new import_errors3.CancelledError());
+    this._waitingPromises.delete(sessionId);
+    this.resolveWaitingPromises.schedule();
+  }
+};
+
 // packages/core/mesh/network-manager/src/connection-log.ts
 var EventType;
 (function(EventType2) {
@@ -1402,8 +1490,8 @@ var ConnectionLog = class {
     /**
     * SwarmId => info
     */
-    this._swarms = new import_util4.ComplexMap(import_keys6.PublicKey.hash);
-    this.update = new import_async5.Event();
+    this._swarms = new import_util5.ComplexMap(import_keys7.PublicKey.hash);
+    this.update = new import_async6.Event();
   }
   getSwarmInfo(swarmId) {
     var _a2;
@@ -1414,13 +1502,13 @@ var ConnectionLog = class {
   }
   joinedSwarm(swarm) {
     const info = {
-      id: import_keys6.PublicKey.from(swarm._instanceId),
+      id: import_keys7.PublicKey.from(swarm._instanceId),
       topic: swarm.topic,
       isActive: true,
       label: swarm.label,
       connections: []
     };
-    this._swarms.set(import_keys6.PublicKey.from(swarm._instanceId), info);
+    this._swarms.set(import_keys7.PublicKey.from(swarm._instanceId), info);
     this.update.emit();
     swarm.connectionAdded.on((connection) => {
       var _a2, _b;
@@ -1449,21 +1537,24 @@ var ConnectionLog = class {
     });
   }
   leftSwarm(swarm) {
-    this.getSwarmInfo(import_keys6.PublicKey.from(swarm._instanceId)).isActive = false;
+    this.getSwarmInfo(import_keys7.PublicKey.from(swarm._instanceId)).isActive = false;
     this.update.emit();
   }
 };
 
 // packages/core/mesh/network-manager/src/network-manager.ts
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
 var NetworkManager = class {
   constructor({ transportFactory, signalManager, log: log1 }) {
-    this._swarms = new import_util5.ComplexMap(import_keys7.PublicKey.hash);
-    this._mappers = new import_util5.ComplexMap(import_keys7.PublicKey.hash);
+    /**
+    * @internal
+    */
+    this._swarms = new import_util6.ComplexMap(import_keys8.PublicKey.hash);
+    this._mappers = new import_util6.ComplexMap(import_keys8.PublicKey.hash);
     this._connectionState = import_services.ConnectionState.ONLINE;
-    this.connectionStateChanged = new import_async6.Event();
-    this.topicsUpdated = new import_async6.Event();
-    this._instanceId = import_keys7.PublicKey.random().toHex();
+    this.connectionStateChanged = new import_async7.Event();
+    this.topicsUpdated = new import_async7.Event();
+    this._instanceId = import_keys8.PublicKey.random().toHex();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
     this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => {
@@ -1477,6 +1568,7 @@ var NetworkManager = class {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
     };
+    this._connectionLimiter = new ConnectionLimiter();
     if (log1) {
       this._connectionLog = new ConnectionLog();
     }
@@ -1499,21 +1591,21 @@ var NetworkManager = class {
     return this._swarms.get(topic);
   }
   async open() {
-    import_log6.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.begin({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file6,
-      L: 127,
+      F: __dxlog_file7,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._messenger.open();
     await this._signalManager.open();
-    import_log6.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.end({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file6,
-      L: 130,
+      F: __dxlog_file7,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1521,9 +1613,9 @@ var NetworkManager = class {
   async close() {
     for (const topic of this._swarms.keys()) {
       await this.leaveSwarm(topic).catch((err) => {
-        (0, import_log6.log)(err, void 0, {
-          F: __dxlog_file6,
-          L: 136,
+        (0, import_log7.log)(err, void 0, {
+          F: __dxlog_file7,
+          L: 140,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1537,30 +1629,30 @@ var NetworkManager = class {
   */
   async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, label }) {
     var _a2;
-    (0, import_tiny_invariant5.default)(import_keys7.PublicKey.isPublicKey(topic));
-    (0, import_tiny_invariant5.default)(import_keys7.PublicKey.isPublicKey(peerId));
+    (0, import_tiny_invariant5.default)(import_keys8.PublicKey.isPublicKey(topic));
+    (0, import_tiny_invariant5.default)(import_keys8.PublicKey.isPublicKey(peerId));
     (0, import_tiny_invariant5.default)(topology);
     (0, import_tiny_invariant5.default)(typeof protocol === "function");
     if (this._swarms.has(topic)) {
-      throw new Error(`Already connected to swarm: ${import_keys7.PublicKey.from(topic)}`);
+      throw new Error(`Already connected to swarm: ${import_keys8.PublicKey.from(topic)}`);
     }
-    (0, import_log6.log)("joining", {
-      topic: import_keys7.PublicKey.from(topic),
+    (0, import_log7.log)("joining", {
+      topic: import_keys8.PublicKey.from(topic),
       peerId,
       topology: topology.toString()
     }, {
-      F: __dxlog_file6,
-      L: 162,
+      F: __dxlog_file7,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    const swarm = new Swarm(topic, peerId, topology, protocol, this._messenger, this._transportFactory, label);
+    const swarm = new Swarm(topic, peerId, topology, protocol, this._messenger, this._transportFactory, label, this._connectionLimiter);
     swarm.errors.handle((error) => {
-      (0, import_log6.log)("swarm error", {
+      (0, import_log7.log)("swarm error", {
         error
       }, {
-        F: __dxlog_file6,
-        L: 165,
+        F: __dxlog_file7,
+        L: 179,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1571,20 +1663,20 @@ var NetworkManager = class {
     this._signalConnection.join({
       topic,
       peerId
-    }).catch((error) => import_log6.log.catch(error, void 0, {
-      F: __dxlog_file6,
-      L: 174,
+    }).catch((error) => import_log7.log.catch(error, void 0, {
+      F: __dxlog_file7,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     }));
     this.topicsUpdated.emit();
     (_a2 = this._connectionLog) == null ? void 0 : _a2.joinedSwarm(swarm);
-    (0, import_log6.log)("joined", {
-      topic: import_keys7.PublicKey.from(topic),
+    (0, import_log7.log)("joined", {
+      topic: import_keys8.PublicKey.from(topic),
       count: this._swarms.size
     }, {
-      F: __dxlog_file6,
-      L: 178,
+      F: __dxlog_file7,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1600,11 +1692,11 @@ var NetworkManager = class {
     if (!this._swarms.has(topic)) {
       return;
     }
-    (0, import_log6.log)("leaving", {
-      topic: import_keys7.PublicKey.from(topic)
+    (0, import_log7.log)("leaving", {
+      topic: import_keys8.PublicKey.from(topic)
     }, {
-      F: __dxlog_file6,
-      L: 194,
+      F: __dxlog_file7,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1620,12 +1712,12 @@ var NetworkManager = class {
     await swarm.destroy();
     this._swarms.delete(topic);
     await this.topicsUpdated.emit();
-    (0, import_log6.log)("left", {
-      topic: import_keys7.PublicKey.from(topic),
+    (0, import_log7.log)("left", {
+      topic: import_keys8.PublicKey.from(topic),
       count: this._swarms.size
     }, {
-      F: __dxlog_file6,
-      L: 208,
+      F: __dxlog_file7,
+      L: 222,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1685,20 +1777,20 @@ var FullyConnectedTopology = class {
 // packages/core/mesh/network-manager/src/topology/mmst-topology.ts
 var import_tiny_invariant7 = __toESM(require("tiny-invariant"));
 var import_xor_distance = __toESM(require("xor-distance"));
-var import_log7 = require("@dxos/log");
+var import_log8 = require("@dxos/log");
 
 // packages/core/mesh/network-manager/src/topology/star-topology.ts
 var import_tiny_invariant8 = __toESM(require("tiny-invariant"));
-var import_log8 = require("@dxos/log");
+var import_log9 = require("@dxos/log");
 
 // packages/core/mesh/network-manager/src/transport/memory-transport.ts
 var import_node_stream = require("node:stream");
 var import_tiny_invariant9 = __toESM(require("tiny-invariant"));
-var import_async7 = require("@dxos/async");
+var import_async8 = require("@dxos/async");
 var import_debug4 = require("@dxos/debug");
-var import_keys8 = require("@dxos/keys");
-var import_log9 = require("@dxos/log");
-var import_util6 = require("@dxos/util");
+var import_keys9 = require("@dxos/keys");
+var import_log10 = require("@dxos/log");
+var import_util7 = require("@dxos/util");
 function _ts_decorate4(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")
@@ -1709,7 +1801,7 @@ function _ts_decorate4(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 __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
 var MEMORY_TRANSPORT_DELAY = 1;
 var createStreamDelay = (delay) => {
   return new import_node_stream.Transform({
@@ -1726,16 +1818,16 @@ var _MemoryTransport = class {
   constructor(options) {
     var _a2;
     this.options = options;
-    this.closed = new import_async7.Event();
-    this.connected = new import_async7.Event();
+    this.closed = new import_async8.Event();
+    this.connected = new import_async8.Event();
     this.errors = new import_debug4.ErrorStream();
-    this._instanceId = import_keys8.PublicKey.random();
-    this._remote = new import_async7.Trigger();
+    this._instanceId = import_keys9.PublicKey.random();
+    this._remote = new import_async8.Trigger();
     this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._destroyed = false;
-    (0, import_log9.log)("creating", void 0, {
-      F: __dxlog_file7,
+    (0, import_log10.log)("creating", void 0, {
+      F: __dxlog_file8,
       L: 64,
       S: this,
       C: (f, a) => f(...a)
@@ -1744,8 +1836,8 @@ var _MemoryTransport = class {
     _MemoryTransport._connections.set(this._instanceId, this);
     if (this.options.initiator) {
       setTimeout(async () => {
-        (0, import_log9.log)("sending signal", void 0, {
-          F: __dxlog_file7,
+        (0, import_log10.log)("sending signal", void 0, {
+          F: __dxlog_file8,
           L: 73,
           S: this,
           C: (f, a) => f(...a)
@@ -1777,8 +1869,8 @@ var _MemoryTransport = class {
         (0, import_tiny_invariant9.default)(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`);
         this._remoteConnection._remoteConnection = this;
         this._remoteConnection._remoteInstanceId = this._instanceId;
-        (0, import_log9.log)("connected", void 0, {
-          F: __dxlog_file7,
+        (0, import_log10.log)("connected", void 0, {
+          F: __dxlog_file8,
           L: 103,
           S: this,
           C: (f, a) => f(...a)
@@ -1795,8 +1887,8 @@ var _MemoryTransport = class {
     }
   }
   async destroy() {
-    (0, import_log9.log)("closing", void 0, {
-      F: __dxlog_file7,
+    (0, import_log10.log)("closing", void 0, {
+      F: __dxlog_file8,
       L: 124,
       S: this,
       C: (f, a) => f(...a)
@@ -1804,8 +1896,8 @@ var _MemoryTransport = class {
     this._destroyed = true;
     _MemoryTransport._connections.delete(this._instanceId);
     if (this._remoteConnection) {
-      (0, import_log9.log)("closing", void 0, {
-        F: __dxlog_file7,
+      (0, import_log10.log)("closing", void 0, {
+        F: __dxlog_file8,
         L: 129,
         S: this,
         C: (f, a) => f(...a)
@@ -1817,26 +1909,26 @@ var _MemoryTransport = class {
       this._remoteConnection.closed.emit();
       this._remoteConnection._remoteConnection = void 0;
       this._remoteConnection = void 0;
-      (0, import_log9.log)("closed", void 0, {
-        F: __dxlog_file7,
+      (0, import_log10.log)("closed", void 0, {
+        F: __dxlog_file8,
         L: 147,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     this.closed.emit();
-    (0, import_log9.log)("closed", void 0, {
-      F: __dxlog_file7,
+    (0, import_log10.log)("closed", void 0, {
+      F: __dxlog_file8,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   signal({ payload }) {
-    (0, import_log9.log)("received signal", {
+    (0, import_log10.log)("received signal", {
       payload
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 155,
       S: this,
       C: (f, a) => f(...a)
@@ -1846,28 +1938,28 @@ var _MemoryTransport = class {
     }
     const transportId = payload.transportId;
     if (transportId) {
-      const remoteId = import_keys8.PublicKey.fromHex(transportId);
+      const remoteId = import_keys9.PublicKey.fromHex(transportId);
       this._remote.wake(remoteId);
     }
   }
 };
 var MemoryTransport = _MemoryTransport;
 // TODO(burdon): Remove static properties (inject context into constructor).
-MemoryTransport._connections = new import_util6.ComplexMap(import_keys8.PublicKey.hash);
+MemoryTransport._connections = new import_util7.ComplexMap(import_keys9.PublicKey.hash);
 _ts_decorate4([
-  import_log9.logInfo
+  import_log10.logInfo
 ], MemoryTransport.prototype, "_instanceId", void 0);
 _ts_decorate4([
-  import_log9.logInfo
+  import_log10.logInfo
 ], MemoryTransport.prototype, "_remoteInstanceId", void 0);
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport.ts
 var import_simple_peer = __toESM(require("simple-peer"));
 var import_tiny_invariant10 = __toESM(require("tiny-invariant"));
-var import_async8 = require("@dxos/async");
+var import_async9 = require("@dxos/async");
 var import_debug5 = require("@dxos/debug");
-var import_keys9 = require("@dxos/keys");
-var import_log10 = require("@dxos/log");
+var import_keys10 = require("@dxos/keys");
+var import_log11 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
 
 // packages/core/mesh/network-manager/src/transport/webrtc.ts
@@ -1878,26 +1970,26 @@ try {
 }
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport.ts
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts";
 var WebRTCTransport = class {
   constructor(params) {
     var _a2;
     this.params = params;
     this._closed = false;
-    this.closed = new import_async8.Event();
-    this.connected = new import_async8.Event();
+    this.closed = new import_async9.Event();
+    this.connected = new import_async9.Event();
     this.errors = new import_debug5.ErrorStream();
-    this._instanceId = import_keys9.PublicKey.random().toHex();
-    import_log10.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.begin({
+    this._instanceId = import_keys10.PublicKey.random().toHex();
+    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 39,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log10.log)("created connection", params, {
-      F: __dxlog_file8,
+    (0, import_log11.log)("created connection", params, {
+      F: __dxlog_file9,
       L: 40,
       S: this,
       C: (f, a) => f(...a)
@@ -1908,8 +2000,8 @@ var WebRTCTransport = class {
       config: this.params.webrtcConfig
     });
     this._peer.on("signal", async (data) => {
-      (0, import_log10.log)("signal", data, {
-        F: __dxlog_file8,
+      (0, import_log11.log)("signal", data, {
+        F: __dxlog_file9,
         L: 48,
         S: this,
         C: (f, a) => f(...a)
@@ -1921,8 +2013,8 @@ var WebRTCTransport = class {
       });
     });
     this._peer.on("connect", () => {
-      (0, import_log10.log)("connected", void 0, {
-        F: __dxlog_file8,
+      (0, import_log11.log)("connected", void 0, {
+        F: __dxlog_file9,
         L: 53,
         S: this,
         C: (f, a) => f(...a)
@@ -1931,8 +2023,8 @@ var WebRTCTransport = class {
       this.connected.emit();
     });
     this._peer.on("close", async () => {
-      (0, import_log10.log)("closed", void 0, {
-        F: __dxlog_file8,
+      (0, import_log11.log)("closed", void 0, {
+        F: __dxlog_file9,
         L: 59,
         S: this,
         C: (f, a) => f(...a)
@@ -1946,11 +2038,11 @@ var WebRTCTransport = class {
       try {
         if (typeof ((_a3 = this._peer) == null ? void 0 : _a3._pc.getStats) === "function") {
           this._peer._pc.getStats().then((stats) => {
-            import_log10.log.warn("report after webrtc error", {
+            import_log11.log.warn("report after webrtc error", {
               config: this.params.webrtcConfig,
               stats
             }, {
-              F: __dxlog_file8,
+              F: __dxlog_file9,
               L: 71,
               S: this,
               C: (f, a) => f(...a)
@@ -1961,18 +2053,18 @@ var WebRTCTransport = class {
       }
       await this.destroy();
     });
-    import_log10.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.end({
+    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async destroy() {
-    (0, import_log10.log)("closing...", void 0, {
-      F: __dxlog_file8,
+    (0, import_log11.log)("closing...", void 0, {
+      F: __dxlog_file9,
       L: 85,
       S: this,
       C: (f, a) => f(...a)
@@ -1981,8 +2073,8 @@ var WebRTCTransport = class {
     await this._disconnectStreams();
     this._peer.destroy();
     this.closed.emit();
-    (0, import_log10.log)("closed", void 0, {
-      F: __dxlog_file8,
+    (0, import_log11.log)("closed", void 0, {
+      F: __dxlog_file9,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
@@ -2005,16 +2097,16 @@ var WebRTCTransport = class {
 var import_node_stream2 = require("node:stream");
 var import_tiny_invariant11 = __toESM(require("tiny-invariant"));
 var import_codec_protobuf = require("@dxos/codec-protobuf");
-var import_keys10 = require("@dxos/keys");
-var import_log11 = require("@dxos/log");
+var import_keys11 = require("@dxos/keys");
+var import_log12 = require("@dxos/log");
 var import_bridge = require("@dxos/protocols/proto/dxos/mesh/bridge");
-var import_util7 = require("@dxos/util");
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts";
+var import_util8 = require("@dxos/util");
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts";
 var WebRTCTransportService = class {
   // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
-    this.transports = new import_util7.ComplexMap(import_keys10.PublicKey.hash);
+    this.transports = new import_util8.ComplexMap(import_keys11.PublicKey.hash);
   }
   open(request) {
     const rpcStream = new import_codec_protobuf.Stream(({ ready, next, close }) => {
@@ -2092,8 +2184,8 @@ var WebRTCTransportService = class {
     await ((_a2 = this.transports.get(proxyId)) == null ? void 0 : _a2.transport.destroy());
     await ((_b = this.transports.get(proxyId)) == null ? void 0 : _b.stream.end());
     this.transports.delete(proxyId);
-    (0, import_log11.log)("Closed.", void 0, {
-      F: __dxlog_file9,
+    (0, import_log12.log)("Closed.", void 0, {
+      F: __dxlog_file10,
       L: 109,
       S: this,
       C: (f, a) => f(...a)
@@ -2103,23 +2195,23 @@ var WebRTCTransportService = class {
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
 var import_tiny_invariant12 = __toESM(require("tiny-invariant"));
-var import_async9 = require("@dxos/async");
-var import_context5 = require("@dxos/context");
+var import_async10 = require("@dxos/async");
+var import_context6 = require("@dxos/context");
 var import_debug6 = require("@dxos/debug");
-var import_keys11 = require("@dxos/keys");
-var import_log12 = require("@dxos/log");
+var import_keys12 = require("@dxos/keys");
+var import_log13 = require("@dxos/log");
 var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
-var import_util8 = require("@dxos/util");
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts";
+var import_util9 = require("@dxos/util");
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts";
 var WebRTCTransportProxy = class {
   // prettier-ignore
   constructor(_params) {
     this._params = _params;
-    this._proxyId = import_keys11.PublicKey.random();
-    this._ctx = new import_context5.Context();
-    this.closed = new import_async9.Event();
+    this._proxyId = import_keys12.PublicKey.random();
+    this._ctx = new import_context6.Context();
+    this.closed = new import_async10.Event();
     this._closed = false;
-    this.connected = new import_async9.Event();
+    this.connected = new import_async10.Event();
     this.errors = new import_debug6.ErrorStream();
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
@@ -2127,8 +2219,8 @@ var WebRTCTransportProxy = class {
     });
     this._serviceStream.waitUntilReady().then(() => {
       this._serviceStream.subscribe(async (event) => {
-        (0, import_log12.log)("WebRTCTransportProxy: event", event, {
-          F: __dxlog_file10,
+        (0, import_log13.log)("WebRTCTransportProxy: event", event, {
+          F: __dxlog_file11,
           L: 50,
           S: this,
           C: (f, a) => f(...a)
@@ -2148,8 +2240,8 @@ var WebRTCTransportProxy = class {
             payload: data
           });
         } catch (err) {
-          import_log12.log.catch(err, void 0, {
-            F: __dxlog_file10,
+          import_log13.log.catch(err, void 0, {
+            F: __dxlog_file11,
             L: 67,
             S: this,
             C: (f, a) => f(...a)
@@ -2160,8 +2252,8 @@ var WebRTCTransportProxy = class {
       this._ctx.onDispose(() => {
         this._params.stream.off("data", dataListener);
       });
-    }, (error) => import_log12.log.catch(error, void 0, {
-      F: __dxlog_file10,
+    }, (error) => import_log13.log.catch(error, void 0, {
+      F: __dxlog_file11,
       L: 73,
       S: this,
       C: (f, a) => f(...a)
@@ -2183,7 +2275,7 @@ var WebRTCTransportProxy = class {
     }
   }
   _handleData(dataEvent) {
-    this._params.stream.write((0, import_util8.arrayToBuffer)(dataEvent.payload));
+    this._params.stream.write((0, import_util9.arrayToBuffer)(dataEvent.payload));
   }
   async _handleSignal(signalEvent) {
     await this._params.sendSignal(signalEvent.payload);
@@ -2206,8 +2298,8 @@ var WebRTCTransportProxy = class {
         proxyId: this._proxyId
       });
     } catch (err) {
-      import_log12.log.catch(err, void 0, {
-        F: __dxlog_file10,
+      import_log13.log.catch(err, void 0, {
+        F: __dxlog_file11,
         L: 124,
         S: this,
         C: (f, a) => f(...a)
@@ -2254,11 +2346,11 @@ var WebRTCTransportProxyFactory = class {
 };
 
 // packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts
-var import_async10 = require("@dxos/async");
-var import_keys12 = require("@dxos/keys");
-var import_log13 = require("@dxos/log");
+var import_async11 = require("@dxos/async");
+var import_keys13 = require("@dxos/keys");
+var import_log14 = require("@dxos/log");
 var import_teleport2 = require("@dxos/teleport");
-var import_util9 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/wire-protocol.ts
 var import_teleport = require("@dxos/teleport");
@@ -2279,19 +2371,19 @@ var createTeleportProtocolFactory = (onConnection) => {
 };
 
 // packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts";
 var TestWireProtocol = class {
   constructor(peerId) {
     this.peerId = peerId;
-    this.connections = new import_util9.ComplexMap(import_keys12.PublicKey.hash);
-    this.streamConnections = new import_util9.ComplexMap(import_keys12.PublicKey.hash);
-    this.connected = new import_async10.Event();
-    this.disconnected = new import_async10.Event();
+    this.connections = new import_util10.ComplexMap(import_keys13.PublicKey.hash);
+    this.streamConnections = new import_util10.ComplexMap(import_keys13.PublicKey.hash);
+    this.connected = new import_async11.Event();
+    this.disconnected = new import_async11.Event();
     this.factory = createTeleportProtocolFactory(async (teleport) => {
-      (0, import_log13.log)("create", {
+      (0, import_log14.log)("create", {
         remotePeerId: teleport.remotePeerId
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file12,
         L: 23,
         S: this,
         C: (f, a) => f(...a)
@@ -2318,15 +2410,15 @@ var TestWireProtocol = class {
     if (this.connections.has(peerId)) {
       return this.connections.get(peerId);
     }
-    (0, import_log13.log)("waitForConnection", {
+    (0, import_log14.log)("waitForConnection", {
       peerId
     }, {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 47,
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_async10.asyncTimeout)(
+    await (0, import_async11.asyncTimeout)(
       this.connected.waitFor((connectedId) => connectedId.equals(peerId)),
       // TODO(nf): Make this configurable.
       1e4
@@ -2372,7 +2464,7 @@ var TestBuilder = class {
     }
     return new import_messaging2.MemorySignalManager(this._signalContext);
   }
-  createPeer(peerId = import_keys13.PublicKey.random()) {
+  createPeer(peerId = import_keys14.PublicKey.random()) {
     return new TestPeer(this, peerId);
   }
 };
@@ -2380,7 +2472,7 @@ var TestPeer = class {
   constructor(testBuilder, peerId) {
     this.testBuilder = testBuilder;
     this.peerId = peerId;
-    this._swarms = new import_util10.ComplexMap(import_keys13.PublicKey.hash);
+    this._swarms = new import_util11.ComplexMap(import_keys14.PublicKey.hash);
     this._signalManager = this.testBuilder.createSignalManager();
     this._networkManager = this.createNetworkManager();
   }