@dxos/network-manager 0.1.57 → 0.1.58-main.0009f6a

package/dist/lib/node/index.cjs

@@ -527,6 +527,8 @@ __export(src_exports, {
   Swarm: () => Swarm,
   SwarmMapper: () => SwarmMapper,
   SwarmMessenger: () => SwarmMessenger,
+  TcpTransport: () => TcpTransport,
+  TcpTransportFactory: () => TcpTransportFactory,
   TransportKind: () => TransportKind,
   cleanup: () => cleanup,
   createLibDataChannelTransportFactory: () => createLibDataChannelTransportFactory,
@@ -545,7 +547,6 @@ var import_util5 = require("@dxos/util");
 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");
@@ -560,7 +561,7 @@ function _ts_decorate(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_file = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/swarm/connection.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts";
 var STARTING_SIGNALLING_DELAY = 10;
 var MAX_SIGNALLING_DELAY = 300;
 var ConnectionState;
@@ -602,6 +603,8 @@ var ConnectionState;
     */
     "CLOSED"
   ] = "CLOSED";
+  ConnectionState5["ABORTING"] = "ABORTING";
+  ConnectionState5["ABORTED"] = "ABORTED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
   constructor(topic, ownId, remoteId, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
@@ -633,7 +636,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 114,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -653,7 +656,7 @@ var Connection = class {
   async openConnection() {
     (0, import_invariant.invariant)(this._state === ConnectionState.INITIAL, "Invalid state.", {
       F: __dxlog_file,
-      L: 139,
+      L: 148,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -664,7 +667,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 140,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -676,7 +679,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 141,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -687,15 +690,15 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 158,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
-      this.close().catch((err) => this.errors.raise(err));
+      this.close(new import_protocols.ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
     });
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 162,
+      L: 171,
       S: this,
       A: [
         "!this._transport",
@@ -715,7 +718,7 @@ var Connection = class {
       this._transport = void 0;
       (0, import_log.log)("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 176,
+        L: 185,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -726,21 +729,38 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 181,
+        L: 190,
         S: this,
         C: (f, a) => f(...a)
       });
       if (!this.closeReason) {
         this.closeReason = err?.message;
       }
-      if (err?.message.includes("OperationError")) {
-        (0, import_log.log)("aborting due to transport OperationError", void 0, {
+      if (err instanceof import_protocols.ConnectionResetError) {
+        import_log.log.warn("aborting due to transport ConnectionResetError", void 0, {
+          F: __dxlog_file,
+          L: 197,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this.abort().catch((err2) => this.errors.raise(err2));
+      } else if (err instanceof import_protocols.ConnectivityError) {
+        import_log.log.warn("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
-          L: 187,
+          L: 200,
           S: this,
           C: (f, a) => f(...a)
         });
         this.abort().catch((err2) => this.errors.raise(err2));
+      } else if (err instanceof import_protocols.UnknownProtocolError) {
+        import_log.log.warn("unsure what to do with UnknownProtocolError, will keep on truckin", {
+          err
+        }, {
+          F: __dxlog_file,
+          L: 203,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
       if (this._state !== ConnectionState.CLOSED && this._state !== ConnectionState.CLOSING) {
         this.errors.raise(err);
@@ -754,7 +774,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 203,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -764,30 +784,30 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 209,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (!this.closeReason) {
-      this.closeReason = err?.message;
-    }
-    if (this._state === ConnectionState.CLOSED) {
-      (0, import_log.log)("abort ignored: already closed", this.closeReason, {
+    if (this._state === ConnectionState.CLOSED || this._state === ConnectionState.ABORTED) {
+      (0, import_log.log)(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 214,
+        L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    this._changeState(ConnectionState.CLOSING);
+    this._changeState(ConnectionState.ABORTING);
+    if (!this.closeReason) {
+      this.closeReason = err?.message;
+    }
     await this._ctx.dispose();
     try {
       (0, import_log.log)("aborting protocol... ", {
         proto: this._protocol
       }, {
         F: __dxlog_file,
-        L: 224,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -795,7 +815,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 227,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -805,56 +825,68 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 234,
+        L: 250,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    this._changeState(ConnectionState.CLOSED);
-    this._callbacks?.onClosed?.(err);
+    try {
+      this._callbacks?.onClosed?.(err);
+    } catch (err2) {
+      import_log.log.catch(err2, void 0, {
+        F: __dxlog_file,
+        L: 256,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    this._changeState(ConnectionState.ABORTED);
   }
   async close(err) {
     if (!this.closeReason) {
       this.closeReason = err?.message;
     }
-    if (this._state === ConnectionState.CLOSED) {
+    if (this._state === ConnectionState.CLOSED || this._state === ConnectionState.ABORTING || this._state === ConnectionState.ABORTED) {
       return;
     }
+    const lastState = this._state;
     this._changeState(ConnectionState.CLOSING);
     await this._ctx.dispose();
     (0, import_log.log)("closing...", {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 253,
+      L: 278,
       S: this,
       C: (f, a) => f(...a)
     });
-    try {
-      await this._protocol.close();
-    } catch (err2) {
-      import_log.log.catch(err2, void 0, {
-        F: __dxlog_file,
-        L: 259,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-    try {
-      await this._transport?.destroy();
-    } catch (err2) {
-      import_log.log.catch(err2, void 0, {
-        F: __dxlog_file,
-        L: 266,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+    if (lastState === ConnectionState.CONNECTED) {
+      try {
+        await this._protocol.close();
+      } catch (err2) {
+        import_log.log.catch(err2, void 0, {
+          F: __dxlog_file,
+          L: 285,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      try {
+        await this._transport?.destroy();
+      } catch (err2) {
+        import_log.log.catch(err2, void 0, {
+          F: __dxlog_file,
+          L: 292,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
     }
     (0, import_log.log)("closed", {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 269,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -890,14 +922,14 @@ var Connection = class {
         }
       });
     } catch (err) {
-      if (err instanceof import_errors.CancelledError) {
+      if (err instanceof import_protocols.CancelledError) {
         return;
       }
       import_log.log.warn("signal failed", {
         err
       }, {
         F: __dxlog_file,
-        L: 306,
+        L: 333,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -910,7 +942,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 315,
+      L: 342,
       S: this,
       A: [
         "msg.sessionId",
@@ -920,7 +952,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: 317,
+        L: 344,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -928,7 +960,7 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 320,
+      L: 347,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -937,7 +969,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 321,
+      L: 348,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -946,7 +978,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 322,
+      L: 349,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -970,7 +1002,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 331,
+          L: 358,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -978,7 +1010,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 334,
+          L: 361,
           S: this,
           A: [
             "this._transport",
@@ -991,7 +1023,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 335,
+          L: 362,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1005,17 +1037,17 @@ var Connection = class {
   _changeState(state) {
     (0, import_log.log)("stateChanged", {
       from: this._state,
-      too: state,
+      to: state,
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 346,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 347,
+      L: 374,
       S: this,
       A: [
         "state !== this._state",
@@ -1040,382 +1072,164 @@ 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_protocols4 = require("@dxos/protocols");
 var import_util2 = require("@dxos/util");
 
-// packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
+// packages/core/mesh/network-manager/src/swarm/peer.ts
+var import_async2 = require("@dxos/async");
 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");
-var import_util = require("@dxos/util");
-var __dxlog_file2 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
-var SwarmMessage = import_protocols2.schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
-var SwarmMessenger = class {
-  constructor({ sendMessage, onSignal, onOffer, topic }) {
+function _ts_decorate2(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        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_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
+var ConnectionDisplacedError = class extends import_protocols2.SystemError {
+  constructor() {
+    super("Connection displaced by remote initiator.");
+  }
+};
+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;
+    this.localPeerId = localPeerId;
+    this._signalMessaging = _signalMessaging;
+    this._protocolProvider = _protocolProvider;
+    this._transportFactory = _transportFactory;
+    this._connectionLimiter = _connectionLimiter;
+    this._callbacks = _callbacks;
+    this._availableAfter = 0;
+    this.availableToConnect = true;
     this._ctx = new import_context2.Context();
-    this._offerRecords = new import_util.ComplexMap((key) => key.toHex());
-    this._sendMessage = sendMessage;
-    this._onSignal = onSignal;
-    this._onOffer = onOffer;
-    this._topic = topic;
+    this.advertizing = false;
+    this.initiating = false;
+    this.connectionDisplaced = new import_async2.Event();
   }
-  async receiveMessage({ author, recipient, payload }) {
-    if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
-      return;
-    }
-    const message = SwarmMessage.decode(payload.value);
-    if (!this._topic.equals(message.topic)) {
-      return;
-    }
-    (0, import_log2.log)("received", {
-      from: author,
-      to: recipient,
-      msg: message
-    }, {
-      F: __dxlog_file2,
-      L: 69,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (message.data?.offer) {
-      await this._handleOffer({
-        author,
-        recipient,
-        message
-      });
-    } else if (message.data?.answer) {
-      await this._resolveAnswers(message);
-    } else if (message.data?.signal) {
-      await this._handleSignal({
-        author,
-        recipient,
-        message
-      });
-    } else if (message.data?.signalBatch) {
-      await this._handleSignal({
-        author,
-        recipient,
-        message
-      });
-    } else {
-      import_log2.log.warn("unknown message", {
-        message
-      }, {
+  /**
+  * Respond to remote offer.
+  */
+  async onOffer(message) {
+    const remoteId = message.author;
+    if (this.connection && ![
+      ConnectionState.CREATED,
+      ConnectionState.INITIAL
+    ].includes(this.connection.state)) {
+      import_log2.log.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
         F: __dxlog_file2,
-        L: 80,
+        L: 112,
         S: this,
         C: (f, a) => f(...a)
       });
+      return {
+        accept: false
+      };
+    }
+    if (this.connection || this.initiating) {
+      if (remoteId.toHex() < this.localPeerId.toHex()) {
+        (0, import_log2.log)("close local connection", {
+          localPeerId: this.id,
+          topic: this.topic,
+          remotePeerId: this.localPeerId,
+          sessionId: this.connection?.sessionId
+        }, {
+          F: __dxlog_file2,
+          L: 121,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (this.connection) {
+          await this.closeConnection(new ConnectionDisplacedError());
+        }
+      } else {
+        return {
+          accept: false
+        };
+      }
+    }
+    if (await this._callbacks.onOffer(remoteId)) {
+      if (!this.connection) {
+        (0, import_invariant2.invariant)(message.sessionId, void 0, {
+          F: __dxlog_file2,
+          L: 141,
+          S: this,
+          A: [
+            "message.sessionId",
+            ""
+          ]
+        });
+        const connection = this._createConnection(false, message.sessionId);
+        try {
+          await this._connectionLimiter.connecting(message.sessionId);
+          connection.initiate();
+          await connection.openConnection();
+        } catch (err) {
+          if (!(err instanceof import_protocols2.CancelledError)) {
+            import_log2.log.warn("connection error", {
+              topic: this.topic,
+              peerId: this.localPeerId,
+              remoteId: this.id,
+              err
+            }, {
+              F: __dxlog_file2,
+              L: 151,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+          await this.closeConnection(err);
+        }
+        return {
+          accept: true
+        };
+      }
     }
+    return {
+      accept: false
+    };
   }
-  async signal(message) {
-    (0, import_invariant2.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
+  /**
+  * Initiate a connection to the remote peer.
+  */
+  async initiateConnection() {
+    (0, import_invariant2.invariant)(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file2,
-      L: 85,
+      L: 168,
       S: this,
       A: [
-        "message.data?.signal || message.data?.signalBatch",
-        "'Invalid message'"
+        "!this.initiating",
+        "'Initiation in progress.'"
       ]
     });
-    await this._sendReliableMessage({
-      author: message.author,
-      recipient: message.recipient,
-      message
-    });
-  }
-  async offer(message) {
-    const networkMessage = {
-      ...message,
-      messageId: import_keys2.PublicKey.random()
-    };
-    return new Promise((resolve, reject) => {
-      this._offerRecords.set(networkMessage.messageId, {
-        resolve
-      });
-      this._sendReliableMessage({
-        author: message.author,
-        recipient: message.recipient,
-        message: networkMessage
-      }).catch((err) => reject(err));
-    });
-  }
-  async _sendReliableMessage({ author, recipient, message }) {
-    const networkMessage = {
-      ...message,
-      // Setting unique message_id if it not specified yet.
-      messageId: message.messageId ?? import_keys2.PublicKey.random()
-    };
-    (0, import_log2.log)("sending", {
-      from: author,
-      to: recipient,
-      msg: networkMessage
-    }, {
+    (0, import_invariant2.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file2,
-      L: 123,
+      L: 169,
       S: this,
-      C: (f, a) => f(...a)
+      A: [
+        "!this.connection",
+        "'Already connected.'"
+      ]
     });
-    await this._sendMessage({
-      author,
-      recipient,
-      payload: {
-        type_url: "dxos.mesh.swarm.SwarmMessage",
-        value: SwarmMessage.encode(networkMessage)
-      }
-    });
-  }
-  async _resolveAnswers(message) {
-    (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_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: 140,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      offerRecord.resolve(message.data.answer);
-    }
-  }
-  async _handleOffer({ author, recipient, message }) {
-    (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,
-      ...message,
-      data: {
-        offer: message.data.offer
-      }
-    };
-    const answer = await this._onOffer(offerMessage);
-    answer.offerMessageId = message.messageId;
-    try {
-      await this._sendReliableMessage({
-        author: recipient,
-        recipient: author,
-        message: {
-          topic: message.topic,
-          sessionId: message.sessionId,
-          data: {
-            answer
-          }
-        }
-      });
-    } catch (err) {
-      import_log2.log.warn("error sending answer", {
-        err
-      }, {
-        F: __dxlog_file2,
-        L: 174,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  async _handleSignal({ author, recipient, 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,
-      ...message,
-      data: {
-        signal: message.data.signal,
-        signalBatch: message.data.signalBatch
-      }
-    };
-    await this._onSignal(signalMessage);
-  }
-};
-
-// packages/core/mesh/network-manager/src/swarm/peer.ts
-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) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        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_file3 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/swarm/peer.ts";
-var ConnectionDisplacedError = class extends import_errors2.SystemError {
-  constructor() {
-    super("Connection displaced by remote initiator.");
-  }
-};
-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;
-    this.localPeerId = localPeerId;
-    this._signalMessaging = _signalMessaging;
-    this._protocolProvider = _protocolProvider;
-    this._transportFactory = _transportFactory;
-    this._connectionLimiter = _connectionLimiter;
-    this._callbacks = _callbacks;
-    this._availableAfter = 0;
-    this.availableToConnect = true;
-    this._ctx = new import_context3.Context();
-    this.advertizing = false;
-    this.initiating = false;
-    this.connectionDisplaced = new import_async2.Event();
-  }
-  /**
-  * Respond to remote offer.
-  */
-  async onOffer(message) {
-    const remoteId = message.author;
-    if (this.connection || this.initiating) {
-      if (remoteId.toHex() < this.localPeerId.toHex()) {
-        (0, import_log3.log)("close local connection", {
-          localPeerId: this.id,
-          topic: this.topic,
-          remotePeerId: this.localPeerId,
-          sessionId: this.connection?.sessionId
-        }, {
-          F: __dxlog_file3,
-          L: 117,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        if (this.connection) {
-          await this.closeConnection(new ConnectionDisplacedError());
-        }
-      } else {
-        return {
-          accept: false
-        };
-      }
-    }
-    if (await this._callbacks.onOffer(remoteId)) {
-      if (!this.connection) {
-        (0, import_invariant3.invariant)(message.sessionId, void 0, {
-          F: __dxlog_file3,
-          L: 137,
-          S: this,
-          A: [
-            "message.sessionId",
-            ""
-          ]
-        });
-        const connection = this._createConnection(false, message.sessionId);
-        try {
-          await this._connectionLimiter.connecting(message.sessionId);
-          connection.initiate();
-          await connection.openConnection();
-        } catch (err) {
-          if (!(err instanceof import_errors2.CancelledError)) {
-            import_log3.log.warn("connection error", {
-              topic: this.topic,
-              peerId: this.localPeerId,
-              remoteId: this.id,
-              err
-            }, {
-              F: __dxlog_file3,
-              L: 147,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-          await this.closeConnection(err);
-        }
-        return {
-          accept: true
-        };
-      }
-    }
-    return {
-      accept: false
-    };
-  }
-  /**
-  * Initiate a connection to the remote peer.
-  */
-  async initiateConnection() {
-    (0, import_invariant3.invariant)(!this.initiating, "Initiation in progress.", {
-      F: __dxlog_file3,
-      L: 164,
-      S: this,
-      A: [
-        "!this.initiating",
-        "'Initiation in progress.'"
-      ]
-    });
-    (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
-      F: __dxlog_file3,
-      L: 165,
-      S: this,
-      A: [
-        "!this.connection",
-        "'Already connected.'"
-      ]
-    });
-    const sessionId = import_keys3.PublicKey.random();
-    (0, import_log3.log)("initiating...", {
+    const sessionId = import_keys2.PublicKey.random();
+    (0, import_log2.log)("initiating...", {
       id: this.id,
       topic: this.topic,
       peerId: this.id,
       sessionId
     }, {
-      F: __dxlog_file3,
-      L: 167,
+      F: __dxlog_file2,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1433,21 +1247,21 @@ var Peer = class {
           offer: {}
         }
       });
-      (0, import_log3.log)("received", {
+      (0, import_log2.log)("received", {
         answer,
         topic: this.topic,
         ownId: this.localPeerId,
         remoteId: this.id
       }, {
-        F: __dxlog_file3,
-        L: 183,
+        F: __dxlog_file2,
+        L: 187,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
-        (0, import_log3.log)("ignoring response", void 0, {
-          F: __dxlog_file3,
-          L: 185,
+        (0, import_log2.log)("ignoring response", void 0, {
+          F: __dxlog_file2,
+          L: 189,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1460,17 +1274,26 @@ var Peer = class {
       await connection.openConnection();
       this._callbacks.onAccepted();
     } catch (err) {
-      (0, import_log3.log)("initiation error", {
+      (0, import_log2.log)("initiation error", {
         err,
         topic: this.topic,
         peerId: this.localPeerId,
         remoteId: this.id
       }, {
-        F: __dxlog_file3,
-        L: 196,
+        F: __dxlog_file2,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
+      if (err instanceof import_protocols2.TimeoutError) {
+        import_log2.log.warn("aborting connection due to signalling failure", void 0, {
+          F: __dxlog_file2,
+          L: 202,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        await connection.abort(err);
+      }
       await this.closeConnection(err);
       throw err;
     } finally {
@@ -1482,21 +1305,21 @@ var Peer = class {
   * Either we're initiating a connection or creating one in response to an offer from the other peer.
   */
   _createConnection(initiator, sessionId) {
-    (0, import_log3.log)("creating connection", {
+    (0, import_log2.log)("creating connection", {
       topic: this.topic,
       peerId: this.localPeerId,
       remoteId: this.id,
       initiator,
       sessionId
     }, {
-      F: __dxlog_file3,
-      L: 210,
+      F: __dxlog_file2,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
-      F: __dxlog_file3,
-      L: 217,
+    (0, import_invariant2.invariant)(!this.connection, "Already connected.", {
+      F: __dxlog_file2,
+      L: 225,
       S: this,
       A: [
         "!this.connection",
@@ -1524,50 +1347,50 @@ var Peer = class {
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
           this._connectionLimiter.doneConnecting(sessionId);
-          import_log3.log.trace("dxos.mesh.connection.connected", {
+          import_log2.log.trace("dxos.mesh.connection.connected", {
             topic: this.topic,
             localPeerId: this.localPeerId,
             remotePeerId: this.id,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file3,
-            L: 236,
+            F: __dxlog_file2,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         onClosed: (err) => {
-          (0, import_log3.log)("connection closed", {
+          (0, import_log2.log)("connection closed", {
             topic: this.topic,
             peerId: this.localPeerId,
             remoteId: this.id,
             initiator
           }, {
-            F: __dxlog_file3,
-            L: 245,
+            F: __dxlog_file2,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
-          (0, import_invariant3.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
-            F: __dxlog_file3,
-            L: 250,
+          (0, import_invariant2.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
+            F: __dxlog_file2,
+            L: 258,
             S: this,
             A: [
               "this.connection === connection",
               "'Connection mismatch (race condition).'"
             ]
           });
-          import_log3.log.trace("dxos.mesh.connection.closed", {
+          import_log2.log.trace("dxos.mesh.connection.closed", {
             topic: this.topic,
             localPeerId: this.localPeerId,
             remotePeerId: this.id,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file3,
-            L: 252,
+            F: __dxlog_file2,
+            L: 260,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1589,108 +1412,340 @@ var Peer = class {
           this.connection = void 0;
         }
       }
-    );
-    this._callbacks.onInitiated(connection);
-    void this._connectionCtx?.dispose();
-    this._connectionCtx = this._ctx.derive();
-    connection.errors.handle((err) => {
-      import_log3.log.warn("connection error", {
-        topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id,
-        initiator,
-        err
-      }, {
+    );
+    this._callbacks.onInitiated(connection);
+    void this._connectionCtx?.dispose();
+    this._connectionCtx = this._ctx.derive();
+    connection.errors.handle((err) => {
+      import_log2.log.warn("connection error", {
+        topic: this.topic,
+        peerId: this.localPeerId,
+        remoteId: this.id,
+        initiator,
+        err
+      }, {
+        F: __dxlog_file2,
+        L: 300,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      import_log2.log.trace("dxos.mesh.connection.error", {
+        topic: this.topic,
+        localPeerId: this.localPeerId,
+        remotePeerId: this.id,
+        sessionId,
+        initiator,
+        err
+      }, {
+        F: __dxlog_file2,
+        L: 301,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      void this.closeConnection(err);
+    });
+    this.connection = connection;
+    return connection;
+  }
+  async closeConnection(err) {
+    if (!this.connection) {
+      return;
+    }
+    const connection = this.connection;
+    (0, import_log2.log)("closing...", {
+      peerId: this.id,
+      sessionId: connection.sessionId
+    }, {
+      F: __dxlog_file2,
+      L: 326,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await connection.close(err);
+    (0, import_log2.log)("closed", {
+      peerId: this.id,
+      sessionId: connection.sessionId
+    }, {
+      F: __dxlog_file2,
+      L: 332,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  async onSignal(message) {
+    if (!this.connection) {
+      (0, import_log2.log)("dropping signal message for non-existent connection", {
+        message
+      }, {
+        F: __dxlog_file2,
+        L: 337,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    await this.connection.signal(message);
+  }
+  async destroy() {
+    await this._ctx.dispose();
+    (0, import_log2.log)("Destroying peer", {
+      peerId: this.id,
+      topic: this.topic
+    }, {
+      F: __dxlog_file2,
+      L: 347,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await this?.connection?.close();
+  }
+};
+_ts_decorate2([
+  import_async2.synchronized
+], Peer.prototype, "destroy", null);
+var increaseInterval = (interval) => {
+  if (interval === 0) {
+    return 50;
+  } else if (interval < 500) {
+    return 500;
+  } else if (interval < 1e3) {
+    return 1e3;
+  } else if (interval < 5e3) {
+    return 5e3;
+  }
+  return 1e4;
+};
+
+// packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
+var import_context3 = require("@dxos/context");
+var import_invariant3 = require("@dxos/invariant");
+var import_keys3 = require("@dxos/keys");
+var import_log3 = require("@dxos/log");
+var import_protocols3 = require("@dxos/protocols");
+var import_util = require("@dxos/util");
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
+var SwarmMessage = import_protocols3.schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
+var SwarmMessenger = class {
+  constructor({ sendMessage, onSignal, onOffer, topic }) {
+    this._ctx = new import_context3.Context();
+    this._offerRecords = new import_util.ComplexMap((key) => key.toHex());
+    this._sendMessage = sendMessage;
+    this._onSignal = onSignal;
+    this._onOffer = onOffer;
+    this._topic = topic;
+  }
+  async receiveMessage({ author, recipient, payload }) {
+    if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
+      return;
+    }
+    const message = SwarmMessage.decode(payload.value);
+    if (!this._topic.equals(message.topic)) {
+      return;
+    }
+    (0, import_log3.log)("received", {
+      from: author,
+      to: recipient,
+      msg: message
+    }, {
+      F: __dxlog_file3,
+      L: 69,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (message.data?.offer) {
+      await this._handleOffer({
+        author,
+        recipient,
+        message
+      });
+    } else if (message.data?.answer) {
+      await this._resolveAnswers(message);
+    } else if (message.data?.signal) {
+      await this._handleSignal({
+        author,
+        recipient,
+        message
+      });
+    } else if (message.data?.signalBatch) {
+      await this._handleSignal({
+        author,
+        recipient,
+        message
+      });
+    } else {
+      import_log3.log.warn("unknown message", {
+        message
+      }, {
+        F: __dxlog_file3,
+        L: 80,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  async signal(message) {
+    (0, import_invariant3.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
+      F: __dxlog_file3,
+      L: 85,
+      S: this,
+      A: [
+        "message.data?.signal || message.data?.signalBatch",
+        "'Invalid message'"
+      ]
+    });
+    await this._sendReliableMessage({
+      author: message.author,
+      recipient: message.recipient,
+      message
+    });
+  }
+  async offer(message) {
+    const networkMessage = {
+      ...message,
+      messageId: import_keys3.PublicKey.random()
+    };
+    return new Promise((resolve, reject) => {
+      this._offerRecords.set(networkMessage.messageId, {
+        resolve
+      });
+      this._sendReliableMessage({
+        author: message.author,
+        recipient: message.recipient,
+        message: networkMessage
+      }).catch((err) => reject(err));
+    });
+  }
+  async _sendReliableMessage({ author, recipient, message }) {
+    const networkMessage = {
+      ...message,
+      // Setting unique message_id if it not specified yet.
+      messageId: message.messageId ?? import_keys3.PublicKey.random()
+    };
+    (0, import_log3.log)("sending", {
+      from: author,
+      to: recipient,
+      msg: networkMessage
+    }, {
+      F: __dxlog_file3,
+      L: 123,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await this._sendMessage({
+      author,
+      recipient,
+      payload: {
+        type_url: "dxos.mesh.swarm.SwarmMessage",
+        value: SwarmMessage.encode(networkMessage)
+      }
+    });
+  }
+  async _resolveAnswers(message) {
+    (0, import_invariant3.invariant)(message.data?.answer?.offerMessageId, "No offerMessageId", {
+      F: __dxlog_file3,
+      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_invariant3.invariant)(message.data?.answer, "No answer", {
         F: __dxlog_file3,
-        L: 292,
+        L: 139,
         S: this,
-        C: (f, a) => f(...a)
+        A: [
+          "message.data?.answer",
+          "'No answer'"
+        ]
       });
-      import_log3.log.trace("dxos.mesh.connection.error", {
-        topic: this.topic,
-        localPeerId: this.localPeerId,
-        remotePeerId: this.id,
-        sessionId,
-        initiator,
-        err
+      (0, import_log3.log)("resolving", {
+        answer: message.data.answer
       }, {
         F: __dxlog_file3,
-        L: 293,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
-      void this.closeConnection(err);
-    });
-    this.connection = connection;
-    return connection;
-  }
-  async closeConnection(err) {
-    if (!this.connection) {
-      return;
+      offerRecord.resolve(message.data.answer);
     }
-    const connection = this.connection;
-    (0, import_log3.log)("closing...", {
-      peerId: this.id,
-      sessionId: connection.sessionId
-    }, {
-      F: __dxlog_file3,
-      L: 318,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await connection.close(err);
-    (0, import_log3.log)("closed", {
-      peerId: this.id,
-      sessionId: connection.sessionId
-    }, {
+  }
+  async _handleOffer({ author, recipient, message }) {
+    (0, import_invariant3.invariant)(message.data.offer, "No offer", {
       F: __dxlog_file3,
-      L: 324,
+      L: 154,
       S: this,
-      C: (f, a) => f(...a)
+      A: [
+        "message.data.offer",
+        "'No offer'"
+      ]
     });
-  }
-  async onSignal(message) {
-    if (!this.connection) {
-      (0, import_log3.log)("dropping signal message for non-existent connection", {
-        message
+    const offerMessage = {
+      author,
+      recipient,
+      ...message,
+      data: {
+        offer: message.data.offer
+      }
+    };
+    const answer = await this._onOffer(offerMessage);
+    answer.offerMessageId = message.messageId;
+    try {
+      await this._sendReliableMessage({
+        author: recipient,
+        recipient: author,
+        message: {
+          topic: message.topic,
+          sessionId: message.sessionId,
+          data: {
+            answer
+          }
+        }
+      });
+    } catch (err) {
+      import_log3.log.warn("error sending answer", {
+        err
       }, {
         F: __dxlog_file3,
-        L: 329,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       });
-      return;
     }
-    await this.connection.signal(message);
   }
-  async destroy() {
-    await this._ctx.dispose();
-    (0, import_log3.log)("Destroying peer", {
-      peerId: this.id,
-      topic: this.topic
-    }, {
+  async _handleSignal({ author, recipient, message }) {
+    (0, import_invariant3.invariant)(message.messageId, void 0, {
       F: __dxlog_file3,
-      L: 339,
+      L: 187,
       S: this,
-      C: (f, a) => f(...a)
+      A: [
+        "message.messageId",
+        ""
+      ]
     });
-    await this?.connection?.close();
-  }
-};
-_ts_decorate2([
-  import_async2.synchronized
-], Peer.prototype, "destroy", null);
-var increaseInterval = (interval) => {
-  if (interval === 0) {
-    return 50;
-  } else if (interval < 500) {
-    return 500;
-  } else if (interval < 1e3) {
-    return 1e3;
-  } else if (interval < 5e3) {
-    return 5e3;
+    (0, import_invariant3.invariant)(message.data.signal || message.data.signalBatch, "Invalid message", {
+      F: __dxlog_file3,
+      L: 188,
+      S: this,
+      A: [
+        "message.data.signal || message.data.signalBatch",
+        "'Invalid message'"
+      ]
+    });
+    const signalMessage = {
+      author,
+      recipient,
+      ...message,
+      data: {
+        signal: message.data.signal,
+        signalBatch: message.data.signalBatch
+      }
+    };
+    await this._onSignal(signalMessage);
   }
-  return 1e4;
 };
 
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
@@ -1704,7 +1759,7 @@ function _ts_decorate3(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_file4 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/swarm/swarm.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts";
 var INITIATION_DELAY = 100;
 var getClassName = (obj) => Object.getPrototypeOf(obj).constructor.name;
 var Swarm = class {
@@ -1728,7 +1783,7 @@ var Swarm = class {
     this.disconnected = new import_async3.Event();
     this.connected = new import_async3.Event();
     this.errors = new import_debug2.ErrorStream();
-    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.begin({
+    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols4.trace.begin({
       id: this._instanceId,
       data: {
         topic: this._topic.toHex(),
@@ -1755,7 +1810,7 @@ var Swarm = class {
       onOffer: async (msg) => await this.onOffer(msg),
       topic: this._topic
     });
-    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.end({
+    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols4.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file4,
@@ -2178,12 +2233,11 @@ var import_async4 = require("@dxos/async");
 var import_keys5 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
 var import_util3 = require("@dxos/util");
-var __dxlog_file5 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts";
 var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
-  // prettier-ignore
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new import_async4.EventSubscriptions();
@@ -2206,7 +2260,7 @@ var SwarmMapper = class {
   _update() {
     (0, import_log5.log)("updating swarm", void 0, {
       F: __dxlog_file5,
-      L: 75,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2230,7 +2284,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file5,
-      L: 116,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2246,13 +2300,13 @@ var SwarmMapper = class {
 // packages/core/mesh/network-manager/src/swarm/connection-limiter.ts
 var import_async5 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
-var import_errors3 = require("@dxos/errors");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
+var import_protocols5 = require("@dxos/protocols");
 var import_util4 = require("@dxos/util");
-var __dxlog_file6 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
-var MAX_CONCURRENT_INITIATING_CONNECTIONS = 10;
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
+var MAX_CONCURRENT_INITIATING_CONNECTIONS = 50;
 var ConnectionLimiter = class {
   constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
     this._ctx = new import_context5.Context();
@@ -2319,7 +2373,7 @@ var ConnectionLimiter = class {
     if (!this._waitingPromises.has(sessionId)) {
       return;
     }
-    this._waitingPromises.get(sessionId).reject(new import_errors3.CancelledError());
+    this._waitingPromises.get(sessionId).reject(new import_protocols5.CancelledError());
     this._waitingPromises.delete(sessionId);
     this.resolveWaitingPromises.schedule();
   }
@@ -2397,10 +2451,10 @@ var import_invariant6 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log7 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
-var import_protocols4 = require("@dxos/protocols");
+var import_protocols6 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_util6 = require("@dxos/util");
-var __dxlog_file7 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/network-manager.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
 var NetworkManager = class {
   constructor({ transportFactory, signalManager, log: log1 }) {
     /**
@@ -2445,7 +2499,7 @@ var NetworkManager = class {
     return this._swarms.get(topic);
   }
   async open() {
-    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.begin({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file7,
@@ -2455,7 +2509,7 @@ var NetworkManager = class {
     });
     await this._messenger.open();
     await this._signalManager.open();
-    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.end({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file7,
@@ -2636,7 +2690,7 @@ var NetworkManager = class {
 
 // packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts
 var import_invariant7 = require("@dxos/invariant");
-var __dxlog_file8 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts";
+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";
@@ -2679,7 +2733,7 @@ var FullyConnectedTopology = class {
 var import_xor_distance = __toESM(require("xor-distance"));
 var import_invariant8 = require("@dxos/invariant");
 var import_log8 = require("@dxos/log");
-var __dxlog_file9 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/topology/mmst-topology.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts";
 var MMSTTopology = class {
   constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
     this._sampleCollected = false;
@@ -2788,9 +2842,8 @@ var sortByXorDistance = (keys, reference) => keys.sort((a, b) => import_xor_dist
 // packages/core/mesh/network-manager/src/topology/star-topology.ts
 var import_invariant9 = require("@dxos/invariant");
 var import_log9 = require("@dxos/log");
-var __dxlog_file10 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/topology/star-topology.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
 var StarTopology = class {
-  // prettier-ignore
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
   }
@@ -2800,7 +2853,7 @@ var StarTopology = class {
   init(controller) {
     (0, import_invariant9.invariant)(!this._controller, "Already initialized.", {
       F: __dxlog_file10,
-      L: 24,
+      L: 21,
       S: this,
       A: [
         "!this._controller",
@@ -2812,7 +2865,7 @@ var StarTopology = class {
   update() {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 29,
+      L: 26,
       S: this,
       A: [
         "this._controller",
@@ -2823,7 +2876,7 @@ var StarTopology = class {
     if (!ownPeerId.equals(this._centralPeer)) {
       (0, import_log9.log)("leaf peer dropping all connections apart from central peer.", void 0, {
         F: __dxlog_file10,
-        L: 32,
+        L: 29,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2833,7 +2886,7 @@ var StarTopology = class {
             peer
           }, {
             F: __dxlog_file10,
-            L: 37,
+            L: 34,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2847,7 +2900,7 @@ var StarTopology = class {
           peer
         }, {
           F: __dxlog_file10,
-          L: 46,
+          L: 43,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2858,7 +2911,7 @@ var StarTopology = class {
   async onOffer(peer) {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 53,
+      L: 50,
       S: this,
       A: [
         "this._controller",
@@ -2872,7 +2925,7 @@ var StarTopology = class {
       isSelfCentral: ownPeerId.equals(this._centralPeer)
     }, {
       F: __dxlog_file10,
-      L: 55,
+      L: 52,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2900,7 +2953,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_file11 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
+var __dxlog_file11 = "/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({
@@ -3075,6 +3128,7 @@ var TransportKind;
   TransportKind2["LIBDATACHANNEL"] = "LIBDATACHANNEL";
   TransportKind2["SIMPLE_PEER_PROXY"] = "SIMPLE_PEER_PROXY";
   TransportKind2["MEMORY"] = "MEMORY";
+  TransportKind2["TCP"] = "TCP";
 })(TransportKind || (TransportKind = {}));
 
 // packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts
@@ -3084,7 +3138,7 @@ var import_async9 = require("@dxos/async");
 var import_debug5 = require("@dxos/debug");
 var import_keys10 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
-var import_protocols5 = require("@dxos/protocols");
+var import_protocols7 = require("@dxos/protocols");
 
 // packages/core/mesh/network-manager/src/transport/webrtc.ts
 var wrtc = null;
@@ -3094,7 +3148,7 @@ try {
 }
 
 // packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts
-var __dxlog_file12 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts";
 var SimplePeerTransport = class {
   constructor(params) {
     this.params = params;
@@ -3103,17 +3157,17 @@ var SimplePeerTransport = class {
     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({
+    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols7.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 39,
+      L: 40,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log11.log)("created connection", params, {
       F: __dxlog_file12,
-      L: 40,
+      L: 41,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3126,7 +3180,7 @@ var SimplePeerTransport = class {
     this._peer.on("signal", async (data) => {
       (0, import_log11.log)("signal", data, {
         F: __dxlog_file12,
-        L: 49,
+        L: 50,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3139,7 +3193,7 @@ var SimplePeerTransport = class {
     this._peer.on("connect", () => {
       (0, import_log11.log)("connected", void 0, {
         F: __dxlog_file12,
-        L: 54,
+        L: 55,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3149,7 +3203,7 @@ var SimplePeerTransport = class {
     this._peer.on("close", async () => {
       (0, import_log11.log)("closed", void 0, {
         F: __dxlog_file12,
-        L: 60,
+        L: 61,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3157,30 +3211,78 @@ var SimplePeerTransport = class {
       this.closed.emit();
     });
     this._peer.on("error", async (err) => {
-      this.errors.raise(err);
+      if (typeof RTCError !== "undefined" && err instanceof RTCError) {
+        if (err.errorDetail === "sctp-failure") {
+          this.errors.raise(new import_protocols7.ConnectionResetError("sctp-failure from RTCError", err));
+        } else {
+          this.errors.raise(new import_protocols7.UnknownProtocolError("unknown RTCError", err));
+        }
+      } else if ("code" in err) {
+        import_log11.log.info("simple-peer error", err, {
+          F: __dxlog_file12,
+          L: 77,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        switch (err.code) {
+          case "ERR_WEBRTC_SUPPORT":
+            this.errors.raise(new import_protocols7.ProtocolError("WebRTC not supported", err));
+            break;
+          case "ERR_ICE_CONNECTION_FAILURE":
+          case "ERR_DATA_CHANNEL":
+          case "ERR_CONNECTION_FAILURE":
+          case "ERR_SIGNALING":
+            this.errors.raise(new import_protocols7.ConnectivityError("unknown communication failure", err));
+            break;
+          case "ERR_CREATE_OFFER":
+          case "ERR_CREATE_ANSWER":
+          case "ERR_SET_LOCAL_DESCRIPTION":
+          case "ERR_SET_REMOTE_DESCRIPTION":
+          case "ERR_ADD_ICE_CANDIDATE":
+            this.errors.raise(new import_protocols7.UnknownProtocolError("unknown simple-peer library failure", err));
+            break;
+          default:
+            this.errors.raise(new Error("unknown simple-peer error"));
+            break;
+        }
+      } else {
+        import_log11.log.info("unknown peer connection error", err, {
+          F: __dxlog_file12,
+          L: 101,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this.errors.raise(err);
+      }
       try {
-        if (typeof this._peer?._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_file12,
-              L: 72,
+              L: 109,
               S: this,
               C: (f, a) => f(...a)
             });
           });
         }
-      } catch {
+      } catch (err2) {
+        import_log11.log.catch(err2, void 0, {
+          F: __dxlog_file12,
+          L: 116,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
       await this.destroy();
     });
-    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.end({
+    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols7.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 82,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3188,7 +3290,7 @@ var SimplePeerTransport = class {
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file12,
-      L: 86,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3198,7 +3300,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file12,
-      L: 91,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3229,9 +3331,8 @@ 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_file13 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
 var SimplePeerTransportService = class {
-  // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
     this.transports = new import_util8.ComplexMap(import_keys11.PublicKey.hash);
@@ -3301,7 +3402,8 @@ var SimplePeerTransportService = class {
       const transportState = {
         transport,
         stream: duplex,
-        writeCallbacks: []
+        writeCallbacks: [],
+        state: "OPEN"
       };
       ready();
       this.transports.set(request.proxyId, transportState);
@@ -3311,7 +3413,7 @@ var SimplePeerTransportService = class {
   async sendSignal({ proxyId, signal }) {
     (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 113,
+      L: 112,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -3321,9 +3423,17 @@ var SimplePeerTransportService = class {
     await this.transports.get(proxyId).transport.signal(signal);
   }
   async sendData({ proxyId, payload }) {
+    if (this.transports.get(proxyId)?.state !== "OPEN") {
+      import_log12.log.debug("transport is closed", void 0, {
+        F: __dxlog_file13,
+        L: 118,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 118,
+      L: 120,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -3341,10 +3451,12 @@ var SimplePeerTransportService = class {
   async close({ proxyId }) {
     await this.transports.get(proxyId)?.transport.destroy();
     await this.transports.get(proxyId)?.stream.end();
-    this.transports.delete(proxyId);
+    if (this.transports.get(proxyId)) {
+      this.transports.get(proxyId).state = "CLOSED";
+    }
     (0, import_log12.log)("Closed.", void 0, {
       F: __dxlog_file13,
-      L: 132,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3359,11 +3471,11 @@ var import_debug6 = require("@dxos/debug");
 var import_invariant12 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
+var import_protocols8 = require("@dxos/protocols");
 var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
 var import_util9 = require("@dxos/util");
-var __dxlog_file14 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
 var SimplePeerTransportProxy = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._proxyId = import_keys12.PublicKey.random();
@@ -3380,7 +3492,7 @@ var SimplePeerTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         (0, import_log13.log)("SimplePeerTransportProxy: event", event, {
           F: __dxlog_file14,
-          L: 51,
+          L: 55,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3400,7 +3512,7 @@ var SimplePeerTransportProxy = class {
           }).then(() => callback(), (err) => {
             import_log13.log.catch(err, void 0, {
               F: __dxlog_file14,
-              L: 69,
+              L: 76,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3409,14 +3521,14 @@ var SimplePeerTransportProxy = class {
       }));
     }, (error) => import_log13.log.catch(error, void 0, {
       F: __dxlog_file14,
-      L: 75,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     }));
   }
   async _handleConnection(connectionEvent) {
     if (connectionEvent.error) {
-      this.errors.raise(new Error(connectionEvent.error));
+      this.errors.raise(decodeError(connectionEvent.error));
     }
     switch (connectionEvent.state) {
       case import_bridge2.ConnectionState.CONNECTED: {
@@ -3439,7 +3551,7 @@ var SimplePeerTransportProxy = class {
     this._params.bridgeService.sendSignal({
       proxyId: this._proxyId,
       signal
-    }).catch((err) => this.errors.raise(err));
+    }).catch((err) => this.errors.raise(decodeError(err)));
   }
   // TODO(burdon): Move open from constructor.
   async destroy() {
@@ -3455,7 +3567,7 @@ var SimplePeerTransportProxy = class {
     } catch (err) {
       import_log13.log.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 126,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3491,7 +3603,7 @@ var SimplePeerTransportProxyFactory = class {
   createTransport(options) {
     (0, import_invariant12.invariant)(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
       F: __dxlog_file14,
-      L: 163,
+      L: 171,
       S: this,
       A: [
         "this._bridgeService",
@@ -3507,6 +3619,22 @@ var SimplePeerTransportProxyFactory = class {
     return transport;
   }
 };
+var decodeError = (err) => {
+  const message = typeof err === "string" ? err : err.message;
+  if (message.includes("CONNECTION_RESET")) {
+    return new import_protocols8.ConnectionResetError(message);
+  } else if (message.includes("TIMEOUT")) {
+    return new import_protocols8.TimeoutError(message);
+  } else if (message.includes("PROTOCOL_ERROR")) {
+    return new import_protocols8.ProtocolError(message);
+  } else if (message.includes("CONNECTIVITY_ERROR")) {
+    return new import_protocols8.ConnectivityError(message);
+  } else if (message.includes("UNKNOWN_PROTOCOL_ERROR")) {
+    return new import_protocols8.UnknownProtocolError(message);
+  } else {
+    return typeof err === "string" ? new Error(err) : err;
+  }
+};
 
 // packages/core/mesh/network-manager/src/transport/index.ts
 init_datachannel();
@@ -3526,7 +3654,7 @@ function _ts_decorate5(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_file15 = "/mnt/ramdisk/work/packages/core/mesh/network-manager/src/transport/libdatachannel-transport.ts";
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/libdatachannel-transport.ts";
 var DATACHANNEL_LABEL = "dxos.mesh.transport";
 var MAX_BUFFERED_AMOUNT = 64 * 1024;
 var MAX_MESSAGE_SIZE = 64 * 1024;
@@ -3850,6 +3978,136 @@ var createLibDataChannelTransportFactory = (webrtcConfig) => ({
   })
 });
 
+// packages/core/mesh/network-manager/src/transport/tcp-transport.ts
+var import_node_net = require("node:net");
+var import_async12 = require("@dxos/async");
+var import_debug8 = require("@dxos/debug");
+var import_log15 = require("@dxos/log");
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/tcp-transport.ts";
+var TcpTransportFactory = {
+  createTransport: (params) => new TcpTransport(params)
+};
+var TcpTransport = class {
+  constructor(options) {
+    this.options = options;
+    this._server = void 0;
+    this._socket = void 0;
+    this.closed = new import_async12.Event();
+    this.connected = new import_async12.Event();
+    this.errors = new import_debug8.ErrorStream();
+    this._destroyed = false;
+    this._connected = false;
+    (0, import_log15.log)("creating", void 0, {
+      F: __dxlog_file16,
+      L: 34,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (this.options.initiator) {
+      setTimeout(async () => {
+        const { Server } = await import("node:net");
+        this._server = new Server((socket) => {
+          (0, import_log15.log)("new connection", void 0, {
+            F: __dxlog_file16,
+            L: 42,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          if (this._connected) {
+            socket.destroy();
+          }
+          this._handleSocket(socket);
+        });
+        this._server.on("listening", () => {
+          const { port } = this._server.address();
+          (0, import_log15.log)("listening", {
+            port
+          }, {
+            F: __dxlog_file16,
+            L: 51,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          void this.options.sendSignal({
+            payload: {
+              port
+            }
+          }).catch((err) => {
+            if (!this._destroyed) {
+              this.errors.raise(err);
+            }
+          });
+        });
+        this._server.on("error", (err) => {
+          this.errors.raise(err);
+        });
+        this._server.listen(0);
+      });
+    }
+  }
+  async destroy() {
+    (0, import_log15.log)("closing", void 0, {
+      F: __dxlog_file16,
+      L: 72,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._socket?.destroy();
+    this._server?.close();
+    this._destroyed = true;
+  }
+  signal({ payload }) {
+    (0, import_log15.log)("received signal", {
+      payload
+    }, {
+      F: __dxlog_file16,
+      L: 80,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (this.options.initiator || this._connected) {
+      return;
+    }
+    const socket = new import_node_net.Socket();
+    this._handleSocket(socket);
+    socket.connect({
+      port: payload.port,
+      host: "localhost"
+    });
+  }
+  _handleSocket(socket) {
+    (0, import_log15.log)("handling socket", {
+      remotePort: socket.remotePort,
+      localPort: socket.localPort
+    }, {
+      F: __dxlog_file16,
+      L: 91,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._socket = socket;
+    this.connected.emit();
+    this.options.stream.pipe(this._socket).pipe(this.options.stream);
+    this._socket.on("connect", () => {
+      (0, import_log15.log)("connected to", {
+        port: this._socket?.remotePort
+      }, {
+        F: __dxlog_file16,
+        L: 97,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._connected = true;
+    });
+    this._socket.on("error", (err) => {
+      this.errors.raise(err);
+    });
+    this._socket.on("close", () => {
+      this.closed.emit();
+    });
+  }
+};
+
 // packages/core/mesh/network-manager/src/wire-protocol.ts
 var import_teleport = require("@dxos/teleport");
 var createTeleportProtocolFactory = (onConnection) => {
@@ -3895,6 +4153,8 @@ var createTeleportProtocolFactory = (onConnection) => {
   Swarm,
   SwarmMapper,
   SwarmMessenger,
+  TcpTransport,
+  TcpTransportFactory,
   TransportKind,
   cleanup,
   createLibDataChannelTransportFactory,