@dxos/network-manager 0.1.56-main.c19b7cd → 0.1.56-main.c277f68

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

@@ -146,7 +146,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -166,7 +166,7 @@ var Connection = class {
   async openConnection() {
     (0, import_invariant.invariant)(this._state === ConnectionState.INITIAL, "Invalid state.", {
       F: __dxlog_file,
-      L: 120,
+      L: 121,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -177,7 +177,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 121,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -189,7 +189,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 122,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -200,7 +200,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 139,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -208,7 +208,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 143,
+      L: 144,
       S: this,
       A: [
         "!this._transport",
@@ -228,6 +228,9 @@ var Connection = class {
       this.close().catch((err) => this.errors.raise(err));
     });
     this._transport.errors.handle((err) => {
+      if (!this.closeReason) {
+        this.closeReason = err?.message;
+      }
       if (this._state !== ConnectionState.CLOSED && this._state !== ConnectionState.CLOSING) {
         this.errors.raise(err);
       }
@@ -240,13 +243,15 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 172,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
-    var _a2;
+  async close(err) {
+    if (!this.closeReason) {
+      this.closeReason = err?.message;
+    }
     if (this._state === ConnectionState.CLOSED) {
       return;
     }
@@ -256,26 +261,26 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 184,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     try {
       await this._protocol.destroy();
-    } catch (err) {
-      import_log.log.catch(err, void 0, {
+    } catch (err2) {
+      import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 190,
+        L: 197,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     try {
-      await ((_a2 = this._transport) == null ? void 0 : _a2.destroy());
-    } catch (err) {
-      import_log.log.catch(err, void 0, {
+      await this._transport?.destroy();
+    } catch (err2) {
+      import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 197,
+        L: 204,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -284,7 +289,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 200,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -299,8 +304,10 @@ var Connection = class {
       return;
     }
     try {
-      await (0, import_context.cancelWithContext)(this._ctx, (0, import_async.sleep)(this._signallingDelay));
-      this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
+      if (process.env.NODE_ENV !== "test") {
+        await (0, import_context.cancelWithContext)(this._ctx, (0, import_async.sleep)(this._signallingDelay));
+        this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
+      }
       const signals = [
         ...this._outgoingSignalBuffer
       ];
@@ -324,7 +331,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 234,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -335,10 +342,9 @@ var Connection = class {
   * Receive a signal from the remote peer.
   */
   async signal(msg) {
-    var _a2, _b, _c;
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 243,
+      L: 252,
       S: this,
       A: [
         "msg.sessionId",
@@ -348,7 +354,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: 245,
+        L: 254,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -356,32 +362,32 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 248,
+      L: 257,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
         ""
       ]
     });
-    (0, import_invariant.invariant)((_a2 = msg.author) == null ? void 0 : _a2.equals(this.remoteId), void 0, {
+    (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 249,
+      L: 258,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
         ""
       ]
     });
-    (0, import_invariant.invariant)((_b = msg.recipient) == null ? void 0 : _b.equals(this.ownId), void 0, {
+    (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 250,
+      L: 259,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
         ""
       ]
     });
-    const signals = msg.data.signalBatch ? (_c = msg.data.signalBatch.signals) != null ? _c : [] : [
+    const signals = msg.data.signalBatch ? msg.data.signalBatch.signals ?? [] : [
       msg.data.signal
     ];
     for (const signal of signals) {
@@ -395,7 +401,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 259,
+          L: 268,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -403,7 +409,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 262,
+          L: 271,
           S: this,
           A: [
             "this._transport",
@@ -416,7 +422,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 263,
+          L: 272,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -431,13 +437,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 270,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 271,
+      L: 280,
       S: this,
       A: [
         "state !== this._state",
@@ -481,7 +487,6 @@ var SwarmMessenger = class {
     this._topic = topic;
   }
   async receiveMessage({ author, recipient, payload }) {
-    var _a2, _b, _c, _d;
     if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
       return;
     }
@@ -499,21 +504,21 @@ var SwarmMessenger = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    if ((_a2 = message.data) == null ? void 0 : _a2.offer) {
+    if (message.data?.offer) {
       await this._handleOffer({
         author,
         recipient,
         message
       });
-    } else if ((_b = message.data) == null ? void 0 : _b.answer) {
+    } else if (message.data?.answer) {
       await this._resolveAnswers(message);
-    } else if ((_c = message.data) == null ? void 0 : _c.signal) {
+    } else if (message.data?.signal) {
       await this._handleSignal({
         author,
         recipient,
         message
       });
-    } else if ((_d = message.data) == null ? void 0 : _d.signalBatch) {
+    } else if (message.data?.signalBatch) {
       await this._handleSignal({
         author,
         recipient,
@@ -531,8 +536,7 @@ var SwarmMessenger = class {
     }
   }
   async signal(message) {
-    var _a2, _b;
-    (0, import_invariant2.invariant)(((_a2 = message.data) == null ? void 0 : _a2.signal) || ((_b = message.data) == null ? void 0 : _b.signalBatch), "Invalid message", {
+    (0, import_invariant2.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
       F: __dxlog_file2,
       L: 85,
       S: this,
@@ -564,11 +568,10 @@ var SwarmMessenger = class {
     });
   }
   async _sendReliableMessage({ author, recipient, message }) {
-    var _a2;
     const networkMessage = {
       ...message,
       // Setting unique message_id if it not specified yet.
-      messageId: (_a2 = message.messageId) != null ? _a2 : import_keys2.PublicKey.random()
+      messageId: message.messageId ?? import_keys2.PublicKey.random()
     };
     (0, import_log2.log)("sending", {
       from: author,
@@ -590,8 +593,7 @@ var SwarmMessenger = class {
     });
   }
   async _resolveAnswers(message) {
-    var _a2, _b, _c;
-    (0, import_invariant2.invariant)((_b = (_a2 = message.data) == null ? void 0 : _a2.answer) == null ? void 0 : _b.offerMessageId, "No offerMessageId", {
+    (0, import_invariant2.invariant)(message.data?.answer?.offerMessageId, "No offerMessageId", {
       F: __dxlog_file2,
       L: 135,
       S: this,
@@ -603,7 +605,7 @@ var SwarmMessenger = class {
     const offerRecord = this._offerRecords.get(message.data.answer.offerMessageId);
     if (offerRecord) {
       this._offerRecords.delete(message.data.answer.offerMessageId);
-      (0, import_invariant2.invariant)((_c = message.data) == null ? void 0 : _c.answer, "No answer", {
+      (0, import_invariant2.invariant)(message.data?.answer, "No answer", {
         F: __dxlog_file2,
         L: 139,
         S: this,
@@ -718,6 +720,7 @@ 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 {
+  // TODO(burdon): Convert to map?
   constructor(id, topic, localPeerId, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
     this.id = id;
     this.topic = topic;
@@ -737,7 +740,6 @@ 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()) {
@@ -745,15 +747,15 @@ var Peer = class {
           localPeerId: this.id,
           topic: this.topic,
           remotePeerId: this.localPeerId,
-          sessionId: (_a2 = this.connection) == null ? void 0 : _a2.sessionId
+          sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file3,
-          L: 106,
+          L: 108,
           S: this,
           C: (f, a) => f(...a)
         });
         if (this.connection) {
-          await this.closeConnection();
+          await this.closeConnection(new Error("Connection displaced by remote initiator."));
         }
       } else {
         return {
@@ -765,7 +767,7 @@ var Peer = class {
       if (!this.connection) {
         (0, import_invariant3.invariant)(message.sessionId, void 0, {
           F: __dxlog_file3,
-          L: 126,
+          L: 128,
           S: this,
           A: [
             "message.sessionId",
@@ -785,12 +787,12 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file3,
-              L: 134,
+              L: 136,
               S: this,
               C: (f, a) => f(...a)
             });
           }
-          await this.closeConnection();
+          await this.closeConnection(err);
         }
         return {
           accept: true
@@ -807,7 +809,7 @@ var Peer = class {
   async initiateConnection() {
     (0, import_invariant3.invariant)(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file3,
-      L: 151,
+      L: 153,
       S: this,
       A: [
         "!this.initiating",
@@ -816,7 +818,7 @@ var Peer = class {
     });
     (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 152,
+      L: 154,
       S: this,
       A: [
         "!this.connection",
@@ -831,7 +833,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 154,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -855,14 +857,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 169,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         (0, import_log3.log)("ignoring response", void 0, {
           F: __dxlog_file3,
-          L: 171,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -882,11 +884,11 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 182,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.closeConnection();
+      await this.closeConnection(err);
       throw err;
     } finally {
       this.initiating = false;
@@ -897,7 +899,6 @@ 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 _a2;
     (0, import_log3.log)("creating connection", {
       topic: this.topic,
       peerId: this.localPeerId,
@@ -906,13 +907,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 196,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 203,
+      L: 205,
       S: this,
       A: [
         "!this.connection",
@@ -936,7 +937,7 @@ var Peer = class {
       this._transportFactory
     );
     this._callbacks.onInitiated(connection);
-    void ((_a2 = this._connectionCtx) == null ? void 0 : _a2.dispose());
+    void this._connectionCtx?.dispose();
     this._connectionCtx = this._ctx.derive();
     connection.stateChanged.on((state) => {
       switch (state) {
@@ -953,7 +954,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 229,
+            L: 231,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -967,13 +968,13 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 240,
+            L: 242,
             S: this,
             C: (f, a) => f(...a)
           });
           (0, import_invariant3.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file3,
-            L: 241,
+            L: 243,
             S: this,
             A: [
               "this.connection === connection",
@@ -988,7 +989,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 243,
+            L: 245,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1018,7 +1019,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 277,
+        L: 279,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1031,16 +1032,16 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 278,
+        L: 280,
         S: this,
         C: (f, a) => f(...a)
       });
-      void this.closeConnection();
+      void this.closeConnection(err);
     });
     this.connection = connection;
     return connection;
   }
-  async closeConnection() {
+  async closeConnection(err) {
     if (!this.connection) {
       return;
     }
@@ -1050,17 +1051,17 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 301,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
-    await connection.close();
+    await connection.close(err);
     (0, import_log3.log)("closed", {
       peerId: this.id,
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 307,
+      L: 309,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1071,7 +1072,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 312,
+        L: 314,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1080,18 +1081,17 @@ var Peer = class {
     await this.connection.signal(message);
   }
   async destroy() {
-    var _a2;
     await this._ctx.dispose();
     (0, import_log3.log)("Destroying peer", {
       peerId: this.id,
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 322,
+      L: 324,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_a2 = this == null ? void 0 : this.connection) == null ? void 0 : _a2.close());
+    await this?.connection?.close();
   }
 };
 _ts_decorate2([
@@ -1136,9 +1136,9 @@ var Swarm = class {
     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;
+    this._peers = new import_util2.ComplexMap(import_keys4.PublicKey.hash);
     this._instanceId = import_keys4.PublicKey.random().toHex();
     this.connectionAdded = new import_async3.Event();
     this.disconnected = new import_async3.Event();
@@ -1221,14 +1221,13 @@ var Swarm = class {
     });
   }
   async destroy() {
-    var _a2;
     (0, import_log4.log)("destroying...", void 0, {
       F: __dxlog_file4,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_a2 = this._listeningHandle) == null ? void 0 : _a2.unsubscribe());
+    await this._listeningHandle?.unsubscribe();
     this._listeningHandle = void 0;
     await this._ctx.dispose();
     await this._topology.destroy();
@@ -1268,7 +1267,6 @@ var Swarm = class {
     this._topology.update();
   }
   onSwarmEvent(swarmEvent) {
-    var _a2;
     (0, import_log4.log)("swarm event", {
       swarmEvent
     }, {
@@ -1304,7 +1302,7 @@ var Swarm = class {
       const peer = this._peers.get(import_keys4.PublicKey.from(swarmEvent.peerLeft.peer));
       if (peer) {
         peer.advertizing = false;
-        if (((_a2 = peer.connection) == null ? void 0 : _a2.state) !== ConnectionState.CONNECTED) {
+        if (peer.connection?.state !== ConnectionState.CONNECTED) {
           void this._destroyPeer(peer.id).catch((err) => import_log4.log.catch(err, void 0, {
             F: __dxlog_file4,
             L: 188,
@@ -1317,7 +1315,6 @@ var Swarm = class {
     this._topology.update();
   }
   async onOffer(message) {
-    var _a2, _b;
     (0, import_log4.log)("offer", {
       message
     }, {
@@ -1346,7 +1343,7 @@ var Swarm = class {
         ""
       ]
     });
-    if (!((_a2 = message.recipient) == null ? void 0 : _a2.equals(this._ownPeerId))) {
+    if (!message.recipient?.equals(this._ownPeerId)) {
       (0, import_log4.log)("rejecting offer with incorrect peerId", {
         message
       }, {
@@ -1359,7 +1356,7 @@ var Swarm = class {
         accept: false
       };
     }
-    if (!((_b = message.topic) == null ? void 0 : _b.equals(this._topic))) {
+    if (!message.topic?.equals(this._topic)) {
       (0, import_log4.log)("rejecting offer with incorrect topic", {
         message
       }, {
@@ -1378,7 +1375,6 @@ var Swarm = class {
     return answer;
   }
   async onSignal(message) {
-    var _a2, _b;
     (0, import_log4.log)("signal", {
       message
     }, {
@@ -1396,7 +1392,7 @@ var Swarm = class {
       });
       return;
     }
-    (0, import_invariant4.invariant)((_a2 = message.recipient) == null ? void 0 : _a2.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
+    (0, import_invariant4.invariant)(message.recipient?.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
       F: __dxlog_file4,
       L: 227,
       S: this,
@@ -1405,7 +1401,7 @@ var Swarm = class {
         "`Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`"
       ]
     });
-    (0, import_invariant4.invariant)((_b = message.topic) == null ? void 0 : _b.equals(this._topic), void 0, {
+    (0, import_invariant4.invariant)(message.topic?.equals(this._topic), void 0, {
       F: __dxlog_file4,
       L: 231,
       S: this,
@@ -1617,8 +1613,7 @@ var SwarmMapper = class {
       }));
     }));
     this._subscriptions.add(_swarm.disconnected.on((peerId) => {
-      var _a2;
-      (_a2 = this._connectionSubscriptions.get(peerId)) == null ? void 0 : _a2();
+      this._connectionSubscriptions.get(peerId)?.();
       this._connectionSubscriptions.delete(peerId);
       this._update();
     }));
@@ -1673,7 +1668,7 @@ 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 MAX_CONCURRENT_INITIATING_CONNECTIONS = 10;
 var ConnectionLimiter = class {
   constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
     this._ctx = new import_context5.Context();
@@ -1764,8 +1759,7 @@ var ConnectionLog = class {
     this.update = new import_async6.Event();
   }
   getSwarmInfo(swarmId) {
-    var _a2;
-    return (_a2 = this._swarms.get(swarmId)) != null ? _a2 : (0, import_debug3.raise)(new Error(`Swarm not found: ${swarmId}`));
+    return this._swarms.get(swarmId) ?? (0, import_debug3.raise)(new Error(`Swarm not found: ${swarmId}`));
   }
   get swarms() {
     return Array.from(this._swarms.values());
@@ -1781,9 +1775,9 @@ var ConnectionLog = class {
     this._swarms.set(import_keys7.PublicKey.from(swarm._instanceId), info);
     this.update.emit();
     swarm.connectionAdded.on((connection) => {
-      var _a2, _b;
       const connectionInfo = {
         state: ConnectionState.INITIAL,
+        closeReason: connection.closeReason,
         remotePeerId: connection.remoteId,
         sessionId: connection.sessionId,
         transport: connection.transport && Object.getPrototypeOf(connection.transport).constructor.name,
@@ -1794,13 +1788,14 @@ var ConnectionLog = class {
       this.update.emit();
       connection.stateChanged.on((state) => {
         connectionInfo.state = state;
+        connectionInfo.closeReason = connection.closeReason;
         connectionInfo.events.push({
           type: EventType.CONNECTION_STATE_CHANGED,
           newState: state
         });
         this.update.emit();
       });
-      (_b = (_a2 = connection.protocol) == null ? void 0 : _a2.stats) == null ? void 0 : _b.on((stats) => {
+      connection.protocol?.stats?.on((stats) => {
         connectionInfo.streams = stats.channels;
         this.update.emit();
       });
@@ -1827,10 +1822,7 @@ var NetworkManager = class {
     this._instanceId = import_keys8.PublicKey.random().toHex();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
-    this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => {
-      var _a2;
-      return (_a2 = this._swarms.get(topic)) == null ? void 0 : _a2.onSwarmEvent(event);
-    });
+    this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => this._swarms.get(topic)?.onSwarmEvent(event));
     this._messenger = new import_messaging.Messenger({
       signalManager: this._signalManager
     });
@@ -1898,7 +1890,6 @@ var NetworkManager = class {
   * Join the swarm.
   */
   async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, label }) {
-    var _a2;
     (0, import_invariant6.invariant)(import_keys8.PublicKey.isPublicKey(topic), void 0, {
       F: __dxlog_file7,
       L: 157,
@@ -1972,7 +1963,7 @@ var NetworkManager = class {
       C: (f, a) => f(...a)
     }));
     this.topicsUpdated.emit();
-    (_a2 = this._connectionLog) == null ? void 0 : _a2.joinedSwarm(swarm);
+    this._connectionLog?.joinedSwarm(swarm);
     (0, import_log7.log)("joined", {
       topic: import_keys8.PublicKey.from(topic),
       count: this._swarms.size
@@ -1990,7 +1981,6 @@ var NetworkManager = class {
   * Close the connection.
   */
   async leaveSwarm(topic) {
-    var _a2;
     if (!this._swarms.has(topic)) {
       return;
     }
@@ -2010,7 +2000,7 @@ var NetworkManager = class {
     const map = this._mappers.get(topic);
     map.destroy();
     this._mappers.delete(topic);
-    (_a2 = this._connectionLog) == null ? void 0 : _a2.leftSwarm(swarm);
+    this._connectionLog?.leftSwarm(swarm);
     await swarm.destroy();
     this._swarms.delete(topic);
     await this.topicsUpdated.emit();
@@ -2133,9 +2123,12 @@ var createStreamDelay = (delay) => {
 var MemoryTransportFactory = {
   createTransport: (params) => new MemoryTransport(params)
 };
-var _MemoryTransport = class {
+var MemoryTransport = class _MemoryTransport {
+  static {
+    // TODO(burdon): Remove static properties (inject context into constructor).
+    this._connections = new import_util7.ComplexMap(import_keys9.PublicKey.hash);
+  }
   constructor(options) {
-    var _a2;
     this.options = options;
     this.closed = new import_async8.Event();
     this.connected = new import_async8.Event();
@@ -2181,7 +2174,7 @@ var _MemoryTransport = class {
       });
     } else {
       this._remote.wait({
-        timeout: (_a2 = this.options.timeout) != null ? _a2 : 1e3
+        timeout: this.options.timeout ?? 1e3
       }).then((remoteId) => {
         if (this._destroyed) {
           return;
@@ -2268,7 +2261,7 @@ var _MemoryTransport = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    if (!(payload == null ? void 0 : payload.transportId)) {
+    if (!payload?.transportId) {
       return;
     }
     const transportId = payload.transportId;
@@ -2278,9 +2271,6 @@ var _MemoryTransport = class {
     }
   }
 };
-var MemoryTransport = _MemoryTransport;
-// TODO(burdon): Remove static properties (inject context into constructor).
-MemoryTransport._connections = new import_util7.ComplexMap(import_keys9.PublicKey.hash);
 _ts_decorate4([
   import_log10.logInfo
 ], MemoryTransport.prototype, "_instanceId", void 0);
@@ -2301,43 +2291,47 @@ var import_protocols5 = require("@dxos/protocols");
 var wrtc = null;
 try {
   wrtc = require("@koush/wrtc");
-} catch (e) {
+} catch {
 }
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport.ts
 var __dxlog_file10 = "/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._instanceId = import_keys10.PublicKey.random().toHex();
     this._closed = false;
     this.closed = new import_async9.Event();
     this.connected = new import_async9.Event();
     this.errors = new import_debug5.ErrorStream();
-    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_file10,
-      L: 39,
+      L: 44,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log11.log)("created connection", params, {
       F: __dxlog_file10,
-      L: 40,
+      L: 45,
       S: this,
       C: (f, a) => f(...a)
     });
     this._peer = new import_simple_peer.default({
       initiator: this.params.initiator,
-      wrtc: import_simple_peer.default.WEBRTC_SUPPORT ? void 0 : (_a2 = wrtc) != null ? _a2 : (0, import_debug5.raise)(new Error("wrtc not available")),
-      config: this.params.webrtcConfig
+      config: this.params.webrtcConfig,
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/createDataChannel
+      channelConfig: {
+        protocol: "dxos.mesh"
+      },
+      // Custom WebRTC implementation (for Node); otherwise get-browser-rtc.
+      wrtc: import_simple_peer.default.WEBRTC_SUPPORT ? void 0 : wrtc ?? (0, import_debug5.raise)(new Error("wrtc not available"))
     });
     this._peer.on("signal", async (data) => {
       (0, import_log11.log)("signal", data, {
         F: __dxlog_file10,
-        L: 48,
+        L: 62,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2350,7 +2344,7 @@ var WebRTCTransport = class {
     this._peer.on("connect", () => {
       (0, import_log11.log)("connected", void 0, {
         F: __dxlog_file10,
-        L: 53,
+        L: 67,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2360,7 +2354,7 @@ var WebRTCTransport = class {
     this._peer.on("close", async () => {
       (0, import_log11.log)("closed", void 0, {
         F: __dxlog_file10,
-        L: 59,
+        L: 73,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2368,23 +2362,22 @@ var WebRTCTransport = class {
       this.closed.emit();
     });
     this._peer.on("error", async (err) => {
-      var _a3;
       this.errors.raise(err);
       try {
-        if (typeof ((_a3 = this._peer) == null ? void 0 : _a3._pc.getStats) === "function") {
+        if (typeof this._peer?._pc.getStats === "function") {
           this._peer._pc.getStats().then((stats) => {
             import_log11.log.warn("report after webrtc error", {
               config: this.params.webrtcConfig,
               stats
             }, {
               F: __dxlog_file10,
-              L: 71,
+              L: 85,
               S: this,
               C: (f, a) => f(...a)
             });
           });
         }
-      } catch (e) {
+      } catch {
       }
       await this.destroy();
     });
@@ -2392,7 +2385,7 @@ var WebRTCTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 81,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2400,7 +2393,7 @@ var WebRTCTransport = class {
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file10,
-      L: 85,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2410,7 +2403,7 @@ var WebRTCTransport = class {
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file10,
-      L: 90,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2421,7 +2414,7 @@ var WebRTCTransport = class {
     }
     (0, import_invariant11.invariant)(signal.payload.data, "Signal message must contain signal data.", {
       F: __dxlog_file10,
-      L: 98,
+      L: 112,
       S: this,
       A: [
         "signal.payload.data",
@@ -2431,8 +2424,7 @@ var WebRTCTransport = class {
     this._peer.signal(signal.payload.data);
   }
   async _disconnectStreams() {
-    var _a2, _b, _c, _d;
-    (_d = (_c = (_b = (_a2 = this.params.stream).unpipe) == null ? void 0 : _b.call(_a2, this._peer)) == null ? void 0 : _c.unpipe) == null ? void 0 : _d.call(_c, this.params.stream);
+    this.params.stream.unpipe?.(this._peer)?.unpipe?.(this.params.stream);
   }
 };
 
@@ -2554,9 +2546,8 @@ var WebRTCTransportService = class {
     }
   }
   async close({ proxyId }) {
-    var _a2, _b;
-    await ((_a2 = this.transports.get(proxyId)) == null ? void 0 : _a2.transport.destroy());
-    await ((_b = this.transports.get(proxyId)) == null ? void 0 : _b.stream.end());
+    await this.transports.get(proxyId)?.transport.destroy();
+    await this.transports.get(proxyId)?.stream.end();
     this.transports.delete(proxyId);
     (0, import_log12.log)("Closed.", void 0, {
       F: __dxlog_file11,
@@ -2585,9 +2576,9 @@ var WebRTCTransportProxy = class {
     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_async10.Event();
     this.errors = new import_debug6.ErrorStream();
+    this._closed = false;
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
       initiator: this._params.initiator
@@ -2663,7 +2654,7 @@ var WebRTCTransportProxy = class {
     if (this._closed) {
       return;
     }
-    this._serviceStream.close();
+    await this._serviceStream.close();
     try {
       await this._params.bridgeService.close({
         proxyId: this._proxyId
@@ -2684,7 +2675,7 @@ var WebRTCTransportProxy = class {
   */
   // TODO(burdon): Option on close method.
   forceClose() {
-    this._serviceStream.close();
+    void this._serviceStream.close();
     this.closed.emit();
     this._closed = true;
   }
@@ -2752,18 +2743,20 @@ var createTeleportProtocolFactory = (onConnection) => {
 // packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts";
 var TestWireProtocol = class {
-  constructor(peerId) {
+  constructor(peerId, _extensionFactory = () => []) {
     this.peerId = peerId;
+    this._extensionFactory = _extensionFactory;
     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.otherConnections = new import_util10.ComplexMap(({ remotePeerId, extension }) => remotePeerId.toHex() + extension);
     this.factory = createTeleportProtocolFactory(async (teleport) => {
       (0, import_log14.log)("create", {
         remotePeerId: teleport.remotePeerId
       }, {
         F: __dxlog_file13,
-        L: 23,
+        L: 38,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2783,6 +2776,13 @@ var TestWireProtocol = class {
       });
       this.streamConnections.set(teleport.remotePeerId, streamExtension);
       teleport.addExtension("test-stream", streamExtension);
+      for (const { name, extension: extension2 } of this._extensionFactory()) {
+        this.otherConnections.set({
+          remotePeerId: teleport.remotePeerId,
+          extension: name
+        }, extension2);
+        teleport.addExtension(name, extension2);
+      }
     });
   }
   async waitForConnection(peerId) {
@@ -2793,7 +2793,7 @@ var TestWireProtocol = class {
       peerId
     }, {
       F: __dxlog_file13,
-      L: 47,
+      L: 67,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2825,8 +2825,7 @@ var TestWireProtocol = class {
 };
 
 // packages/core/mesh/network-manager/src/testing/test-builder.ts
-var _a;
-var port = (_a = process.env.SIGNAL_PORT) != null ? _a : 4e3;
+var port = process.env.SIGNAL_PORT ?? 4e3;
 var TEST_SIGNAL_HOSTS = [
   {
     server: `ws://localhost:${port}/.well-known/dx/signal`
@@ -2897,17 +2896,15 @@ var TestPeer = class {
     });
   }
   async open() {
-    var _a2, _b;
     await this._networkManager.open();
-    await ((_a2 = this._proxy) == null ? void 0 : _a2.open());
-    await ((_b = this._service) == null ? void 0 : _b.open());
+    await this._proxy?.open();
+    await this._service?.open();
   }
   async close() {
-    var _a2, _b;
     await Promise.all(Array.from(this._swarms.values()).map((swarm) => swarm.leave()));
     this._swarms.clear();
-    await ((_a2 = this._proxy) == null ? void 0 : _a2.close());
-    await ((_b = this._service) == null ? void 0 : _b.close());
+    await this._proxy?.close();
+    await this._service?.close();
     await this._networkManager.close();
   }
   getSwarm(topic) {
@@ -2917,8 +2914,8 @@ var TestPeer = class {
     }
     return swarm;
   }
-  createSwarm(topic) {
-    const swarm = new TestSwarmConnection(this, topic);
+  createSwarm(topic, extensionFactory = () => []) {
+    const swarm = new TestSwarmConnection(this, topic, extensionFactory);
     this._swarms.set(topic, swarm);
     return swarm;
   }
@@ -2930,10 +2927,11 @@ var TestPeer = class {
   }
 };
 var TestSwarmConnection = class {
-  constructor(peer, topic) {
+  constructor(peer, topic, extensionFactory) {
     this.peer = peer;
     this.topic = topic;
-    this.protocol = new TestWireProtocol(this.peer.peerId);
+    this.extensionFactory = extensionFactory;
+    this.protocol = new TestWireProtocol(this.peer.peerId, this.extensionFactory);
   }
   // TODO(burdon): Need to create new plugin instance per swarm?
   //  If so, then perhaps joinSwarm should return swarm object with access to plugins.