@dxos/network-manager 0.6.13 → 0.6.14-main.2b6a0f3

package/dist/lib/node/{chunk-4YAYC7WN.cjs → chunk-4TTFBX3M.cjs}

@@ -26,37 +26,29 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_4YAYC7WN_exports = {};
-__export(chunk_4YAYC7WN_exports, {
+var chunk_4TTFBX3M_exports = {};
+__export(chunk_4TTFBX3M_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
   ConnectionState: () => ConnectionState,
   EventType: () => EventType,
   FullyConnectedTopology: () => FullyConnectedTopology,
-  LibDataChannelTransport: () => LibDataChannelTransport,
   MAX_CONCURRENT_INITIATING_CONNECTIONS: () => MAX_CONCURRENT_INITIATING_CONNECTIONS,
-  MMSTTopology: () => MMSTTopology,
   MemoryTransport: () => MemoryTransport,
   MemoryTransportFactory: () => MemoryTransportFactory,
-  SimplePeerTransport: () => SimplePeerTransport,
-  SimplePeerTransportProxy: () => SimplePeerTransportProxy,
-  SimplePeerTransportProxyFactory: () => SimplePeerTransportProxyFactory,
-  SimplePeerTransportService: () => SimplePeerTransportService,
-  StarTopology: () => StarTopology,
+  RtcTransportProxy: () => RtcTransportProxy,
+  RtcTransportProxyFactory: () => RtcTransportProxyFactory,
+  RtcTransportService: () => RtcTransportService,
   Swarm: () => Swarm,
   SwarmMapper: () => SwarmMapper,
   SwarmMessenger: () => SwarmMessenger,
   SwarmNetworkManager: () => SwarmNetworkManager,
-  TcpTransport: () => TcpTransport,
-  TcpTransportFactory: () => TcpTransportFactory,
   TransportKind: () => TransportKind,
-  createIceProvider: () => createIceProvider,
-  createLibDataChannelTransportFactory: () => createLibDataChannelTransportFactory,
-  createSimplePeerTransportFactory: () => createSimplePeerTransportFactory,
+  createRtcTransportFactory: () => createRtcTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_4YAYC7WN_exports);
+module.exports = __toCommonJS(chunk_4TTFBX3M_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -64,107 +56,91 @@ var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
-var import_async2 = require("@dxos/async");
-var import_log2 = require("@dxos/log");
-var import_util = require("@dxos/util");
 var import_context2 = require("@dxos/context");
 var import_invariant2 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
+var import_log2 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_proto = require("@dxos/protocols/proto");
-var import_util2 = require("@dxos/util");
-var import_async3 = require("@dxos/async");
+var import_util = require("@dxos/util");
+var import_async2 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
 var import_debug2 = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
-var import_log4 = require("@dxos/log");
+var import_log3 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_protocols3 = require("@dxos/protocols");
-var import_util3 = require("@dxos/util");
-var import_async4 = require("@dxos/async");
+var import_util2 = require("@dxos/util");
+var import_async3 = require("@dxos/async");
 var import_context4 = require("@dxos/context");
 var import_invariant4 = require("@dxos/invariant");
 var import_keys4 = require("@dxos/keys");
-var import_log5 = require("@dxos/log");
+var import_log4 = require("@dxos/log");
 var import_protocols4 = require("@dxos/protocols");
-var import_async5 = require("@dxos/async");
+var import_async4 = require("@dxos/async");
 var import_keys5 = require("@dxos/keys");
-var import_log6 = require("@dxos/log");
+var import_log5 = require("@dxos/log");
 var import_messaging2 = require("@dxos/messaging");
-var import_util4 = require("@dxos/util");
-var import_async6 = require("@dxos/async");
+var import_util3 = require("@dxos/util");
+var import_async5 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
-var import_log7 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
-var import_util5 = require("@dxos/util");
-var import_async7 = require("@dxos/async");
+var import_util4 = require("@dxos/util");
+var import_async6 = require("@dxos/async");
 var import_debug3 = require("@dxos/debug");
 var import_keys7 = require("@dxos/keys");
-var import_util6 = require("@dxos/util");
-var import_async8 = require("@dxos/async");
+var import_util5 = require("@dxos/util");
+var import_async7 = require("@dxos/async");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
-var import_log8 = require("@dxos/log");
+var import_log7 = require("@dxos/log");
 var import_messaging3 = require("@dxos/messaging");
 var import_protocols6 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
-var import_util7 = require("@dxos/util");
+var import_util6 = require("@dxos/util");
 var import_invariant7 = require("@dxos/invariant");
-var import_invariant8 = require("@dxos/invariant");
-var import_log9 = require("@dxos/log");
-var import_invariant9 = require("@dxos/invariant");
-var import_log10 = require("@dxos/log");
 var import_node_stream = require("node:stream");
-var import_async9 = require("@dxos/async");
+var import_async8 = require("@dxos/async");
 var import_debug4 = require("@dxos/debug");
-var import_invariant10 = require("@dxos/invariant");
+var import_invariant8 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
-var import_log11 = require("@dxos/log");
-var import_util8 = require("@dxos/util");
-var import_simple_peer = __toESM(require("simple-peer"));
-var import_tiny_invariant = __toESM(require("tiny-invariant"));
+var import_log8 = require("@dxos/log");
+var import_util7 = require("@dxos/util");
+var import_async9 = require("@dxos/async");
 var import_async10 = require("@dxos/async");
-var import_debug5 = require("@dxos/debug");
-var import_keys10 = require("@dxos/keys");
-var import_log12 = require("@dxos/log");
+var import_invariant9 = require("@dxos/invariant");
+var import_log9 = require("@dxos/log");
 var import_protocols7 = require("@dxos/protocols");
+var import_tracing = require("@dxos/tracing");
 var import_node_stream2 = require("node:stream");
-var import_codec_protobuf = require("@dxos/codec-protobuf");
-var import_invariant11 = require("@dxos/invariant");
-var import_keys11 = require("@dxos/keys");
-var import_log13 = require("@dxos/log");
-var import_bridge = require("@dxos/protocols/proto/dxos/mesh/bridge");
-var import_util9 = require("@dxos/util");
-var import_node_stream3 = require("node:stream");
 var import_async11 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
+var import_debug5 = require("@dxos/debug");
+var import_invariant10 = require("@dxos/invariant");
+var import_log10 = require("@dxos/log");
+var import_protocols8 = require("@dxos/protocols");
+var import_node_stream3 = require("node:stream");
+var import_async12 = require("@dxos/async");
+var import_context7 = require("@dxos/context");
 var import_debug6 = require("@dxos/debug");
+var import_invariant11 = require("@dxos/invariant");
+var import_keys10 = require("@dxos/keys");
+var import_log11 = require("@dxos/log");
+var import_protocols9 = require("@dxos/protocols");
+var import_bridge = require("@dxos/protocols/proto/dxos/mesh/bridge");
+var import_util8 = require("@dxos/util");
+var import_node_stream4 = require("node:stream");
+var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_invariant12 = require("@dxos/invariant");
-var import_keys12 = require("@dxos/keys");
-var import_log14 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
+var import_keys11 = require("@dxos/keys");
+var import_log12 = require("@dxos/log");
 var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
-var import_util10 = require("@dxos/util");
-var import_stream = require("stream");
-var import_async12 = require("@dxos/async");
-var import_debug7 = require("@dxos/debug");
-var import_invariant13 = require("@dxos/invariant");
-var import_log15 = require("@dxos/log");
-var import_node_net = require("node:net");
-var import_async13 = require("@dxos/async");
-var import_debug8 = require("@dxos/debug");
-var import_log16 = require("@dxos/log");
+var import_util9 = require("@dxos/util");
 var import_teleport = require("@dxos/teleport");
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 function _ts_decorate(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);
@@ -200,11 +176,11 @@ var Connection = class {
     this._callbacks = _callbacks;
     this._ctx = new import_context.Context(void 0, {
       F: __dxlog_file,
-      L: 101
+      L: 100
     });
     this.connectedTimeoutContext = new import_context.Context(void 0, {
       F: __dxlog_file,
-      L: 102
+      L: 101
     });
     this._protocolClosed = new import_async.Trigger();
     this._transportClosed = new import_async.Trigger();
@@ -227,7 +203,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 138,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -250,7 +226,7 @@ var Connection = class {
   async openConnection() {
     (0, import_invariant.invariant)(this._state === "INITIAL", "Invalid state.", {
       F: __dxlog_file,
-      L: 168,
+      L: 167,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -261,7 +237,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 169,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -273,7 +249,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 170,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -284,7 +260,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 187,
+        L: 186,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -294,7 +270,7 @@ var Connection = class {
     (0, import_async.scheduleTask)(this.connectedTimeoutContext, async () => {
       import_log.log.info(`timeout waiting ${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect, aborting`, void 0, {
         F: __dxlog_file,
-        L: 195,
+        L: 194,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -302,7 +278,7 @@ var Connection = class {
     }, TRANSPORT_CONNECTION_TIMEOUT);
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 203,
+      L: 202,
       S: this,
       A: [
         "!this._transport",
@@ -310,12 +286,14 @@ var Connection = class {
       ]
     });
     this._transport = this._transportFactory.createTransport({
+      ownPeerKey: this.localInfo.peerKey,
+      remotePeerKey: this.remoteInfo.peerKey,
+      topic: this.topic.toHex(),
       initiator: this.initiator,
       stream: this._protocol.stream,
       sendSignal: async (signal) => this._sendSignal(signal),
       sessionId: this.sessionId
     });
-    await this._transport.open();
     this._transport.connected.once(async () => {
       this._changeState("CONNECTED");
       await this.connectedTimeoutContext.dispose();
@@ -361,21 +339,13 @@ var Connection = class {
           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: 242,
-          S: this,
-          C: (f, a) => f(...a)
-        });
       }
       if (this._state !== "CLOSED" && this._state !== "CLOSING") {
         await this.connectedTimeoutContext.dispose();
         this.errors.raise(err);
       }
     });
+    await this._transport.open();
     for (const signal of this._incomingSignalBuffer) {
       void this._transport.onSignal(signal);
     }
@@ -727,38 +697,15 @@ _ts_decorate([
 _ts_decorate([
   import_async.synchronized
 ], Connection.prototype, "close", null);
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/ice.ts";
-var createIceProvider = (iceProviders) => {
-  let cachedIceServers;
-  return {
-    getIceServers: async () => {
-      if (cachedIceServers) {
-        return cachedIceServers;
-      }
-      cachedIceServers = (await Promise.all(iceProviders.map(({ urls }) => (0, import_async2.asyncTimeout)(fetch(urls, {
-        method: "GET"
-      }), 1e4).then((response) => response.json()).catch((err) => import_log2.log.error("Failed to fetch ICE servers from provider", {
-        urls,
-        err
-      }, {
-        F: __dxlog_file2,
-        L: 27,
-        S: void 0,
-        C: (f, a) => f(...a)
-      }))))).filter(import_util.isNotNullOrUndefined).map(({ iceServers }) => iceServers).flat();
-      return cachedIceServers;
-    }
-  };
-};
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
 var SwarmMessage = import_proto.schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
 var SwarmMessenger = class {
   constructor({ sendMessage, onSignal, onOffer, topic }) {
     this._ctx = new import_context2.Context(void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 35
     });
-    this._offerRecords = new import_util2.ComplexMap((key) => key.toHex());
+    this._offerRecords = new import_util.ComplexMap((key) => key.toHex());
     this._sendMessage = sendMessage;
     this._onSignal = onSignal;
     this._onOffer = onOffer;
@@ -772,12 +719,12 @@ var SwarmMessenger = class {
     if (!this._topic.equals(message.topic)) {
       return;
     }
-    (0, import_log3.log)("received", {
+    (0, import_log2.log)("received", {
       from: author,
       to: recipient,
       msg: message
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 71,
       S: this,
       C: (f, a) => f(...a)
@@ -803,10 +750,10 @@ var SwarmMessenger = class {
         message
       });
     } else {
-      import_log3.log.warn("unknown message", {
+      import_log2.log.warn("unknown message", {
         message
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -815,7 +762,7 @@ var SwarmMessenger = class {
   }
   async signal(message) {
     (0, import_invariant2.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 87,
       S: this,
       A: [
@@ -851,12 +798,12 @@ var SwarmMessenger = class {
       // Setting unique message_id if it not specified yet.
       messageId: message.messageId ?? import_keys2.PublicKey.random()
     };
-    (0, import_log3.log)("sending", {
+    (0, import_log2.log)("sending", {
       from: author,
       to: recipient,
       msg: networkMessage
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 125,
       S: this,
       C: (f, a) => f(...a)
@@ -872,7 +819,7 @@ var SwarmMessenger = class {
   }
   async _resolveAnswers(message) {
     (0, import_invariant2.invariant)(message.data?.answer?.offerMessageId, "No offerMessageId", {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 137,
       S: this,
       A: [
@@ -884,7 +831,7 @@ var SwarmMessenger = class {
     if (offerRecord) {
       this._offerRecords.delete(message.data.answer.offerMessageId);
       (0, import_invariant2.invariant)(message.data?.answer, "No answer", {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 141,
         S: this,
         A: [
@@ -892,10 +839,10 @@ var SwarmMessenger = class {
           "'No answer'"
         ]
       });
-      (0, import_log3.log)("resolving", {
+      (0, import_log2.log)("resolving", {
         answer: message.data.answer
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 142,
         S: this,
         C: (f, a) => f(...a)
@@ -905,7 +852,7 @@ var SwarmMessenger = class {
   }
   async _handleOffer({ author, recipient, message }) {
     (0, import_invariant2.invariant)(message.data.offer, "No offer", {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 156,
       S: this,
       A: [
@@ -937,19 +884,19 @@ var SwarmMessenger = class {
       });
     } catch (err) {
       if (err instanceof import_protocols2.TimeoutError) {
-        import_log3.log.info("timeout sending answer to offer", {
+        import_log2.log.info("timeout sending answer to offer", {
           err
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 177,
           S: this,
           C: (f, a) => f(...a)
         });
       } else {
-        import_log3.log.info("error sending answer to offer", {
+        import_log2.log.info("error sending answer to offer", {
           err
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 179,
           S: this,
           C: (f, a) => f(...a)
@@ -959,7 +906,7 @@ var SwarmMessenger = class {
   }
   async _handleSignal({ author, recipient, message }) {
     (0, import_invariant2.invariant)(message.messageId, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 193,
       S: this,
       A: [
@@ -968,7 +915,7 @@ var SwarmMessenger = class {
       ]
     });
     (0, import_invariant2.invariant)(message.data.signal || message.data.signalBatch, "Invalid message", {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 194,
       S: this,
       A: [
@@ -994,7 +941,7 @@ function _ts_decorate2(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_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
 var ConnectionDisplacedError = class extends import_protocols4.SystemError {
   constructor() {
     super("Connection displaced by remote initiator.");
@@ -1014,12 +961,12 @@ var Peer = class {
     this._availableAfter = 0;
     this.availableToConnect = true;
     this._ctx = new import_context4.Context(void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 80
     });
     this.advertizing = false;
     this.initiating = false;
-    this.connectionDisplaced = new import_async4.Event();
+    this.connectionDisplaced = new import_async3.Event();
   }
   /**
   * Respond to remote offer.
@@ -1031,8 +978,8 @@ var Peer = class {
       ConnectionState.INITIAL,
       ConnectionState.CONNECTING
     ].includes(this.connection.state)) {
-      import_log5.log.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
-        F: __dxlog_file4,
+      import_log4.log.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
+        F: __dxlog_file3,
         L: 115,
         S: this,
         C: (f, a) => f(...a)
@@ -1043,13 +990,13 @@ var Peer = class {
     }
     if (this.connection || this.initiating) {
       if (remote.peerKey < this.localInfo.peerKey) {
-        (0, import_log5.log)("close local connection", {
+        (0, import_log4.log)("close local connection", {
           localPeer: this.localInfo,
           topic: this.topic,
           remotePeer: this.remoteInfo,
           sessionId: this.connection?.sessionId
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 124,
           S: this,
           C: (f, a) => f(...a)
@@ -1066,7 +1013,7 @@ var Peer = class {
     if (await this._callbacks.onOffer(remote)) {
       if (!this.connection) {
         (0, import_invariant4.invariant)(message.sessionId, void 0, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 144,
           S: this,
           A: [
@@ -1081,13 +1028,13 @@ var Peer = class {
           await connection.openConnection();
         } catch (err) {
           if (!(err instanceof import_protocols4.CancelledError)) {
-            import_log5.log.info("connection error", {
+            import_log4.log.info("connection error", {
               topic: this.topic,
               peerId: this.localInfo,
               remoteId: this.remoteInfo,
               err
             }, {
-              F: __dxlog_file4,
+              F: __dxlog_file3,
               L: 154,
               S: this,
               C: (f, a) => f(...a)
@@ -1109,7 +1056,7 @@ var Peer = class {
   */
   async initiateConnection() {
     (0, import_invariant4.invariant)(!this.initiating, "Initiation in progress.", {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 171,
       S: this,
       A: [
@@ -1118,7 +1065,7 @@ var Peer = class {
       ]
     });
     (0, import_invariant4.invariant)(!this.connection, "Already connected.", {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 172,
       S: this,
       A: [
@@ -1127,13 +1074,13 @@ var Peer = class {
       ]
     });
     const sessionId = import_keys4.PublicKey.random();
-    (0, import_log5.log)("initiating...", {
+    (0, import_log4.log)("initiating...", {
       local: this.localInfo,
       topic: this.topic,
       remote: this.remoteInfo,
       sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 174,
       S: this,
       C: (f, a) => f(...a)
@@ -1153,20 +1100,20 @@ var Peer = class {
           offer: {}
         }
       });
-      (0, import_log5.log)("received", {
+      (0, import_log4.log)("received", {
         answer,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 191,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
-        (0, import_log5.log)("ignoring response", void 0, {
-          F: __dxlog_file4,
+        (0, import_log4.log)("ignoring response", void 0, {
+          F: __dxlog_file3,
           L: 193,
           S: this,
           C: (f, a) => f(...a)
@@ -1174,13 +1121,13 @@ var Peer = class {
         return;
       }
     } catch (err) {
-      (0, import_log5.log)("initiation error: send offer", {
+      (0, import_log4.log)("initiation error: send offer", {
         err,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 197,
         S: this,
         C: (f, a) => f(...a)
@@ -1196,13 +1143,13 @@ var Peer = class {
         return;
       }
     } catch (err) {
-      (0, import_log5.log)("initiation error: accept answer", {
+      (0, import_log4.log)("initiation error: accept answer", {
         err,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 210,
         S: this,
         C: (f, a) => f(...a)
@@ -1213,8 +1160,8 @@ var Peer = class {
       this.initiating = false;
     }
     try {
-      (0, import_log5.log)("opening connection as initiator", void 0, {
-        F: __dxlog_file4,
+      (0, import_log4.log)("opening connection as initiator", void 0, {
+        F: __dxlog_file3,
         L: 223,
         S: this,
         C: (f, a) => f(...a)
@@ -1222,21 +1169,21 @@ var Peer = class {
       await connection.openConnection();
       this._callbacks.onAccepted();
     } catch (err) {
-      (0, import_log5.log)("initiation error: open connection", {
+      (0, import_log4.log)("initiation error: open connection", {
         err,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
-      import_log5.log.warn("closing connection due to unhandled error on openConnection", {
+      import_log4.log.warn("closing connection due to unhandled error on openConnection", {
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 234,
         S: this,
         C: (f, a) => f(...a)
@@ -1252,20 +1199,20 @@ 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_log5.log)("creating connection", {
+    (0, import_log4.log)("creating connection", {
       topic: this.topic,
       peerId: this.localInfo,
       remoteId: this.remoteInfo,
       initiator,
       sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 248,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(!this.connection, "Already connected.", {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 255,
       S: this,
       A: [
@@ -1294,34 +1241,34 @@ var Peer = class {
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
           this._connectionLimiter.doneConnecting(sessionId);
-          import_log5.log.trace("dxos.mesh.connection.connected", {
+          import_log4.log.trace("dxos.mesh.connection.connected", {
             topic: this.topic,
             localPeerId: this.localInfo,
             remotePeerId: this.remoteInfo,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         onClosed: (err) => {
-          (0, import_log5.log)("connection closed", {
+          (0, import_log4.log)("connection closed", {
             topic: this.topic,
             peerId: this.localInfo,
             remoteId: this.remoteInfo,
             initiator
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 288,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           (0, import_invariant4.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 293,
             S: this,
             A: [
@@ -1329,14 +1276,14 @@ var Peer = class {
               "'Connection mismatch (race condition).'"
             ]
           });
-          import_log5.log.trace("dxos.mesh.connection.closed", {
+          import_log4.log.trace("dxos.mesh.connection.closed", {
             topic: this.topic,
             localPeerId: this.localInfo,
             remotePeerId: this.remoteInfo,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 295,
             S: this,
             C: (f, a) => f(...a)
@@ -1351,7 +1298,7 @@ var Peer = class {
               this._availableAfter = increaseInterval(this._availableAfter);
             }
             this._callbacks.onDisconnected();
-            (0, import_async4.scheduleTask)(this._connectionCtx, () => {
+            (0, import_async3.scheduleTask)(this._connectionCtx, () => {
               this.availableToConnect = true;
               this._callbacks.onPeerAvailable();
             }, this._availableAfter);
@@ -1364,19 +1311,19 @@ var Peer = class {
     void this._connectionCtx?.dispose();
     this._connectionCtx = this._ctx.derive();
     connection.errors.handle((err) => {
-      import_log5.log.info("connection error, closing", {
+      import_log4.log.info("connection error, closing", {
         topic: this.topic,
         peerId: this.localInfo,
         remoteId: this.remoteInfo,
         initiator,
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 335,
         S: this,
         C: (f, a) => f(...a)
       });
-      import_log5.log.trace("dxos.mesh.connection.error", {
+      import_log4.log.trace("dxos.mesh.connection.error", {
         topic: this.topic,
         localPeerId: this.localInfo,
         remotePeerId: this.remoteInfo,
@@ -1384,7 +1331,7 @@ var Peer = class {
         initiator,
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 342,
         S: this,
         C: (f, a) => f(...a)
@@ -1399,21 +1346,21 @@ var Peer = class {
       return;
     }
     const connection = this.connection;
-    (0, import_log5.log)("closing...", {
+    (0, import_log4.log)("closing...", {
       peerId: this.remoteInfo,
       sessionId: connection.sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 367,
       S: this,
       C: (f, a) => f(...a)
     });
     await connection.close(err);
-    (0, import_log5.log)("closed", {
+    (0, import_log4.log)("closed", {
       peerId: this.remoteInfo,
       sessionId: connection.sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 373,
       S: this,
       C: (f, a) => f(...a)
@@ -1421,10 +1368,10 @@ var Peer = class {
   }
   async onSignal(message) {
     if (!this.connection) {
-      (0, import_log5.log)("dropping signal message for non-existent connection", {
+      (0, import_log4.log)("dropping signal message for non-existent connection", {
         message
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 378,
         S: this,
         C: (f, a) => f(...a)
@@ -1435,11 +1382,11 @@ var Peer = class {
   }
   async safeDestroy(reason) {
     await this._ctx.dispose();
-    (0, import_log5.log)("Destroying peer", {
+    (0, import_log4.log)("Destroying peer", {
       peerId: this.remoteInfo,
       topic: this.topic
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 388,
       S: this,
       C: (f, a) => f(...a)
@@ -1448,7 +1395,7 @@ var Peer = class {
   }
 };
 _ts_decorate2([
-  import_async4.synchronized
+  import_async3.synchronized
 ], Peer.prototype, "safeDestroy", null);
 var increaseInterval = (interval) => {
   if (interval === 0) {
@@ -1468,7 +1415,7 @@ function _ts_decorate3(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_file5 = "/home/runner/work/dxos/dxos/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 {
@@ -1485,32 +1432,32 @@ var Swarm = class {
     this._connectionLimiter = _connectionLimiter;
     this._initiationDelay = _initiationDelay;
     this._ctx = new import_context3.Context(void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 38
     });
     this._listeningHandle = void 0;
-    this._peers = new import_util3.ComplexMap(import_messaging.PeerInfoHash);
+    this._peers = new import_util2.ComplexMap(import_messaging.PeerInfoHash);
     this._instanceId = import_keys3.PublicKey.random().toHex();
-    this.connectionAdded = new import_async3.Event();
-    this.disconnected = new import_async3.Event();
-    this.connected = new import_async3.Event();
+    this.connectionAdded = new import_async2.Event();
+    this.disconnected = new import_async2.Event();
+    this.connected = new import_async2.Event();
     this.errors = new import_debug2.ErrorStream();
-    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.begin({
+    import_log3.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.begin({
       id: this._instanceId,
       data: {
         topic: this._topic.toHex(),
         peer: this._ownPeer
       }
     }), {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 88,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log4.log)("creating swarm", {
+    (0, import_log3.log)("creating swarm", {
       peerId: _ownPeer
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 92,
       S: this,
       C: (f, a) => f(...a)
@@ -1522,17 +1469,17 @@ 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_log3.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   get connections() {
-    return Array.from(this._peers.values()).map((peer) => peer.connection).filter(import_util3.isNotNullOrUndefined);
+    return Array.from(this._peers.values()).map((peer) => peer.connection).filter(import_util2.isNotNullOrUndefined);
   }
   get ownPeerId() {
     return import_keys3.PublicKey.from(this._ownPeer.peerKey);
@@ -1551,7 +1498,7 @@ var Swarm = class {
   }
   async open() {
     (0, import_invariant3.invariant)(!this._listeningHandle, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 132,
       S: this,
       A: [
@@ -1563,10 +1510,10 @@ var Swarm = class {
       peer: this._ownPeer,
       payloadType: "dxos.mesh.swarm.SwarmMessage",
       onMessage: async (message) => {
-        await this._swarmMessenger.receiveMessage(message).catch((err) => import_log4.log.info("Error while receiving message", {
+        await this._swarmMessenger.receiveMessage(message).catch((err) => import_log3.log.info("Error while receiving message", {
           err
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 140,
           S: this,
           C: (f, a) => f(...a)
@@ -1575,8 +1522,8 @@ var Swarm = class {
     });
   }
   async destroy() {
-    (0, import_log4.log)("destroying...", void 0, {
-      F: __dxlog_file5,
+    (0, import_log3.log)("destroying...", void 0, {
+      F: __dxlog_file4,
       L: 146,
       S: this,
       C: (f, a) => f(...a)
@@ -1586,8 +1533,8 @@ var Swarm = class {
     await this._ctx.dispose();
     await this._topology.destroy();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key, "swarm destroyed")));
-    (0, import_log4.log)("destroyed", void 0, {
-      F: __dxlog_file5,
+    (0, import_log3.log)("destroyed", void 0, {
+      F: __dxlog_file4,
       L: 153,
       S: this,
       C: (f, a) => f(...a)
@@ -1595,7 +1542,7 @@ var Swarm = class {
   }
   async setTopology(topology) {
     (0, import_invariant3.invariant)(!this._ctx.disposed, "Swarm is offline", {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 157,
       S: this,
       A: [
@@ -1606,11 +1553,11 @@ var Swarm = class {
     if (topology === this._topology) {
       return;
     }
-    (0, import_log4.log)("setting topology", {
+    (0, import_log3.log)("setting topology", {
       previous: getClassName(this._topology),
       topology: getClassName(topology)
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 161,
       S: this,
       C: (f, a) => f(...a)
@@ -1621,17 +1568,17 @@ var Swarm = class {
     this._topology.update();
   }
   onSwarmEvent(swarmEvent) {
-    (0, import_log4.log)("swarm event", {
+    (0, import_log3.log)("swarm event", {
       swarmEvent
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 174,
       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_file5,
+      (0, import_log3.log)("swarm event ignored for disposed swarm", void 0, {
+        F: __dxlog_file4,
         L: 177,
         S: this,
         C: (f, a) => f(...a)
@@ -1641,10 +1588,10 @@ var Swarm = class {
     if (swarmEvent.peerAvailable) {
       const peerId = swarmEvent.peerAvailable.peer.peerKey;
       if (peerId !== this._ownPeer.peerKey) {
-        (0, import_log4.log)("new peer", {
+        (0, import_log3.log)("new peer", {
           peerId
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 184,
           S: this,
           C: (f, a) => f(...a)
@@ -1657,18 +1604,18 @@ var Swarm = class {
       if (peer) {
         peer.advertizing = false;
         if (peer.connection?.state !== ConnectionState.CONNECTED) {
-          void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => import_log4.log.catch(err, void 0, {
-            F: __dxlog_file5,
+          void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => import_log3.log.catch(err, void 0, {
+            F: __dxlog_file4,
             L: 194,
             S: this,
             C: (f, a) => f(...a)
           }));
         }
       } else {
-        (0, import_log4.log)("received peerLeft but no peer found", {
+        (0, import_log3.log)("received peerLeft but no peer found", {
           peer: swarmEvent.peerLeft.peer.peerKey
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 197,
           S: this,
           C: (f, a) => f(...a)
@@ -1678,17 +1625,17 @@ var Swarm = class {
     this._topology.update();
   }
   async onOffer(message) {
-    (0, import_log4.log)("offer", {
+    (0, import_log3.log)("offer", {
       message
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      (0, import_log4.log)("ignored for disposed swarm", void 0, {
-        F: __dxlog_file5,
+      (0, import_log3.log)("ignored for disposed swarm", void 0, {
+        F: __dxlog_file4,
         L: 208,
         S: this,
         C: (f, a) => f(...a)
@@ -1698,7 +1645,7 @@ var Swarm = class {
       };
     }
     (0, import_invariant3.invariant)(message.author, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 213,
       S: this,
       A: [
@@ -1707,10 +1654,10 @@ var Swarm = class {
       ]
     });
     if (message.recipient.peerKey !== this._ownPeer.peerKey) {
-      (0, import_log4.log)("rejecting offer with incorrect peerId", {
+      (0, import_log3.log)("rejecting offer with incorrect peerId", {
         message
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 215,
         S: this,
         C: (f, a) => f(...a)
@@ -1720,10 +1667,10 @@ var Swarm = class {
       };
     }
     if (!message.topic?.equals(this._topic)) {
-      (0, import_log4.log)("rejecting offer with incorrect topic", {
+      (0, import_log3.log)("rejecting offer with incorrect topic", {
         message
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 219,
         S: this,
         C: (f, a) => f(...a)
@@ -1738,17 +1685,17 @@ var Swarm = class {
     return answer;
   }
   async onSignal(message) {
-    (0, import_log4.log)("signal", {
+    (0, import_log3.log)("signal", {
       message
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      import_log4.log.info("ignored for offline swarm", void 0, {
-        F: __dxlog_file5,
+      import_log3.log.info("ignored for offline swarm", void 0, {
+        F: __dxlog_file4,
         L: 232,
         S: this,
         C: (f, a) => f(...a)
@@ -1756,7 +1703,7 @@ var Swarm = class {
       return;
     }
     (0, import_invariant3.invariant)(message.recipient.peerKey === this._ownPeer.peerKey, `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 235,
       S: this,
       A: [
@@ -1765,7 +1712,7 @@ var Swarm = class {
       ]
     });
     (0, import_invariant3.invariant)(message.topic?.equals(this._topic), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 239,
       S: this,
       A: [
@@ -1774,7 +1721,7 @@ var Swarm = class {
       ]
     });
     (0, import_invariant3.invariant)(message.author, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 240,
       S: this,
       A: [
@@ -1795,13 +1742,13 @@ var Swarm = class {
   // For debug purposes
   async goOnline() {
     this._ctx = new import_context3.Context(void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 256
     });
   }
   _getOrCreatePeer(peerInfo) {
     (0, import_invariant3.invariant)(peerInfo.peerKey, "PeerInfo.peerKey is required", {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 260,
       S: this,
       A: [
@@ -1830,10 +1777,10 @@ var Swarm = class {
         },
         onRejected: () => {
           if (!this._isUnregistered(peer)) {
-            (0, import_log4.log)("peer rejected connection", {
+            (0, import_log3.log)("peer rejected connection", {
               peerInfo
             }, {
-              F: __dxlog_file5,
+              F: __dxlog_file4,
               L: 293,
               S: this,
               C: (f, a) => f(...a)
@@ -1858,7 +1805,7 @@ var Swarm = class {
   async _destroyPeer(peerInfo, reason) {
     const peer = this._peers.get(peerInfo);
     (0, import_invariant3.invariant)(peer, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 316,
       S: this,
       A: [
@@ -1881,14 +1828,14 @@ var Swarm = class {
         if (this._ctx.disposed) {
           return;
         }
-        (0, import_async3.scheduleTask)(this._ctx, async () => {
+        (0, import_async2.scheduleTask)(this._ctx, async () => {
           try {
             await this._initiateConnection({
               peerKey: peer.toHex()
             });
           } catch (err) {
-            (0, import_log4.log)("initiation error", err, {
-              F: __dxlog_file5,
+            (0, import_log3.log)("initiation error", err, {
+              F: __dxlog_file4,
               L: 343,
               S: this,
               C: (f, a) => f(...a)
@@ -1900,7 +1847,7 @@ var Swarm = class {
         if (this._ctx.disposed) {
           return;
         }
-        (0, import_async3.scheduleTask)(this._ctx, async () => {
+        (0, import_async2.scheduleTask)(this._ctx, async () => {
           await this._closeConnection({
             peerKey: peer.toHex()
           });
@@ -1916,15 +1863,15 @@ var Swarm = class {
     const ctx = this._ctx;
     const peer = this._getOrCreatePeer(remotePeer);
     if (remotePeer.peerKey < this._ownPeer.peerKey) {
-      (0, import_log4.log)("initiation delay", {
+      (0, import_log3.log)("initiation delay", {
         remotePeer
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 371,
         S: this,
         C: (f, a) => f(...a)
       });
-      await (0, import_async3.sleep)(this._initiationDelay);
+      await (0, import_async2.sleep)(this._initiationDelay);
     }
     if (ctx.disposed) {
       return;
@@ -1935,20 +1882,20 @@ var Swarm = class {
     if (peer.connection) {
       return;
     }
-    (0, import_log4.log)("initiating connection...", {
+    (0, import_log3.log)("initiating connection...", {
       remotePeer
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 387,
       S: this,
       C: (f, a) => f(...a)
     });
     await peer.initiateConnection();
     this._topology.update();
-    (0, import_log4.log)("initiated", {
+    (0, import_log3.log)("initiated", {
       remotePeer
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 390,
       S: this,
       C: (f, a) => f(...a)
@@ -1966,37 +1913,37 @@ var Swarm = class {
   }
 };
 _ts_decorate3([
-  import_log4.logInfo
+  import_log3.logInfo
 ], Swarm.prototype, "_instanceId", void 0);
 _ts_decorate3([
-  import_log4.logInfo
+  import_log3.logInfo
 ], Swarm.prototype, "ownPeer", null);
 _ts_decorate3([
-  import_log4.logInfo
+  import_log3.logInfo
 ], Swarm.prototype, "topic", null);
 _ts_decorate3([
-  import_async3.synchronized
+  import_async2.synchronized
 ], Swarm.prototype, "onSwarmEvent", null);
 _ts_decorate3([
-  import_async3.synchronized
+  import_async2.synchronized
 ], Swarm.prototype, "onOffer", null);
 _ts_decorate3([
-  import_async3.synchronized
+  import_async2.synchronized
 ], Swarm.prototype, "goOffline", null);
 _ts_decorate3([
-  import_async3.synchronized
+  import_async2.synchronized
 ], Swarm.prototype, "goOnline", null);
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/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());
   }
   constructor(_swarm) {
     this._swarm = _swarm;
-    this._subscriptions = new import_async5.EventSubscriptions();
-    this._connectionSubscriptions = new import_util4.ComplexMap(import_messaging2.PeerInfoHash);
-    this._peers = new import_util4.ComplexMap(import_messaging2.PeerInfoHash);
-    this.mapUpdated = new import_async5.Event();
+    this._subscriptions = new import_async4.EventSubscriptions();
+    this._connectionSubscriptions = new import_util3.ComplexMap(import_messaging2.PeerInfoHash);
+    this._peers = new import_util3.ComplexMap(import_messaging2.PeerInfoHash);
+    this.mapUpdated = new import_async4.Event();
     this._subscriptions.add(_swarm.connectionAdded.on((connection) => {
       this._update();
       this._connectionSubscriptions.set(connection.remoteInfo, connection.stateChanged.on(() => {
@@ -2011,8 +1958,8 @@ var SwarmMapper = class {
     this._update();
   }
   _update() {
-    (0, import_log6.log)("updating swarm", void 0, {
-      F: __dxlog_file6,
+    (0, import_log5.log)("updating swarm", void 0, {
+      F: __dxlog_file5,
       L: 73,
       S: this,
       C: (f, a) => f(...a)
@@ -2032,11 +1979,11 @@ var SwarmMapper = class {
         ]
       });
     }
-    (0, import_log6.log)("graph changed", {
+    (0, import_log5.log)("graph changed", {
       directConnections: this._swarm.connections.length,
       totalPeersInSwarm: this._peers.size
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 114,
       S: this,
       C: (f, a) => f(...a)
@@ -2049,16 +1996,16 @@ var SwarmMapper = class {
     this._subscriptions.clear();
   }
 };
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
+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(void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 23
     });
-    this._waitingPromises = new import_util5.ComplexMap(import_keys6.PublicKey.hash);
-    this.resolveWaitingPromises = new import_async6.DeferredTask(this._ctx, async () => {
+    this._waitingPromises = new import_util4.ComplexMap(import_keys6.PublicKey.hash);
+    this.resolveWaitingPromises = new import_async5.DeferredTask(this._ctx, async () => {
       Array.from(this._waitingPromises.values()).slice(0, this._maxConcurrentInitConnections).forEach(({ resolve }) => {
         resolve();
       });
@@ -2070,7 +2017,7 @@ var ConnectionLimiter = class {
   */
   async connecting(sessionId) {
     (0, import_invariant5.invariant)(!this._waitingPromises.has(sessionId), "Peer is already waiting for connection", {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 48,
       S: this,
       A: [
@@ -2078,10 +2025,10 @@ var ConnectionLimiter = class {
         "'Peer is already waiting for connection'"
       ]
     });
-    (0, import_log7.log)("waiting", {
+    (0, import_log6.log)("waiting", {
       sessionId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 49,
       S: this,
       C: (f, a) => f(...a)
@@ -2093,10 +2040,10 @@ var ConnectionLimiter = class {
       });
       this.resolveWaitingPromises.schedule();
     });
-    (0, import_log7.log)("allow", {
+    (0, import_log6.log)("allow", {
       sessionId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 57,
       S: this,
       C: (f, a) => f(...a)
@@ -2106,10 +2053,10 @@ var ConnectionLimiter = class {
   * Rejects promise returned by `connecting` method.
   */
   doneConnecting(sessionId) {
-    (0, import_log7.log)("done", {
+    (0, import_log6.log)("done", {
       sessionId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 64,
       S: this,
       C: (f, a) => f(...a)
@@ -2133,8 +2080,8 @@ var EventType;
 })(EventType || (EventType = {}));
 var ConnectionLog = class {
   constructor() {
-    this._swarms = new import_util6.ComplexMap(import_keys7.PublicKey.hash);
-    this.update = new import_async7.Event();
+    this._swarms = new import_util5.ComplexMap(import_keys7.PublicKey.hash);
+    this.update = new import_async6.Event();
   }
   getSwarmInfo(swarmId) {
     return this._swarms.get(swarmId) ?? (0, import_debug3.raise)(new Error(`Swarm not found: ${swarmId}`));
@@ -2211,16 +2158,16 @@ function _ts_decorate4(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_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
 var SwarmNetworkManager = class {
   constructor({ transportFactory, signalManager, enableDevtoolsLogging, peerInfo }) {
-    this._swarms = new import_util7.ComplexMap(import_keys8.PublicKey.hash);
-    this._mappers = new import_util7.ComplexMap(import_keys8.PublicKey.hash);
+    this._swarms = new import_util6.ComplexMap(import_keys8.PublicKey.hash);
+    this._mappers = new import_util6.ComplexMap(import_keys8.PublicKey.hash);
     this._instanceId = import_keys8.PublicKey.random().toHex();
     this._peerInfo = void 0;
     this._connectionState = import_services.ConnectionState.ONLINE;
-    this.connectionStateChanged = new import_async8.Event();
-    this.topicsUpdated = new import_async8.Event();
+    this.connectionStateChanged = new import_async7.Event();
+    this.topicsUpdated = new import_async7.Event();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
     this._signalManager.swarmEvent.on((event) => this._swarms.get(event.topic)?.onSwarmEvent(event));
@@ -2258,20 +2205,20 @@ var SwarmNetworkManager = class {
     this._peerInfo = peerInfo;
   }
   async open() {
-    import_log8.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.begin({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file8,
+      F: __dxlog_file7,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._messenger.open();
     await this._signalManager.open();
-    import_log8.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.end({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file8,
+      F: __dxlog_file7,
       L: 136,
       S: this,
       C: (f, a) => f(...a)
@@ -2280,8 +2227,8 @@ var SwarmNetworkManager = class {
   async close() {
     for (const topic of this._swarms.keys()) {
       await this.leaveSwarm(topic).catch((err) => {
-        (0, import_log8.log)(err, void 0, {
-          F: __dxlog_file8,
+        (0, import_log7.log)(err, void 0, {
+          F: __dxlog_file7,
           L: 142,
           S: this,
           C: (f, a) => f(...a)
@@ -2294,52 +2241,37 @@ var SwarmNetworkManager = class {
   /**
   * Join the swarm.
   */
-  async joinSwarm({ topic, peerInfo, topology, protocolProvider: protocol, label }) {
+  async joinSwarm({ topic, topology, protocolProvider: protocol, label }) {
     (0, import_invariant6.invariant)(import_keys8.PublicKey.isPublicKey(topic), void 0, {
-      F: __dxlog_file8,
-      L: 161,
+      F: __dxlog_file7,
+      L: 160,
       S: this,
       A: [
         "PublicKey.isPublicKey(topic)",
         ""
       ]
     });
-    if (!peerInfo) {
-      peerInfo = {
-        peerKey: this._peerInfo?.peerKey ?? import_keys8.PublicKey.random().toHex(),
-        identityKey: this._peerInfo?.identityKey ?? import_keys8.PublicKey.random().toHex()
-      };
-    }
-    (0, import_invariant6.invariant)(import_keys8.PublicKey.from(peerInfo.peerKey), void 0, {
-      F: __dxlog_file8,
-      L: 168,
-      S: this,
-      A: [
-        "PublicKey.from(peerInfo.peerKey)",
-        ""
-      ]
-    });
-    (0, import_invariant6.invariant)(import_keys8.PublicKey.from(peerInfo.identityKey), void 0, {
-      F: __dxlog_file8,
-      L: 169,
+    (0, import_invariant6.invariant)(topology, void 0, {
+      F: __dxlog_file7,
+      L: 161,
       S: this,
       A: [
-        "PublicKey.from(peerInfo.identityKey!)",
+        "topology",
         ""
       ]
     });
-    (0, import_invariant6.invariant)(topology, void 0, {
-      F: __dxlog_file8,
-      L: 170,
+    (0, import_invariant6.invariant)(this._peerInfo, void 0, {
+      F: __dxlog_file7,
+      L: 162,
       S: this,
       A: [
-        "topology",
+        "this._peerInfo",
         ""
       ]
     });
     (0, import_invariant6.invariant)(typeof protocol === "function", void 0, {
-      F: __dxlog_file8,
-      L: 171,
+      F: __dxlog_file7,
+      L: 163,
       S: this,
       A: [
         "typeof protocol === 'function'",
@@ -2349,23 +2281,23 @@ var SwarmNetworkManager = class {
     if (this._swarms.has(topic)) {
       throw new Error(`Already connected to swarm: ${import_keys8.PublicKey.from(topic)}`);
     }
-    (0, import_log8.log)("joining", {
+    (0, import_log7.log)("joining", {
       topic: import_keys8.PublicKey.from(topic),
-      peerInfo,
+      peerInfo: this._peerInfo,
       topology: topology.toString()
     }, {
-      F: __dxlog_file8,
-      L: 176,
+      F: __dxlog_file7,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
-    const swarm = new Swarm(topic, peerInfo, topology, protocol, this._messenger, this._transportFactory, label, this._connectionLimiter);
+    const swarm = new Swarm(topic, this._peerInfo, topology, protocol, this._messenger, this._transportFactory, label, this._connectionLimiter);
     swarm.errors.handle((error) => {
-      (0, import_log8.log)("swarm error", {
+      (0, import_log7.log)("swarm error", {
         error
       }, {
-        F: __dxlog_file8,
-        L: 189,
+        F: __dxlog_file7,
+        L: 181,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2375,21 +2307,21 @@ var SwarmNetworkManager = class {
     await swarm.open();
     this._signalConnection.join({
       topic,
-      peer: peerInfo
-    }).catch((error) => import_log8.log.catch(error, void 0, {
-      F: __dxlog_file8,
-      L: 198,
+      peer: this._peerInfo
+    }).catch((error) => import_log7.log.catch(error, void 0, {
+      F: __dxlog_file7,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     }));
     this.topicsUpdated.emit();
     this._connectionLog?.joinedSwarm(swarm);
-    (0, import_log8.log)("joined", {
+    (0, import_log7.log)("joined", {
       topic: import_keys8.PublicKey.from(topic),
       count: this._swarms.size
     }, {
-      F: __dxlog_file8,
-      L: 202,
+      F: __dxlog_file7,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2404,11 +2336,11 @@ var SwarmNetworkManager = class {
     if (!this._swarms.has(topic)) {
       return;
     }
-    (0, import_log8.log)("leaving", {
+    (0, import_log7.log)("leaving", {
       topic: import_keys8.PublicKey.from(topic)
     }, {
-      F: __dxlog_file8,
-      L: 219,
+      F: __dxlog_file7,
+      L: 211,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2424,12 +2356,12 @@ var SwarmNetworkManager = class {
     await swarm.destroy();
     this._swarms.delete(topic);
     this.topicsUpdated.emit();
-    (0, import_log8.log)("left", {
+    (0, import_log7.log)("left", {
       topic: import_keys8.PublicKey.from(topic),
       count: this._swarms.size
     }, {
-      F: __dxlog_file8,
-      L: 233,
+      F: __dxlog_file7,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2462,19 +2394,19 @@ var SwarmNetworkManager = class {
   }
 };
 _ts_decorate4([
-  import_async8.synchronized
+  import_async7.synchronized
 ], SwarmNetworkManager.prototype, "joinSwarm", null);
 _ts_decorate4([
-  import_async8.synchronized
+  import_async7.synchronized
 ], SwarmNetworkManager.prototype, "leaveSwarm", null);
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/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";
   }
   init(controller) {
     (0, import_invariant7.invariant)(!this._controller, "Already initialized", {
-      F: __dxlog_file9,
+      F: __dxlog_file8,
       L: 18,
       S: this,
       A: [
@@ -2486,7 +2418,7 @@ var FullyConnectedTopology = class {
   }
   update() {
     (0, import_invariant7.invariant)(this._controller, "Not initialized", {
-      F: __dxlog_file9,
+      F: __dxlog_file8,
       L: 23,
       S: this,
       A: [
@@ -2505,307 +2437,13 @@ var FullyConnectedTopology = class {
   async destroy() {
   }
 };
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts";
-var MIN_UPDATE_INTERVAL = 1e3 * 10;
-var MAX_CHANGES_PER_UPDATE = 1;
-var MMSTTopology = class {
-  constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
-    this._sampleCollected = false;
-    this._lastAction = /* @__PURE__ */ new Date(0);
-    this._originateConnections = originateConnections;
-    this._maxPeers = maxPeers;
-    this._sampleSize = sampleSize;
-  }
-  init(controller) {
-    (0, import_invariant8.invariant)(!this._controller, "Already initialized", {
-      F: __dxlog_file10,
-      L: 49,
-      S: this,
-      A: [
-        "!this._controller",
-        "'Already initialized'"
-      ]
-    });
-    this._controller = controller;
-  }
-  update() {
-    (0, import_invariant8.invariant)(this._controller, "Not initialized", {
-      F: __dxlog_file10,
-      L: 54,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized'"
-      ]
-    });
-    const { connected, candidates } = this._controller.getState();
-    if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
-      (0, import_log9.log)("Running the algorithm.", void 0, {
-        F: __dxlog_file10,
-        L: 58,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._sampleCollected = true;
-      this._runAlgorithm();
-    }
-  }
-  forceUpdate() {
-    this._lastAction = /* @__PURE__ */ new Date(0);
-    this.update();
-  }
-  async onOffer(peer) {
-    (0, import_invariant8.invariant)(this._controller, "Not initialized", {
-      F: __dxlog_file10,
-      L: 70,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized'"
-      ]
-    });
-    const { connected } = this._controller.getState();
-    const accept = connected.length < this._maxPeers;
-    (0, import_log9.log)(`Offer ${peer} accept=${accept}`, void 0, {
-      F: __dxlog_file10,
-      L: 73,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    return accept;
-  }
-  async destroy() {
-  }
-  _runAlgorithm() {
-    (0, import_invariant8.invariant)(this._controller, "Not initialized", {
-      F: __dxlog_file10,
-      L: 82,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized'"
-      ]
-    });
-    const { connected, candidates, ownPeerId } = this._controller.getState();
-    if (connected.length > this._maxPeers) {
-      (0, import_log9.log)(`disconnect ${connected.length - this._maxPeers} peers.`, void 0, {
-        F: __dxlog_file10,
-        L: 88,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      const sorted = sortByXorDistance(connected, ownPeerId).reverse().slice(0, this._maxPeers - connected.length);
-      (0, import_invariant8.invariant)(sorted.length === 0, void 0, {
-        F: __dxlog_file10,
-        L: 92,
-        S: this,
-        A: [
-          "sorted.length === 0",
-          ""
-        ]
-      });
-      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
-        (0, import_log9.log)(`want to disconnect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`, void 0, {
-          F: __dxlog_file10,
-          L: 95,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      if (Date.now() - this._lastAction.getTime() > MIN_UPDATE_INTERVAL) {
-        for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
-          (0, import_log9.log)(`Disconnect ${peer}.`, void 0, {
-            F: __dxlog_file10,
-            L: 100,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          this._controller.disconnect(peer);
-        }
-        this._lastAction = /* @__PURE__ */ new Date();
-      } else {
-        (0, import_log9.log)("rate limited disconnect", void 0, {
-          F: __dxlog_file10,
-          L: 105,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    } else if (connected.length < this._originateConnections) {
-      (0, import_log9.log)(`connect ${this._originateConnections - connected.length} peers.`, void 0, {
-        F: __dxlog_file10,
-        L: 109,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      const sample = candidates.sort(() => Math.random() - 0.5).slice(0, this._sampleSize);
-      const sorted = sortByXorDistance(sample, ownPeerId).slice(0, this._originateConnections - connected.length);
-      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
-        (0, import_log9.log)(`want to connect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`, void 0, {
-          F: __dxlog_file10,
-          L: 114,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      if (Date.now() - this._lastAction.getTime() > MIN_UPDATE_INTERVAL) {
-        for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
-          (0, import_log9.log)(`Connect ${peer}.`, void 0, {
-            F: __dxlog_file10,
-            L: 118,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          this._controller.connect(peer);
-        }
-        this._lastAction = /* @__PURE__ */ new Date();
-      } else {
-        (0, import_log9.log)("rate limited connect", void 0, {
-          F: __dxlog_file10,
-          L: 123,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    }
-  }
-  toString() {
-    return "MMSTTopology";
-  }
-};
-var sortByXorDistance = (keys, reference) => {
-  const sorted = keys.sort((a, b) => {
-    return compareXor(distXor(a.asBuffer(), reference.asBuffer()), distXor(b.asBuffer(), reference.asBuffer()));
-  });
-  (0, import_log9.log)("Sorted keys", {
-    keys,
-    reference,
-    sorted
-  }, {
-    F: __dxlog_file10,
-    L: 137,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
-  return sorted;
-};
-var distXor = (a, b) => {
-  const maxLength = Math.max(a.length, b.length);
-  const result = Buffer.allocUnsafe(maxLength);
-  for (let i = 0; i < maxLength; i++) {
-    result[i] = (a[i] || 0) ^ (b[i] || 0);
-  }
-  return result;
-};
-var compareXor = (a, b) => {
-  const maxLength = Math.max(a.length, b.length);
-  for (let i = 0; i < maxLength; i++) {
-    if ((a[i] || 0) === (b[i] || 0)) {
-      continue;
-    }
-    return (a[i] || 0) < (b[i] || 0) ? -1 : 1;
-  }
-  return 0;
-};
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
-var StarTopology = class {
-  constructor(_centralPeer) {
-    this._centralPeer = _centralPeer;
-  }
-  toString() {
-    return `StarTopology(${this._centralPeer.truncate()})`;
-  }
-  init(controller) {
-    (0, import_invariant9.invariant)(!this._controller, "Already initialized.", {
-      F: __dxlog_file11,
-      L: 21,
-      S: this,
-      A: [
-        "!this._controller",
-        "'Already initialized.'"
-      ]
-    });
-    this._controller = controller;
-  }
-  update() {
-    (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
-      L: 26,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized.'"
-      ]
-    });
-    const { candidates, connected, ownPeerId } = this._controller.getState();
-    if (!ownPeerId.equals(this._centralPeer)) {
-      (0, import_log10.log)("leaf peer dropping all connections apart from central peer.", void 0, {
-        F: __dxlog_file11,
-        L: 29,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      for (const peer of connected) {
-        if (!peer.equals(this._centralPeer)) {
-          (0, import_log10.log)("dropping connection", {
-            peer
-          }, {
-            F: __dxlog_file11,
-            L: 34,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          this._controller.disconnect(peer);
-        }
-      }
-    }
-    for (const peer of candidates) {
-      if (peer.equals(this._centralPeer) || ownPeerId.equals(this._centralPeer)) {
-        (0, import_log10.log)("connecting to peer", {
-          peer
-        }, {
-          F: __dxlog_file11,
-          L: 43,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._controller.connect(peer);
-      }
-    }
-  }
-  async onOffer(peer) {
-    (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
-      L: 50,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized.'"
-      ]
-    });
-    const { ownPeerId } = this._controller.getState();
-    (0, import_log10.log)("offer", {
-      peer,
-      isCentral: peer.equals(this._centralPeer),
-      isSelfCentral: ownPeerId.equals(this._centralPeer)
-    }, {
-      F: __dxlog_file11,
-      L: 52,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    return ownPeerId.equals(this._centralPeer) || peer.equals(this._centralPeer);
-  }
-  async destroy() {
-  }
-};
 function _ts_decorate5(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_file12 = "/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({
@@ -2820,20 +2458,20 @@ var MemoryTransportFactory = {
 };
 var MemoryTransport = class _MemoryTransport {
   static {
-    this._connections = new import_util8.ComplexMap(import_keys9.PublicKey.hash);
+    this._connections = new import_util7.ComplexMap(import_keys9.PublicKey.hash);
   }
   constructor(_options) {
     this._options = _options;
     this._instanceId = import_keys9.PublicKey.random();
-    this._remote = new import_async9.Trigger();
+    this._remote = new import_async8.Trigger();
     this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._closed = false;
-    this.closed = new import_async9.Event();
-    this.connected = new import_async9.Event();
+    this.closed = new import_async8.Event();
+    this.connected = new import_async8.Event();
     this.errors = new import_debug4.ErrorStream();
-    (0, import_invariant10.invariant)(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection", {
-      F: __dxlog_file12,
+    (0, import_invariant8.invariant)(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection", {
+      F: __dxlog_file9,
       L: 64,
       S: this,
       A: [
@@ -2847,15 +2485,15 @@ var MemoryTransport = class _MemoryTransport {
     return !this._closed;
   }
   async open() {
-    (0, import_log11.log)("opening...", void 0, {
-      F: __dxlog_file12,
+    (0, import_log8.log)("opening...", void 0, {
+      F: __dxlog_file9,
       L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._options.initiator) {
-      (0, import_log11.log)("sending signal", void 0, {
-        F: __dxlog_file12,
+      (0, import_log8.log)("sending signal", void 0, {
+        F: __dxlog_file9,
         L: 78,
         S: this,
         C: (f, a) => f(...a)
@@ -2885,8 +2523,8 @@ var MemoryTransport = class _MemoryTransport {
           this.closed.emit();
           return;
         }
-        (0, import_invariant10.invariant)(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`, {
-          F: __dxlog_file12,
+        (0, import_invariant8.invariant)(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`, {
+          F: __dxlog_file9,
           L: 104,
           S: this,
           A: [
@@ -2896,8 +2534,8 @@ var MemoryTransport = class _MemoryTransport {
         });
         this._remoteConnection._remoteConnection = this;
         this._remoteConnection._remoteInstanceId = this._instanceId;
-        (0, import_log11.log)("connected", void 0, {
-          F: __dxlog_file12,
+        (0, import_log8.log)("connected", void 0, {
+          F: __dxlog_file9,
           L: 108,
           S: this,
           C: (f, a) => f(...a)
@@ -2912,11 +2550,12 @@ var MemoryTransport = class _MemoryTransport {
         this.errors.raise(err);
       });
     }
+    return this;
   }
   async close() {
-    (0, import_log11.log)("closing...", void 0, {
-      F: __dxlog_file12,
-      L: 129,
+    (0, import_log8.log)("closing...", void 0, {
+      F: __dxlog_file9,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2935,19 +2574,20 @@ var MemoryTransport = class _MemoryTransport {
       this._remoteConnection = void 0;
     }
     this.closed.emit();
-    (0, import_log11.log)("closed", void 0, {
-      F: __dxlog_file12,
-      L: 157,
+    (0, import_log8.log)("closed", void 0, {
+      F: __dxlog_file9,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
+    return this;
   }
   async onSignal({ payload }) {
-    (0, import_log11.log)("received signal", {
+    (0, import_log8.log)("received signal", {
       payload
     }, {
-      F: __dxlog_file12,
-      L: 161,
+      F: __dxlog_file9,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2973,1286 +2613,1376 @@ var MemoryTransport = class _MemoryTransport {
   }
 };
 _ts_decorate5([
-  import_log11.logInfo
+  import_log8.logInfo
 ], MemoryTransport.prototype, "_instanceId", void 0);
 _ts_decorate5([
-  import_log11.logInfo
+  import_log8.logInfo
 ], MemoryTransport.prototype, "_remoteInstanceId", void 0);
 var toError = (err) => err instanceof Error ? err : new Error(String(err));
 var TransportKind;
 (function(TransportKind2) {
-  TransportKind2["SIMPLE_PEER"] = "SIMPLE_PEER";
-  TransportKind2["SIMPLE_PEER_PROXY"] = "SIMPLE_PEER_PROXY";
-  TransportKind2["LIBDATACHANNEL"] = "LIBDATACHANNEL";
+  TransportKind2["WEB_RTC"] = "WEB-RTC";
+  TransportKind2["WEB_RTC_PROXY"] = "WEB-RTC_PROXY";
   TransportKind2["MEMORY"] = "MEMORY";
   TransportKind2["TCP"] = "TCP";
 })(TransportKind || (TransportKind = {}));
-var wrtc = null;
-try {
-  wrtc = __require("@koush/wrtc");
-} catch {
-}
-function _ts_decorate6(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_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts";
-var createSimplePeerTransportFactory = (webrtcConfig, iceProvider) => ({
-  createTransport: (options) => new SimplePeerTransport({
-    ...options,
-    webrtcConfig,
-    iceProvider
-  })
-});
-var SimplePeerTransport = class {
-  get isOpen() {
-    return this._piped && !this._closed;
+var BrowserRtcConnectionFactory = class {
+  async initialize() {
   }
-  /**
-  * @params opts.config formatted as per https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/RTCPeerConnection
-  */
-  constructor(_params) {
-    this._params = _params;
-    this._peer = void 0;
-    this._closed = false;
-    this._piped = false;
-    this.closed = new import_async10.Event();
-    this.connected = new import_async10.Event();
-    this.errors = new import_debug5.ErrorStream();
-    this._instanceId = import_keys10.PublicKey.random().toHex();
+  async onConnectionDestroyed() {
   }
-  async getStats() {
-    const stats = await this._getStats();
-    if (!stats) {
-      return {
-        bytesSent: 0,
-        bytesReceived: 0,
-        packetsSent: 0,
-        packetsReceived: 0,
-        rawStats: {}
-      };
-    }
-    return {
-      bytesSent: stats.transport.bytesSent,
-      bytesReceived: stats.transport.bytesReceived,
-      packetsSent: stats.transport.packetsSent,
-      packetsReceived: stats.transport.packetsReceived,
-      rawStats: stats.raw
-    };
+  async createConnection(config) {
+    return new RTCPeerConnection(config);
   }
-  async _getStats() {
-    if (typeof this._peer?._pc?.getStats !== "function") {
-      return null;
-    }
-    return await this._peer._pc.getStats().then((stats) => {
-      const statsEntries = Array.from(stats.entries());
-      const transport = statsEntries.filter((s) => s[1].type === "transport")[0][1];
-      const candidatePair = statsEntries.filter((s) => s[0] === transport.selectedCandidatePairId);
-      let selectedCandidatePair;
-      let remoteCandidate;
-      if (candidatePair.length > 0) {
-        selectedCandidatePair = candidatePair[0][1];
-        remoteCandidate = statsEntries.filter((s) => s[0] === selectedCandidatePair.remoteCandidateId)[0][1];
+  async initConnection(connection, info) {
+  }
+};
+var NodeRtcConnectionFactory = class _NodeRtcConnectionFactory {
+  static {
+    this._createdConnections = 0;
+  }
+  static {
+    this._cleanupMutex = new import_async9.Mutex();
+  }
+  // This should be inside the function to avoid triggering `eval` in the global scope.
+  // eslint-disable-next-line no-new-func
+  // TODO(burdon): Do imports here?
+  async initialize() {
+  }
+  async onConnectionDestroyed() {
+    return _NodeRtcConnectionFactory._cleanupMutex.executeSynchronized(async () => {
+      if (--_NodeRtcConnectionFactory._createdConnections === 0) {
+        (await import("#node-datachannel")).cleanup();
       }
-      return {
-        datachannel: statsEntries.filter((s) => s[1].type === "data-channel")[0][1],
-        transport,
-        selectedCandidatePair,
-        remoteCandidate,
-        raw: Object.fromEntries(stats.entries())
-      };
     });
   }
-  async getDetails() {
-    const stats = await this._getStats();
-    const rc = stats?.remoteCandidate;
-    if (!rc) {
-      return "unavailable";
-    }
-    if (rc.candidateType === "relay") {
-      return `${rc.ip}:${rc.port}/${rc.protocol} relay for ${rc.relatedAddress}:${rc.relatedPort}`;
+  async createConnection(config) {
+    return _NodeRtcConnectionFactory._cleanupMutex.executeSynchronized(async () => {
+      const { RTCPeerConnection: RTCPeerConnection1 } = await import("#node-datachannel/polyfill");
+      _NodeRtcConnectionFactory._createdConnections++;
+      return new RTCPeerConnection1(config);
+    });
+  }
+  async initConnection(connection, info) {
+    if (info.initiator) {
+      connection.onnegotiationneeded?.(null);
     }
-    return `${rc.ip}:${rc.port}/${rc.protocol} ${rc.candidateType}`;
   }
-  async open() {
-    import_log12.log.trace("dxos.mesh.webrtc-transport.open", import_protocols7.trace.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file13,
-      L: 122,
+};
+var getRtcConnectionFactory = () => {
+  return typeof globalThis.RTCPeerConnection === "undefined" ? new NodeRtcConnectionFactory() : new BrowserRtcConnectionFactory();
+};
+var describeSelectedRemoteCandidate = async (connection) => {
+  const stats = connection && await getRtcConnectionStats(connection);
+  const rc = stats?.remoteCandidate;
+  if (!rc) {
+    return "unavailable";
+  }
+  if (rc.candidateType === "relay") {
+    return `${rc.ip}:${rc.port} relay for ${rc.relatedAddress}:${rc.relatedPort}`;
+  }
+  return `${rc.ip}:${rc.port} ${rc.candidateType}`;
+};
+var createRtcTransportStats = async (connection, topic) => {
+  const stats = connection && await getRtcConnectionStats(connection, topic);
+  if (!stats) {
+    return {
+      bytesSent: 0,
+      bytesReceived: 0,
+      packetsSent: 0,
+      packetsReceived: 0,
+      rawStats: {}
+    };
+  }
+  return {
+    bytesSent: stats.dataChannel?.bytesSent,
+    bytesReceived: stats.dataChannel?.bytesReceived,
+    packetsSent: 0,
+    packetsReceived: 0,
+    rawStats: stats.raw
+  };
+};
+var getRtcConnectionStats = async (connection, channelTopic) => {
+  const stats = await connection.getStats();
+  const statsEntries = Array.from(stats.entries());
+  const transport = statsEntries.find(([_, entry]) => entry.type === "transport")?.[1];
+  const selectedCandidatePair = transport && statsEntries.find(([entryId]) => entryId === transport.selectedCandidatePairId)?.[1];
+  const remoteCandidate = selectedCandidatePair && statsEntries.find(([entryId]) => entryId === selectedCandidatePair.remoteCandidateId)?.[1];
+  const dataChannel = channelTopic && statsEntries.find(([_, entry]) => entry.type === "data-channel" && entry.label === channelTopic)?.[1];
+  return {
+    transport,
+    selectedCandidatePair,
+    dataChannel,
+    remoteCandidate,
+    raw: Object.fromEntries(stats)
+  };
+};
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-channel.ts";
+var MAX_MESSAGE_SIZE = 64 * 1024;
+var MAX_BUFFERED_AMOUNT = 64 * 1024;
+var RtcTransportChannel = class extends import_context6.Resource {
+  constructor(_connection, _options) {
+    super();
+    this._connection = _connection;
+    this._options = _options;
+    this.closed = new import_async11.Event();
+    this.connected = new import_async11.Event();
+    this.errors = new import_debug5.ErrorStream();
+    this._streamDataFlushedCallback = null;
+    this._isChannelCreationInProgress = false;
+  }
+  get isRtcChannelCreationInProgress() {
+    return this._isChannelCreationInProgress;
+  }
+  onConnectionError(error) {
+    if (this.isOpen) {
+      this.errors.raise(error);
+    }
+  }
+  async _open() {
+    (0, import_invariant10.invariant)(!this._isChannelCreationInProgress, void 0, {
+      F: __dxlog_file10,
+      L: 56,
       S: this,
-      C: (f, a) => f(...a)
+      A: [
+        "!this._isChannelCreationInProgress",
+        ""
+      ]
     });
-    (0, import_log12.log)("created connection", {
-      params: this._params
-    }, {
-      F: __dxlog_file13,
-      L: 123,
-      S: this,
-      C: (f, a) => f(...a)
+    this._isChannelCreationInProgress = true;
+    this._connection.createDataChannel(this._options.topic).then((channel) => {
+      if (this.isOpen) {
+        this._channel = channel;
+        this._initChannel(this._channel);
+      } else {
+        this._safeCloseChannel(channel);
+      }
+    }).catch((err) => {
+      if (this.isOpen) {
+        this.errors.raise(new import_protocols8.ConnectivityError(`Failed to create a channel: ${err?.message ?? "unknown reason."}`));
+      }
+    }).finally(() => {
+      this._isChannelCreationInProgress = false;
     });
-    const providedIceServers = await this._params.iceProvider?.getIceServers();
-    if (!this._params.webrtcConfig) {
-      this._params.webrtcConfig = {};
+  }
+  async _close() {
+    if (this._channel) {
+      this._safeCloseChannel(this._channel);
+      this._channel = void 0;
+      this._stream = void 0;
     }
-    this._params.webrtcConfig.iceServers = [
-      ...this._params.webrtcConfig.iceServers ?? [],
-      ...providedIceServers ?? []
-    ];
-    this._peer = new import_simple_peer.default({
-      channelName: "dxos.mesh.transport",
-      initiator: this._params.initiator,
-      wrtc: import_simple_peer.default.WEBRTC_SUPPORT ? void 0 : wrtc ?? (0, import_debug5.raise)(new Error("wrtc not available")),
-      config: this._params.webrtcConfig
-    });
-    this._peer.on("signal", async (data) => {
-      (0, import_log12.log)("signal", data, {
-        F: __dxlog_file13,
-        L: 142,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._params.sendSignal({
-        payload: {
-          data
-        }
-      });
-    });
-    this._peer.on("connect", () => {
-      (0, import_log12.log)("connected", void 0, {
-        F: __dxlog_file13,
-        L: 147,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._params.stream.pipe(this._peer).pipe(this._params.stream);
-      this._piped = true;
-      this.connected.emit();
-    });
-    this._peer.on("close", async () => {
-      (0, import_log12.log)("closed", void 0, {
-        F: __dxlog_file13,
-        L: 154,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this.close();
+    this.closed.emit();
+    (0, import_log10.log)("closed", void 0, {
+      F: __dxlog_file10,
+      L: 86,
+      S: this,
+      C: (f, a) => f(...a)
     });
-    this._peer.on("error", async (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 {
-          import_log12.log.info("unknown RTCError", {
-            err
+  }
+  _initChannel(channel) {
+    Object.assign(channel, {
+      onopen: () => {
+        if (!this.isOpen) {
+          import_log10.log.warn("channel opened in a closed transport", {
+            topic: this._options.topic
           }, {
-            F: __dxlog_file13,
-            L: 165,
+            F: __dxlog_file10,
+            L: 93,
             S: this,
             C: (f, a) => f(...a)
           });
-          this.errors.raise(new import_protocols7.UnknownProtocolError("unknown RTCError", err));
+          this._safeCloseChannel(channel);
+          return;
         }
-      } else if ("code" in err) {
-        import_log12.log.info("simple-peer error", err, {
-          F: __dxlog_file13,
-          L: 170,
+        (0, import_log10.log)("onopen", void 0, {
+          F: __dxlog_file10,
+          L: 98,
           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_SIGNALING":
-            this.errors.raise(new import_protocols7.ConnectivityError("signaling failure", err));
-            break;
-          case "ERR_ICE_CONNECTION_FAILURE":
-          case "ERR_DATA_CHANNEL":
-          case "ERR_CONNECTION_FAILURE":
-            this.errors.raise(new import_protocols7.ConnectivityError("unknown communication failure", err));
-            break;
-          // errors due to library issues or improper API usage
-          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_log12.log.info("unknown peer connection error", err, {
-          F: __dxlog_file13,
-          L: 196,
+        const duplex = new import_node_stream2.Duplex({
+          read: () => {
+          },
+          write: (chunk, encoding, callback) => {
+            return this._handleChannelWrite(chunk, callback);
+          }
+        });
+        duplex.pipe(this._options.stream).pipe(duplex);
+        this._stream = duplex;
+        this.connected.emit();
+      },
+      onclose: async () => {
+        (0, import_log10.log)("onclose", void 0, {
+          F: __dxlog_file10,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
-        this.errors.raise(err);
-      }
-      try {
-        if (typeof this._peer?._pc?.getStats === "function") {
-          this._peer._pc.getStats().then((stats) => {
-            import_log12.log.info("report after webrtc error", {
-              config: this._params.webrtcConfig,
-              stats: Object.fromEntries(stats.entries())
-            }, {
-              F: __dxlog_file13,
-              L: 204,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+        await this.close();
+      },
+      onmessage: (event) => {
+        if (!this._stream) {
+          import_log10.log.warn("ignoring message on a closed channel", void 0, {
+            F: __dxlog_file10,
+            L: 117,
+            S: this,
+            C: (f, a) => f(...a)
           });
+          return;
         }
-      } catch (err2) {
-        import_log12.log.catch(err2, void 0, {
-          F: __dxlog_file13,
-          L: 211,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        let data = event.data;
+        if (data instanceof ArrayBuffer) {
+          data = Buffer.from(data);
+        }
+        this._stream.push(data);
+      },
+      onerror: (event) => {
+        if (this.isOpen) {
+          const err = event.error instanceof Error ? event.error : new Error(`Datachannel error: ${event.type}.`);
+          this.errors.raise(err);
+        }
+      },
+      onbufferedamountlow: () => {
+        const cb = this._streamDataFlushedCallback;
+        this._streamDataFlushedCallback = null;
+        cb?.();
       }
-      await this.close();
-    });
-    import_log12.log.trace("dxos.mesh.webrtc-transport.open", import_protocols7.trace.end({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file13,
-      L: 217,
-      S: this,
-      C: (f, a) => f(...a)
     });
   }
-  async close() {
-    (0, import_log12.log)("closing...", void 0, {
-      F: __dxlog_file13,
-      L: 222,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (this._closed) {
+  async _handleChannelWrite(chunk, callback) {
+    if (!this._channel) {
+      import_log10.log.warn("writing to a channel after a connection was closed", void 0, {
+        F: __dxlog_file10,
+        L: 145,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return;
     }
-    this._disconnectStreams();
-    this._peer.destroy();
-    this._closed = true;
-    this.closed.emit();
-    (0, import_log12.log)("closed", void 0, {
-      F: __dxlog_file13,
-      L: 230,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-  async onSignal(signal) {
-    if (this._closed) {
+    if (chunk.length > MAX_MESSAGE_SIZE) {
+      const error = new Error(`Message too large: ${chunk.length} > ${MAX_MESSAGE_SIZE}.`);
+      this.errors.raise(error);
+      callback();
       return;
     }
-    (0, import_tiny_invariant.default)(signal.payload.data, "Signal message must contain signal data.");
-    (0, import_tiny_invariant.default)(this._peer, "Peer must be initialized before receiving signals.");
-    this._peer.signal(signal.payload.data);
-  }
-  _disconnectStreams() {
-    if (this._piped) {
-      this._params.stream.unpipe?.(this._peer)?.unpipe?.(this._params.stream);
+    try {
+      this._channel.send(chunk);
+    } catch (err) {
+      this.errors.raise(err);
+      callback();
+      return;
     }
-  }
-};
-_ts_decorate6([
-  import_async10.synchronized
-], SimplePeerTransport.prototype, "open", null);
-_ts_decorate6([
-  import_async10.synchronized
-], SimplePeerTransport.prototype, "close", null);
-_ts_decorate6([
-  import_async10.synchronized
-], SimplePeerTransport.prototype, "onSignal", null);
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
-var SimplePeerTransportService = class {
-  constructor(_webrtcConfig, _iceProvider) {
-    this._webrtcConfig = _webrtcConfig;
-    this._iceProvider = _iceProvider;
-    this.transports = new import_util9.ComplexMap(import_keys11.PublicKey.hash);
-  }
-  open(request) {
-    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({
-            data: {
-              payload: chunk
-            }
-          });
-          callback();
-        }
-      });
-      const transport = new SimplePeerTransport({
-        initiator: request.initiator,
-        stream: duplex,
-        webrtcConfig: this._webrtcConfig,
-        sendSignal: async (signal) => {
-          next({
-            signal: {
-              payload: signal
-            }
-          });
-        },
-        iceProvider: this._iceProvider
-      });
-      void transport.open();
-      next({
-        connection: {
-          state: import_bridge.ConnectionState.CONNECTING
-        }
-      });
-      transport.connected.on(() => {
-        next({
-          connection: {
-            state: import_bridge.ConnectionState.CONNECTED
-          }
-        });
-      });
-      transport.errors.handle((err) => {
-        next({
-          connection: {
-            state: import_bridge.ConnectionState.CLOSED,
-            error: err.toString()
-          }
-        });
-        close(err);
-      });
-      transport.closed.on(() => {
-        next({
-          connection: {
-            state: import_bridge.ConnectionState.CLOSED
-          }
+    if (this._channel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
+      if (this._streamDataFlushedCallback !== null) {
+        import_log10.log.error("consumer trying to write before we are ready for more data", void 0, {
+          F: __dxlog_file10,
+          L: 166,
+          S: this,
+          C: (f, a) => f(...a)
         });
-        close();
+      }
+      this._streamDataFlushedCallback = callback;
+    } else {
+      callback();
+    }
+  }
+  _safeCloseChannel(channel) {
+    try {
+      channel.close();
+    } catch (error) {
+      import_log10.log.catch(error, void 0, {
+        F: __dxlog_file10,
+        L: 178,
+        S: this,
+        C: (f, a) => f(...a)
       });
-      const transportState = {
-        transport,
-        stream: duplex,
-        writeCallbacks: [],
-        state: "OPEN"
-      };
-      ready();
-      this.transports.set(request.proxyId, transportState);
-    });
-    return rpcStream;
+    }
   }
-  async sendSignal({ proxyId, signal }) {
-    (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
-      F: __dxlog_file14,
-      L: 124,
-      S: this,
-      A: [
-        "this.transports.has(proxyId)",
-        ""
-      ]
-    });
-    await this.transports.get(proxyId).transport.onSignal(signal);
+  onSignal(signal) {
+    return this._connection.onSignal(signal);
   }
-  async getDetails({ proxyId }) {
-    (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
-      F: __dxlog_file14,
-      L: 129,
-      S: this,
-      A: [
-        "this.transports.has(proxyId)",
-        ""
-      ]
-    });
-    return {
-      details: await this.transports.get(proxyId).transport.getDetails()
-    };
+  async getDetails() {
+    return describeSelectedRemoteCandidate(this._connection.currentConnection);
   }
-  async getStats({ proxyId }) {
-    (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
-      F: __dxlog_file14,
-      L: 134,
-      S: this,
-      A: [
-        "this.transports.has(proxyId)",
-        ""
-      ]
-    });
-    return {
-      stats: await this.transports.get(proxyId).transport.getStats()
-    };
+  async getStats() {
+    return createRtcTransportStats(this._connection.currentConnection, this._options.topic);
   }
-  async sendData({ proxyId, payload }) {
-    if (this.transports.get(proxyId)?.state !== "OPEN") {
-      import_log13.log.debug("transport is closed", void 0, {
-        F: __dxlog_file14,
-        L: 140,
+};
+var chooseInitiatorPeer = (peer1Key, peer2Key) => peer1Key < peer2Key ? peer1Key : peer2Key;
+var areSdpEqual = (sdp1, sdp2) => {
+  const sdp1Lines = deduplicatedSdpLines(sdp1);
+  const sdp2Lines = deduplicatedSdpLines(sdp2);
+  if (sdp1Lines.length !== sdp2Lines.length) {
+    return false;
+  }
+  return sdp1Lines.every((line, idx) => line === sdp2Lines[idx]);
+};
+var deduplicatedSdpLines = (sdp) => {
+  const deduplicatedLines = [];
+  const seenLines = [];
+  for (const line of sdp.split("\r\n")) {
+    if (line.startsWith("m")) {
+      seenLines.length = 0;
+    }
+    if (seenLines.includes(line)) {
+      continue;
+    }
+    seenLines.push(line);
+    deduplicatedLines.push(line);
+  }
+  return deduplicatedLines;
+};
+function _ts_decorate6(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_file11 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-peer-connection.ts";
+var RtcPeerConnection = class {
+  constructor(_factory, _options) {
+    this._factory = _factory;
+    this._options = _options;
+    this._channelCreatedCallbacks = /* @__PURE__ */ new Map();
+    this._transportChannels = /* @__PURE__ */ new Map();
+    this._dataChannels = /* @__PURE__ */ new Map();
+    this._readyForCandidates = new import_async10.Trigger();
+    this._offerProcessingMutex = new import_async10.Mutex();
+    this._initiator = chooseInitiatorPeer(_options.ownPeerKey, _options.remotePeerKey) === _options.ownPeerKey;
+  }
+  get transportChannelCount() {
+    return this._transportChannels.size;
+  }
+  get currentConnection() {
+    return this._connection;
+  }
+  async createDataChannel(topic) {
+    const connection = await this._openConnection();
+    if (!this._transportChannels.has(topic)) {
+      if (!this._transportChannels.size) {
+        this._lockAndCloseConnection();
+      }
+      throw new Error("Transport closed while connection was being open");
+    }
+    if (this._initiator) {
+      const channel = connection.createDataChannel(topic);
+      this._dataChannels.set(topic, channel);
+      return channel;
+    } else {
+      const existingChannel = this._dataChannels.get(topic);
+      if (existingChannel) {
+        return existingChannel;
+      }
+      (0, import_log9.log)("waiting for initiator-peer to open a data channel", void 0, {
+        F: __dxlog_file11,
+        L: 90,
         S: this,
         C: (f, a) => f(...a)
       });
-    }
-    (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
-      F: __dxlog_file14,
-      L: 142,
-      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);
+      return new Promise((resolve, reject) => {
+        this._channelCreatedCallbacks.set(topic, {
+          resolve,
+          reject
+        });
       });
     }
   }
-  async close({ proxyId }) {
-    await this.transports.get(proxyId)?.transport.close();
-    await this.transports.get(proxyId)?.stream.end();
-    if (this.transports.get(proxyId)) {
-      this.transports.get(proxyId).state = "CLOSED";
+  createTransportChannel(options) {
+    const channel = new RtcTransportChannel(this, options);
+    this._transportChannels.set(options.topic, channel);
+    channel.closed.on(() => {
+      this._transportChannels.delete(options.topic);
+      if (this._transportChannels.size === 0) {
+        this._lockAndCloseConnection();
+      }
+    });
+    return channel;
+  }
+  async _openConnection() {
+    if (this._connection) {
+      return this._connection;
     }
-    (0, import_log13.log)("Closed.", void 0, {
-      F: __dxlog_file14,
-      L: 158,
+    (0, import_log9.log)("initializing connection...", () => ({
+      remotePeer: this._options.remotePeerKey
+    }), {
+      F: __dxlog_file11,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
-  }
-};
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
-var RPC_TIMEOUT = 1e4;
-var RESP_MIN_THRESHOLD = 500;
-var TIMEOUT_THRESHOLD = 10;
-var SimplePeerTransportProxy = class {
-  constructor(_options) {
-    this._options = _options;
-    this._proxyId = import_keys12.PublicKey.random();
-    this._ctx = new import_context6.Context(void 0, {
-      F: __dxlog_file15,
-      L: 37
-    });
-    this._timeoutCount = 0;
-    this.closed = new import_async11.Event();
-    this.connected = new import_async11.Event();
-    this.errors = new import_debug6.ErrorStream();
-    this._closed = false;
-  }
-  get isOpen() {
-    return !this._closed;
-  }
-  async open() {
-    this._serviceStream = this._options.bridgeService.open({
-      proxyId: this._proxyId,
-      initiator: this._options.initiator
-    }, {
-      timeout: RPC_TIMEOUT
-    });
-    this._serviceStream.waitUntilReady().then(() => {
-      this._serviceStream.subscribe(async (event) => {
-        (0, import_log14.log)("SimplePeerTransportProxy: event", event, {
-          F: __dxlog_file15,
-          L: 66,
+    const config = await this._loadConnectionConfig();
+    const connection = await this._factory.createConnection(config);
+    const iceCandidateErrors = [];
+    Object.assign(connection, {
+      onnegotiationneeded: async () => {
+        (0, import_invariant9.invariant)(this._initiator, void 0, {
+          F: __dxlog_file11,
+          L: 130,
+          S: this,
+          A: [
+            "this._initiator",
+            ""
+          ]
+        });
+        if (connection !== this._connection) {
+          this._onConnectionCallbackAfterClose("onnegotiationneeded", connection);
+          return;
+        }
+        (0, import_log9.log)("onnegotiationneeded", void 0, {
+          F: __dxlog_file11,
+          L: 137,
           S: this,
           C: (f, a) => f(...a)
         });
-        if (event.connection) {
-          await this._handleConnection(event.connection);
-        } else if (event.data) {
-          this._handleData(event.data);
-        } else if (event.signal) {
-          await this._handleSignal(event.signal);
+        try {
+          const offer = await connection.createOffer();
+          await connection.setLocalDescription(offer);
+          await this._sendDescription(connection, offer);
+        } catch (err) {
+          this._lockAndAbort(connection, err);
         }
-      });
-      const proxyStream = new import_node_stream3.Writable({
-        write: (chunk, _, callback) => {
-          const then = performance.now();
-          this._options.bridgeService.sendData({
-            proxyId: this._proxyId,
-            payload: chunk
+      },
+      // When ICE candidate identified (should be sent to remote peer) and when ICE gathering finalized.
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/icecandidate_event
+      onicecandidate: async (event) => {
+        if (connection !== this._connection) {
+          this._onConnectionCallbackAfterClose("onicecandidate", connection);
+          return;
+        }
+        if (event.candidate) {
+          (0, import_log9.log)("onicecandidate", {
+            candidate: event.candidate.candidate
           }, {
-            timeout: RPC_TIMEOUT
-          }).then(() => {
-            if (performance.now() - then > RESP_MIN_THRESHOLD) {
-              (0, import_log14.log)("slow response, delaying callback", void 0, {
-                F: __dxlog_file15,
-                L: 90,
-                S: this,
-                C: (f, a) => f(...a)
-              });
-              (0, import_async11.scheduleTask)(this._ctx, () => callback(), RESP_MIN_THRESHOLD);
-            } else {
-              callback();
-            }
-            this._timeoutCount = 0;
-          }, (err) => {
-            if (err instanceof import_protocols8.TimeoutError || err.constructor.name === "TimeoutError") {
-              if (this._timeoutCount++ > TIMEOUT_THRESHOLD) {
-                throw new import_protocols8.TimeoutError(`too many timeouts (${this._timeoutCount} > ${TIMEOUT_THRESHOLD}`);
-              } else {
-                (0, import_log14.log)("timeout error, but still invoking callback", void 0, {
-                  F: __dxlog_file15,
-                  L: 102,
-                  S: this,
-                  C: (f, a) => f(...a)
-                });
-                callback();
-              }
-            } else {
-              import_log14.log.catch(err, void 0, {
-                F: __dxlog_file15,
-                L: 106,
-                S: this,
-                C: (f, a) => f(...a)
-              });
-            }
+            F: __dxlog_file11,
+            L: 156,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await this._sendIceCandidate(event.candidate);
+        } else {
+          (0, import_log9.log)("onicecandidate gathering complete", void 0, {
+            F: __dxlog_file11,
+            L: 159,
+            S: this,
+            C: (f, a) => f(...a)
           });
         }
-      });
-      proxyStream.on("error", (err) => {
-        (0, import_log14.log)("proxystream error", {
-          err
+      },
+      // When error occurs while performing ICE negotiations through a STUN or TURN server.
+      // It's ok for some candidates to fail if a working pair is eventually found.
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/icecandidateerror_event
+      onicecandidateerror: (event) => {
+        const { url, errorCode, errorText } = event;
+        iceCandidateErrors.push({
+          url,
+          errorCode,
+          errorText
+        });
+      },
+      // When possible error during ICE gathering.
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/iceconnectionstatechange_event
+      oniceconnectionstatechange: () => {
+        if (connection !== this._connection) {
+          this._onConnectionCallbackAfterClose("oniceconnectionstatechange", connection);
+          return;
+        }
+        (0, import_log9.log)("oniceconnectionstatechange", {
+          state: connection.iceConnectionState
         }, {
-          F: __dxlog_file15,
-          L: 114,
+          F: __dxlog_file11,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
-      });
-      this._options.stream.pipe(proxyStream);
-    }, (error) => import_log14.log.catch(error, void 0, {
-      F: __dxlog_file15,
-      L: 119,
-      S: this,
-      C: (f, a) => f(...a)
-    }));
+        if (connection.iceConnectionState === "failed") {
+          this._lockAndAbort(connection, createIceFailureError(iceCandidateErrors));
+        }
+      },
+      // When new track (or channel) is added.
+      // State: { new, connecting, connected, disconnected, failed, closed }
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/connectionstatechange_event
+      onconnectionstatechange: () => {
+        if (connection !== this._connection) {
+          if (connection.connectionState !== "closed" && connection.connectionState !== "failed") {
+            this._onConnectionCallbackAfterClose("onconnectionstatechange", connection);
+          }
+          return;
+        }
+        (0, import_log9.log)("onconnectionstatechange", {
+          state: connection.connectionState
+        }, {
+          F: __dxlog_file11,
+          L: 196,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (connection.connectionState === "failed") {
+          this._lockAndAbort(connection, new Error("Connection failed."));
+        }
+      },
+      onsignalingstatechange: () => {
+        (0, import_log9.log)("onsignalingstatechange", {
+          state: connection.signalingState
+        }, {
+          F: __dxlog_file11,
+          L: 203,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      },
+      // When channel is added to connection.
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/datachannel_event
+      ondatachannel: (event) => {
+        (0, import_invariant9.invariant)(!this._initiator, "Initiator is expected to create data channels.", {
+          F: __dxlog_file11,
+          L: 209,
+          S: this,
+          A: [
+            "!this._initiator",
+            "'Initiator is expected to create data channels.'"
+          ]
+        });
+        if (connection !== this._connection) {
+          this._onConnectionCallbackAfterClose("ondatachannel", connection);
+          return;
+        }
+        (0, import_log9.log)("ondatachannel", {
+          label: event.channel.label
+        }, {
+          F: __dxlog_file11,
+          L: 216,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._dataChannels.set(event.channel.label, event.channel);
+        const pendingCallback = this._channelCreatedCallbacks.get(event.channel.label);
+        if (pendingCallback) {
+          this._channelCreatedCallbacks.delete(event.channel.label);
+          pendingCallback.resolve(event.channel);
+        }
+      }
+    });
+    this._connection = connection;
+    this._readyForCandidates.reset();
+    await this._factory.initConnection(connection, {
+      initiator: this._initiator
+    });
+    return this._connection;
   }
-  async close() {
-    await this._ctx.dispose();
-    if (this._closed) {
-      return;
-    }
-    await this._serviceStream.close();
-    try {
-      await this._options.bridgeService.close({
-        proxyId: this._proxyId
+  _lockAndAbort(connection, error) {
+    this._abortConnection(connection, error);
+  }
+  _abortConnection(connection, error) {
+    if (connection !== this._connection) {
+      import_log9.log.error("attempted to abort an inactive connection", {
+        error
       }, {
-        timeout: RPC_TIMEOUT
-      });
-    } catch (err) {
-      import_log14.log.catch(err, void 0, {
-        F: __dxlog_file15,
-        L: 134,
+        F: __dxlog_file11,
+        L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
+      this._safeCloseConnection(connection);
+      return;
     }
-    this.closed.emit();
-    this._closed = true;
-  }
-  async onSignal(signal) {
-    this._options.bridgeService.sendSignal({
-      proxyId: this._proxyId,
-      signal
-    }, {
-      timeout: RPC_TIMEOUT
-    }).catch((err) => this.errors.raise(decodeError(err)));
-  }
-  async _handleConnection(connectionEvent) {
-    if (connectionEvent.error) {
-      this.errors.raise(decodeError(connectionEvent.error));
+    for (const [topic, pendingCallback] of this._channelCreatedCallbacks.entries()) {
+      pendingCallback.reject(error);
+      this._transportChannels.delete(topic);
     }
-    switch (connectionEvent.state) {
-      case import_bridge2.ConnectionState.CONNECTED: {
-        this.connected.emit();
-        break;
-      }
-      case import_bridge2.ConnectionState.CLOSED: {
-        await this.close();
-        break;
-      }
+    this._channelCreatedCallbacks.clear();
+    for (const channel of this._transportChannels.values()) {
+      channel.onConnectionError(error);
     }
-  }
-  _handleData(dataEvent) {
-    this._options.stream.write((0, import_util10.arrayToBuffer)(dataEvent.payload));
-  }
-  async _handleSignal(signalEvent) {
-    await this._options.sendSignal(signalEvent.payload);
-  }
-  async getDetails() {
-    return (await this._options.bridgeService.getDetails({
-      proxyId: this._proxyId
-    }, {
-      timeout: RPC_TIMEOUT
-    })).details;
-  }
-  async getStats() {
-    return (await this._options.bridgeService.getStats({
-      proxyId: this._proxyId
+    this._transportChannels.clear();
+    this._safeCloseConnection();
+    (0, import_log9.log)("connection aborted", {
+      reason: error.message
     }, {
-      timeout: RPC_TIMEOUT
-    })).stats;
-  }
-  /**
-  * Called when underlying proxy service becomes unavailable.
-  */
-  // TODO(burdon): Option on close method.
-  forceClose() {
-    void this._serviceStream.close();
-    this.closed.emit();
-    this._closed = true;
-  }
-};
-var SimplePeerTransportProxyFactory = class {
-  constructor() {
-    this._connections = /* @__PURE__ */ new Set();
-  }
-  /**
-  * Sets the current BridgeService to be used to open connections.
-  * Calling this method will close any existing connections.
-  */
-  setBridgeService(bridgeService) {
-    this._bridgeService = bridgeService;
-    for (const connection of this._connections) {
-      connection.forceClose();
-    }
-    return this;
-  }
-  createTransport(options) {
-    (0, import_invariant12.invariant)(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
-      F: __dxlog_file15,
-      L: 218,
+      F: __dxlog_file11,
+      L: 255,
       S: this,
-      A: [
-        "this._bridgeService",
-        "'SimplePeerTransportProxyFactory is not ready to open connections'"
-      ]
-    });
-    const transport = new SimplePeerTransportProxy({
-      ...options,
-      bridgeService: this._bridgeService
+      C: (f, a) => f(...a)
     });
-    this._connections.add(transport);
-    transport.closed.on(() => this._connections.delete(transport));
-    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;
-  }
-};
-function _ts_decorate7(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_file16 = "/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;
-var createLibDataChannelTransportFactory = (webrtcConfig, iceProvider) => {
-  return {
-    createTransport: (options) => new LibDataChannelTransport({
-      ...options,
-      webrtcConfig,
-      iceProvider
-    })
-  };
-};
-var LibDataChannelTransport = class _LibDataChannelTransport {
-  static {
-    this._instanceCount = 0;
-  }
-  constructor(_options) {
-    this._options = _options;
-    this._closed = false;
-    this._connected = false;
-    this._writeCallback = null;
-    this._readyForCandidates = new import_async12.Trigger();
-    this.closed = new import_async12.Event();
-    this.connected = new import_async12.Event();
-    this.errors = new import_debug7.ErrorStream();
-  }
-  get isOpen() {
-    return !!this._peer && !this._closed;
-  }
-  async open() {
-    if (this._closed) {
-      this.errors.raise(new Error("connection already closed"));
-    }
-    const { RTCPeerConnection } = (await importESM("node-datachannel/polyfill")).default;
-    const providedIceServers = await this._options.iceProvider?.getIceServers();
-    if (!this._options.webrtcConfig) {
-      this._options.webrtcConfig = {};
-    }
-    this._options.webrtcConfig.iceServers = [
-      ...this._options.webrtcConfig.iceServers ?? [],
-      ...providedIceServers ?? []
-    ];
-    this._peer = new RTCPeerConnection(this._options.webrtcConfig);
-    this._peer.onicecandidateerror = (event) => {
-      import_log15.log.error("peer.onicecandidateerror", {
-        event
-      }, {
-        F: __dxlog_file16,
-        L: 93,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    };
-    this._peer.onconnectionstatechange = (event) => {
-      import_log15.log.debug("peer.onconnectionstatechange", {
-        event,
-        peerConnectionState: this._peer?.connectionState,
-        transportConnectionState: this._connected
-      }, {
-        F: __dxlog_file16,
-        L: 97,
+  _lockAndCloseConnection() {
+    (0, import_invariant9.invariant)(this._transportChannels.size === 0, void 0, {
+      F: __dxlog_file11,
+      L: 260,
+      S: this,
+      A: [
+        "this._transportChannels.size === 0",
+        ""
+      ]
+    });
+    if (this._connection) {
+      this._safeCloseConnection();
+      (0, import_log9.log)("connection closed", void 0, {
+        F: __dxlog_file11,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
-    };
-    this._peer.onicecandidate = async (event) => {
-      import_log15.log.debug("peer.onicecandidate", {
-        event
+    }
+  }
+  async onSignal(signal) {
+    const connection = this._connection;
+    if (!connection) {
+      import_log9.log.warn("a signal ignored because the connection was closed", {
+        type: signal.payload.data.type
       }, {
-        F: __dxlog_file16,
-        L: 107,
+        F: __dxlog_file11,
+        L: 271,
         S: this,
         C: (f, a) => f(...a)
       });
-      if (event.candidate) {
-        try {
-          await this._options.sendSignal({
-            payload: {
-              data: {
-                type: "candidate",
-                candidate: {
-                  candidate: event.candidate.candidate,
-                  // These fields never seem to be not null, but connecting to Chrome doesn't work if they are.
-                  sdpMLineIndex: event.candidate.sdpMLineIndex ?? 0,
-                  sdpMid: event.candidate.sdpMid ?? 0
-                }
-              }
-            }
-          });
-        } catch (err) {
-          import_log15.log.info("signaling error", {
-            err
-          }, {
-            F: __dxlog_file16,
-            L: 124,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        }
+      return;
+    }
+    const data = signal.payload.data;
+    switch (data.type) {
+      case "offer": {
+        await this._offerProcessingMutex.executeSynchronized(async () => {
+          if (isRemoteDescriptionSet(connection, data)) {
+            return;
+          }
+          if (connection.connectionState !== "new") {
+            this._abortConnection(connection, new Error(`Received an offer in ${connection.connectionState}.`));
+            return;
+          }
+          try {
+            await connection.setRemoteDescription({
+              type: data.type,
+              sdp: data.sdp
+            });
+            const answer = await connection.createAnswer();
+            await connection.setLocalDescription(answer);
+            await this._sendDescription(connection, answer);
+            this._onSessionNegotiated(connection);
+          } catch (err) {
+            this._abortConnection(connection, new Error("Error handling a remote offer.", {
+              cause: err
+            }));
+          }
+        });
+        break;
       }
-    };
-    if (this._options.initiator) {
-      (0, import_invariant13.invariant)(this._peer, "not open", {
-        F: __dxlog_file16,
-        L: 130,
-        S: this,
-        A: [
-          "this._peer",
-          "'not open'"
-        ]
-      });
-      this._peer.createOffer().then(async (offer) => {
-        if (this._closed) {
-          return;
-        }
-        if (this._peer?.connectionState !== "connecting") {
-          import_log15.log.error("peer not connecting", {
-            peer: this._peer
-          }, {
-            F: __dxlog_file16,
-            L: 141,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          this.errors.raise(new Error("invalid state: peer is initiator, but other peer not in state connecting"));
-        }
-        import_log15.log.debug("creating offer", {
-          peer: this._peer,
-          offer
+      case "answer":
+        await this._offerProcessingMutex.executeSynchronized(async () => {
+          try {
+            if (isRemoteDescriptionSet(connection, data)) {
+              return;
+            }
+            if (connection.signalingState !== "have-local-offer") {
+              this._abortConnection(connection, new Error(`Unexpected answer from remote peer, signalingState was ${connection.signalingState}.`));
+              return;
+            }
+            await connection.setRemoteDescription({
+              type: data.type,
+              sdp: data.sdp
+            });
+            this._onSessionNegotiated(connection);
+          } catch (err) {
+            this._abortConnection(connection, new Error("Error handling a remote answer.", {
+              cause: err
+            }));
+          }
+        });
+        break;
+      case "candidate":
+        void this._processIceCandidate(connection, data.candidate);
+        break;
+      default:
+        this._abortConnection(connection, new Error(`Unknown signal type ${data.type}.`));
+        break;
+    }
+    (0, import_log9.log)("signal processed", void 0, {
+      F: __dxlog_file11,
+      L: 330,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  async _processIceCandidate(connection, candidate) {
+    try {
+      await this._readyForCandidates.wait();
+      if (connection === this._connection) {
+        (0, import_log9.log)("adding ice candidate", {
+          candidate
         }, {
-          F: __dxlog_file16,
-          L: 145,
+          F: __dxlog_file11,
+          L: 338,
           S: this,
           C: (f, a) => f(...a)
         });
-        await this._peer.setLocalDescription(offer);
-        await this._options.sendSignal({
-          payload: {
-            data: {
-              type: offer.type,
-              sdp: offer.sdp
-            }
-          }
-        });
-      }).catch((err) => {
-        this.errors.raise(err);
+        await connection.addIceCandidate(candidate);
+      }
+    } catch (err) {
+      import_log9.log.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 342,
+        S: this,
+        C: (f, a) => f(...a)
       });
-      this._handleChannel(this._peer.createDataChannel(DATACHANNEL_LABEL));
-      import_log15.log.debug("created data channel", void 0, {
-        F: __dxlog_file16,
-        L: 155,
+    }
+  }
+  _onSessionNegotiated(connection) {
+    if (connection === this._connection) {
+      (0, import_log9.log)("ready to process ice candidates", void 0, {
+        F: __dxlog_file11,
+        L: 348,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._peer.ondatachannel = () => {
-        this.errors.raise(new Error("unexpected ondatachannel event for initiator"));
-      };
+      this._readyForCandidates.wake();
     } else {
-      this._peer.ondatachannel = (event) => {
-        import_log15.log.debug("peer.ondatachannel (non-initiator)", {
-          event
-        }, {
-          F: __dxlog_file16,
-          L: 161,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        if (event.channel.label !== DATACHANNEL_LABEL) {
-          this.errors.raise(new Error(`unexpected channel label ${event.channel.label}`));
-        }
-        this._handleChannel(event.channel);
-      };
+      import_log9.log.warn("session was negotiated after connection became inactive", void 0, {
+        F: __dxlog_file11,
+        L: 351,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     }
-    _LibDataChannelTransport._instanceCount++;
   }
-  async close() {
-    await this._close();
-    if (--_LibDataChannelTransport._instanceCount === 0) {
-      (await importESM("node-datachannel")).cleanup();
-    }
+  _onConnectionCallbackAfterClose(callback, connection) {
+    import_log9.log.warn("callback invoked after a connection was destroyed, this is probably a bug", {
+      callback,
+      state: connection.connectionState
+    }, {
+      F: __dxlog_file11,
+      L: 356,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._safeCloseConnection(connection);
   }
-  async _close() {
-    if (this._closed) {
-      return;
-    }
-    await this._disconnectStreams();
+  _safeCloseConnection(connection = this._connection) {
+    const resetFields = this._connection && connection === this._connection;
     try {
-      this._peer?.close();
+      connection?.close();
     } catch (err) {
-      this.errors.raise(err);
+      import_log9.log.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 368,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    if (resetFields) {
+      this._connection = void 0;
+      this._dataChannels.clear();
+      this._readyForCandidates.wake();
+      void this._factory.onConnectionDestroyed().catch((err) => import_log9.log.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 374,
+        S: this,
+        C: (f, a) => f(...a)
+      }));
+      for (const [_, pendingCallback] of this._channelCreatedCallbacks.entries()) {
+        pendingCallback.reject("Connection closed.");
+      }
+      this._channelCreatedCallbacks.clear();
     }
-    this._peer = void 0;
-    this._closed = true;
-    this.closed.emit();
   }
-  /**
-  * Handle data channel events.
-  */
-  _handleChannel(dataChannel) {
-    this._channel = dataChannel;
-    this._channel.onopen = () => {
-      import_log15.log.debug("channel.onopen", void 0, {
-        F: __dxlog_file16,
-        L: 206,
+  async _loadConnectionConfig() {
+    const config = {
+      ...this._options.webrtcConfig
+    };
+    try {
+      const providedIceServers = await this._options.iceProvider?.getIceServers() ?? [];
+      if (providedIceServers.length > 0) {
+        config.iceServers = [
+          ...config.iceServers ?? [],
+          ...providedIceServers
+        ];
+      }
+    } catch (error) {
+      import_log9.log.catch(error, void 0, {
+        F: __dxlog_file11,
+        L: 390,
         S: this,
         C: (f, a) => f(...a)
       });
-      const duplex = new import_stream.Duplex({
-        read: () => {
-        },
-        write: async (chunk, encoding, callback) => {
-          if (chunk.length > MAX_MESSAGE_SIZE) {
-            this.errors.raise(new Error(`message too large: ${chunk.length} > ${MAX_MESSAGE_SIZE}`));
-          }
-          try {
-            dataChannel.send(chunk);
-          } catch (err) {
-            this.errors.raise(err);
-            await this._close();
-          }
-          if (this._channel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
-            if (this._writeCallback !== null) {
-              import_log15.log.error("consumer trying to write before we are ready for more data", void 0, {
-                F: __dxlog_file16,
-                L: 223,
-                S: this,
-                C: (f, a) => f(...a)
-              });
+    }
+    return config;
+  }
+  async _sendIceCandidate(candidate) {
+    try {
+      await this._options.sendSignal({
+        payload: {
+          data: {
+            type: "candidate",
+            candidate: {
+              candidate: candidate.candidate,
+              // These fields never seem to be not null, but connecting to Chrome doesn't work if they are.
+              sdpMLineIndex: candidate.sdpMLineIndex ?? "0",
+              sdpMid: candidate.sdpMid ?? "0"
             }
-            this._writeCallback = callback;
-          } else {
-            callback();
           }
         }
       });
-      duplex.pipe(this._options.stream).pipe(duplex);
-      this._stream = duplex;
-      this._connected = true;
-      this.connected.emit();
-    };
-    this._channel.onclose = async (err) => {
-      import_log15.log.info("channel.onclose", {
+    } catch (err) {
+      import_log9.log.warn("signaling error", {
         err
       }, {
-        F: __dxlog_file16,
-        L: 239,
+        F: __dxlog_file11,
+        L: 411,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this._close();
+    }
+  }
+  async _sendDescription(connection, description) {
+    if (connection !== this._connection) {
+      return;
+    }
+    const data = {
+      type: description.type,
+      sdp: description.sdp
     };
-    this._channel.onerror = async (err) => {
-      this.errors.raise(new Error("channel error: " + err.toString()));
-      await this._close();
+    await this._options.sendSignal({
+      payload: {
+        data
+      }
+    });
+  }
+  get _connectionInfo() {
+    const connectionInfo = this._connection && {
+      connectionState: this._connection.connectionState,
+      iceConnectionState: this._connection.iceConnectionState,
+      iceGatheringState: this._connection.iceGatheringState,
+      signalingState: this._connection.signalingState,
+      remoteDescription: this._connection.remoteDescription,
+      localDescription: this._connection.localDescription
     };
-    this._channel.onbufferedamountlow = () => {
-      const cb = this._writeCallback;
-      this._writeCallback = null;
-      cb?.();
+    return {
+      ...connectionInfo,
+      ts: Date.now(),
+      remotePeerKey: this._options.remotePeerKey,
+      channels: [
+        ...this._transportChannels.keys()
+      ].map((topic) => topic),
+      config: this._connection?.getConfiguration()
     };
-    this._channel.onmessage = (event) => {
-      let data = event.data;
-      if (data instanceof ArrayBuffer) {
-        data = Buffer.from(data);
-      }
-      this._stream.push(data);
+  }
+  get _loggerContext() {
+    return {
+      ownPeerKey: this._options.ownPeerKey,
+      remotePeerKey: this._options.remotePeerKey,
+      initiator: this._initiator,
+      channels: this._transportChannels.size
     };
   }
-  async onSignal(signal) {
-    (0, import_invariant13.invariant)(this._peer, "not open", {
-      F: __dxlog_file16,
-      L: 265,
-      S: this,
-      A: [
-        "this._peer",
-        "'not open'"
-      ]
-    });
+};
+_ts_decorate6([
+  import_async10.synchronized
+], RtcPeerConnection.prototype, "_openConnection", null);
+_ts_decorate6([
+  import_async10.synchronized
+], RtcPeerConnection.prototype, "_lockAndAbort", null);
+_ts_decorate6([
+  import_async10.synchronized
+], RtcPeerConnection.prototype, "_lockAndCloseConnection", null);
+_ts_decorate6([
+  import_async10.synchronized
+], RtcPeerConnection.prototype, "onSignal", null);
+_ts_decorate6([
+  import_tracing.trace.info()
+], RtcPeerConnection.prototype, "_connectionInfo", null);
+_ts_decorate6([
+  import_log9.logInfo
+], RtcPeerConnection.prototype, "_loggerContext", null);
+RtcPeerConnection = _ts_decorate6([
+  import_tracing.trace.resource()
+], RtcPeerConnection);
+var isRemoteDescriptionSet = (connection, data) => {
+  if (!connection.remoteDescription?.type || connection.remoteDescription?.type !== data.type) {
+    return false;
+  }
+  return areSdpEqual(connection.remoteDescription.sdp, data.sdp);
+};
+var createIceFailureError = (details) => {
+  const candidateErrors = details.map(({ url, errorCode, errorText }) => `${errorCode} ${url}: ${errorText}`);
+  return new import_protocols7.ConnectivityError(`ICE failed:
+${candidateErrors.join("\n")}`);
+};
+var createRtcTransportFactory = (webrtcConfig, iceProvider) => {
+  const connectionFactory = getRtcConnectionFactory();
+  return {
+    createTransport: (options) => {
+      const connection = new RtcPeerConnection(connectionFactory, {
+        ownPeerKey: options.ownPeerKey,
+        remotePeerKey: options.remotePeerKey,
+        sendSignal: options.sendSignal,
+        webrtcConfig,
+        iceProvider
+      });
+      return connection.createTransportChannel(options);
+    }
+  };
+};
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-proxy.ts";
+var RPC_TIMEOUT = 1e4;
+var CLOSE_RPC_TIMEOUT = 3e3;
+var RESP_MIN_THRESHOLD = 500;
+var RtcTransportProxy = class extends import_context7.Resource {
+  constructor(_options) {
+    super();
+    this._options = _options;
+    this._proxyId = import_keys10.PublicKey.random();
+    this.closed = new import_async12.Event();
+    this.connected = new import_async12.Event();
+    this.errors = new import_debug6.ErrorStream();
+  }
+  async _open() {
+    let stream;
     try {
-      const data = signal.payload.data;
-      switch (data.type) {
-        case "offer": {
-          if (this._peer.connectionState !== "new") {
-            import_log15.log.error("received offer but peer not in state new", {
-              peer: this._peer
-            }, {
-              F: __dxlog_file16,
-              L: 272,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            this.errors.raise(new Error("invalid signalling state: received offer when peer is not in state new"));
-            break;
-          }
-          try {
-            await this._peer.setRemoteDescription({
-              type: data.type,
-              sdp: data.sdp
-            });
-            const answer = await this._peer.createAnswer();
-            await this._peer.setLocalDescription(answer);
-            await this._options.sendSignal({
-              payload: {
-                data: {
-                  type: answer.type,
-                  sdp: answer.sdp
-                }
-              }
-            });
-            this._readyForCandidates.wake();
-          } catch (err) {
-            import_log15.log.error("cannot handle offer from signalling server", {
-              err
-            }, {
-              F: __dxlog_file16,
-              L: 284,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            this.errors.raise(new Error("error handling offer"));
-          }
-          break;
+      stream = this._options.bridgeService.open({
+        proxyId: this._proxyId,
+        remotePeerKey: this._options.remotePeerKey,
+        ownPeerKey: this._options.ownPeerKey,
+        topic: this._options.topic,
+        initiator: this._options.initiator ?? false
+      }, {
+        timeout: RPC_TIMEOUT
+      });
+    } catch (error) {
+      this.errors.raise(error);
+      return;
+    }
+    this._serviceStream = stream;
+    stream.waitUntilReady().then(() => {
+      stream.subscribe(async (event) => {
+        (0, import_log11.log)("rtc transport proxy event", event, {
+          F: __dxlog_file12,
+          L: 66,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (event.connection) {
+          await this._handleConnection(event.connection);
+        } else if (event.data) {
+          this._handleData(event.data);
+        } else if (event.signal) {
+          await this._handleSignal(event.signal);
         }
-        case "answer":
-          try {
-            await this._peer.setRemoteDescription({
-              type: data.type,
-              sdp: data.sdp
-            });
-            this._readyForCandidates.wake();
-          } catch (err) {
-            import_log15.log.error("cannot handle answer from signalling server", {
-              err
-            }, {
-              F: __dxlog_file16,
-              L: 295,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            this.errors.raise(new Error("error handling answer"));
-          }
-          break;
-        case "candidate":
-          await this._readyForCandidates.wait();
-          await this._peer.addIceCandidate({
-            candidate: data.candidate.candidate
-          });
-          break;
-        default:
-          import_log15.log.error("unhandled signal type", {
-            type: data.type,
-            signal
+      }, (err) => {
+        (0, import_log11.log)("rtc bridge stream closed", {
+          err
+        }, {
+          F: __dxlog_file12,
+          L: 76,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (err) {
+          this._raiseIfOpen(err);
+        } else {
+          void this.close();
+        }
+      });
+      const connectorStream = new import_node_stream3.Writable({
+        write: (chunk, _, callback) => {
+          const sendStartMs = Date.now();
+          this._options.bridgeService.sendData({
+            proxyId: this._proxyId,
+            payload: chunk
           }, {
-            F: __dxlog_file16,
-            L: 306,
-            S: this,
-            C: (f, a) => f(...a)
+            timeout: RPC_TIMEOUT
+          }).then(() => {
+            if (Date.now() - sendStartMs > RESP_MIN_THRESHOLD) {
+              (0, import_log11.log)("slow response, delaying callback", void 0, {
+                F: __dxlog_file12,
+                L: 93,
+                S: this,
+                C: (f, a) => f(...a)
+              });
+              (0, import_async12.scheduleTask)(this._ctx, () => callback(), RESP_MIN_THRESHOLD);
+            } else {
+              callback();
+            }
+          }, (err) => {
+            callback();
+            this._raiseIfOpen(err);
           });
-          this.errors.raise(new Error(`unhandled signal type ${data.type}`));
+        }
+      });
+      connectorStream.on("error", (err) => {
+        this._raiseIfOpen(err);
+      });
+      this._options.stream.pipe(connectorStream);
+    }, (error) => {
+      if (error) {
+        this._raiseIfOpen(error);
+      } else {
+        void this.close();
       }
+    });
+  }
+  async _close() {
+    try {
+      await this._serviceStream?.close();
+      this._serviceStream = void 0;
+    } catch (err) {
+      import_log11.log.catch(err, void 0, {
+        F: __dxlog_file12,
+        L: 128,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    try {
+      await this._options.bridgeService.close({
+        proxyId: this._proxyId
+      }, {
+        timeout: CLOSE_RPC_TIMEOUT
+      });
     } catch (err) {
-      import_log15.log.catch(err, void 0, {
-        F: __dxlog_file16,
-        L: 310,
+      import_log11.log.catch(err, void 0, {
+        F: __dxlog_file12,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
     }
+    this.closed.emit();
   }
-  async getDetails() {
-    const stats = await this._getStats();
-    const rc = stats?.remoteCandidate;
-    if (!rc) {
-      return "unavailable";
+  async onSignal(signal) {
+    this._options.bridgeService.sendSignal({
+      proxyId: this._proxyId,
+      signal
+    }, {
+      timeout: RPC_TIMEOUT
+    }).catch((err) => this._raiseIfOpen(decodeError(err)));
+  }
+  async _handleConnection(connectionEvent) {
+    if (connectionEvent.error) {
+      this.errors.raise(decodeError(connectionEvent.error));
+      return;
+    }
+    switch (connectionEvent.state) {
+      case import_bridge.ConnectionState.CONNECTED: {
+        this.connected.emit();
+        break;
+      }
+      case import_bridge.ConnectionState.CLOSED: {
+        await this.close();
+        break;
+      }
+    }
+  }
+  _handleData(dataEvent) {
+    try {
+      this._options.stream.write((0, import_util8.arrayToBuffer)(dataEvent.payload));
+    } catch (error) {
+      this._raiseIfOpen(error);
+    }
+  }
+  async _handleSignal(signalEvent) {
+    try {
+      await this._options.sendSignal(signalEvent.payload);
+    } catch (error) {
+      const type = signalEvent.payload.payload.data?.type;
+      if (type === "offer" || type === "answer") {
+        this._raiseIfOpen(new import_protocols9.ConnectivityError(`Session establishment failed: ${type} couldn't be sent.`));
+      }
     }
-    if (rc.candidateType === "relay") {
-      return `${rc.ip}:${rc.port} relay for ${rc.relatedAddress}:${rc.relatedPort}`;
+  }
+  async getDetails() {
+    try {
+      const response = await this._options.bridgeService.getDetails({
+        proxyId: this._proxyId
+      }, {
+        timeout: RPC_TIMEOUT
+      });
+      return response.details;
+    } catch (err) {
+      return "bridge-svc unreachable";
     }
-    return `${rc.ip}:${rc.port} ${rc.candidateType}`;
   }
   async getStats() {
-    const stats = await this._getStats();
-    if (!stats) {
+    try {
+      const response = await this._options.bridgeService.getStats({
+        proxyId: this._proxyId
+      }, {
+        timeout: RPC_TIMEOUT
+      });
+      return response.stats;
+    } catch (err) {
       return {
         bytesSent: 0,
         bytesReceived: 0,
         packetsSent: 0,
         packetsReceived: 0,
-        rawStats: {}
+        rawStats: "bridge-svc unreachable"
       };
     }
-    return {
-      bytesSent: stats.transport.bytesSent,
-      bytesReceived: stats.transport.bytesReceived,
-      packetsSent: 0,
-      packetsReceived: 0,
-      rawStats: stats.raw
-    };
   }
-  async _getStats() {
-    (0, import_invariant13.invariant)(this._peer, "not open", {
-      F: __dxlog_file16,
-      L: 350,
+  _raiseIfOpen(error) {
+    if (this.isOpen) {
+      this.errors.raise(error);
+    } else {
+      import_log11.log.info("error swallowed because transport was closed", {
+        message: error.message
+      }, {
+        F: __dxlog_file12,
+        L: 215,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  /**
+  * Called when underlying proxy service becomes unavailable.
+  */
+  forceClose() {
+    void this._serviceStream?.close();
+    this.closed.emit();
+  }
+};
+var RtcTransportProxyFactory = class {
+  constructor() {
+    this._connections = /* @__PURE__ */ new Set();
+  }
+  /**
+  * Sets the current BridgeService to be used to open connections.
+  * Calling this method will close any existing connections.
+  */
+  setBridgeService(bridgeService) {
+    this._bridgeService = bridgeService;
+    for (const connection of this._connections) {
+      connection.forceClose();
+    }
+    return this;
+  }
+  createTransport(options) {
+    (0, import_invariant11.invariant)(this._bridgeService, "RtcTransportProxyFactory is not ready to open connections", {
+      F: __dxlog_file12,
+      L: 245,
       S: this,
       A: [
-        "this._peer",
-        "'not open'"
+        "this._bridgeService",
+        "'RtcTransportProxyFactory is not ready to open connections'"
       ]
     });
-    const stats = await this._peer.getStats();
-    const statsEntries = Array.from(stats.entries());
-    const transport = statsEntries.filter((s) => s[1].type === "transport")[0][1];
-    const candidatePair = statsEntries.filter((s) => s[0] === transport.selectedCandidatePairId);
-    let selectedCandidatePair;
-    let remoteCandidate;
-    if (candidatePair.length > 0) {
-      selectedCandidatePair = candidatePair[0][1];
-      remoteCandidate = statsEntries.filter((s) => s[0] === selectedCandidatePair.remoteCandidateId)[0][1];
-    }
-    return {
-      transport,
-      selectedCandidatePair,
-      remoteCandidate,
-      raw: Object.fromEntries(stats)
-    };
-  }
-  async _disconnectStreams() {
-    this._options.stream.unpipe?.(this._stream)?.unpipe?.(this._options.stream);
+    const transport = new RtcTransportProxy({
+      ...options,
+      bridgeService: this._bridgeService
+    });
+    this._connections.add(transport);
+    transport.closed.on(() => this._connections.delete(transport));
+    return transport;
   }
 };
-_ts_decorate7([
-  import_async12.synchronized
-], LibDataChannelTransport.prototype, "_close", null);
-var importESM = Function("path", "return import(path)");
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/tcp-transport.ts";
-var TcpTransportFactory = {
-  createTransport: (options) => new TcpTransport(options)
+var decodeError = (err) => {
+  const message = typeof err === "string" ? err : err.message;
+  if (message.includes("CONNECTION_RESET")) {
+    return new import_protocols9.ConnectionResetError(message);
+  } else if (message.includes("TIMEOUT")) {
+    return new import_protocols9.TimeoutError(message);
+  } else if (message.includes("CONNECTIVITY_ERROR")) {
+    return new import_protocols9.ConnectivityError(message);
+  } else {
+    return typeof err === "string" ? new Error(err) : err;
+  }
 };
-var TcpTransport = class {
-  constructor(options) {
-    this.options = options;
-    this._server = void 0;
-    this._socket = void 0;
-    this._connected = false;
-    this._closed = false;
-    this.closed = new import_async13.Event();
-    this.connected = new import_async13.Event();
-    this.errors = new import_debug8.ErrorStream();
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-service.ts";
+var RtcTransportService = class {
+  constructor(webrtcConfig, iceProvider, _transportFactory = createRtcTransportFactory(webrtcConfig, iceProvider)) {
+    this._transportFactory = _transportFactory;
+    this._openTransports = new import_util9.ComplexMap(import_keys11.PublicKey.hash);
   }
-  get isOpen() {
-    return this._connected && !this._closed;
+  hasOpenTransports() {
+    return this._openTransports.size > 0;
   }
-  async open() {
-    (0, import_log16.log)("opening", void 0, {
-      F: __dxlog_file17,
-      L: 39,
-      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_log16.log)("new connection", void 0, {
-            F: __dxlog_file17,
-            L: 47,
-            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_log16.log)("listening", {
-            port
-          }, {
-            F: __dxlog_file17,
-            L: 56,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          void this.options.sendSignal({
-            payload: {
-              port
+  open(request) {
+    const existingTransport = this._openTransports.get(request.proxyId);
+    if (existingTransport) {
+      import_log12.log.error("requesting a new transport bridge for an existing proxy", void 0, {
+        F: __dxlog_file13,
+        L: 53,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      void this._safeCloseTransport(existingTransport);
+      this._openTransports.delete(request.proxyId);
+    }
+    return new import_codec_protobuf.Stream(({ ready, next, close }) => {
+      const pushNewState = createStateUpdater(next);
+      const transportStream = new import_node_stream4.Duplex({
+        read: () => {
+          const callbacks = [
+            ...transportState.writeProcessedCallbacks
+          ];
+          transportState.writeProcessedCallbacks.length = 0;
+          callbacks.forEach((cb) => cb());
+        },
+        write: function(chunk, _, callback) {
+          next({
+            data: {
+              payload: chunk
             }
-          }).catch((err) => {
-            if (!this._closed) {
-              this.errors.raise(err);
+          });
+          callback();
+        }
+      });
+      const transport = this._transportFactory.createTransport({
+        initiator: request.initiator,
+        topic: request.topic,
+        ownPeerKey: request.ownPeerKey,
+        remotePeerKey: request.remotePeerKey,
+        stream: transportStream,
+        sendSignal: async (signal) => {
+          next({
+            signal: {
+              payload: signal
             }
           });
-        });
-        this._server.on("error", (err) => {
-          this.errors.raise(err);
-        });
-        this._server.listen(0);
+        }
       });
-    }
+      const transportState = {
+        proxyId: request.proxyId,
+        transport,
+        connectorStream: transportStream,
+        writeProcessedCallbacks: []
+      };
+      pushNewState(import_bridge2.ConnectionState.CONNECTING);
+      transport.connected.on(() => pushNewState(import_bridge2.ConnectionState.CONNECTED));
+      transport.errors.handle(async (err) => {
+        pushNewState(import_bridge2.ConnectionState.CLOSED, err);
+        void this._safeCloseTransport(transportState);
+        close(err);
+      });
+      transport.closed.on(async () => {
+        pushNewState(import_bridge2.ConnectionState.CLOSED);
+        void this._safeCloseTransport(transportState);
+        close();
+      });
+      this._openTransports.set(request.proxyId, transportState);
+      transport.open().catch(async (err) => {
+        pushNewState(import_bridge2.ConnectionState.CLOSED, err);
+        void this._safeCloseTransport(transportState);
+        close(err);
+      });
+      ready();
+    });
   }
-  async close() {
-    (0, import_log16.log)("closing", void 0, {
-      F: __dxlog_file17,
-      L: 78,
+  async sendSignal({ proxyId, signal }) {
+    const transport = this._openTransports.get(proxyId);
+    (0, import_invariant12.invariant)(transport, void 0, {
+      F: __dxlog_file13,
+      L: 121,
       S: this,
-      C: (f, a) => f(...a)
+      A: [
+        "transport",
+        ""
+      ]
     });
-    this._socket?.destroy();
-    this._server?.close();
-    this._closed = true;
+    await transport.transport.onSignal(signal);
   }
-  async onSignal({ payload }) {
-    (0, import_log16.log)("received signal", {
-      payload
-    }, {
-      F: __dxlog_file17,
-      L: 85,
+  async getDetails({ proxyId }) {
+    const transport = this._openTransports.get(proxyId);
+    (0, import_invariant12.invariant)(transport, void 0, {
+      F: __dxlog_file13,
+      L: 128,
       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"
+      A: [
+        "transport",
+        ""
+      ]
     });
+    return {
+      details: await transport.transport.getDetails()
+    };
   }
-  async getDetails() {
-    if (this.options.initiator) {
-      const { port: port2, address: address2 } = this._server?.address();
-      return `LISTEN ${address2}:${port2}`;
-    }
-    const { port, address } = this._socket?.address();
-    return `ACCEPT ${address}:${port}`;
-  }
-  async getStats() {
+  async getStats({ proxyId }) {
+    const transport = this._openTransports.get(proxyId);
+    (0, import_invariant12.invariant)(transport, void 0, {
+      F: __dxlog_file13,
+      L: 135,
+      S: this,
+      A: [
+        "transport",
+        ""
+      ]
+    });
     return {
-      bytesSent: 0,
-      bytesReceived: 0,
-      packetsSent: 0,
-      packetsReceived: 0
+      stats: await transport.transport.getStats()
     };
   }
-  _handleSocket(socket) {
-    (0, import_log16.log)("handling socket", {
-      remotePort: socket.remotePort,
-      localPort: socket.localPort
-    }, {
-      F: __dxlog_file17,
-      L: 115,
+  async sendData({ proxyId, payload }) {
+    const transport = this._openTransports.get(proxyId);
+    (0, import_invariant12.invariant)(transport, void 0, {
+      F: __dxlog_file13,
+      L: 142,
       S: this,
-      C: (f, a) => f(...a)
+      A: [
+        "transport",
+        ""
+      ]
     });
-    this._socket = socket;
-    this._socket.on("connect", () => {
-      (0, import_log16.log)("connected to", {
-        port: this._socket?.remotePort
+    const bufferHasSpace = transport.connectorStream.push(payload);
+    if (!bufferHasSpace) {
+      await new Promise((resolve) => {
+        transport.writeProcessedCallbacks.push(resolve);
+      });
+    }
+  }
+  async close({ proxyId }) {
+    const transport = this._openTransports.get(proxyId);
+    if (!transport) {
+      return;
+    }
+    this._openTransports.delete(proxyId);
+    await this._safeCloseTransport(transport);
+  }
+  async _safeCloseTransport(transport) {
+    if (this._openTransports.get(transport.proxyId) === transport) {
+      this._openTransports.delete(transport.proxyId);
+    }
+    transport.writeProcessedCallbacks.forEach((cb) => cb());
+    try {
+      await transport.transport.close();
+    } catch (error) {
+      import_log12.log.warn("transport close error", {
+        message: error?.message
       }, {
-        F: __dxlog_file17,
-        L: 119,
+        F: __dxlog_file13,
+        L: 172,
         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();
+    }
+    try {
+      transport.connectorStream.end();
+    } catch (error) {
+      import_log12.log.warn("connectorStream close error", {
+        message: error?.message
+      }, {
+        F: __dxlog_file13,
+        L: 177,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    (0, import_log12.log)("closed", void 0, {
+      F: __dxlog_file13,
+      L: 179,
+      S: this,
+      C: (f, a) => f(...a)
     });
-    this.connected.emit();
-    this.options.stream.pipe(this._socket).pipe(this.options.stream);
   }
 };
+var createStateUpdater = (next) => {
+  return (state, err) => {
+    next({
+      connection: {
+        state,
+        ...err ? {
+          error: err.message
+        } : void 0
+      }
+    });
+  };
+};
 var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   return (params) => {
     const teleport = new import_teleport.Teleport({
@@ -4282,26 +4012,18 @@ var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   ConnectionState,
   EventType,
   FullyConnectedTopology,
-  LibDataChannelTransport,
   MAX_CONCURRENT_INITIATING_CONNECTIONS,
-  MMSTTopology,
   MemoryTransport,
   MemoryTransportFactory,
-  SimplePeerTransport,
-  SimplePeerTransportProxy,
-  SimplePeerTransportProxyFactory,
-  SimplePeerTransportService,
-  StarTopology,
+  RtcTransportProxy,
+  RtcTransportProxyFactory,
+  RtcTransportService,
   Swarm,
   SwarmMapper,
   SwarmMessenger,
   SwarmNetworkManager,
-  TcpTransport,
-  TcpTransportFactory,
   TransportKind,
-  createIceProvider,
-  createLibDataChannelTransportFactory,
-  createSimplePeerTransportFactory,
+  createRtcTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-4YAYC7WN.cjs.map
+//# sourceMappingURL=chunk-4TTFBX3M.cjs.map