@dxos/network-manager 0.8.4-main.406dc2a → 0.8.4-main.422d1c7879

package/dist/lib/browser/{chunk-NRRQ4H6U.mjs → chunk-Y2FDDNGM.mjs}

@@ -8,19 +8,6 @@ import { invariant } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log, logInfo } from "@dxos/log";
 import { CancelledError, ConnectionResetError, ConnectivityError, ProtocolError, TimeoutError, trace } from "@dxos/protocols";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -44,6 +31,61 @@ var ConnectionState = /* @__PURE__ */ (function(ConnectionState5) {
   return ConnectionState5;
 })({});
 var Connection = class {
+  topic;
+  localInfo;
+  remoteInfo;
+  sessionId;
+  initiator;
+  _signalMessaging;
+  _protocol;
+  _transportFactory;
+  _callbacks;
+  _ctx = new Context(void 0, {
+    F: __dxlog_file,
+    L: 100
+  });
+  connectedTimeoutContext = new Context(void 0, {
+    F: __dxlog_file,
+    L: 101
+  });
+  _protocolClosed = new Trigger();
+  _transportClosed = new Trigger();
+  _state = "CREATED";
+  _transport;
+  closeReason;
+  _incomingSignalBuffer = [];
+  _outgoingSignalBuffer = [];
+  stateChanged = new Event();
+  errors = new ErrorStream();
+  _instanceId = PublicKey.random().toHex();
+  transportStats = new Event();
+  _signalSendTask = new DeferredTask(this._ctx, async () => {
+    await this._flushSignalBuffer(this._ctx);
+  });
+  _signallingDelay = STARTING_SIGNALLING_DELAY;
+  constructor(topic, localInfo, remoteInfo, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
+    this.topic = topic;
+    this.localInfo = localInfo;
+    this.remoteInfo = remoteInfo;
+    this.sessionId = sessionId;
+    this.initiator = initiator;
+    this._signalMessaging = _signalMessaging;
+    this._protocol = _protocol;
+    this._transportFactory = _transportFactory;
+    this._callbacks = _callbacks;
+    log.trace("dxos.mesh.connection.construct", {
+      sessionId: this.sessionId,
+      topic: this.topic,
+      localPeer: this.localInfo,
+      remotePeer: this.remoteInfo,
+      initiator: this.initiator
+    }, {
+      F: __dxlog_file,
+      L: 137,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   get sessionIdString() {
     return this.sessionId.truncate();
   }
@@ -102,21 +144,25 @@ var Connection = class {
       });
       this._protocolClosed.wake();
       this.close({
-        error: new ProtocolError("protocol stream closed")
+        error: new ProtocolError({
+          message: "protocol stream closed"
+        })
       }).catch((err) => this.errors.raise(err));
     });
     scheduleTask(this.connectedTimeoutContext, async () => {
       log.info(`timeout waiting ${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect, aborting`, void 0, {
         F: __dxlog_file,
-        L: 194,
+        L: 196,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.abort(new TimeoutError(`${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect`)).catch((err) => this.errors.raise(err));
+      await this.abort(new TimeoutError({
+        message: `${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect`
+      })).catch((err) => this.errors.raise(err));
     }, TRANSPORT_CONNECTION_TIMEOUT);
     invariant(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 202,
+      L: 204,
       S: this,
       A: [
         "!this._transport",
@@ -143,7 +189,7 @@ var Connection = class {
       this._transportClosed.wake();
       log("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 224,
+        L: 226,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -154,7 +200,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 229,
+        L: 231,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -164,7 +210,7 @@ var Connection = class {
       if (err instanceof ConnectionResetError) {
         log.info("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
-          L: 236,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -172,7 +218,7 @@ var Connection = class {
       } else if (err instanceof ConnectivityError) {
         log.info("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
-          L: 239,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -192,7 +238,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 258,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -202,14 +248,14 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 265,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === "CLOSED" || this._state === "ABORTED") {
       log(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 267,
+        L: 269,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -226,7 +272,7 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 279,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -237,7 +283,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 285,
+        L: 287,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -247,7 +293,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 292,
+        L: 294,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -257,7 +303,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 298,
+        L: 300,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -269,7 +315,7 @@ var Connection = class {
       error
     }, {
       F: __dxlog_file,
-      L: 305,
+      L: 307,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -284,7 +330,7 @@ var Connection = class {
         error
       }, {
         F: __dxlog_file,
-        L: 316,
+        L: 318,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -298,7 +344,7 @@ var Connection = class {
     if (lastState !== "CONNECTED" || error != null) {
       log(`graceful close requested when we were in ${lastState} state? aborting`, void 0, {
         F: __dxlog_file,
-        L: 327,
+        L: 329,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -310,7 +356,7 @@ var Connection = class {
       error
     }, {
       F: __dxlog_file,
-      L: 331,
+      L: 333,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -321,7 +367,7 @@ var Connection = class {
     } catch (err) {
       log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 336,
+        L: 338,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -331,7 +377,7 @@ var Connection = class {
     } catch (err) {
       log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 342,
+        L: 344,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -340,7 +386,7 @@ var Connection = class {
       peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 345,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -350,7 +396,7 @@ var Connection = class {
   async _closeProtocol(options) {
     log("closing protocol", options, {
       F: __dxlog_file,
-      L: 351,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -360,7 +406,7 @@ var Connection = class {
     ]);
     log("protocol closed", options, {
       F: __dxlog_file,
-      L: 353,
+      L: 355,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -368,7 +414,7 @@ var Connection = class {
   async _closeTransport() {
     log("closing transport", void 0, {
       F: __dxlog_file,
-      L: 357,
+      L: 359,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -378,7 +424,7 @@ var Connection = class {
     ]);
     log("transport closed", void 0, {
       F: __dxlog_file,
-      L: 359,
+      L: 361,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -387,20 +433,20 @@ var Connection = class {
     this._outgoingSignalBuffer.push(signal);
     this._signalSendTask.schedule();
   }
-  async _flushSignalBuffer() {
+  async _flushSignalBuffer(ctx) {
     if (this._outgoingSignalBuffer.length === 0) {
       return;
     }
     try {
       if (true) {
-        await cancelWithContext(this._ctx, sleep(this._signallingDelay));
+        await cancelWithContext(ctx, sleep(this._signallingDelay));
         this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
       }
       const signals = [
         ...this._outgoingSignalBuffer
       ];
       this._outgoingSignalBuffer.length = 0;
-      await this._signalMessaging.signal({
+      await this._signalMessaging.signal(ctx, {
         author: this.localInfo,
         recipient: this.remoteInfo,
         sessionId: this.sessionId,
@@ -419,22 +465,25 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 399,
+        L: 401,
         S: this,
         C: (f, a) => f(...a)
       });
       await this.close({
-        error: new ConnectivityError("signal message failed to deliver", err)
+        error: new ConnectivityError({
+          message: "signal message failed to deliver",
+          cause: err
+        })
       });
     }
   }
   /**
   * Receive a signal from the remote peer.
   */
-  async signal(msg) {
+  async signal(_ctx, msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 408,
+      L: 410,
       S: this,
       A: [
         "msg.sessionId",
@@ -444,7 +493,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 410,
+        L: 412,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -452,7 +501,7 @@ var Connection = class {
     }
     invariant(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 413,
+      L: 415,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -461,7 +510,7 @@ var Connection = class {
     });
     invariant(msg.author.peerKey === this.remoteInfo.peerKey, void 0, {
       F: __dxlog_file,
-      L: 414,
+      L: 416,
       S: this,
       A: [
         "msg.author.peerKey === this.remoteInfo.peerKey",
@@ -470,7 +519,7 @@ var Connection = class {
     });
     invariant(msg.recipient.peerKey === this.localInfo.peerKey, void 0, {
       F: __dxlog_file,
-      L: 415,
+      L: 417,
       S: this,
       A: [
         "msg.recipient.peerKey === this.localInfo.peerKey",
@@ -494,7 +543,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 424,
+          L: 426,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -502,7 +551,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 427,
+          L: 429,
           S: this,
           A: [
             "this._transport",
@@ -515,7 +564,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 428,
+          L: 430,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -533,13 +582,13 @@ var Connection = class {
       peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 439,
+      L: 441,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 440,
+      L: 442,
       S: this,
       A: [
         "state !== this._state",
@@ -555,74 +604,6 @@ var Connection = class {
       this.transportStats.emit(stats);
     }
   }
-  constructor(topic, localInfo, remoteInfo, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
-    _define_property(this, "topic", void 0);
-    _define_property(this, "localInfo", void 0);
-    _define_property(this, "remoteInfo", void 0);
-    _define_property(this, "sessionId", void 0);
-    _define_property(this, "initiator", void 0);
-    _define_property(this, "_signalMessaging", void 0);
-    _define_property(this, "_protocol", void 0);
-    _define_property(this, "_transportFactory", void 0);
-    _define_property(this, "_callbacks", void 0);
-    _define_property(this, "_ctx", void 0);
-    _define_property(this, "connectedTimeoutContext", void 0);
-    _define_property(this, "_protocolClosed", void 0);
-    _define_property(this, "_transportClosed", void 0);
-    _define_property(this, "_state", void 0);
-    _define_property(this, "_transport", void 0);
-    _define_property(this, "closeReason", void 0);
-    _define_property(this, "_incomingSignalBuffer", void 0);
-    _define_property(this, "_outgoingSignalBuffer", void 0);
-    _define_property(this, "stateChanged", void 0);
-    _define_property(this, "errors", void 0);
-    _define_property(this, "_instanceId", void 0);
-    _define_property(this, "transportStats", void 0);
-    _define_property(this, "_signalSendTask", void 0);
-    _define_property(this, "_signallingDelay", void 0);
-    this.topic = topic;
-    this.localInfo = localInfo;
-    this.remoteInfo = remoteInfo;
-    this.sessionId = sessionId;
-    this.initiator = initiator;
-    this._signalMessaging = _signalMessaging;
-    this._protocol = _protocol;
-    this._transportFactory = _transportFactory;
-    this._callbacks = _callbacks;
-    this._ctx = new Context(void 0, {
-      F: __dxlog_file,
-      L: 100
-    });
-    this.connectedTimeoutContext = new Context(void 0, {
-      F: __dxlog_file,
-      L: 101
-    });
-    this._protocolClosed = new Trigger();
-    this._transportClosed = new Trigger();
-    this._state = "CREATED";
-    this._incomingSignalBuffer = [];
-    this._outgoingSignalBuffer = [];
-    this.stateChanged = new Event();
-    this.errors = new ErrorStream();
-    this._instanceId = PublicKey.random().toHex();
-    this.transportStats = new Event();
-    this._signalSendTask = new DeferredTask(this._ctx, async () => {
-      await this._flushSignalBuffer();
-    });
-    this._signallingDelay = STARTING_SIGNALLING_DELAY;
-    log.trace("dxos.mesh.connection.construct", {
-      sessionId: this.sessionId,
-      topic: this.topic,
-      localPeer: this.localInfo,
-      remotePeer: this.remoteInfo,
-      initiator: this.initiator
-    }, {
-      F: __dxlog_file,
-      L: 137,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
 };
 _ts_decorate([
   logInfo
@@ -634,64 +615,28 @@ _ts_decorate([
   synchronized
 ], Connection.prototype, "close", null);
 
-// src/signal/ice.ts
-import { asyncTimeout } from "@dxos/async";
-import { log as log2 } from "@dxos/log";
-import { isNonNullable } from "@dxos/util";
-var __dxlog_file2 = "/__w/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 }) => asyncTimeout(fetch(urls, {
-        method: "GET"
-      }), 1e4).then((response) => response.json()).catch((err) => {
-        const isDev = typeof window !== "undefined" && window.location.href.includes("localhost");
-        if (!isDev) {
-          log2.error("Failed to fetch ICE servers from provider", {
-            urls,
-            err
-          }, {
-            F: __dxlog_file2,
-            L: 30,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-        }
-      })))).filter(isNonNullable).map(({ iceServers }) => iceServers).flat();
-      return cachedIceServers;
-    }
-  };
-};
-
 // src/signal/swarm-messenger.ts
-import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { TimeoutError as TimeoutError2 } from "@dxos/protocols";
 import { schema } from "@dxos/protocols/proto";
 import { ComplexMap } from "@dxos/util";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
 var SwarmMessage = schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
 var SwarmMessenger = class {
-  async receiveMessage({ author, recipient, payload }) {
+  _sendMessage;
+  _onSignal;
+  _onOffer;
+  _topic;
+  _offerRecords = new ComplexMap((key) => key.toHex());
+  constructor({ sendMessage, onSignal, onOffer, topic }) {
+    this._sendMessage = sendMessage;
+    this._onSignal = onSignal;
+    this._onOffer = onOffer;
+    this._topic = topic;
+  }
+  async receiveMessage(ctx, { author, recipient, payload }) {
     if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
       return;
     }
@@ -699,18 +644,18 @@ var SwarmMessenger = class {
     if (!this._topic.equals(message.topic)) {
       return;
     }
-    log3("received", {
+    log2("received", {
       from: author,
       to: recipient,
       msg: message
     }, {
-      F: __dxlog_file3,
-      L: 71,
+      F: __dxlog_file2,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
     if (message.data?.offer) {
-      await this._handleOffer({
+      await this._handleOffer(ctx, {
         author,
         recipient,
         message
@@ -718,45 +663,45 @@ var SwarmMessenger = class {
     } else if (message.data?.answer) {
       await this._resolveAnswers(message);
     } else if (message.data?.signal) {
-      await this._handleSignal({
+      await this._handleSignal(ctx, {
         author,
         recipient,
         message
       });
     } else if (message.data?.signalBatch) {
-      await this._handleSignal({
+      await this._handleSignal(ctx, {
         author,
         recipient,
         message
       });
     } else {
-      log3.warn("unknown message", {
+      log2.warn("unknown message", {
         message
       }, {
-        F: __dxlog_file3,
-        L: 82,
+        F: __dxlog_file2,
+        L: 83,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
-  async signal(message) {
+  async signal(ctx, message) {
     invariant2(message.data?.signal || message.data?.signalBatch, "Invalid message", {
-      F: __dxlog_file3,
-      L: 87,
+      F: __dxlog_file2,
+      L: 88,
       S: this,
       A: [
         "message.data?.signal || message.data?.signalBatch",
         "'Invalid message'"
       ]
     });
-    await this._sendReliableMessage({
+    await this._sendReliableMessage(ctx, {
       author: message.author,
       recipient: message.recipient,
       message
     });
   }
-  async offer(message) {
+  async offer(ctx, message) {
     const networkMessage = {
       ...message,
       messageId: PublicKey2.random()
@@ -765,30 +710,30 @@ var SwarmMessenger = class {
       this._offerRecords.set(networkMessage.messageId, {
         resolve
       });
-      this._sendReliableMessage({
+      this._sendReliableMessage(ctx, {
         author: message.author,
         recipient: message.recipient,
         message: networkMessage
       }).catch((err) => reject(err));
     });
   }
-  async _sendReliableMessage({ author, recipient, message }) {
+  async _sendReliableMessage(ctx, { author, recipient, message }) {
     const networkMessage = {
       ...message,
       // Setting unique message_id if it not specified yet.
       messageId: message.messageId ?? PublicKey2.random()
     };
-    log3("sending", {
+    log2("sending", {
       from: author,
       to: recipient,
       msg: networkMessage
     }, {
-      F: __dxlog_file3,
-      L: 125,
+      F: __dxlog_file2,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
-    await this._sendMessage({
+    await this._sendMessage(ctx, {
       author,
       recipient,
       payload: {
@@ -799,8 +744,8 @@ var SwarmMessenger = class {
   }
   async _resolveAnswers(message) {
     invariant2(message.data?.answer?.offerMessageId, "No offerMessageId", {
-      F: __dxlog_file3,
-      L: 137,
+      F: __dxlog_file2,
+      L: 141,
       S: this,
       A: [
         "message.data?.answer?.offerMessageId",
@@ -811,29 +756,29 @@ var SwarmMessenger = class {
     if (offerRecord) {
       this._offerRecords.delete(message.data.answer.offerMessageId);
       invariant2(message.data?.answer, "No answer", {
-        F: __dxlog_file3,
-        L: 141,
+        F: __dxlog_file2,
+        L: 145,
         S: this,
         A: [
           "message.data?.answer",
           "'No answer'"
         ]
       });
-      log3("resolving", {
+      log2("resolving", {
         answer: message.data.answer
       }, {
-        F: __dxlog_file3,
-        L: 142,
+        F: __dxlog_file2,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
       offerRecord.resolve(message.data.answer);
     }
   }
-  async _handleOffer({ author, recipient, message }) {
+  async _handleOffer(ctx, { author, recipient, message }) {
     invariant2(message.data.offer, "No offer", {
-      F: __dxlog_file3,
-      L: 156,
+      F: __dxlog_file2,
+      L: 163,
       S: this,
       A: [
         "message.data.offer",
@@ -848,10 +793,10 @@ var SwarmMessenger = class {
         offer: message.data.offer
       }
     };
-    const answer = await this._onOffer(offerMessage);
+    const answer = await this._onOffer(ctx, offerMessage);
     answer.offerMessageId = message.messageId;
     try {
-      await this._sendReliableMessage({
+      await this._sendReliableMessage(ctx, {
         author: recipient,
         recipient: author,
         message: {
@@ -864,30 +809,30 @@ var SwarmMessenger = class {
       });
     } catch (err) {
       if (err instanceof TimeoutError2) {
-        log3.info("timeout sending answer to offer", {
+        log2.info("timeout sending answer to offer", {
           err
         }, {
-          F: __dxlog_file3,
-          L: 177,
+          F: __dxlog_file2,
+          L: 184,
           S: this,
           C: (f, a) => f(...a)
         });
       } else {
-        log3.info("error sending answer to offer", {
+        log2.info("error sending answer to offer", {
           err
         }, {
-          F: __dxlog_file3,
-          L: 179,
+          F: __dxlog_file2,
+          L: 186,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     }
   }
-  async _handleSignal({ author, recipient, message }) {
+  async _handleSignal(ctx, { author, recipient, message }) {
     invariant2(message.messageId, void 0, {
-      F: __dxlog_file3,
-      L: 193,
+      F: __dxlog_file2,
+      L: 203,
       S: this,
       A: [
         "message.messageId",
@@ -895,8 +840,8 @@ var SwarmMessenger = class {
       ]
     });
     invariant2(message.data.signal || message.data.signalBatch, "Invalid message", {
-      F: __dxlog_file3,
-      L: 194,
+      F: __dxlog_file2,
+      L: 204,
       S: this,
       A: [
         "message.data.signal || message.data.signalBatch",
@@ -912,83 +857,93 @@ var SwarmMessenger = class {
         signalBatch: message.data.signalBatch
       }
     };
-    await this._onSignal(signalMessage);
-  }
-  constructor({ sendMessage, onSignal, onOffer, topic }) {
-    _define_property2(this, "_ctx", new Context2(void 0, {
-      F: __dxlog_file3,
-      L: 35
-    }));
-    _define_property2(this, "_sendMessage", void 0);
-    _define_property2(this, "_onSignal", void 0);
-    _define_property2(this, "_onOffer", void 0);
-    _define_property2(this, "_topic", void 0);
-    _define_property2(this, "_offerRecords", new ComplexMap((key) => key.toHex()));
-    this._sendMessage = sendMessage;
-    this._onSignal = onSignal;
-    this._onOffer = onOffer;
-    this._topic = topic;
+    await this._onSignal(ctx, signalMessage);
   }
 };
 
 // src/swarm/swarm.ts
 import { Event as Event3, scheduleTask as scheduleTask3, sleep as sleep2, synchronized as synchronized3 } from "@dxos/async";
-import { Context as Context4 } from "@dxos/context";
+import { Context as Context3 } from "@dxos/context";
 import { ErrorStream as ErrorStream2 } from "@dxos/debug";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
-import { log as log5, logInfo as logInfo2 } from "@dxos/log";
+import { log as log4, logInfo as logInfo2 } from "@dxos/log";
 import { PeerInfoHash } from "@dxos/messaging";
 import { trace as trace2 } from "@dxos/protocols";
-import { ComplexMap as ComplexMap2, isNonNullable as isNonNullable2 } from "@dxos/util";
+import { ComplexMap as ComplexMap2, isNonNullable } from "@dxos/util";
 
 // src/swarm/peer.ts
 import { Event as Event2, scheduleTask as scheduleTask2, synchronized as synchronized2 } from "@dxos/async";
-import { Context as Context3 } from "@dxos/context";
+import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { CancelledError as CancelledError2, SystemError } from "@dxos/protocols";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
 var ConnectionDisplacedError = class extends SystemError {
   constructor() {
-    super("Connection displaced by remote initiator.");
+    super({
+      message: "Connection displaced by remote initiator."
+    });
   }
 };
 var CONNECTION_COUNTS_STABLE_AFTER = 5e3;
 var Peer = class {
+  remoteInfo;
+  topic;
+  localInfo;
+  _signalMessaging;
+  _protocolProvider;
+  _transportFactory;
+  _connectionLimiter;
+  _callbacks;
+  /**
+  * Will be available to connect after this time.
+  */
+  _availableAfter = 0;
+  availableToConnect = true;
+  _lastConnectionTime;
+  _ctx = new Context2(void 0, {
+    F: __dxlog_file3,
+    L: 80
+  });
+  _connectionCtx;
+  connection;
+  /**
+  * Whether the peer is currently advertizing itself on the signal-network.
+  */
+  advertizing = false;
+  initiating = false;
+  connectionDisplaced = new Event2();
+  constructor(remoteInfo, topic, localInfo, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
+    this.remoteInfo = remoteInfo;
+    this.topic = topic;
+    this.localInfo = localInfo;
+    this._signalMessaging = _signalMessaging;
+    this._protocolProvider = _protocolProvider;
+    this._transportFactory = _transportFactory;
+    this._connectionLimiter = _connectionLimiter;
+    this._callbacks = _callbacks;
+  }
   /**
   * Respond to remote offer.
   */
-  async onOffer(message) {
+  async onOffer(_ctx, message) {
     const remote = message.author;
     if (this.connection && ![
       ConnectionState.CREATED,
       ConnectionState.INITIAL,
       ConnectionState.CONNECTING
     ].includes(this.connection.state)) {
-      log4.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
-        F: __dxlog_file4,
-        L: 116,
+      log3.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)
       });
@@ -998,14 +953,14 @@ var Peer = class {
     }
     if (this.connection || this.initiating) {
       if (remote.peerKey < this.localInfo.peerKey) {
-        log4("close local connection", {
+        log3("close local connection", {
           localPeer: this.localInfo,
           topic: this.topic,
           remotePeer: this.remoteInfo,
           sessionId: this.connection?.sessionId
         }, {
-          F: __dxlog_file4,
-          L: 125,
+          F: __dxlog_file3,
+          L: 124,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1021,8 +976,8 @@ var Peer = class {
     if (await this._callbacks.onOffer(remote)) {
       if (!this.connection) {
         invariant3(message.sessionId, void 0, {
-          F: __dxlog_file4,
-          L: 145,
+          F: __dxlog_file3,
+          L: 144,
           S: this,
           A: [
             "message.sessionId",
@@ -1036,14 +991,14 @@ var Peer = class {
           await connection.openConnection();
         } catch (err) {
           if (!(err instanceof CancelledError2)) {
-            log4.info("connection error", {
+            log3.info("connection error", {
               topic: this.topic,
               peerId: this.localInfo,
               remoteId: this.remoteInfo,
               err
             }, {
-              F: __dxlog_file4,
-              L: 155,
+              F: __dxlog_file3,
+              L: 154,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1062,9 +1017,9 @@ var Peer = class {
   /**
   * Initiate a connection to the remote peer.
   */
-  async initiateConnection() {
+  async initiateConnection(ctx) {
     invariant3(!this.initiating, "Initiation in progress.", {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 172,
       S: this,
       A: [
@@ -1073,7 +1028,7 @@ var Peer = class {
       ]
     });
     invariant3(!this.connection, "Already connected.", {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 173,
       S: this,
       A: [
@@ -1082,13 +1037,13 @@ var Peer = class {
       ]
     });
     const sessionId = PublicKey3.random();
-    log4("initiating...", {
+    log3("initiating...", {
       local: this.localInfo,
       topic: this.topic,
       remote: this.remoteInfo,
       sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 175,
       S: this,
       C: (f, a) => f(...a)
@@ -1099,7 +1054,7 @@ var Peer = class {
     try {
       await this._connectionLimiter.connecting(sessionId);
       connection.initiate();
-      answer = await this._signalMessaging.offer({
+      answer = await this._signalMessaging.offer(ctx, {
         author: this.localInfo,
         recipient: this.remoteInfo,
         sessionId,
@@ -1108,20 +1063,20 @@ var Peer = class {
           offer: {}
         }
       });
-      log4("received", {
+      log3("received", {
         answer,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 192,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
-        log4("ignoring response", void 0, {
-          F: __dxlog_file4,
+        log3("ignoring response", void 0, {
+          F: __dxlog_file3,
           L: 194,
           S: this,
           C: (f, a) => f(...a)
@@ -1129,13 +1084,13 @@ var Peer = class {
         return;
       }
     } catch (err) {
-      log4("initiation error: send offer", {
+      log3("initiation error: send offer", {
         err,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 198,
         S: this,
         C: (f, a) => f(...a)
@@ -1151,13 +1106,13 @@ var Peer = class {
         return;
       }
     } catch (err) {
-      log4("initiation error: accept answer", {
+      log3("initiation error: accept answer", {
         err,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 211,
         S: this,
         C: (f, a) => f(...a)
@@ -1168,8 +1123,8 @@ var Peer = class {
       this.initiating = false;
     }
     try {
-      log4("opening connection as initiator", void 0, {
-        F: __dxlog_file4,
+      log3("opening connection as initiator", void 0, {
+        F: __dxlog_file3,
         L: 224,
         S: this,
         C: (f, a) => f(...a)
@@ -1177,21 +1132,21 @@ var Peer = class {
       await connection.openConnection();
       this._callbacks.onAccepted();
     } catch (err) {
-      log4("initiation error: open connection", {
+      log3("initiation error: open connection", {
         err,
         topic: this.topic,
         local: this.localInfo,
         remote: this.remoteInfo
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 228,
         S: this,
         C: (f, a) => f(...a)
       });
-      log4.warn("closing connection due to unhandled error on openConnection", {
+      log3.warn("closing connection due to unhandled error on openConnection", {
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 235,
         S: this,
         C: (f, a) => f(...a)
@@ -1207,20 +1162,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) {
-    log4("creating connection", {
+    log3("creating connection", {
       topic: this.topic,
       peerId: this.localInfo,
       remoteId: this.remoteInfo,
       initiator,
       sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 249,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this.connection, "Already connected.", {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 256,
       S: this,
       A: [
@@ -1249,14 +1204,14 @@ var Peer = class {
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
           this._connectionLimiter.doneConnecting(sessionId);
-          log4.trace("dxos.mesh.connection.connected", {
+          log3.trace("dxos.mesh.connection.connected", {
             topic: this.topic,
             localPeerId: this.localInfo,
             remotePeerId: this.remoteInfo,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 280,
             S: this,
             C: (f, a) => f(...a)
@@ -1269,15 +1224,15 @@ var Peer = class {
             remoteId: this.remoteInfo,
             initiator
           };
-          log4("connection closed", logMeta, {
-            F: __dxlog_file4,
+          log3("connection closed", logMeta, {
+            F: __dxlog_file3,
             L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           invariant3(this.connection === connection, "Connection mismatch (race condition).", {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 295,
             S: this,
             A: [
@@ -1285,14 +1240,14 @@ var Peer = class {
               "'Connection mismatch (race condition).'"
             ]
           });
-          log4.trace("dxos.mesh.connection.closed", {
+          log3.trace("dxos.mesh.connection.closed", {
             topic: this.topic,
             localPeerId: this.localInfo,
             remotePeerId: this.remoteInfo,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 297,
             S: this,
             C: (f, a) => f(...a)
@@ -1308,8 +1263,8 @@ var Peer = class {
             }
             this._callbacks.onDisconnected();
             scheduleTask2(this._connectionCtx, () => {
-              log4("peer became available", logMeta, {
-                F: __dxlog_file4,
+              log3("peer became available", logMeta, {
+                F: __dxlog_file3,
                 L: 321,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1326,19 +1281,19 @@ var Peer = class {
     void this._connectionCtx?.dispose();
     this._connectionCtx = this._ctx.derive();
     connection.errors.handle((err) => {
-      log4.info("connection error, closing", {
+      log3.info("connection error, closing", {
         topic: this.topic,
         peerId: this.localInfo,
         remoteId: this.remoteInfo,
         initiator,
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 339,
         S: this,
         C: (f, a) => f(...a)
       });
-      log4.trace("dxos.mesh.connection.error", {
+      log3.trace("dxos.mesh.connection.error", {
         topic: this.topic,
         localPeerId: this.localInfo,
         remotePeerId: this.remoteInfo,
@@ -1346,7 +1301,7 @@ var Peer = class {
         initiator,
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 346,
         S: this,
         C: (f, a) => f(...a)
@@ -1361,11 +1316,11 @@ var Peer = class {
       return;
     }
     const connection = this.connection;
-    log4("closing...", {
+    log3("closing...", {
       peerId: this.remoteInfo,
       sessionId: connection.sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 371,
       S: this,
       C: (f, a) => f(...a)
@@ -1373,37 +1328,37 @@ var Peer = class {
     await connection.close({
       error: err
     });
-    log4("closed", {
+    log3("closed", {
       peerId: this.remoteInfo,
       sessionId: connection.sessionId
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 377,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async onSignal(message) {
+  async onSignal(ctx, message) {
     if (!this.connection) {
-      log4("dropping signal message for non-existent connection", {
+      log3("dropping signal message for non-existent connection", {
         message
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 382,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    await this.connection.signal(message);
+    await this.connection.signal(ctx, message);
   }
   async safeDestroy(reason) {
     await this._ctx.dispose();
-    log4("Destroying peer", {
+    log3("Destroying peer", {
       peerId: this.remoteInfo,
       topic: this.topic
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 392,
       S: this,
       C: (f, a) => f(...a)
@@ -1412,42 +1367,6 @@ var Peer = class {
       reason
     });
   }
-  constructor(remoteInfo, topic, localInfo, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
-    _define_property3(this, "remoteInfo", void 0);
-    _define_property3(this, "topic", void 0);
-    _define_property3(this, "localInfo", void 0);
-    _define_property3(this, "_signalMessaging", void 0);
-    _define_property3(this, "_protocolProvider", void 0);
-    _define_property3(this, "_transportFactory", void 0);
-    _define_property3(this, "_connectionLimiter", void 0);
-    _define_property3(this, "_callbacks", void 0);
-    _define_property3(this, "_availableAfter", void 0);
-    _define_property3(this, "availableToConnect", void 0);
-    _define_property3(this, "_lastConnectionTime", void 0);
-    _define_property3(this, "_ctx", void 0);
-    _define_property3(this, "_connectionCtx", void 0);
-    _define_property3(this, "connection", void 0);
-    _define_property3(this, "advertizing", void 0);
-    _define_property3(this, "initiating", void 0);
-    _define_property3(this, "connectionDisplaced", void 0);
-    this.remoteInfo = remoteInfo;
-    this.topic = topic;
-    this.localInfo = localInfo;
-    this._signalMessaging = _signalMessaging;
-    this._protocolProvider = _protocolProvider;
-    this._transportFactory = _transportFactory;
-    this._connectionLimiter = _connectionLimiter;
-    this._callbacks = _callbacks;
-    this._availableAfter = 0;
-    this.availableToConnect = true;
-    this._ctx = new Context3(void 0, {
-      F: __dxlog_file4,
-      L: 81
-    });
-    this.advertizing = false;
-    this.initiating = false;
-    this.connectionDisplaced = new Event2();
-  }
 };
 _ts_decorate2([
   synchronized2
@@ -1466,31 +1385,106 @@ var increaseInterval = (interval) => {
 };
 
 // src/swarm/swarm.ts
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate3(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_file5 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts";
+var __dxlog_file4 = "/__w/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 {
+  _topic;
+  _ownPeer;
+  _topology;
+  _protocolProvider;
+  _messenger;
+  _transportFactory;
+  _label;
+  _connectionLimiter;
+  _initiationDelay;
+  _swarmMessenger;
+  _ctx = new Context3(void 0, {
+    F: __dxlog_file4,
+    L: 38
+  });
+  _listeningHandle = void 0;
+  /**
+  * PeerInfo -> Peer.
+  * @internal
+  */
+  _peers = new ComplexMap2(PeerInfoHash);
+  /**
+  * Unique id of the swarm, local to the current peer, generated when swarm is joined.
+  */
+  _instanceId = PublicKey4.random().toHex();
+  /**
+  * New connection to a peer is started.
+  * @internal
+  */
+  connectionAdded = new Event3();
+  /**
+  * Connection to a peer is dropped.
+  * @internal
+  */
+  disconnected = new Event3();
+  /**
+  * Connection is established to a new peer.
+  * @internal
+  */
+  connected = new Event3();
+  errors = new ErrorStream2();
+  // TODO(burdon): Swarm => Peer.create/destroy =< Connection.open/close
+  // TODO(burdon): Pass in object.
+  constructor(_topic, _ownPeer, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter, _initiationDelay = INITIATION_DELAY) {
+    this._topic = _topic;
+    this._ownPeer = _ownPeer;
+    this._topology = _topology;
+    this._protocolProvider = _protocolProvider;
+    this._messenger = _messenger;
+    this._transportFactory = _transportFactory;
+    this._label = _label;
+    this._connectionLimiter = _connectionLimiter;
+    this._initiationDelay = _initiationDelay;
+    log4.trace("dxos.mesh.swarm.constructor", trace2.begin({
+      id: this._instanceId,
+      data: {
+        topic: this._topic.toHex(),
+        peer: this._ownPeer
+      }
+    }), {
+      F: __dxlog_file4,
+      L: 88,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log4("creating swarm", {
+      peerId: _ownPeer
+    }, {
+      F: __dxlog_file4,
+      L: 92,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    _topology.init(this._getSwarmController());
+    this._swarmMessenger = new SwarmMessenger({
+      sendMessage: async (ctx, msg) => await this._messenger.sendMessage(ctx, msg),
+      onSignal: async (ctx, msg) => await this.onSignal(ctx, msg),
+      onOffer: async (ctx, msg) => await this.onOffer(ctx, msg),
+      topic: this._topic
+    });
+    log4.trace("dxos.mesh.swarm.constructor", trace2.end({
+      id: this._instanceId
+    }), {
+      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(isNonNullable2);
+    return Array.from(this._peers.values()).map((peer) => peer.connection).filter(isNonNullable);
   }
   get ownPeerId() {
     return PublicKey4.from(this._ownPeer.peerKey);
@@ -1509,8 +1503,8 @@ var Swarm = class {
   }
   async open() {
     invariant4(!this._listeningHandle, void 0, {
-      F: __dxlog_file5,
-      L: 133,
+      F: __dxlog_file4,
+      L: 132,
       S: this,
       A: [
         "!this._listeningHandle",
@@ -1521,11 +1515,11 @@ var Swarm = class {
       peer: this._ownPeer,
       payloadType: "dxos.mesh.swarm.SwarmMessage",
       onMessage: async (message) => {
-        await this._swarmMessenger.receiveMessage(message).catch((err) => log5.info("Error while receiving message", {
+        await this._swarmMessenger.receiveMessage(this._ctx, message).catch((err) => log4.info("Error while receiving message", {
           err
         }, {
-          F: __dxlog_file5,
-          L: 141,
+          F: __dxlog_file4,
+          L: 140,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -1533,9 +1527,9 @@ var Swarm = class {
     });
   }
   async destroy() {
-    log5("destroying...", void 0, {
-      F: __dxlog_file5,
-      L: 147,
+    log4("destroying...", void 0, {
+      F: __dxlog_file4,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1544,17 +1538,17 @@ 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")));
-    log5("destroyed", void 0, {
-      F: __dxlog_file5,
-      L: 154,
+    log4("destroyed", void 0, {
+      F: __dxlog_file4,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async setTopology(topology) {
     invariant4(!this._ctx.disposed, "Swarm is offline", {
-      F: __dxlog_file5,
-      L: 158,
+      F: __dxlog_file4,
+      L: 157,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1564,12 +1558,12 @@ var Swarm = class {
     if (topology === this._topology) {
       return;
     }
-    log5("setting topology", {
+    log4("setting topology", {
       previous: getClassName(this._topology),
       topology: getClassName(topology)
     }, {
-      F: __dxlog_file5,
-      L: 162,
+      F: __dxlog_file4,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1579,18 +1573,18 @@ var Swarm = class {
     this._topology.update();
   }
   async onSwarmEvent(swarmEvent) {
-    log5("swarm event", {
+    log4("swarm event", {
       swarmEvent
     }, {
-      F: __dxlog_file5,
-      L: 175,
+      F: __dxlog_file4,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      log5("swarm event ignored for disposed swarm", void 0, {
-        F: __dxlog_file5,
-        L: 178,
+      log4("swarm event ignored for disposed swarm", void 0, {
+        F: __dxlog_file4,
+        L: 177,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1599,11 +1593,11 @@ var Swarm = class {
     if (swarmEvent.peerAvailable) {
       const peerId = swarmEvent.peerAvailable.peer.peerKey;
       if (peerId !== this._ownPeer.peerKey) {
-        log5("new peer", {
+        log4("new peer", {
           peerId
         }, {
-          F: __dxlog_file5,
-          L: 185,
+          F: __dxlog_file4,
+          L: 184,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1615,25 +1609,25 @@ var Swarm = class {
       if (peer) {
         peer.advertizing = false;
         if (this._isConnectionEstablishmentInProgress(peer)) {
-          log5(`destroying peer, state: ${peer.connection?.state}`, void 0, {
-            F: __dxlog_file5,
-            L: 196,
+          log4(`destroying peer, state: ${peer.connection?.state}`, void 0, {
+            F: __dxlog_file4,
+            L: 195,
             S: this,
             C: (f, a) => f(...a)
           });
-          void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => log5.catch(err, void 0, {
-            F: __dxlog_file5,
-            L: 197,
+          void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => log4.catch(err, void 0, {
+            F: __dxlog_file4,
+            L: 196,
             S: this,
             C: (f, a) => f(...a)
           }));
         }
       } else {
-        log5("received peerLeft but no peer found", {
+        log4("received peerLeft but no peer found", {
           peer: swarmEvent.peerLeft.peer.peerKey
         }, {
-          F: __dxlog_file5,
-          L: 200,
+          F: __dxlog_file4,
+          L: 199,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1641,19 +1635,19 @@ var Swarm = class {
     }
     this._topology.update();
   }
-  async onOffer(message) {
-    log5("offer", {
+  async onOffer(ctx, message) {
+    log4("offer", {
       message
     }, {
-      F: __dxlog_file5,
-      L: 209,
+      F: __dxlog_file4,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      log5("ignored for disposed swarm", void 0, {
-        F: __dxlog_file5,
-        L: 211,
+      log4("ignored for disposed swarm", void 0, {
+        F: __dxlog_file4,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1662,8 +1656,8 @@ var Swarm = class {
       };
     }
     invariant4(message.author, void 0, {
-      F: __dxlog_file5,
-      L: 216,
+      F: __dxlog_file4,
+      L: 215,
       S: this,
       A: [
         "message.author",
@@ -1671,11 +1665,11 @@ var Swarm = class {
       ]
     });
     if (message.recipient.peerKey !== this._ownPeer.peerKey) {
-      log5("rejecting offer with incorrect peerId", {
+      log4("rejecting offer with incorrect peerId", {
         message
       }, {
-        F: __dxlog_file5,
-        L: 218,
+        F: __dxlog_file4,
+        L: 217,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1684,11 +1678,11 @@ var Swarm = class {
       };
     }
     if (!message.topic?.equals(this._topic)) {
-      log5("rejecting offer with incorrect topic", {
+      log4("rejecting offer with incorrect topic", {
         message
       }, {
-        F: __dxlog_file5,
-        L: 222,
+        F: __dxlog_file4,
+        L: 221,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1697,7 +1691,7 @@ var Swarm = class {
       };
     }
     const peer = this._getOfferSenderPeer(message.author);
-    const answer = await peer.onOffer(message);
+    const answer = await peer.onOffer(ctx, message);
     this._topology.update();
     return answer;
   }
@@ -1711,27 +1705,27 @@ var Swarm = class {
     }
     return peer;
   }
-  async onSignal(message) {
-    log5("signal", {
+  async onSignal(ctx, message) {
+    log4("signal", {
       message
     }, {
-      F: __dxlog_file5,
-      L: 247,
+      F: __dxlog_file4,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      log5.info("ignored for offline swarm", void 0, {
-        F: __dxlog_file5,
-        L: 249,
+      log4.info("ignored for offline swarm", void 0, {
+        F: __dxlog_file4,
+        L: 248,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
     invariant4(message.recipient.peerKey === this._ownPeer.peerKey, `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
-      F: __dxlog_file5,
-      L: 252,
+      F: __dxlog_file4,
+      L: 251,
       S: this,
       A: [
         "message.recipient.peerKey === this._ownPeer.peerKey",
@@ -1739,8 +1733,8 @@ var Swarm = class {
       ]
     });
     invariant4(message.topic?.equals(this._topic), void 0, {
-      F: __dxlog_file5,
-      L: 256,
+      F: __dxlog_file4,
+      L: 255,
       S: this,
       A: [
         "message.topic?.equals(this._topic)",
@@ -1748,8 +1742,8 @@ var Swarm = class {
       ]
     });
     invariant4(message.author, void 0, {
-      F: __dxlog_file5,
-      L: 257,
+      F: __dxlog_file4,
+      L: 256,
       S: this,
       A: [
         "message.author",
@@ -1757,7 +1751,7 @@ var Swarm = class {
       ]
     });
     const peer = this._getOrCreatePeer(message.author);
-    await peer.onSignal(message);
+    await peer.onSignal(ctx, message);
   }
   // For debug purposes
   async goOffline() {
@@ -1768,15 +1762,15 @@ var Swarm = class {
   }
   // For debug purposes
   async goOnline() {
-    this._ctx = new Context4(void 0, {
-      F: __dxlog_file5,
-      L: 273
+    this._ctx = new Context3(void 0, {
+      F: __dxlog_file4,
+      L: 272
     });
   }
   _getOrCreatePeer(peerInfo) {
     invariant4(peerInfo.peerKey, "PeerInfo.peerKey is required", {
-      F: __dxlog_file5,
-      L: 277,
+      F: __dxlog_file4,
+      L: 276,
       S: this,
       A: [
         "peerInfo.peerKey",
@@ -1794,9 +1788,9 @@ var Swarm = class {
         },
         onDisconnected: async () => {
           if (this._isUnregistered(peer)) {
-            log5.verbose("ignored onDisconnected for unregistered peer", void 0, {
-              F: __dxlog_file5,
-              L: 297,
+            log4.verbose("ignored onDisconnected for unregistered peer", void 0, {
+              F: __dxlog_file4,
+              L: 296,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1810,11 +1804,11 @@ var Swarm = class {
         },
         onRejected: () => {
           if (!this._isUnregistered(peer)) {
-            log5("peer rejected connection", {
+            log4("peer rejected connection", {
               peerInfo
             }, {
-              F: __dxlog_file5,
-              L: 311,
+              F: __dxlog_file4,
+              L: 310,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1836,19 +1830,19 @@ var Swarm = class {
     return peer;
   }
   async _destroyPeer(peerInfo, reason) {
-    log5("destroy peer", {
+    log4("destroy peer", {
       peerKey: peerInfo.peerKey,
       reason
     }, {
-      F: __dxlog_file5,
-      L: 333,
+      F: __dxlog_file4,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
     const peer = this._peers.get(peerInfo);
     invariant4(peer, void 0, {
-      F: __dxlog_file5,
-      L: 335,
+      F: __dxlog_file4,
+      L: 334,
       S: this,
       A: [
         "peer",
@@ -1876,9 +1870,9 @@ var Swarm = class {
               peerKey: peer.toHex()
             });
           } catch (err) {
-            log5("initiation error", err, {
-              F: __dxlog_file5,
-              L: 362,
+            log4("initiation error", err, {
+              F: __dxlog_file4,
+              L: 361,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1905,11 +1899,11 @@ var Swarm = class {
     const ctx = this._ctx;
     const peer = this._getOrCreatePeer(remotePeer);
     if (remotePeer.peerKey < this._ownPeer.peerKey) {
-      log5("initiation delay", {
+      log4("initiation delay", {
         remotePeer
       }, {
-        F: __dxlog_file5,
-        L: 390,
+        F: __dxlog_file4,
+        L: 389,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1924,21 +1918,21 @@ var Swarm = class {
     if (peer.connection) {
       return;
     }
-    log5("initiating connection...", {
+    log4("initiating connection...", {
       remotePeer
     }, {
-      F: __dxlog_file5,
-      L: 406,
+      F: __dxlog_file4,
+      L: 405,
       S: this,
       C: (f, a) => f(...a)
     });
-    await peer.initiateConnection();
+    await peer.initiateConnection(ctx);
     this._topology.update();
-    log5("initiated", {
+    log4("initiated", {
       remotePeer
     }, {
-      F: __dxlog_file5,
-      L: 409,
+      F: __dxlog_file4,
+      L: 408,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1963,83 +1957,6 @@ var Swarm = class {
   _isUnregistered(peer) {
     return !peer || this._peers.get(peer.remoteInfo) !== peer;
   }
-  // TODO(burdon): Swarm => Peer.create/destroy =< Connection.open/close
-  // TODO(burdon): Pass in object.
-  constructor(_topic, _ownPeer, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter, _initiationDelay = INITIATION_DELAY) {
-    _define_property4(this, "_topic", void 0);
-    _define_property4(this, "_ownPeer", void 0);
-    _define_property4(this, "_topology", void 0);
-    _define_property4(this, "_protocolProvider", void 0);
-    _define_property4(this, "_messenger", void 0);
-    _define_property4(this, "_transportFactory", void 0);
-    _define_property4(this, "_label", void 0);
-    _define_property4(this, "_connectionLimiter", void 0);
-    _define_property4(this, "_initiationDelay", void 0);
-    _define_property4(this, "_swarmMessenger", void 0);
-    _define_property4(this, "_ctx", void 0);
-    _define_property4(this, "_listeningHandle", void 0);
-    _define_property4(this, "_peers", void 0);
-    _define_property4(this, "_instanceId", void 0);
-    _define_property4(this, "connectionAdded", void 0);
-    _define_property4(this, "disconnected", void 0);
-    _define_property4(this, "connected", void 0);
-    _define_property4(this, "errors", void 0);
-    this._topic = _topic;
-    this._ownPeer = _ownPeer;
-    this._topology = _topology;
-    this._protocolProvider = _protocolProvider;
-    this._messenger = _messenger;
-    this._transportFactory = _transportFactory;
-    this._label = _label;
-    this._connectionLimiter = _connectionLimiter;
-    this._initiationDelay = _initiationDelay;
-    this._ctx = new Context4(void 0, {
-      F: __dxlog_file5,
-      L: 39
-    });
-    this._listeningHandle = void 0;
-    this._peers = new ComplexMap2(PeerInfoHash);
-    this._instanceId = PublicKey4.random().toHex();
-    this.connectionAdded = new Event3();
-    this.disconnected = new Event3();
-    this.connected = new Event3();
-    this.errors = new ErrorStream2();
-    log5.trace("dxos.mesh.swarm.constructor", trace2.begin({
-      id: this._instanceId,
-      data: {
-        topic: this._topic.toHex(),
-        peer: this._ownPeer
-      }
-    }), {
-      F: __dxlog_file5,
-      L: 89,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    log5("creating swarm", {
-      peerId: _ownPeer
-    }, {
-      F: __dxlog_file5,
-      L: 93,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    _topology.init(this._getSwarmController());
-    this._swarmMessenger = new SwarmMessenger({
-      sendMessage: async (msg) => await this._messenger.sendMessage(msg),
-      onSignal: async (msg) => await this.onSignal(msg),
-      onOffer: async (msg) => await this.onOffer(msg),
-      topic: this._topic
-    });
-    log5.trace("dxos.mesh.swarm.constructor", trace2.end({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file5,
-      L: 102,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
 };
 _ts_decorate3([
   logInfo2
@@ -2066,30 +1983,37 @@ _ts_decorate3([
 // src/swarm/swarm-mapper.ts
 import { Event as Event4, SubscriptionList } from "@dxos/async";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
-import { log as log6 } from "@dxos/log";
+import { log as log5 } from "@dxos/log";
 import { PeerInfoHash as PeerInfoHash2 } from "@dxos/messaging";
 import { ComplexMap as ComplexMap3 } from "@dxos/util";
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts";
 var SwarmMapper = class {
+  _swarm;
+  _subscriptions = new SubscriptionList();
+  _connectionSubscriptions = new ComplexMap3(PeerInfoHash2);
+  _peers = new ComplexMap3(PeerInfoHash2);
+  mapUpdated = new Event4();
   get peers() {
     return Array.from(this._peers.values());
   }
+  constructor(_swarm) {
+    this._swarm = _swarm;
+    this._subscriptions.add(_swarm.connectionAdded.on((connection) => {
+      this._update();
+      this._connectionSubscriptions.set(connection.remoteInfo, connection.stateChanged.on(() => {
+        this._update();
+      }));
+    }));
+    this._subscriptions.add(_swarm.disconnected.on((peerId) => {
+      this._connectionSubscriptions.get(peerId)?.();
+      this._connectionSubscriptions.delete(peerId);
+      this._update();
+    }));
+    this._update();
+  }
   _update() {
-    log6("updating swarm", void 0, {
-      F: __dxlog_file6,
+    log5("updating swarm", void 0, {
+      F: __dxlog_file5,
       L: 71,
       S: this,
       C: (f, a) => f(...a)
@@ -2109,11 +2033,11 @@ var SwarmMapper = class {
         ]
       });
     }
-    log6("graph changed", {
+    log5("graph changed", {
       directConnections: this._swarm.connections.length,
       totalPeersInSwarm: this._peers.size
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 112,
       S: this,
       C: (f, a) => f(...a)
@@ -2126,62 +2050,42 @@ var SwarmMapper = class {
     this._connectionSubscriptions.clear();
     this._subscriptions.clear();
   }
-  constructor(_swarm) {
-    _define_property5(this, "_swarm", void 0);
-    _define_property5(this, "_subscriptions", void 0);
-    _define_property5(this, "_connectionSubscriptions", void 0);
-    _define_property5(this, "_peers", void 0);
-    _define_property5(this, "mapUpdated", void 0);
-    this._swarm = _swarm;
-    this._subscriptions = new SubscriptionList();
-    this._connectionSubscriptions = new ComplexMap3(PeerInfoHash2);
-    this._peers = new ComplexMap3(PeerInfoHash2);
-    this.mapUpdated = new Event4();
-    this._subscriptions.add(_swarm.connectionAdded.on((connection) => {
-      this._update();
-      this._connectionSubscriptions.set(connection.remoteInfo, connection.stateChanged.on(() => {
-        this._update();
-      }));
-    }));
-    this._subscriptions.add(_swarm.disconnected.on((peerId) => {
-      this._connectionSubscriptions.get(peerId)?.();
-      this._connectionSubscriptions.delete(peerId);
-      this._update();
-    }));
-    this._update();
-  }
 };
 
 // src/swarm/connection-limiter.ts
 import { DeferredTask as DeferredTask2 } from "@dxos/async";
-import { Context as Context5 } from "@dxos/context";
+import { Context as Context4 } from "@dxos/context";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
+import { log as log6 } from "@dxos/log";
 import { CancelledError as CancelledError3 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap4 } from "@dxos/util";
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
 var MAX_CONCURRENT_INITIATING_CONNECTIONS = 50;
 var ConnectionLimiter = class {
+  _ctx = new Context4(void 0, {
+    F: __dxlog_file6,
+    L: 23
+  });
+  _maxConcurrentInitConnections;
+  /**
+  * Queue of promises to resolve when initiating connections amount is below the limit.
+  */
+  _waitingPromises = new ComplexMap4(PublicKey6.hash);
+  resolveWaitingPromises = new DeferredTask2(this._ctx, async () => {
+    Array.from(this._waitingPromises.values()).slice(0, this._maxConcurrentInitConnections).forEach(({ resolve }) => {
+      resolve();
+    });
+  });
+  constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
+    this._maxConcurrentInitConnections = maxConcurrentInitConnections;
+  }
   /**
   * @returns Promise that resolves in queue when connections amount with 'CONNECTING' state is below the limit.
   */
   async connecting(sessionId) {
     invariant5(!this._waitingPromises.has(sessionId), "Peer is already waiting for connection", {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 48,
       S: this,
       A: [
@@ -2189,10 +2093,10 @@ var ConnectionLimiter = class {
         "'Peer is already waiting for connection'"
       ]
     });
-    log7("waiting", {
+    log6("waiting", {
       sessionId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 49,
       S: this,
       C: (f, a) => f(...a)
@@ -2204,10 +2108,10 @@ var ConnectionLimiter = class {
       });
       this.resolveWaitingPromises.schedule();
     });
-    log7("allow", {
+    log6("allow", {
       sessionId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 57,
       S: this,
       C: (f, a) => f(...a)
@@ -2217,10 +2121,10 @@ var ConnectionLimiter = class {
   * Rejects promise returned by `connecting` method.
   */
   doneConnecting(sessionId) {
-    log7("done", {
+    log6("done", {
       sessionId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 64,
       S: this,
       C: (f, a) => f(...a)
@@ -2232,20 +2136,6 @@ var ConnectionLimiter = class {
     this._waitingPromises.delete(sessionId);
     this.resolveWaitingPromises.schedule();
   }
-  constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
-    _define_property6(this, "_ctx", new Context5(void 0, {
-      F: __dxlog_file7,
-      L: 23
-    }));
-    _define_property6(this, "_maxConcurrentInitConnections", void 0);
-    _define_property6(this, "_waitingPromises", new ComplexMap4(PublicKey6.hash));
-    _define_property6(this, "resolveWaitingPromises", new DeferredTask2(this._ctx, async () => {
-      Array.from(this._waitingPromises.values()).slice(0, this._maxConcurrentInitConnections).forEach(({ resolve }) => {
-        resolve();
-      });
-    }));
-    this._maxConcurrentInitConnections = maxConcurrentInitConnections;
-  }
 };
 
 // src/connection-log.ts
@@ -2253,19 +2143,6 @@ import { Event as Event5 } from "@dxos/async";
 import { raise } from "@dxos/debug";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var CONNECTION_GC_THRESHOLD = 1e3 * 60 * 15;
 var EventType = /* @__PURE__ */ (function(EventType2) {
   EventType2["CONNECTION_STATE_CHANGED"] = "CONNECTION_STATE_CHANGED";
@@ -2276,6 +2153,11 @@ var EventType = /* @__PURE__ */ (function(EventType2) {
   return EventType2;
 })({});
 var ConnectionLog = class {
+  /**
+  * SwarmId => info
+  */
+  _swarms = new ComplexMap5(PublicKey7.hash);
+  update = new Event5();
   getSwarmInfo(swarmId) {
     return this._swarms.get(swarmId) ?? raise(new Error(`Swarm not found: ${swarmId}`));
   }
@@ -2339,10 +2221,6 @@ var ConnectionLog = class {
     this.getSwarmInfo(PublicKey7.from(swarm._instanceId)).isActive = false;
     this.update.emit();
   }
-  constructor() {
-    _define_property7(this, "_swarms", new ComplexMap5(PublicKey7.hash));
-    _define_property7(this, "update", new Event5());
-  }
 };
 var gcSwarm = (swarm) => {
   swarm.connections = swarm.connections?.filter((connection) => {
@@ -2354,32 +2232,52 @@ var gcSwarm = (swarm) => {
 import { Event as Event6, synchronized as synchronized4 } from "@dxos/async";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { Messenger } from "@dxos/messaging";
 import { trace as trace3 } from "@dxos/protocols";
 import { ConnectionState as ConnectionState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap6 } from "@dxos/util";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") 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_file8 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
+var __dxlog_file7 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
 var SwarmNetworkManager = class {
+  /**
+  * @internal
+  */
+  _swarms = new ComplexMap6(PublicKey8.hash);
+  _mappers = new ComplexMap6(PublicKey8.hash);
+  _transportFactory;
+  _signalManager;
+  _messenger;
+  _signalConnection;
+  _connectionLimiter;
+  _connectionLog;
+  _instanceId = PublicKey8.random().toHex();
+  _peerInfo = void 0;
+  _connectionState = ConnectionState2.ONLINE;
+  connectionStateChanged = new Event6();
+  topicsUpdated = new Event6();
+  constructor({ transportFactory, signalManager, enableDevtoolsLogging, peerInfo }) {
+    this._transportFactory = transportFactory;
+    this._signalManager = signalManager;
+    this._signalManager.swarmEvent.on((event) => this._swarms.get(event.topic)?.onSwarmEvent(event));
+    this._messenger = new Messenger({
+      signalManager: this._signalManager
+    });
+    this._signalConnection = {
+      join: (ctx, opts) => this._signalManager.join(ctx, opts),
+      leave: (ctx, opts) => this._signalManager.leave(ctx, opts)
+    };
+    this._peerInfo = peerInfo;
+    this._connectionLimiter = new ConnectionLimiter();
+    if (enableDevtoolsLogging) {
+      this._connectionLog = new ConnectionLog();
+    }
+  }
   // TODO(burdon): Remove access (Devtools only).
   get connectionLog() {
     return this._connectionLog;
@@ -2401,31 +2299,31 @@ var SwarmNetworkManager = class {
     this._peerInfo = peerInfo;
   }
   async open() {
-    log8.trace("dxos.mesh.network-manager.open", trace3.begin({
+    log7.trace("dxos.mesh.network-manager.open", trace3.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file8,
-      L: 133,
+      F: __dxlog_file7,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._messenger.open();
     await this._signalManager.open();
-    log8.trace("dxos.mesh.network-manager.open", trace3.end({
+    log7.trace("dxos.mesh.network-manager.open", trace3.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file8,
-      L: 136,
+      F: __dxlog_file7,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async close(ctx) {
     for (const topic of this._swarms.keys()) {
-      await this.leaveSwarm(topic).catch((err) => {
-        log8(err, void 0, {
-          F: __dxlog_file8,
-          L: 142,
+      await this.leaveSwarm(ctx, topic).catch((err) => {
+        log7(err, void 0, {
+          F: __dxlog_file7,
+          L: 143,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2437,10 +2335,10 @@ var SwarmNetworkManager = class {
   /**
   * Join the swarm.
   */
-  async joinSwarm({ topic, topology, protocolProvider: protocol, label }) {
+  async joinSwarm(ctx, { topic, topology, protocolProvider: protocol, label }) {
     invariant6(PublicKey8.isPublicKey(topic), void 0, {
-      F: __dxlog_file8,
-      L: 160,
+      F: __dxlog_file7,
+      L: 164,
       S: this,
       A: [
         "PublicKey.isPublicKey(topic)",
@@ -2448,8 +2346,8 @@ var SwarmNetworkManager = class {
       ]
     });
     invariant6(topology, void 0, {
-      F: __dxlog_file8,
-      L: 161,
+      F: __dxlog_file7,
+      L: 165,
       S: this,
       A: [
         "topology",
@@ -2457,8 +2355,8 @@ var SwarmNetworkManager = class {
       ]
     });
     invariant6(this._peerInfo, void 0, {
-      F: __dxlog_file8,
-      L: 162,
+      F: __dxlog_file7,
+      L: 166,
       S: this,
       A: [
         "this._peerInfo",
@@ -2466,8 +2364,8 @@ var SwarmNetworkManager = class {
       ]
     });
     invariant6(typeof protocol === "function", void 0, {
-      F: __dxlog_file8,
-      L: 163,
+      F: __dxlog_file7,
+      L: 167,
       S: this,
       A: [
         "typeof protocol === 'function'",
@@ -2477,23 +2375,23 @@ var SwarmNetworkManager = class {
     if (this._swarms.has(topic)) {
       throw new Error(`Already connected to swarm: ${PublicKey8.from(topic)}`);
     }
-    log8("joining", {
+    log7("joining", {
       topic: PublicKey8.from(topic),
       peerInfo: this._peerInfo,
       topology: topology.toString()
     }, {
-      F: __dxlog_file8,
-      L: 168,
+      F: __dxlog_file7,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
     const swarm = new Swarm(topic, this._peerInfo, topology, protocol, this._messenger, this._transportFactory, label, this._connectionLimiter);
     swarm.errors.handle((error) => {
-      log8("swarm error", {
+      log7("swarm error", {
         error
       }, {
-        F: __dxlog_file8,
-        L: 181,
+        F: __dxlog_file7,
+        L: 185,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2501,47 +2399,47 @@ var SwarmNetworkManager = class {
     this._swarms.set(topic, swarm);
     this._mappers.set(topic, new SwarmMapper(swarm));
     await swarm.open();
-    this._signalConnection.join({
+    this._signalConnection.join(ctx, {
       topic,
       peer: this._peerInfo
-    }).catch((error) => log8.catch(error, void 0, {
-      F: __dxlog_file8,
-      L: 190,
+    }).catch((error) => log7.catch(error, void 0, {
+      F: __dxlog_file7,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     }));
     this.topicsUpdated.emit();
     this._connectionLog?.joinedSwarm(swarm);
-    log8("joined", {
+    log7("joined", {
       topic: PublicKey8.from(topic),
       count: this._swarms.size
     }, {
-      F: __dxlog_file8,
-      L: 194,
+      F: __dxlog_file7,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
     return {
-      close: () => this.leaveSwarm(topic)
+      close: (ctx2) => this.leaveSwarm(ctx2, topic)
     };
   }
   /**
   * Close the connection.
   */
-  async leaveSwarm(topic) {
+  async leaveSwarm(ctx, topic) {
     if (!this._swarms.has(topic)) {
       return;
     }
-    log8("leaving", {
+    log7("leaving", {
       topic: PublicKey8.from(topic)
     }, {
-      F: __dxlog_file8,
-      L: 211,
+      F: __dxlog_file7,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     const swarm = this._swarms.get(topic);
-    await this._signalConnection.leave({
+    await this._signalConnection.leave(ctx, {
       topic,
       peer: swarm.ownPeer
     });
@@ -2552,12 +2450,12 @@ var SwarmNetworkManager = class {
     await swarm.destroy();
     this._swarms.delete(topic);
     this.topicsUpdated.emit();
-    log8("left", {
+    log7("left", {
       topic: PublicKey8.from(topic),
       count: this._swarms.size
     }, {
-      F: __dxlog_file8,
-      L: 225,
+      F: __dxlog_file7,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2576,475 +2474,83 @@ var SwarmNetworkManager = class {
         await this._signalManager.close();
         break;
       }
-      case ConnectionState2.ONLINE: {
-        this._connectionState = state;
-        this._messenger.open();
-        await Promise.all([
-          ...this._swarms.values()
-        ].map((swarm) => swarm.goOnline()));
-        await this._signalManager.open();
-        break;
-      }
-    }
-    this.connectionStateChanged.emit(this._connectionState);
-  }
-  constructor({ transportFactory, signalManager, enableDevtoolsLogging, peerInfo }) {
-    _define_property8(this, "_swarms", new ComplexMap6(PublicKey8.hash));
-    _define_property8(this, "_mappers", new ComplexMap6(PublicKey8.hash));
-    _define_property8(this, "_transportFactory", void 0);
-    _define_property8(this, "_signalManager", void 0);
-    _define_property8(this, "_messenger", void 0);
-    _define_property8(this, "_signalConnection", void 0);
-    _define_property8(this, "_connectionLimiter", void 0);
-    _define_property8(this, "_connectionLog", void 0);
-    _define_property8(this, "_instanceId", PublicKey8.random().toHex());
-    _define_property8(this, "_peerInfo", void 0);
-    _define_property8(this, "_connectionState", ConnectionState2.ONLINE);
-    _define_property8(this, "connectionStateChanged", new Event6());
-    _define_property8(this, "topicsUpdated", new Event6());
-    this._transportFactory = transportFactory;
-    this._signalManager = signalManager;
-    this._signalManager.swarmEvent.on((event) => this._swarms.get(event.topic)?.onSwarmEvent(event));
-    this._messenger = new Messenger({
-      signalManager: this._signalManager
-    });
-    this._signalConnection = {
-      join: (opts) => this._signalManager.join(opts),
-      leave: (opts) => this._signalManager.leave(opts)
-    };
-    this._peerInfo = peerInfo;
-    this._connectionLimiter = new ConnectionLimiter();
-    if (enableDevtoolsLogging) {
-      this._connectionLog = new ConnectionLog();
-    }
-  }
-};
-_ts_decorate4([
-  synchronized4
-], SwarmNetworkManager.prototype, "joinSwarm", null);
-_ts_decorate4([
-  synchronized4
-], SwarmNetworkManager.prototype, "leaveSwarm", null);
-
-// src/topology/fully-connected-topology.ts
-import { invariant as invariant7 } from "@dxos/invariant";
-function _define_property9(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file9 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts";
-var FullyConnectedTopology = class {
-  toString() {
-    return "FullyConnectedTopology";
-  }
-  init(controller) {
-    invariant7(!this._controller, "Already initialized", {
-      F: __dxlog_file9,
-      L: 18,
-      S: this,
-      A: [
-        "!this._controller",
-        "'Already initialized'"
-      ]
-    });
-    this._controller = controller;
-  }
-  update() {
-    invariant7(this._controller, "Not initialized", {
-      F: __dxlog_file9,
-      L: 23,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized'"
-      ]
-    });
-    const { candidates: discovered } = this._controller.getState();
-    for (const peer of discovered) {
-      this._controller.connect(peer);
-    }
-  }
-  async onOffer(peer) {
-    return true;
-  }
-  async destroy() {
-  }
-  constructor() {
-    _define_property9(this, "_controller", void 0);
-  }
-};
-
-// src/topology/mmst-topology.ts
-import { invariant as invariant8 } from "@dxos/invariant";
-import { log as log9 } from "@dxos/log";
-function _define_property10(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file10 = "/__w/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 {
-  init(controller) {
-    invariant8(!this._controller, "Already initialized", {
-      F: __dxlog_file10,
-      L: 49,
-      S: this,
-      A: [
-        "!this._controller",
-        "'Already initialized'"
-      ]
-    });
-    this._controller = controller;
-  }
-  update() {
-    invariant8(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) {
-      log9("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) {
-    invariant8(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;
-    log9(`Offer ${peer} accept=${accept}`, void 0, {
-      F: __dxlog_file10,
-      L: 73,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    return accept;
-  }
-  async destroy() {
-  }
-  _runAlgorithm() {
-    invariant8(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) {
-      log9(`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);
-      invariant8(sorted.length === 0, void 0, {
-        F: __dxlog_file10,
-        L: 92,
-        S: this,
-        A: [
-          "sorted.length === 0",
-          ""
-        ]
-      });
-      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
-        log9(`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)) {
-          log9(`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 {
-        log9("rate limited disconnect", void 0, {
-          F: __dxlog_file10,
-          L: 105,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    } else if (connected.length < this._originateConnections) {
-      log9(`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) {
-        log9(`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)) {
-          log9(`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 {
-        log9("rate limited connect", void 0, {
-          F: __dxlog_file10,
-          L: 123,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    }
-  }
-  toString() {
-    return "MMSTTopology";
-  }
-  constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
-    _define_property10(this, "_originateConnections", void 0);
-    _define_property10(this, "_maxPeers", void 0);
-    _define_property10(this, "_sampleSize", void 0);
-    _define_property10(this, "_controller", void 0);
-    _define_property10(this, "_sampleCollected", false);
-    _define_property10(this, "_lastAction", /* @__PURE__ */ new Date(0));
-    this._originateConnections = originateConnections;
-    this._maxPeers = maxPeers;
-    this._sampleSize = sampleSize;
-  }
-};
-var sortByXorDistance = (keys, reference) => {
-  const sorted = keys.sort((a, b) => {
-    return compareXor(distXor(a.asBuffer(), reference.asBuffer()), distXor(b.asBuffer(), reference.asBuffer()));
-  });
-  log9("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;
+      case ConnectionState2.ONLINE: {
+        this._connectionState = state;
+        this._messenger.open();
+        await Promise.all([
+          ...this._swarms.values()
+        ].map((swarm) => swarm.goOnline()));
+        await this._signalManager.open();
+        break;
+      }
     }
-    return (a[i] || 0) < (b[i] || 0) ? -1 : 1;
+    this.connectionStateChanged.emit(this._connectionState);
   }
-  return 0;
 };
+_ts_decorate4([
+  synchronized4
+], SwarmNetworkManager.prototype, "joinSwarm", null);
+_ts_decorate4([
+  synchronized4
+], SwarmNetworkManager.prototype, "leaveSwarm", null);
 
-// src/topology/star-topology.ts
-import { invariant as invariant9 } from "@dxos/invariant";
-import { log as log10 } from "@dxos/log";
-function _define_property11(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file11 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
-var StarTopology = class {
+// src/topology/fully-connected-topology.ts
+import { invariant as invariant7 } from "@dxos/invariant";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts";
+var FullyConnectedTopology = class {
+  _controller;
   toString() {
-    return `StarTopology(${this._centralPeer.truncate()})`;
+    return "FullyConnectedTopology";
   }
   init(controller) {
-    invariant9(!this._controller, "Already initialized.", {
-      F: __dxlog_file11,
-      L: 21,
+    invariant7(!this._controller, "Already initialized", {
+      F: __dxlog_file8,
+      L: 18,
       S: this,
       A: [
         "!this._controller",
-        "'Already initialized.'"
+        "'Already initialized'"
       ]
     });
     this._controller = controller;
   }
   update() {
-    invariant9(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
-      L: 26,
+    invariant7(this._controller, "Not initialized", {
+      F: __dxlog_file8,
+      L: 23,
       S: this,
       A: [
         "this._controller",
-        "'Not initialized.'"
+        "'Not initialized'"
       ]
     });
-    const { candidates, connected, ownPeerId } = this._controller.getState();
-    if (!ownPeerId.equals(this._centralPeer)) {
-      log10("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)) {
-          log10("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)) {
-        log10("connecting to peer", {
-          peer
-        }, {
-          F: __dxlog_file11,
-          L: 43,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._controller.connect(peer);
-      }
+    const { candidates: discovered } = this._controller.getState();
+    for (const peer of discovered) {
+      this._controller.connect(peer);
     }
   }
   async onOffer(peer) {
-    invariant9(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
-      L: 50,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized.'"
-      ]
-    });
-    const { ownPeerId } = this._controller.getState();
-    log10("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);
+    return true;
   }
   async destroy() {
   }
-  constructor(_centralPeer) {
-    _define_property11(this, "_centralPeer", void 0);
-    _define_property11(this, "_controller", void 0);
-    this._centralPeer = _centralPeer;
-  }
 };
 
 // src/transport/memory-transport.ts
 import { Transform } from "@dxos/node-std/stream";
 import { Event as Event7, Trigger as Trigger2 } from "@dxos/async";
 import { ErrorStream as ErrorStream3 } from "@dxos/debug";
-import { invariant as invariant10 } from "@dxos/invariant";
+import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log11, logInfo as logInfo3 } from "@dxos/log";
+import { log as log8, logInfo as logInfo3 } from "@dxos/log";
 import { ComplexMap as ComplexMap7 } from "@dxos/util";
-function _define_property12(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
+var __dxlog_file9 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
 var MEMORY_TRANSPORT_DELAY = 1;
 var createStreamDelay = (delay) => {
   return new Transform({
@@ -3058,19 +2564,45 @@ var MemoryTransportFactory = {
   createTransport: (options) => new MemoryTransport(options)
 };
 var MemoryTransport = class _MemoryTransport {
+  _options;
+  // TODO(burdon): Remove static properties (inject context into constructor).
+  static _connections = new ComplexMap7(PublicKey9.hash);
+  _instanceId = PublicKey9.random();
+  _remote = new Trigger2();
+  _outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
+  _incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
+  _closed = false;
+  _remoteInstanceId;
+  _remoteConnection;
+  closed = new Event7();
+  connected = new Event7();
+  errors = new ErrorStream3();
+  constructor(_options) {
+    this._options = _options;
+    invariant8(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection", {
+      F: __dxlog_file9,
+      L: 64,
+      S: this,
+      A: [
+        "!MemoryTransport._connections.has(this._instanceId)",
+        "'Duplicate memory connection'"
+      ]
+    });
+    _MemoryTransport._connections.set(this._instanceId, this);
+  }
   get isOpen() {
     return !this._closed;
   }
   async open() {
-    log11("opening...", void 0, {
-      F: __dxlog_file12,
+    log8("opening...", void 0, {
+      F: __dxlog_file9,
       L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._options.initiator) {
-      log11("sending signal", void 0, {
-        F: __dxlog_file12,
+      log8("sending signal", void 0, {
+        F: __dxlog_file9,
         L: 78,
         S: this,
         C: (f, a) => f(...a)
@@ -3100,8 +2632,8 @@ var MemoryTransport = class _MemoryTransport {
           this.closed.emit();
           return;
         }
-        invariant10(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`, {
-          F: __dxlog_file12,
+        invariant8(!this._remoteConnection._remoteConnection, `Remote already connected: ${this._remoteInstanceId}`, {
+          F: __dxlog_file9,
           L: 104,
           S: this,
           A: [
@@ -3111,8 +2643,8 @@ var MemoryTransport = class _MemoryTransport {
         });
         this._remoteConnection._remoteConnection = this;
         this._remoteConnection._remoteInstanceId = this._instanceId;
-        log11("connected", void 0, {
-          F: __dxlog_file12,
+        log8("connected", void 0, {
+          F: __dxlog_file9,
           L: 108,
           S: this,
           C: (f, a) => f(...a)
@@ -3130,8 +2662,8 @@ var MemoryTransport = class _MemoryTransport {
     return this;
   }
   async close() {
-    log11("closing...", void 0, {
-      F: __dxlog_file12,
+    log8("closing...", void 0, {
+      F: __dxlog_file9,
       L: 130,
       S: this,
       C: (f, a) => f(...a)
@@ -3151,8 +2683,8 @@ var MemoryTransport = class _MemoryTransport {
       this._remoteConnection = void 0;
     }
     this.closed.emit();
-    log11("closed", void 0, {
-      F: __dxlog_file12,
+    log8("closed", void 0, {
+      F: __dxlog_file9,
       L: 158,
       S: this,
       C: (f, a) => f(...a)
@@ -3160,10 +2692,10 @@ var MemoryTransport = class _MemoryTransport {
     return this;
   }
   async onSignal({ payload }) {
-    log11("received signal", {
+    log8("received signal", {
       payload
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file9,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
@@ -3188,40 +2720,7 @@ var MemoryTransport = class _MemoryTransport {
       packetsReceived: 0
     };
   }
-  constructor(_options) {
-    _define_property12(this, "_options", void 0);
-    _define_property12(this, "_instanceId", void 0);
-    _define_property12(this, "_remote", void 0);
-    _define_property12(this, "_outgoingDelay", void 0);
-    _define_property12(this, "_incomingDelay", void 0);
-    _define_property12(this, "_closed", void 0);
-    _define_property12(this, "_remoteInstanceId", void 0);
-    _define_property12(this, "_remoteConnection", void 0);
-    _define_property12(this, "closed", void 0);
-    _define_property12(this, "connected", void 0);
-    _define_property12(this, "errors", void 0);
-    this._options = _options;
-    this._instanceId = PublicKey9.random();
-    this._remote = new Trigger2();
-    this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
-    this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
-    this._closed = false;
-    this.closed = new Event7();
-    this.connected = new Event7();
-    this.errors = new ErrorStream3();
-    invariant10(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection", {
-      F: __dxlog_file12,
-      L: 64,
-      S: this,
-      A: [
-        "!MemoryTransport._connections.has(this._instanceId)",
-        "'Duplicate memory connection'"
-      ]
-    });
-    _MemoryTransport._connections.set(this._instanceId, this);
-  }
 };
-_define_property12(MemoryTransport, "_connections", new ComplexMap7(PublicKey9.hash));
 _ts_decorate5([
   logInfo3
 ], MemoryTransport.prototype, "_instanceId", void 0);
@@ -3241,19 +2740,6 @@ var TransportKind = /* @__PURE__ */ (function(TransportKind2) {
 
 // src/transport/webrtc/rtc-connection-factory.ts
 import { Mutex } from "@dxos/async";
-function _define_property13(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var BrowserRtcConnectionFactory = class {
   async initialize() {
   }
@@ -3266,6 +2752,8 @@ var BrowserRtcConnectionFactory = class {
   }
 };
 var NodeRtcConnectionFactory = class _NodeRtcConnectionFactory {
+  static _createdConnections = 0;
+  static _cleanupMutex = new Mutex();
   // This should be inside the function to avoid triggering `eval` in the global scope.
   // eslint-disable-next-line @typescript-eslint/no-implied-eval
   // TODO(burdon): Do imports here?
@@ -3291,16 +2779,14 @@ var NodeRtcConnectionFactory = class _NodeRtcConnectionFactory {
     }
   }
 };
-_define_property13(NodeRtcConnectionFactory, "_createdConnections", 0);
-_define_property13(NodeRtcConnectionFactory, "_cleanupMutex", new Mutex());
 var getRtcConnectionFactory = () => {
   return typeof globalThis.RTCPeerConnection === "undefined" ? new NodeRtcConnectionFactory() : new BrowserRtcConnectionFactory();
 };
 
 // src/transport/webrtc/rtc-peer-connection.ts
 import { Mutex as Mutex2, Trigger as Trigger3, synchronized as synchronized5 } from "@dxos/async";
-import { invariant as invariant12 } from "@dxos/invariant";
-import { log as log13, logInfo as logInfo4 } from "@dxos/log";
+import { invariant as invariant10 } from "@dxos/invariant";
+import { log as log10, logInfo as logInfo4 } from "@dxos/log";
 import { ConnectivityError as ConnectivityError3 } from "@dxos/protocols";
 import { trace as trace4 } from "@dxos/tracing";
 
@@ -3309,8 +2795,8 @@ import { Duplex } from "@dxos/node-std/stream";
 import { Event as AsyncEvent } from "@dxos/async";
 import { Resource } from "@dxos/context";
 import { ErrorStream as ErrorStream4 } from "@dxos/debug";
-import { invariant as invariant11 } from "@dxos/invariant";
-import { log as log12 } from "@dxos/log";
+import { invariant as invariant9 } from "@dxos/invariant";
+import { log as log9 } from "@dxos/log";
 import { ConnectivityError as ConnectivityError2 } from "@dxos/protocols";
 
 // src/transport/webrtc/rtc-transport-stats.ts
@@ -3361,23 +2847,22 @@ var getRtcConnectionStats = async (connection, channelTopic) => {
 };
 
 // src/transport/webrtc/rtc-transport-channel.ts
-function _define_property14(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file13 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-channel.ts";
+var __dxlog_file10 = "/__w/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 Resource {
+  _connection;
+  _options;
+  closed = new AsyncEvent();
+  connected = new AsyncEvent();
+  errors = new ErrorStream4();
+  _channel;
+  _stream;
+  _streamDataFlushedCallback = null;
+  _isChannelCreationInProgress = false;
+  constructor(_connection, _options) {
+    super(), this._connection = _connection, this._options = _options;
+  }
   get isRtcChannelCreationInProgress() {
     return this._isChannelCreationInProgress;
   }
@@ -3387,9 +2872,9 @@ var RtcTransportChannel = class extends Resource {
     }
   }
   async _open() {
-    invariant11(!this._isChannelCreationInProgress, void 0, {
-      F: __dxlog_file13,
-      L: 57,
+    invariant9(!this._isChannelCreationInProgress, void 0, {
+      F: __dxlog_file10,
+      L: 56,
       S: this,
       A: [
         "!this._isChannelCreationInProgress",
@@ -3406,14 +2891,16 @@ var RtcTransportChannel = class extends Resource {
       }
     }).catch((err) => {
       if (this.isOpen) {
-        const error = err instanceof Error ? err : new ConnectivityError2(`Failed to create a channel: ${JSON.stringify(err?.message)}`);
+        const error = err instanceof Error ? err : new ConnectivityError2({
+          message: `Failed to create a channel: ${JSON.stringify(err?.message)}`
+        });
         this.errors.raise(error);
       } else {
-        log12.verbose("connection establishment failed after transport was closed", {
+        log9.verbose("connection establishment failed after transport was closed", {
           err
         }, {
-          F: __dxlog_file13,
-          L: 77,
+          F: __dxlog_file10,
+          L: 76,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3429,9 +2916,9 @@ var RtcTransportChannel = class extends Resource {
       this._stream = void 0;
     }
     this.closed.emit();
-    log12("closed", void 0, {
-      F: __dxlog_file13,
-      L: 93,
+    log9("closed", void 0, {
+      F: __dxlog_file10,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3440,20 +2927,20 @@ var RtcTransportChannel = class extends Resource {
     Object.assign(channel, {
       onopen: () => {
         if (!this.isOpen) {
-          log12.warn("channel opened in a closed transport", {
+          log9.warn("channel opened in a closed transport", {
             topic: this._options.topic
           }, {
-            F: __dxlog_file13,
-            L: 100,
+            F: __dxlog_file10,
+            L: 99,
             S: this,
             C: (f, a) => f(...a)
           });
           this._safeCloseChannel(channel);
           return;
         }
-        log12("onopen", void 0, {
-          F: __dxlog_file13,
-          L: 105,
+        log9("onopen", void 0, {
+          F: __dxlog_file10,
+          L: 104,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3469,9 +2956,9 @@ var RtcTransportChannel = class extends Resource {
         this.connected.emit();
       },
       onclose: async () => {
-        log12("onclose", void 0, {
-          F: __dxlog_file13,
-          L: 118,
+        log9("onclose", void 0, {
+          F: __dxlog_file10,
+          L: 117,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3479,9 +2966,9 @@ var RtcTransportChannel = class extends Resource {
       },
       onmessage: async (event) => {
         if (!this._stream) {
-          log12.warn("ignoring message on a closed channel", void 0, {
-            F: __dxlog_file13,
-            L: 124,
+          log9.warn("ignoring message on a closed channel", void 0, {
+            F: __dxlog_file10,
+            L: 123,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3510,9 +2997,9 @@ var RtcTransportChannel = class extends Resource {
   }
   async _handleChannelWrite(chunk, callback) {
     if (!this._channel) {
-      log12.warn("writing to a channel after a connection was closed", void 0, {
-        F: __dxlog_file13,
-        L: 154,
+      log9.warn("writing to a channel after a connection was closed", void 0, {
+        F: __dxlog_file10,
+        L: 153,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3533,9 +3020,9 @@ var RtcTransportChannel = class extends Resource {
     }
     if (this._channel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
       if (this._streamDataFlushedCallback !== null) {
-        log12.error("consumer trying to write before we are ready for more data", void 0, {
-          F: __dxlog_file13,
-          L: 175,
+        log9.error("consumer trying to write before we are ready for more data", void 0, {
+          F: __dxlog_file10,
+          L: 174,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3549,9 +3036,9 @@ var RtcTransportChannel = class extends Resource {
     try {
       channel.close();
     } catch (error) {
-      log12.catch(error, void 0, {
-        F: __dxlog_file13,
-        L: 187,
+      log9.catch(error, void 0, {
+        F: __dxlog_file10,
+        L: 186,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3566,9 +3053,6 @@ var RtcTransportChannel = class extends Resource {
   async getStats() {
     return createRtcTransportStats(this._connection.currentConnection, this._options.topic);
   }
-  constructor(_connection, _options) {
-    super(), _define_property14(this, "_connection", void 0), _define_property14(this, "_options", void 0), _define_property14(this, "closed", void 0), _define_property14(this, "connected", void 0), _define_property14(this, "errors", void 0), _define_property14(this, "_channel", void 0), _define_property14(this, "_stream", void 0), _define_property14(this, "_streamDataFlushedCallback", void 0), _define_property14(this, "_isChannelCreationInProgress", void 0), this._connection = _connection, this._options = _options, this.closed = new AsyncEvent(), this.connected = new AsyncEvent(), this.errors = new ErrorStream4(), this._streamDataFlushedCallback = null, this._isChannelCreationInProgress = false;
-  }
 };
 
 // src/transport/webrtc/utils.ts
@@ -3598,27 +3082,37 @@ var deduplicatedSdpLines = (sdp) => {
 };
 
 // src/transport/webrtc/rtc-peer-connection.ts
-function _define_property15(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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_file14 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-peer-connection.ts";
+var __dxlog_file11 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-peer-connection.ts";
 var RtcPeerConnection = class {
+  _factory;
+  _options;
+  // A peer who is not the initiator waits for another party to open a channel.
+  _channelCreatedCallbacks = /* @__PURE__ */ new Map();
+  // Channels indexed by topic.
+  _transportChannels = /* @__PURE__ */ new Map();
+  _dataChannels = /* @__PURE__ */ new Map();
+  // A peer is ready to receive ICE candidates when local and remote description were set.
+  _readyForCandidates = new Trigger3();
+  _offerProcessingMutex = new Mutex2();
+  /**
+  * Can't use peer.connection.initiator, because if two connections to the same peer are created in
+  * different swarms, we might be the initiator of the first one, but not of the other one.
+  * Use a stable peer keypair property (key ordering) to decide who's acting as the initiator of
+  * transport connection establishment and data channel creation.
+  */
+  _initiator;
+  _connection;
+  constructor(_factory, _options) {
+    this._factory = _factory;
+    this._options = _options;
+    this._initiator = chooseInitiatorPeer(_options.ownPeerKey, _options.remotePeerKey) === _options.ownPeerKey;
+  }
   get transportChannelCount() {
     return this._transportChannels.size;
   }
@@ -3642,9 +3136,9 @@ var RtcPeerConnection = class {
       if (existingChannel) {
         return existingChannel;
       }
-      log13("waiting for initiator-peer to open a data channel", void 0, {
-        F: __dxlog_file14,
-        L: 96,
+      log10("waiting for initiator-peer to open a data channel", void 0, {
+        F: __dxlog_file11,
+        L: 95,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3671,11 +3165,11 @@ var RtcPeerConnection = class {
     if (this._connection) {
       return this._connection;
     }
-    log13("initializing connection...", () => ({
+    log10("initializing connection...", () => ({
       remotePeer: this._options.remotePeerKey
     }), {
-      F: __dxlog_file14,
-      L: 121,
+      F: __dxlog_file11,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3684,9 +3178,9 @@ var RtcPeerConnection = class {
     const iceCandidateErrors = [];
     Object.assign(connection, {
       onnegotiationneeded: async () => {
-        invariant12(this._initiator, void 0, {
-          F: __dxlog_file14,
-          L: 136,
+        invariant10(this._initiator, void 0, {
+          F: __dxlog_file11,
+          L: 135,
           S: this,
           A: [
             "this._initiator",
@@ -3697,9 +3191,9 @@ var RtcPeerConnection = class {
           this._onConnectionCallbackAfterClose("onnegotiationneeded", connection);
           return;
         }
-        log13("onnegotiationneeded", void 0, {
-          F: __dxlog_file14,
-          L: 143,
+        log10("onnegotiationneeded", void 0, {
+          F: __dxlog_file11,
+          L: 142,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3719,19 +3213,19 @@ var RtcPeerConnection = class {
           return;
         }
         if (event.candidate) {
-          log13("onicecandidate", {
+          log10("onicecandidate", {
             candidate: event.candidate.candidate
           }, {
-            F: __dxlog_file14,
-            L: 162,
+            F: __dxlog_file11,
+            L: 161,
             S: this,
             C: (f, a) => f(...a)
           });
           await this._sendIceCandidate(event.candidate);
         } else {
-          log13("onicecandidate gathering complete", void 0, {
-            F: __dxlog_file14,
-            L: 165,
+          log10("onicecandidate gathering complete", void 0, {
+            F: __dxlog_file11,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3755,11 +3249,11 @@ var RtcPeerConnection = class {
           this._onConnectionCallbackAfterClose("oniceconnectionstatechange", connection);
           return;
         }
-        log13("oniceconnectionstatechange", {
+        log10("oniceconnectionstatechange", {
           state: connection.iceConnectionState
         }, {
-          F: __dxlog_file14,
-          L: 185,
+          F: __dxlog_file11,
+          L: 184,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3777,11 +3271,11 @@ var RtcPeerConnection = class {
           }
           return;
         }
-        log13("onconnectionstatechange", {
+        log10("onconnectionstatechange", {
           state: connection.connectionState
         }, {
-          F: __dxlog_file14,
-          L: 202,
+          F: __dxlog_file11,
+          L: 201,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3790,11 +3284,11 @@ var RtcPeerConnection = class {
         }
       },
       onsignalingstatechange: () => {
-        log13("onsignalingstatechange", {
+        log10("onsignalingstatechange", {
           state: connection.signalingState
         }, {
-          F: __dxlog_file14,
-          L: 209,
+          F: __dxlog_file11,
+          L: 208,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3802,9 +3296,9 @@ var RtcPeerConnection = class {
       // When channel is added to connection.
       // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/datachannel_event
       ondatachannel: (event) => {
-        invariant12(!this._initiator, "Initiator is expected to create data channels.", {
-          F: __dxlog_file14,
-          L: 215,
+        invariant10(!this._initiator, "Initiator is expected to create data channels.", {
+          F: __dxlog_file11,
+          L: 214,
           S: this,
           A: [
             "!this._initiator",
@@ -3815,11 +3309,11 @@ var RtcPeerConnection = class {
           this._onConnectionCallbackAfterClose("ondatachannel", connection);
           return;
         }
-        log13("ondatachannel", {
+        log10("ondatachannel", {
           label: event.channel.label
         }, {
-          F: __dxlog_file14,
-          L: 222,
+          F: __dxlog_file11,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3843,11 +3337,11 @@ var RtcPeerConnection = class {
   }
   _abortConnection(connection, error) {
     if (connection !== this._connection) {
-      log13.error("attempted to abort an inactive connection", {
+      log10.error("attempted to abort an inactive connection", {
         error
       }, {
-        F: __dxlog_file14,
-        L: 247,
+        F: __dxlog_file11,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3864,19 +3358,19 @@ var RtcPeerConnection = class {
     }
     this._transportChannels.clear();
     this._safeCloseConnection();
-    log13("connection aborted", {
+    log10("connection aborted", {
       reason: error.message
     }, {
-      F: __dxlog_file14,
-      L: 261,
+      F: __dxlog_file11,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _lockAndCloseConnection() {
-    invariant12(this._transportChannels.size === 0, void 0, {
-      F: __dxlog_file14,
-      L: 266,
+    invariant10(this._transportChannels.size === 0, void 0, {
+      F: __dxlog_file11,
+      L: 265,
       S: this,
       A: [
         "this._transportChannels.size === 0",
@@ -3885,9 +3379,9 @@ var RtcPeerConnection = class {
     });
     if (this._connection) {
       this._safeCloseConnection();
-      log13("connection closed", void 0, {
-        F: __dxlog_file14,
-        L: 269,
+      log10("connection closed", void 0, {
+        F: __dxlog_file11,
+        L: 268,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3896,11 +3390,11 @@ var RtcPeerConnection = class {
   async onSignal(signal) {
     const connection = this._connection;
     if (!connection) {
-      log13.warn("a signal ignored because the connection was closed", {
+      log10.warn("a signal ignored because the connection was closed", {
         type: signal.payload.data.type
       }, {
-        F: __dxlog_file14,
-        L: 277,
+        F: __dxlog_file11,
+        L: 276,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3963,11 +3457,11 @@ var RtcPeerConnection = class {
         this._abortConnection(connection, new Error(`Unknown signal type ${data.type}.`));
         break;
     }
-    log13("signal processed", {
+    log10("signal processed", {
       type: data.type
     }, {
-      F: __dxlog_file14,
-      L: 336,
+      F: __dxlog_file11,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3976,20 +3470,20 @@ var RtcPeerConnection = class {
     try {
       await this._readyForCandidates.wait();
       if (connection === this._connection) {
-        log13("adding ice candidate", {
+        log10("adding ice candidate", {
           candidate
         }, {
-          F: __dxlog_file14,
-          L: 344,
+          F: __dxlog_file11,
+          L: 343,
           S: this,
           C: (f, a) => f(...a)
         });
         await connection.addIceCandidate(candidate);
       }
     } catch (err) {
-      log13.catch(err, void 0, {
-        F: __dxlog_file14,
-        L: 348,
+      log10.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 347,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3997,29 +3491,29 @@ var RtcPeerConnection = class {
   }
   _onSessionNegotiated(connection) {
     if (connection === this._connection) {
-      log13("ready to process ice candidates", void 0, {
-        F: __dxlog_file14,
-        L: 354,
+      log10("ready to process ice candidates", void 0, {
+        F: __dxlog_file11,
+        L: 353,
         S: this,
         C: (f, a) => f(...a)
       });
       this._readyForCandidates.wake();
     } else {
-      log13.warn("session was negotiated after connection became inactive", void 0, {
-        F: __dxlog_file14,
-        L: 357,
+      log10.warn("session was negotiated after connection became inactive", void 0, {
+        F: __dxlog_file11,
+        L: 356,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   _onConnectionCallbackAfterClose(callback, connection) {
-    log13.warn("callback invoked after a connection was destroyed, this is probably a bug", {
+    log10.warn("callback invoked after a connection was destroyed, this is probably a bug", {
       callback,
       state: connection.connectionState
     }, {
-      F: __dxlog_file14,
-      L: 362,
+      F: __dxlog_file11,
+      L: 361,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4030,9 +3524,9 @@ var RtcPeerConnection = class {
     try {
       connection?.close();
     } catch (err) {
-      log13.catch(err, void 0, {
-        F: __dxlog_file14,
-        L: 374,
+      log10.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 373,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4041,9 +3535,9 @@ var RtcPeerConnection = class {
       this._connection = void 0;
       this._dataChannels.clear();
       this._readyForCandidates.wake();
-      void this._factory.onConnectionDestroyed().catch((err) => log13.catch(err, void 0, {
-        F: __dxlog_file14,
-        L: 380,
+      void this._factory.onConnectionDestroyed().catch((err) => log10.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 379,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -4066,9 +3560,9 @@ var RtcPeerConnection = class {
         ];
       }
     } catch (error) {
-      log13.catch(error, void 0, {
-        F: __dxlog_file14,
-        L: 396,
+      log10.catch(error, void 0, {
+        F: __dxlog_file11,
+        L: 395,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4091,11 +3585,11 @@ var RtcPeerConnection = class {
         }
       });
     } catch (err) {
-      log13.warn("signaling error", {
+      log10.warn("signaling error", {
         err
       }, {
-        F: __dxlog_file14,
-        L: 417,
+        F: __dxlog_file11,
+        L: 416,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4142,25 +3636,6 @@ var RtcPeerConnection = class {
       channels: this._transportChannels.size
     };
   }
-  constructor(_factory, _options) {
-    _define_property15(this, "_factory", void 0);
-    _define_property15(this, "_options", void 0);
-    _define_property15(this, "_channelCreatedCallbacks", void 0);
-    _define_property15(this, "_transportChannels", void 0);
-    _define_property15(this, "_dataChannels", void 0);
-    _define_property15(this, "_readyForCandidates", void 0);
-    _define_property15(this, "_offerProcessingMutex", void 0);
-    _define_property15(this, "_initiator", void 0);
-    _define_property15(this, "_connection", void 0);
-    this._factory = _factory;
-    this._options = _options;
-    this._channelCreatedCallbacks = /* @__PURE__ */ new Map();
-    this._transportChannels = /* @__PURE__ */ new Map();
-    this._dataChannels = /* @__PURE__ */ new Map();
-    this._readyForCandidates = new Trigger3();
-    this._offerProcessingMutex = new Mutex2();
-    this._initiator = chooseInitiatorPeer(_options.ownPeerKey, _options.remotePeerKey) === _options.ownPeerKey;
-  }
 };
 _ts_decorate6([
   synchronized5
@@ -4191,8 +3666,10 @@ var isRemoteDescriptionSet = (connection, data) => {
 };
 var createIceFailureError = (details) => {
   const candidateErrors = details.map(({ url, errorCode, errorText }) => `${errorCode} ${url}: ${errorText}`);
-  return new ConnectivityError3(`ICE failed:
-${candidateErrors.join("\n")}`);
+  return new ConnectivityError3({
+    message: `ICE failed:
+${candidateErrors.join("\n")}`
+  });
 };
 
 // src/transport/webrtc/rtc-transport-factory.ts
@@ -4218,30 +3695,26 @@ import { Writable } from "@dxos/node-std/stream";
 import { Event as Event8, scheduleTask as scheduleTask4 } from "@dxos/async";
 import { Resource as Resource2 } from "@dxos/context";
 import { ErrorStream as ErrorStream5 } from "@dxos/debug";
-import { invariant as invariant13 } from "@dxos/invariant";
+import { invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log14 } from "@dxos/log";
+import { log as log11 } from "@dxos/log";
 import { ConnectionResetError as ConnectionResetError2, ConnectivityError as ConnectivityError4, TimeoutError as TimeoutError3 } from "@dxos/protocols";
 import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 import { arrayToBuffer } from "@dxos/util";
-function _define_property16(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file15 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-proxy.ts";
+var __dxlog_file12 = "/__w/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 Resource2 {
+  _options;
+  _proxyId = PublicKey10.random();
+  closed = new Event8();
+  connected = new Event8();
+  errors = new ErrorStream5();
+  _serviceStream;
+  constructor(_options) {
+    super(), this._options = _options;
+  }
   async _open() {
     let stream;
     try {
@@ -4261,8 +3734,8 @@ var RtcTransportProxy = class extends Resource2 {
     this._serviceStream = stream;
     stream.waitUntilReady().then(() => {
       stream.subscribe(async (event) => {
-        log14("rtc transport proxy event", event, {
-          F: __dxlog_file15,
+        log11("rtc transport proxy event", event, {
+          F: __dxlog_file12,
           L: 66,
           S: this,
           C: (f, a) => f(...a)
@@ -4275,10 +3748,10 @@ var RtcTransportProxy = class extends Resource2 {
           await this._handleSignal(event.signal);
         }
       }, (err) => {
-        log14("rtc bridge stream closed", {
+        log11("rtc bridge stream closed", {
           err
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file12,
           L: 76,
           S: this,
           C: (f, a) => f(...a)
@@ -4299,8 +3772,8 @@ var RtcTransportProxy = class extends Resource2 {
             timeout: RPC_TIMEOUT
           }).then(() => {
             if (Date.now() - sendStartMs > RESP_MIN_THRESHOLD) {
-              log14("slow response, delaying callback", void 0, {
-                F: __dxlog_file15,
+              log11("slow response, delaying callback", void 0, {
+                F: __dxlog_file12,
                 L: 93,
                 S: this,
                 C: (f, a) => f(...a)
@@ -4332,8 +3805,8 @@ var RtcTransportProxy = class extends Resource2 {
       await this._serviceStream?.close();
       this._serviceStream = void 0;
     } catch (err) {
-      log14.catch(err, void 0, {
-        F: __dxlog_file15,
+      log11.catch(err, void 0, {
+        F: __dxlog_file12,
         L: 128,
         S: this,
         C: (f, a) => f(...a)
@@ -4346,8 +3819,8 @@ var RtcTransportProxy = class extends Resource2 {
         timeout: CLOSE_RPC_TIMEOUT
       });
     } catch (err) {
-      log14.catch(err, void 0, {
-        F: __dxlog_file15,
+      log11.catch(err, void 0, {
+        F: __dxlog_file12,
         L: 134,
         S: this,
         C: (f, a) => f(...a)
@@ -4392,7 +3865,9 @@ var RtcTransportProxy = class extends Resource2 {
     } catch (error) {
       const type = signalEvent.payload.payload.data?.type;
       if (type === "offer" || type === "answer") {
-        this._raiseIfOpen(new ConnectivityError4(`Session establishment failed: ${type} couldn't be sent.`));
+        this._raiseIfOpen(new ConnectivityError4({
+          message: `Session establishment failed: ${type} couldn't be sent.`
+        }));
       }
     }
   }
@@ -4430,11 +3905,11 @@ var RtcTransportProxy = class extends Resource2 {
     if (this.isOpen) {
       this.errors.raise(error);
     } else {
-      log14.info("error swallowed because transport was closed", {
+      log11.info("error swallowed because transport was closed", {
         message: error.message
       }, {
-        F: __dxlog_file15,
-        L: 215,
+        F: __dxlog_file12,
+        L: 217,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4447,11 +3922,10 @@ var RtcTransportProxy = class extends Resource2 {
     void this._serviceStream?.close();
     this.closed.emit();
   }
-  constructor(_options) {
-    super(), _define_property16(this, "_options", void 0), _define_property16(this, "_proxyId", void 0), _define_property16(this, "closed", void 0), _define_property16(this, "connected", void 0), _define_property16(this, "errors", void 0), _define_property16(this, "_serviceStream", void 0), this._options = _options, this._proxyId = PublicKey10.random(), this.closed = new Event8(), this.connected = new Event8(), this.errors = new ErrorStream5();
-  }
 };
 var RtcTransportProxyFactory = class {
+  _bridgeService;
+  _connections = /* @__PURE__ */ new Set();
   /**
   * Sets the current BridgeService to be used to open connections.
   * Calling this method will close any existing connections.
@@ -4464,9 +3938,9 @@ var RtcTransportProxyFactory = class {
     return this;
   }
   createTransport(options) {
-    invariant13(this._bridgeService, "RtcTransportProxyFactory is not ready to open connections", {
-      F: __dxlog_file15,
-      L: 245,
+    invariant11(this._bridgeService, "RtcTransportProxyFactory is not ready to open connections", {
+      F: __dxlog_file12,
+      L: 247,
       S: this,
       A: [
         "this._bridgeService",
@@ -4483,19 +3957,21 @@ var RtcTransportProxyFactory = class {
     });
     return transport;
   }
-  constructor() {
-    _define_property16(this, "_bridgeService", void 0);
-    _define_property16(this, "_connections", /* @__PURE__ */ new Set());
-  }
 };
 var decodeError = (err) => {
   const message = typeof err === "string" ? err : err.message;
   if (message.includes("CONNECTION_RESET")) {
-    return new ConnectionResetError2(message);
+    return new ConnectionResetError2({
+      message
+    });
   } else if (message.includes("TIMEOUT")) {
-    return new TimeoutError3(message);
+    return new TimeoutError3({
+      message
+    });
   } else if (message.includes("CONNECTIVITY_ERROR")) {
-    return new ConnectivityError4(message);
+    return new ConnectivityError4({
+      message
+    });
   } else {
     return typeof err === "string" ? new Error(err) : err;
   }
@@ -4504,35 +3980,27 @@ var decodeError = (err) => {
 // src/transport/webrtc/rtc-transport-service.ts
 import { Duplex as Duplex2 } from "@dxos/node-std/stream";
 import { Stream } from "@dxos/codec-protobuf/stream";
-import { invariant as invariant14 } from "@dxos/invariant";
+import { invariant as invariant12 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { log as log15 } from "@dxos/log";
+import { log as log12 } from "@dxos/log";
 import { ConnectionState as ConnectionState4 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 import { ComplexMap as ComplexMap8 } from "@dxos/util";
-function _define_property17(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file16 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-service.ts";
+var __dxlog_file13 = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc/rtc-transport-service.ts";
 var RtcTransportService = class {
+  _transportFactory;
+  _openTransports = new ComplexMap8(PublicKey11.hash);
+  constructor(webrtcConfig, iceProvider, _transportFactory = createRtcTransportFactory(webrtcConfig, iceProvider)) {
+    this._transportFactory = _transportFactory;
+  }
   hasOpenTransports() {
     return this._openTransports.size > 0;
   }
   open(request) {
     const existingTransport = this._openTransports.get(request.proxyId);
     if (existingTransport) {
-      log15.error("requesting a new transport bridge for an existing proxy", void 0, {
-        F: __dxlog_file16,
-        L: 54,
+      log12.error("requesting a new transport bridge for an existing proxy", void 0, {
+        F: __dxlog_file13,
+        L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4596,9 +4064,9 @@ var RtcTransportService = class {
         close(err);
       });
       ready();
-      log15("stream ready", void 0, {
-        F: __dxlog_file16,
-        L: 116,
+      log12("stream ready", void 0, {
+        F: __dxlog_file13,
+        L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4607,9 +4075,9 @@ var RtcTransportService = class {
   }
   async sendSignal({ proxyId, signal }) {
     const transport = this._openTransports.get(proxyId);
-    invariant14(transport, void 0, {
-      F: __dxlog_file16,
-      L: 124,
+    invariant12(transport, void 0, {
+      F: __dxlog_file13,
+      L: 123,
       S: this,
       A: [
         "transport",
@@ -4620,9 +4088,9 @@ var RtcTransportService = class {
   }
   async getDetails({ proxyId }) {
     const transport = this._openTransports.get(proxyId);
-    invariant14(transport, void 0, {
-      F: __dxlog_file16,
-      L: 131,
+    invariant12(transport, void 0, {
+      F: __dxlog_file13,
+      L: 130,
       S: this,
       A: [
         "transport",
@@ -4635,9 +4103,9 @@ var RtcTransportService = class {
   }
   async getStats({ proxyId }) {
     const transport = this._openTransports.get(proxyId);
-    invariant14(transport, void 0, {
-      F: __dxlog_file16,
-      L: 138,
+    invariant12(transport, void 0, {
+      F: __dxlog_file13,
+      L: 137,
       S: this,
       A: [
         "transport",
@@ -4650,9 +4118,9 @@ var RtcTransportService = class {
   }
   async sendData({ proxyId, payload }) {
     const transport = this._openTransports.get(proxyId);
-    invariant14(transport, void 0, {
-      F: __dxlog_file16,
-      L: 145,
+    invariant12(transport, void 0, {
+      F: __dxlog_file13,
+      L: 144,
       S: this,
       A: [
         "transport",
@@ -4682,11 +4150,11 @@ var RtcTransportService = class {
     try {
       await transport.transport.close();
     } catch (error) {
-      log15.warn("transport close error", {
+      log12.warn("transport close error", {
         message: error?.message
       }, {
-        F: __dxlog_file16,
-        L: 175,
+        F: __dxlog_file13,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4694,28 +4162,22 @@ var RtcTransportService = class {
     try {
       transport.connectorStream.end();
     } catch (error) {
-      log15.warn("connectorStream close error", {
+      log12.warn("connectorStream close error", {
         message: error?.message
       }, {
-        F: __dxlog_file16,
-        L: 180,
+        F: __dxlog_file13,
+        L: 179,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    log15("closed", void 0, {
-      F: __dxlog_file16,
-      L: 182,
+    log12("closed", void 0, {
+      F: __dxlog_file13,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  constructor(webrtcConfig, iceProvider, _transportFactory = createRtcTransportFactory(webrtcConfig, iceProvider)) {
-    _define_property17(this, "_transportFactory", void 0);
-    _define_property17(this, "_openTransports", void 0);
-    this._transportFactory = _transportFactory;
-    this._openTransports = new ComplexMap8(PublicKey11.hash);
-  }
 };
 var createStateUpdater = (next) => {
   return (state, err) => {
@@ -4732,10 +4194,10 @@ var createStateUpdater = (next) => {
 
 // src/wire-protocol.ts
 import { Teleport } from "@dxos/teleport";
-var createTeleportProtocolFactory = (onConnection, defaultParams) => {
+var createTeleportProtocolFactory = (onConnection, defaultProps) => {
   return (params) => {
     const teleport = new Teleport({
-      ...defaultParams,
+      ...defaultProps,
       ...params
     });
     return {
@@ -4757,7 +4219,6 @@ var createTeleportProtocolFactory = (onConnection, defaultParams) => {
 export {
   ConnectionState,
   Connection,
-  createIceProvider,
   SwarmMessenger,
   Swarm,
   SwarmMapper,
@@ -4767,8 +4228,6 @@ export {
   ConnectionLog,
   SwarmNetworkManager,
   FullyConnectedTopology,
-  MMSTTopology,
-  StarTopology,
   MemoryTransportFactory,
   MemoryTransport,
   TransportKind,
@@ -4778,4 +4237,4 @@ export {
   RtcTransportService,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-NRRQ4H6U.mjs.map
+//# sourceMappingURL=chunk-Y2FDDNGM.mjs.map