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

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

@@ -46,8 +46,8 @@ var import_rpc = require("@dxos/rpc");
 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_async7 = require("@dxos/async");
+var import_invariant6 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log7 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
@@ -62,11 +62,11 @@ 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"));
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
 var import_errors = require("@dxos/errors");
+var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
@@ -138,6 +138,18 @@ var Connection = class {
       await this._flushSignalBuffer();
     });
     this._signallingDelay = STARTING_SIGNALLING_DELAY;
+    import_log.log.trace("dxos.mesh.connection.construct", {
+      sessionId: this.sessionId,
+      topic: this.topic,
+      localPeerId: this.ownId,
+      remotePeerId: this.remoteId,
+      initiator: this.initiator
+    }, {
+      F: __dxlog_file,
+      L: 96,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   get state() {
     return this._state;
@@ -152,12 +164,32 @@ var Connection = class {
   * Create an underlying transport and prepares it for the connection.
   */
   async openConnection() {
-    (0, import_tiny_invariant.default)(this._state === ConnectionState.INITIAL, "Invalid state.");
+    (0, import_invariant.invariant)(this._state === ConnectionState.INITIAL, "Invalid state.", {
+      F: __dxlog_file,
+      L: 121,
+      S: this,
+      A: [
+        "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: 114,
+      L: 122,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    import_log.log.trace("dxos.mesh.connection.open", {
+      sessionId: this.sessionId,
+      topic: this.topic,
+      localPeerId: this.ownId,
+      remotePeerId: this.remoteId,
+      initiator: this.initiator
+    }, {
+      F: __dxlog_file,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -168,13 +200,21 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 125,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
       this.close().catch((err) => this.errors.raise(err));
     });
-    (0, import_tiny_invariant.default)(!this._transport);
+    (0, import_invariant.invariant)(!this._transport, void 0, {
+      F: __dxlog_file,
+      L: 144,
+      S: this,
+      A: [
+        "!this._transport",
+        ""
+      ]
+    });
     this._transport = this._transportFactory.createTransport({
       initiator: this.initiator,
       stream: this._protocol.stream,
@@ -188,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);
       }
@@ -200,13 +243,15 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 158,
+      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;
     }
@@ -216,26 +261,26 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 170,
+      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: 176,
+        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: 183,
+        L: 204,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -244,7 +289,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 186,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -259,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
       ];
@@ -284,7 +331,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 220,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -295,21 +342,52 @@ var Connection = class {
   * Receive a signal from the remote peer.
   */
   async signal(msg) {
-    var _a2, _b, _c;
-    (0, import_tiny_invariant.default)(msg.sessionId);
+    (0, import_invariant.invariant)(msg.sessionId, void 0, {
+      F: __dxlog_file,
+      L: 252,
+      S: this,
+      A: [
+        "msg.sessionId",
+        ""
+      ]
+    });
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 231,
+        L: 254,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    (0, import_tiny_invariant.default)(msg.data.signal || msg.data.signalBatch);
-    (0, import_tiny_invariant.default)((_a2 = msg.author) == null ? void 0 : _a2.equals(this.remoteId));
-    (0, import_tiny_invariant.default)((_b = msg.recipient) == null ? void 0 : _b.equals(this.ownId));
-    const signals = msg.data.signalBatch ? (_c = msg.data.signalBatch.signals) != null ? _c : [] : [
+    (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
+      F: __dxlog_file,
+      L: 257,
+      S: this,
+      A: [
+        "msg.data.signal || msg.data.signalBatch",
+        ""
+      ]
+    });
+    (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
+      F: __dxlog_file,
+      L: 258,
+      S: this,
+      A: [
+        "msg.author?.equals(this.remoteId)",
+        ""
+      ]
+    });
+    (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
+      F: __dxlog_file,
+      L: 259,
+      S: this,
+      A: [
+        "msg.recipient?.equals(this.ownId)",
+        ""
+      ]
+    });
+    const signals = msg.data.signalBatch ? msg.data.signalBatch.signals ?? [] : [
       msg.data.signal
     ];
     for (const signal of signals) {
@@ -323,20 +401,28 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 245,
+          L: 268,
           S: this,
           C: (f, a) => f(...a)
         });
         this._incomingSignalBuffer.push(signal);
       } else {
-        (0, import_tiny_invariant.default)(this._transport, "Connection not ready to accept signals.");
+        (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
+          F: __dxlog_file,
+          L: 271,
+          S: this,
+          A: [
+            "this._transport",
+            "'Connection not ready to accept signals.'"
+          ]
+        });
         (0, import_log.log)("received signal", {
           peerId: this.ownId,
           remoteId: this.remoteId,
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 249,
+          L: 272,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -351,11 +437,19 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 256,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant.default)(state !== this._state, "Already in this state.");
+    (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
+      F: __dxlog_file,
+      L: 280,
+      S: this,
+      A: [
+        "state !== this._state",
+        "'Already in this state.'"
+      ]
+    });
     this._state = state;
     this.stateChanged.emit(state);
   }
@@ -365,18 +459,18 @@ _ts_decorate([
 ], Connection.prototype, "close", null);
 
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
-var import_tiny_invariant4 = __toESM(require("tiny-invariant"));
 var import_async3 = require("@dxos/async");
 var import_context4 = require("@dxos/context");
 var import_debug2 = require("@dxos/debug");
+var import_invariant4 = require("@dxos/invariant");
 var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
 var import_util2 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
-var import_tiny_invariant2 = __toESM(require("tiny-invariant"));
 var import_context2 = require("@dxos/context");
+var import_invariant2 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
 var import_log2 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
@@ -393,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;
     }
@@ -407,25 +500,25 @@ var SwarmMessenger = class {
       msg: message
     }, {
       F: __dxlog_file2,
-      L: 70,
+      L: 69,
       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,
@@ -436,15 +529,22 @@ var SwarmMessenger = class {
         message
       }, {
         F: __dxlog_file2,
-        L: 81,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   async signal(message) {
-    var _a2, _b;
-    (0, import_tiny_invariant2.default)(((_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,
+      A: [
+        "message.data?.signal || message.data?.signalBatch",
+        "'Invalid message'"
+      ]
+    });
     await this._sendReliableMessage({
       author: message.author,
       recipient: message.recipient,
@@ -468,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,
@@ -480,7 +579,7 @@ var SwarmMessenger = class {
       msg: networkMessage
     }, {
       F: __dxlog_file2,
-      L: 124,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -494,17 +593,32 @@ var SwarmMessenger = class {
     });
   }
   async _resolveAnswers(message) {
-    var _a2, _b, _c;
-    (0, import_tiny_invariant2.default)((_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,
+      A: [
+        "message.data?.answer?.offerMessageId",
+        "'No offerMessageId'"
+      ]
+    });
     const offerRecord = this._offerRecords.get(message.data.answer.offerMessageId);
     if (offerRecord) {
       this._offerRecords.delete(message.data.answer.offerMessageId);
-      (0, import_tiny_invariant2.default)((_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,
+        A: [
+          "message.data?.answer",
+          "'No answer'"
+        ]
+      });
       (0, import_log2.log)("resolving", {
         answer: message.data.answer
       }, {
         F: __dxlog_file2,
-        L: 141,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -512,7 +626,15 @@ var SwarmMessenger = class {
     }
   }
   async _handleOffer({ author, recipient, message }) {
-    (0, import_tiny_invariant2.default)(message.data.offer, "No offer");
+    (0, import_invariant2.invariant)(message.data.offer, "No offer", {
+      F: __dxlog_file2,
+      L: 154,
+      S: this,
+      A: [
+        "message.data.offer",
+        "'No offer'"
+      ]
+    });
     const offerMessage = {
       author,
       recipient,
@@ -540,15 +662,31 @@ var SwarmMessenger = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 175,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   async _handleSignal({ author, recipient, message }) {
-    (0, import_tiny_invariant2.default)(message.messageId);
-    (0, import_tiny_invariant2.default)(message.data.signal || message.data.signalBatch, "Invalid message");
+    (0, import_invariant2.invariant)(message.messageId, void 0, {
+      F: __dxlog_file2,
+      L: 187,
+      S: this,
+      A: [
+        "message.messageId",
+        ""
+      ]
+    });
+    (0, import_invariant2.invariant)(message.data.signal || message.data.signalBatch, "Invalid message", {
+      F: __dxlog_file2,
+      L: 188,
+      S: this,
+      A: [
+        "message.data.signal || message.data.signalBatch",
+        "'Invalid message'"
+      ]
+    });
     const signalMessage = {
       author,
       recipient,
@@ -563,10 +701,10 @@ var SwarmMessenger = class {
 };
 
 // packages/core/mesh/network-manager/src/swarm/peer.ts
-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_invariant3 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
 function _ts_decorate2(decorators, target, key, desc) {
@@ -582,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;
@@ -601,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()) {
@@ -609,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: 107,
+          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 {
@@ -627,7 +765,15 @@ var Peer = class {
     }
     if (await this._callbacks.onOffer(remoteId)) {
       if (!this.connection) {
-        (0, import_tiny_invariant3.default)(message.sessionId);
+        (0, import_invariant3.invariant)(message.sessionId, void 0, {
+          F: __dxlog_file3,
+          L: 128,
+          S: this,
+          A: [
+            "message.sessionId",
+            ""
+          ]
+        });
         const connection = this._createConnection(false, message.sessionId);
         try {
           await this._connectionLimiter.connecting(message.sessionId);
@@ -641,12 +787,12 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file3,
-              L: 135,
+              L: 136,
               S: this,
               C: (f, a) => f(...a)
             });
           }
-          await this.closeConnection();
+          await this.closeConnection(err);
         }
         return {
           accept: true
@@ -661,8 +807,24 @@ var Peer = class {
   * Initiate a connection to the remote peer.
   */
   async initiateConnection() {
-    (0, import_tiny_invariant3.default)(!this.initiating, "Initiation in progress.");
-    (0, import_tiny_invariant3.default)(!this.connection, "Already connected.");
+    (0, import_invariant3.invariant)(!this.initiating, "Initiation in progress.", {
+      F: __dxlog_file3,
+      L: 153,
+      S: this,
+      A: [
+        "!this.initiating",
+        "'Initiation in progress.'"
+      ]
+    });
+    (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
+      F: __dxlog_file3,
+      L: 154,
+      S: this,
+      A: [
+        "!this.connection",
+        "'Already connected.'"
+      ]
+    });
     const sessionId = import_keys3.PublicKey.random();
     (0, import_log3.log)("initiating...", {
       id: this.id,
@@ -671,7 +833,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 155,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -695,14 +857,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 170,
+        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: 172,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -722,11 +884,11 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 183,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.closeConnection();
+      await this.closeConnection(err);
       throw err;
     } finally {
       this.initiating = false;
@@ -737,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,
@@ -746,11 +907,19 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 197,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant3.default)(!this.connection, "Already connected.");
+    (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
+      F: __dxlog_file3,
+      L: 205,
+      S: this,
+      A: [
+        "!this.connection",
+        "'Already connected.'"
+      ]
+    });
     const connection = new Connection(
       this.topic,
       this.localPeerId,
@@ -768,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) {
@@ -777,6 +946,18 @@ var Peer = class {
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
           this._connectionLimiter.doneConnecting(sessionId);
+          import_log3.log.trace("dxos.mesh.connection.connected", {
+            topic: this.topic,
+            localPeerId: this.localPeerId,
+            remotePeerId: this.id,
+            sessionId,
+            initiator
+          }, {
+            F: __dxlog_file3,
+            L: 231,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           break;
         }
         case ConnectionState.CLOSED: {
@@ -787,11 +968,31 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 234,
+            L: 242,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          (0, import_invariant3.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
+            F: __dxlog_file3,
+            L: 243,
+            S: this,
+            A: [
+              "this.connection === connection",
+              "'Connection mismatch (race condition).'"
+            ]
+          });
+          import_log3.log.trace("dxos.mesh.connection.closed", {
+            topic: this.topic,
+            localPeerId: this.localPeerId,
+            remotePeerId: this.id,
+            sessionId,
+            initiator
+          }, {
+            F: __dxlog_file3,
+            L: 245,
             S: this,
             C: (f, a) => f(...a)
           });
-          (0, import_tiny_invariant3.default)(this.connection === connection, "Connection mismatch (race condition).");
           if (this._lastConnectionTime && this._lastConnectionTime + CONNECTION_COUNTS_STABLE_AFTER < Date.now()) {
             this._availableAfter = 0;
           } else {
@@ -818,16 +1019,29 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 263,
+        L: 279,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      import_log3.log.trace("dxos.mesh.connection.error", {
+        topic: this.topic,
+        localPeerId: this.localPeerId,
+        remotePeerId: this.id,
+        sessionId,
+        initiator,
+        err
+      }, {
+        F: __dxlog_file3,
+        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;
     }
@@ -837,17 +1051,17 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 279,
+      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: 285,
+      L: 309,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -858,7 +1072,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 290,
+        L: 314,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -867,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: 300,
+      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([
@@ -923,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();
@@ -939,7 +1152,7 @@ var Swarm = class {
       }
     }), {
       F: __dxlog_file4,
-      L: 88,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -947,7 +1160,7 @@ var Swarm = class {
       peerId: _ownPeerId
     }, {
       F: __dxlog_file4,
-      L: 92,
+      L: 91,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -962,7 +1175,7 @@ var Swarm = class {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 101,
+      L: 100,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -983,7 +1196,15 @@ var Swarm = class {
     return this._topic;
   }
   async open() {
-    (0, import_tiny_invariant4.default)(!this._listeningHandle);
+    (0, import_invariant4.invariant)(!this._listeningHandle, void 0, {
+      F: __dxlog_file4,
+      L: 127,
+      S: this,
+      A: [
+        "!this._listeningHandle",
+        ""
+      ]
+    });
     this._listeningHandle = await this._messenger.listen({
       peerId: this._ownPeerId,
       payloadType: "dxos.mesh.swarm.SwarmMessage",
@@ -992,7 +1213,7 @@ var Swarm = class {
           err
         }, {
           F: __dxlog_file4,
-          L: 135,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -1000,27 +1221,34 @@ var Swarm = class {
     });
   }
   async destroy() {
-    var _a2;
     (0, import_log4.log)("destroying...", void 0, {
       F: __dxlog_file4,
-      L: 141,
+      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();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     (0, import_log4.log)("destroyed", void 0, {
       F: __dxlog_file4,
-      L: 148,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async setTopology(topology) {
-    (0, import_tiny_invariant4.default)(!this._ctx.disposed, "Swarm is offline");
+    (0, import_invariant4.invariant)(!this._ctx.disposed, "Swarm is offline", {
+      F: __dxlog_file4,
+      L: 151,
+      S: this,
+      A: [
+        "!this._ctx.disposed",
+        "'Swarm is offline'"
+      ]
+    });
     if (topology === this._topology) {
       return;
     }
@@ -1029,7 +1257,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       F: __dxlog_file4,
-      L: 156,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1039,19 +1267,18 @@ var Swarm = class {
     this._topology.update();
   }
   onSwarmEvent(swarmEvent) {
-    var _a2;
     (0, import_log4.log)("swarm event", {
       swarmEvent
     }, {
       F: __dxlog_file4,
-      L: 169,
+      L: 168,
       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: 172,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1063,7 +1290,7 @@ var Swarm = class {
         peerId
       }, {
         F: __dxlog_file4,
-        L: 178,
+        L: 177,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1075,10 +1302,10 @@ 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: 189,
+            L: 188,
             S: this,
             C: (f, a) => f(...a)
           }));
@@ -1088,19 +1315,18 @@ var Swarm = class {
     this._topology.update();
   }
   async onOffer(message) {
-    var _a2, _b;
     (0, import_log4.log)("offer", {
       message
     }, {
       F: __dxlog_file4,
-      L: 199,
+      L: 198,
       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: 201,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1108,13 +1334,21 @@ var Swarm = class {
         accept: false
       };
     }
-    (0, import_tiny_invariant4.default)(message.author);
-    if (!((_a2 = message.recipient) == null ? void 0 : _a2.equals(this._ownPeerId))) {
+    (0, import_invariant4.invariant)(message.author, void 0, {
+      F: __dxlog_file4,
+      L: 205,
+      S: this,
+      A: [
+        "message.author",
+        ""
+      ]
+    });
+    if (!message.recipient?.equals(this._ownPeerId)) {
       (0, import_log4.log)("rejecting offer with incorrect peerId", {
         message
       }, {
         F: __dxlog_file4,
-        L: 208,
+        L: 207,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1122,12 +1356,12 @@ 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
       }, {
         F: __dxlog_file4,
-        L: 212,
+        L: 211,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1141,27 +1375,50 @@ var Swarm = class {
     return answer;
   }
   async onSignal(message) {
-    var _a2, _b;
     (0, import_log4.log)("signal", {
       message
     }, {
       F: __dxlog_file4,
-      L: 223,
+      L: 222,
       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: 225,
+        L: 224,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    (0, import_tiny_invariant4.default)((_a2 = message.recipient) == null ? void 0 : _a2.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`);
-    (0, import_tiny_invariant4.default)((_b = message.topic) == null ? void 0 : _b.equals(this._topic));
-    (0, import_tiny_invariant4.default)(message.author);
+    (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,
+      A: [
+        "message.recipient?.equals(this._ownPeerId)",
+        "`Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`"
+      ]
+    });
+    (0, import_invariant4.invariant)(message.topic?.equals(this._topic), void 0, {
+      F: __dxlog_file4,
+      L: 231,
+      S: this,
+      A: [
+        "message.topic?.equals(this._topic)",
+        ""
+      ]
+    });
+    (0, import_invariant4.invariant)(message.author, void 0, {
+      F: __dxlog_file4,
+      L: 232,
+      S: this,
+      A: [
+        "message.author",
+        ""
+      ]
+    });
     const peer = this._getOrCreatePeer(message.author);
     await peer.onSignal(message);
   }
@@ -1213,7 +1470,15 @@ var Swarm = class {
     return peer;
   }
   async _destroyPeer(peerId) {
-    (0, import_tiny_invariant4.default)(this._peers.has(peerId));
+    (0, import_invariant4.invariant)(this._peers.has(peerId), void 0, {
+      F: __dxlog_file4,
+      L: 302,
+      S: this,
+      A: [
+        "this._peers.has(peerId)",
+        ""
+      ]
+    });
     await this._peers.get(peerId).destroy();
     this._peers.delete(peerId);
   }
@@ -1234,7 +1499,7 @@ var Swarm = class {
           } catch (err) {
             (0, import_log4.log)("initiation error", err, {
               F: __dxlog_file4,
-              L: 329,
+              L: 328,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1262,7 +1527,7 @@ var Swarm = class {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 356,
+        L: 355,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1279,7 +1544,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 370,
+      L: 369,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1289,7 +1554,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 373,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1348,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();
     }));
@@ -1399,11 +1663,12 @@ var SwarmMapper = class {
 var import_async5 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
 var import_errors3 = require("@dxos/errors");
+var import_invariant5 = require("@dxos/invariant");
 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();
@@ -1422,9 +1687,9 @@ var ConnectionLimiter = class {
   * @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", {
+    (0, import_invariant5.invariant)(!this._waitingPromises.has(sessionId), "Peer is already waiting for connection", {
       F: __dxlog_file6,
-      L: 47,
+      L: 48,
       S: this,
       A: [
         "!this._waitingPromises.has(sessionId)",
@@ -1435,7 +1700,7 @@ var ConnectionLimiter = class {
       sessionId
     }, {
       F: __dxlog_file6,
-      L: 48,
+      L: 49,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1450,7 +1715,7 @@ var ConnectionLimiter = class {
       sessionId
     }, {
       F: __dxlog_file6,
-      L: 56,
+      L: 57,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1463,7 +1728,7 @@ var ConnectionLimiter = class {
       sessionId
     }, {
       F: __dxlog_file6,
-      L: 63,
+      L: 64,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1494,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());
@@ -1511,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,
@@ -1524,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();
       });
@@ -1557,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
     });
@@ -1595,7 +1857,7 @@ var NetworkManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file7,
-      L: 131,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1605,7 +1867,7 @@ var NetworkManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file7,
-      L: 134,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1615,7 +1877,7 @@ var NetworkManager = class {
       await this.leaveSwarm(topic).catch((err) => {
         (0, import_log7.log)(err, void 0, {
           F: __dxlog_file7,
-          L: 140,
+          L: 139,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1628,11 +1890,42 @@ var NetworkManager = class {
   * Join the swarm.
   */
   async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, label }) {
-    var _a2;
-    (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");
+    (0, import_invariant6.invariant)(import_keys8.PublicKey.isPublicKey(topic), void 0, {
+      F: __dxlog_file7,
+      L: 157,
+      S: this,
+      A: [
+        "PublicKey.isPublicKey(topic)",
+        ""
+      ]
+    });
+    (0, import_invariant6.invariant)(import_keys8.PublicKey.isPublicKey(peerId), void 0, {
+      F: __dxlog_file7,
+      L: 158,
+      S: this,
+      A: [
+        "PublicKey.isPublicKey(peerId)",
+        ""
+      ]
+    });
+    (0, import_invariant6.invariant)(topology, void 0, {
+      F: __dxlog_file7,
+      L: 159,
+      S: this,
+      A: [
+        "topology",
+        ""
+      ]
+    });
+    (0, import_invariant6.invariant)(typeof protocol === "function", void 0, {
+      F: __dxlog_file7,
+      L: 160,
+      S: this,
+      A: [
+        "typeof protocol === 'function'",
+        ""
+      ]
+    });
     if (this._swarms.has(topic)) {
       throw new Error(`Already connected to swarm: ${import_keys8.PublicKey.from(topic)}`);
     }
@@ -1642,7 +1935,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       F: __dxlog_file7,
-      L: 166,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1652,7 +1945,7 @@ var NetworkManager = class {
         error
       }, {
         F: __dxlog_file7,
-        L: 179,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1665,18 +1958,18 @@ var NetworkManager = class {
       peerId
     }).catch((error) => import_log7.log.catch(error, void 0, {
       F: __dxlog_file7,
-      L: 188,
+      L: 187,
       S: this,
       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
     }, {
       F: __dxlog_file7,
-      L: 192,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1688,7 +1981,6 @@ var NetworkManager = class {
   * Close the connection.
   */
   async leaveSwarm(topic) {
-    var _a2;
     if (!this._swarms.has(topic)) {
       return;
     }
@@ -1696,7 +1988,7 @@ var NetworkManager = class {
       topic: import_keys8.PublicKey.from(topic)
     }, {
       F: __dxlog_file7,
-      L: 208,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1708,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();
@@ -1717,7 +2009,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       F: __dxlog_file7,
-      L: 222,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1751,17 +2043,34 @@ var NetworkManager = class {
 };
 
 // packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts
-var import_tiny_invariant6 = __toESM(require("tiny-invariant"));
+var import_invariant7 = require("@dxos/invariant");
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts";
 var FullyConnectedTopology = class {
   toString() {
     return "FullyConnectedTopology";
   }
   init(controller) {
-    (0, import_tiny_invariant6.default)(!this._controller, "Already initialized");
+    (0, import_invariant7.invariant)(!this._controller, "Already initialized", {
+      F: __dxlog_file8,
+      L: 18,
+      S: this,
+      A: [
+        "!this._controller",
+        "'Already initialized'"
+      ]
+    });
     this._controller = controller;
   }
   update() {
-    (0, import_tiny_invariant6.default)(this._controller, "Not initialized");
+    (0, import_invariant7.invariant)(this._controller, "Not initialized", {
+      F: __dxlog_file8,
+      L: 23,
+      S: this,
+      A: [
+        "this._controller",
+        "'Not initialized'"
+      ]
+    });
     const { candidates: discovered } = this._controller.getState();
     for (const peer of discovered) {
       this._controller.connect(peer);
@@ -1775,19 +2084,19 @@ 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_invariant8 = require("@dxos/invariant");
 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_invariant9 = require("@dxos/invariant");
 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_async8 = require("@dxos/async");
 var import_debug4 = require("@dxos/debug");
+var import_invariant10 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
 var import_util7 = require("@dxos/util");
@@ -1801,7 +2110,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_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
+var __dxlog_file9 = "/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({
@@ -1814,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();
@@ -1827,17 +2139,25 @@ var _MemoryTransport = class {
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._destroyed = false;
     (0, import_log10.log)("creating", void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 64,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant9.default)(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection");
+    (0, import_invariant10.invariant)(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection", {
+      F: __dxlog_file9,
+      L: 66,
+      S: this,
+      A: [
+        "!MemoryTransport._connections.has(this._instanceId)",
+        "'Duplicate memory connection'"
+      ]
+    });
     _MemoryTransport._connections.set(this._instanceId, this);
     if (this.options.initiator) {
       setTimeout(async () => {
         (0, import_log10.log)("sending signal", void 0, {
-          F: __dxlog_file8,
+          F: __dxlog_file9,
           L: 73,
           S: this,
           C: (f, a) => f(...a)
@@ -1854,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;
@@ -1866,11 +2186,19 @@ var _MemoryTransport = class {
           this.closed.emit();
           return;
         }
-        (0, import_tiny_invariant9.default)(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`);
+        (0, import_invariant10.invariant)(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`, {
+          F: __dxlog_file9,
+          L: 99,
+          S: this,
+          A: [
+            "!this._remoteConnection._remoteConnection",
+            "`Remote already connected: ${this._remoteInstanceId}`"
+          ]
+        });
         this._remoteConnection._remoteConnection = this;
         this._remoteConnection._remoteInstanceId = this._instanceId;
         (0, import_log10.log)("connected", void 0, {
-          F: __dxlog_file8,
+          F: __dxlog_file9,
           L: 103,
           S: this,
           C: (f, a) => f(...a)
@@ -1888,7 +2216,7 @@ var _MemoryTransport = class {
   }
   async destroy() {
     (0, import_log10.log)("closing", void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 124,
       S: this,
       C: (f, a) => f(...a)
@@ -1897,7 +2225,7 @@ var _MemoryTransport = class {
     _MemoryTransport._connections.delete(this._instanceId);
     if (this._remoteConnection) {
       (0, import_log10.log)("closing", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 129,
         S: this,
         C: (f, a) => f(...a)
@@ -1910,7 +2238,7 @@ var _MemoryTransport = class {
       this._remoteConnection._remoteConnection = void 0;
       this._remoteConnection = void 0;
       (0, import_log10.log)("closed", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 147,
         S: this,
         C: (f, a) => f(...a)
@@ -1918,7 +2246,7 @@ var _MemoryTransport = class {
     }
     this.closed.emit();
     (0, import_log10.log)("closed", void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
@@ -1928,12 +2256,12 @@ var _MemoryTransport = class {
     (0, import_log10.log)("received signal", {
       payload
     }, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (!(payload == null ? void 0 : payload.transportId)) {
+    if (!payload?.transportId) {
       return;
     }
     const transportId = payload.transportId;
@@ -1943,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);
@@ -1955,9 +2280,9 @@ _ts_decorate4([
 
 // 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_async9 = require("@dxos/async");
 var import_debug5 = require("@dxos/debug");
+var import_invariant11 = require("@dxos/invariant");
 var import_keys10 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
@@ -1966,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_file9 = "/home/runner/work/dxos/dxos/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_file9,
-      L: 39,
+      F: __dxlog_file10,
+      L: 44,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log11.log)("created connection", params, {
-      F: __dxlog_file9,
-      L: 40,
+      F: __dxlog_file10,
+      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_file9,
-        L: 48,
+        F: __dxlog_file10,
+        L: 62,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2014,8 +2343,8 @@ var WebRTCTransport = class {
     });
     this._peer.on("connect", () => {
       (0, import_log11.log)("connected", void 0, {
-        F: __dxlog_file9,
-        L: 53,
+        F: __dxlog_file10,
+        L: 67,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2024,8 +2353,8 @@ var WebRTCTransport = class {
     });
     this._peer.on("close", async () => {
       (0, import_log11.log)("closed", void 0, {
-        F: __dxlog_file9,
-        L: 59,
+        F: __dxlog_file10,
+        L: 73,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2033,39 +2362,38 @@ 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_file9,
-              L: 71,
+              F: __dxlog_file10,
+              L: 85,
               S: this,
               C: (f, a) => f(...a)
             });
           });
         }
-      } catch (e) {
+      } catch {
       }
       await this.destroy();
     });
     import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file9,
-      L: 81,
+      F: __dxlog_file10,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
-      F: __dxlog_file9,
-      L: 85,
+      F: __dxlog_file10,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2074,8 +2402,8 @@ var WebRTCTransport = class {
     this._peer.destroy();
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
-      F: __dxlog_file9,
-      L: 90,
+      F: __dxlog_file10,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2084,24 +2412,31 @@ var WebRTCTransport = class {
     if (this._closed) {
       return;
     }
-    (0, import_tiny_invariant10.default)(signal.payload.data, "Signal message must contain signal data.");
+    (0, import_invariant11.invariant)(signal.payload.data, "Signal message must contain signal data.", {
+      F: __dxlog_file10,
+      L: 112,
+      S: this,
+      A: [
+        "signal.payload.data",
+        "'Signal message must contain signal data.'"
+      ]
+    });
     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);
   }
 };
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts
 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_invariant12 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
 var import_bridge = 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-service.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts";
 var WebRTCTransportService = class {
   // prettier-ignore
   constructor(_webrtcConfig) {
@@ -2112,6 +2447,13 @@ var WebRTCTransportService = class {
     const rpcStream = new import_codec_protobuf.Stream(({ ready, next, close }) => {
       const duplex = new import_node_stream2.Duplex({
         read: () => {
+          const callbacks = [
+            ...transportState.writeCallbacks
+          ];
+          transportState.writeCallbacks.length = 0;
+          for (const cb of callbacks) {
+            cb();
+          }
         },
         write: function(chunk, _, callback) {
           next({
@@ -2163,30 +2505,53 @@ var WebRTCTransportService = class {
         });
         close();
       });
-      ready();
-      this.transports.set(request.proxyId, {
+      const transportState = {
         transport,
-        stream: duplex
-      });
+        stream: duplex,
+        writeCallbacks: []
+      };
+      ready();
+      this.transports.set(request.proxyId, transportState);
     });
     return rpcStream;
   }
   async sendSignal({ proxyId, signal }) {
-    (0, import_tiny_invariant11.default)(this.transports.has(proxyId));
+    (0, import_invariant12.invariant)(this.transports.has(proxyId), void 0, {
+      F: __dxlog_file11,
+      L: 113,
+      S: this,
+      A: [
+        "this.transports.has(proxyId)",
+        ""
+      ]
+    });
     await this.transports.get(proxyId).transport.signal(signal);
   }
   async sendData({ proxyId, payload }) {
-    (0, import_tiny_invariant11.default)(this.transports.has(proxyId));
-    await this.transports.get(proxyId).stream.push(payload);
+    (0, import_invariant12.invariant)(this.transports.has(proxyId), void 0, {
+      F: __dxlog_file11,
+      L: 118,
+      S: this,
+      A: [
+        "this.transports.has(proxyId)",
+        ""
+      ]
+    });
+    const state = this.transports.get(proxyId);
+    const bufferHasSpace = state.stream.push(payload);
+    if (!bufferHasSpace) {
+      await new Promise((resolve) => {
+        state.writeCallbacks.push(resolve);
+      });
+    }
   }
   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_file10,
-      L: 109,
+      F: __dxlog_file11,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2194,15 +2559,16 @@ var WebRTCTransportService = class {
 };
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
-var import_tiny_invariant12 = __toESM(require("tiny-invariant"));
+var import_node_stream3 = require("node:stream");
 var import_async10 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_debug6 = require("@dxos/debug");
+var import_invariant13 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
 var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
 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 __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts";
 var WebRTCTransportProxy = class {
   // prettier-ignore
   constructor(_params) {
@@ -2210,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
@@ -2220,8 +2586,8 @@ var WebRTCTransportProxy = class {
     this._serviceStream.waitUntilReady().then(() => {
       this._serviceStream.subscribe(async (event) => {
         (0, import_log13.log)("WebRTCTransportProxy: event", event, {
-          F: __dxlog_file11,
-          L: 50,
+          F: __dxlog_file12,
+          L: 51,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2233,28 +2599,24 @@ var WebRTCTransportProxy = class {
           await this._handleSignal(event.signal);
         }
       });
-      const dataListener = async (data) => {
-        try {
-          await this._params.bridgeService.sendData({
+      this._params.stream.pipe(new import_node_stream3.Writable({
+        write: (chunk, _, callback) => {
+          this._params.bridgeService.sendData({
             proxyId: this._proxyId,
-            payload: data
-          });
-        } catch (err) {
-          import_log13.log.catch(err, void 0, {
-            F: __dxlog_file11,
-            L: 67,
-            S: this,
-            C: (f, a) => f(...a)
+            payload: chunk
+          }).then(() => callback(), (err) => {
+            import_log13.log.catch(err, void 0, {
+              F: __dxlog_file12,
+              L: 69,
+              S: this,
+              C: (f, a) => f(...a)
+            });
           });
         }
-      };
-      this._params.stream.on("data", dataListener);
-      this._ctx.onDispose(() => {
-        this._params.stream.off("data", dataListener);
-      });
+      }));
     }, (error) => import_log13.log.catch(error, void 0, {
-      F: __dxlog_file11,
-      L: 73,
+      F: __dxlog_file12,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -2292,15 +2654,15 @@ var WebRTCTransportProxy = class {
     if (this._closed) {
       return;
     }
-    this._serviceStream.close();
+    await this._serviceStream.close();
     try {
       await this._params.bridgeService.close({
         proxyId: this._proxyId
       });
     } catch (err) {
       import_log13.log.catch(err, void 0, {
-        F: __dxlog_file11,
-        L: 124,
+        F: __dxlog_file12,
+        L: 126,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2313,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;
   }
@@ -2334,7 +2696,15 @@ var WebRTCTransportProxyFactory = class {
     return this;
   }
   createTransport(options) {
-    (0, import_tiny_invariant12.default)(this._bridgeService, "WebRTCTransportProxyFactory is not ready to open connections");
+    (0, import_invariant13.invariant)(this._bridgeService, "WebRTCTransportProxyFactory is not ready to open connections", {
+      F: __dxlog_file12,
+      L: 163,
+      S: this,
+      A: [
+        "this._bridgeService",
+        "'WebRTCTransportProxyFactory is not ready to open connections'"
+      ]
+    });
     const transport = new WebRTCTransportProxy({
       ...options,
       bridgeService: this._bridgeService
@@ -2371,20 +2741,22 @@ var createTeleportProtocolFactory = (onConnection) => {
 };
 
 // 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 __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_file12,
-        L: 23,
+        F: __dxlog_file13,
+        L: 38,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2404,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) {
@@ -2413,8 +2792,8 @@ var TestWireProtocol = class {
     (0, import_log14.log)("waitForConnection", {
       peerId
     }, {
-      F: __dxlog_file12,
-      L: 47,
+      F: __dxlog_file13,
+      L: 67,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2446,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`
@@ -2518,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) {
@@ -2538,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;
   }
@@ -2551,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.