@dxos/network-manager 0.6.8-main.3be982f → 0.6.8-staging.63bcb81

package/dist/lib/node/{chunk-DZJ3BJOK.cjs → chunk-IQBYIEAR.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_DZJ3BJOK_exports = {};
-__export(chunk_DZJ3BJOK_exports, {
+var chunk_IQBYIEAR_exports = {};
+__export(chunk_IQBYIEAR_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
@@ -56,7 +56,7 @@ __export(chunk_DZJ3BJOK_exports, {
   createSimplePeerTransportFactory: () => createSimplePeerTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_DZJ3BJOK_exports);
+module.exports = __toCommonJS(chunk_IQBYIEAR_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -79,6 +79,7 @@ var import_debug2 = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
+var import_messaging = require("@dxos/messaging");
 var import_protocols3 = require("@dxos/protocols");
 var import_util3 = require("@dxos/util");
 var import_async4 = require("@dxos/async");
@@ -90,6 +91,7 @@ var import_protocols4 = require("@dxos/protocols");
 var import_async5 = require("@dxos/async");
 var import_keys5 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
+var import_messaging2 = require("@dxos/messaging");
 var import_util4 = require("@dxos/util");
 var import_async6 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
@@ -106,7 +108,7 @@ var import_async8 = require("@dxos/async");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
-var import_messaging = require("@dxos/messaging");
+var import_messaging3 = require("@dxos/messaging");
 var import_protocols6 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_util7 = require("@dxos/util");
@@ -191,10 +193,10 @@ var ConnectionState;
   ConnectionState5["ABORTED"] = "ABORTED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
-  constructor(topic, ownId, remoteId, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
+  constructor(topic, localInfo, remoteInfo, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
     this.topic = topic;
-    this.ownId = ownId;
-    this.remoteId = remoteId;
+    this.localInfo = localInfo;
+    this.remoteInfo = remoteInfo;
     this.sessionId = sessionId;
     this.initiator = initiator;
     this._signalMessaging = _signalMessaging;
@@ -203,11 +205,11 @@ var Connection = class {
     this._callbacks = _callbacks;
     this._ctx = new import_context.Context(void 0, {
       F: __dxlog_file,
-      L: 100
+      L: 101
     });
     this.connectedTimeoutContext = new import_context.Context(void 0, {
       F: __dxlog_file,
-      L: 101
+      L: 102
     });
     this._protocolClosed = new import_async.Trigger();
     this._transportClosed = new import_async.Trigger();
@@ -225,12 +227,12 @@ var Connection = class {
     import_log.log.trace("dxos.mesh.connection.construct", {
       sessionId: this.sessionId,
       topic: this.topic,
-      localPeerId: this.ownId,
-      remotePeerId: this.remoteId,
+      localPeer: this.localInfo,
+      remotePeer: this.remoteInfo,
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 137,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -253,7 +255,7 @@ var Connection = class {
   async openConnection() {
     (0, import_invariant.invariant)(this._state === "INITIAL", "Invalid state.", {
       F: __dxlog_file,
-      L: 167,
+      L: 168,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -264,19 +266,19 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 168,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log.log.trace("dxos.mesh.connection.open", {
       sessionId: this.sessionId,
       topic: this.topic,
-      localPeerId: this.ownId,
-      remotePeerId: this.remoteId,
+      localPeerId: this.localInfo,
+      remotePeerId: this.remoteInfo,
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 169,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -287,7 +289,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 186,
+        L: 187,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -297,7 +299,7 @@ var Connection = class {
     (0, import_async.scheduleTask)(this.connectedTimeoutContext, async () => {
       import_log.log.info(`timeout waiting ${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect, aborting`, void 0, {
         F: __dxlog_file,
-        L: 194,
+        L: 195,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -305,7 +307,7 @@ var Connection = class {
     }, TRANSPORT_CONNECTION_TIMEOUT);
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 202,
+      L: 203,
       S: this,
       A: [
         "!this._transport",
@@ -330,7 +332,7 @@ var Connection = class {
       this._transportClosed.wake();
       (0, import_log.log)("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 223,
+        L: 224,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -341,7 +343,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 228,
+        L: 229,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -351,7 +353,7 @@ var Connection = class {
       if (err instanceof import_protocols.ConnectionResetError) {
         import_log.log.info("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
-          L: 235,
+          L: 236,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -359,7 +361,7 @@ var Connection = class {
       } else if (err instanceof import_protocols.ConnectivityError) {
         import_log.log.info("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
-          L: 238,
+          L: 239,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -369,7 +371,7 @@ var Connection = class {
           err
         }, {
           F: __dxlog_file,
-          L: 241,
+          L: 242,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -387,7 +389,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 257,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -397,14 +399,14 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 264,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === "CLOSED" || this._state === "ABORTED") {
       (0, import_log.log)(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 266,
+        L: 267,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -423,7 +425,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 282,
+        L: 283,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -433,7 +435,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 289,
+        L: 290,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -443,7 +445,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 295,
+        L: 296,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -464,10 +466,10 @@ var Connection = class {
     await this.connectedTimeoutContext.dispose();
     await this._ctx.dispose();
     (0, import_log.log)("closing...", {
-      peerId: this.ownId
+      peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 320,
+      L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -475,7 +477,7 @@ var Connection = class {
     if (lastState !== "CONNECTED") {
       (0, import_log.log)(`graceful close requested when we were in ${lastState} state? aborting`, void 0, {
         F: __dxlog_file,
-        L: 324,
+        L: 325,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -488,7 +490,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 330,
+        L: 331,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -498,16 +500,16 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 336,
+        L: 337,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     (0, import_log.log)("closed", {
-      peerId: this.ownId
+      peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 339,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -517,7 +519,7 @@ var Connection = class {
   async _closeProtocol(options) {
     (0, import_log.log)("closing protocol", options, {
       F: __dxlog_file,
-      L: 345,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -527,7 +529,7 @@ var Connection = class {
     ]);
     (0, import_log.log)("protocol closed", options, {
       F: __dxlog_file,
-      L: 347,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -535,7 +537,7 @@ var Connection = class {
   async _closeTransport() {
     (0, import_log.log)("closing transport", void 0, {
       F: __dxlog_file,
-      L: 351,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -545,7 +547,7 @@ var Connection = class {
     ]);
     (0, import_log.log)("transport closed", void 0, {
       F: __dxlog_file,
-      L: 353,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -568,8 +570,8 @@ var Connection = class {
       ];
       this._outgoingSignalBuffer.length = 0;
       await this._signalMessaging.signal({
-        author: this.ownId,
-        recipient: this.remoteId,
+        author: this.localInfo,
+        recipient: this.remoteInfo,
         sessionId: this.sessionId,
         topic: this.topic,
         data: {
@@ -586,7 +588,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 393,
+        L: 394,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -599,7 +601,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 402,
+      L: 403,
       S: this,
       A: [
         "msg.sessionId",
@@ -609,7 +611,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 404,
+        L: 405,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -617,28 +619,28 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 407,
+      L: 408,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
         ""
       ]
     });
-    (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
+    (0, import_invariant.invariant)(msg.author.peerKey === this.remoteInfo.peerKey, void 0, {
       F: __dxlog_file,
-      L: 408,
+      L: 409,
       S: this,
       A: [
-        "msg.author?.equals(this.remoteId)",
+        "msg.author.peerKey === this.remoteInfo.peerKey",
         ""
       ]
     });
-    (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
+    (0, import_invariant.invariant)(msg.recipient.peerKey === this.localInfo.peerKey, void 0, {
       F: __dxlog_file,
-      L: 409,
+      L: 410,
       S: this,
       A: [
-        "msg.recipient?.equals(this.ownId)",
+        "msg.recipient.peerKey === this.localInfo.peerKey",
         ""
       ]
     });
@@ -654,12 +656,12 @@ var Connection = class {
         "INITIAL"
       ].includes(this.state)) {
         (0, import_log.log)("buffered signal", {
-          peerId: this.ownId,
-          remoteId: this.remoteId,
+          peerId: this.localInfo,
+          remoteId: this.remoteInfo,
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 418,
+          L: 419,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -667,7 +669,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 421,
+          L: 422,
           S: this,
           A: [
             "this._transport",
@@ -675,12 +677,12 @@ var Connection = class {
           ]
         });
         (0, import_log.log)("received signal", {
-          peerId: this.ownId,
-          remoteId: this.remoteId,
+          peerId: this.localInfo,
+          remoteId: this.remoteInfo,
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 422,
+          L: 423,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -695,16 +697,16 @@ var Connection = class {
     (0, import_log.log)("stateChanged", {
       from: this._state,
       to: state,
-      peerId: this.ownId
+      peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 433,
+      L: 434,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 434,
+      L: 435,
       S: this,
       A: [
         "state !== this._state",
@@ -759,7 +761,7 @@ var SwarmMessenger = class {
   constructor({ sendMessage, onSignal, onOffer, topic }) {
     this._ctx = new import_context2.Context(void 0, {
       F: __dxlog_file3,
-      L: 33
+      L: 34
     });
     this._offerRecords = new import_util2.ComplexMap((key) => key.toHex());
     this._sendMessage = sendMessage;
@@ -781,7 +783,7 @@ var SwarmMessenger = class {
       msg: message
     }, {
       F: __dxlog_file3,
-      L: 69,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -810,7 +812,7 @@ var SwarmMessenger = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 80,
+        L: 81,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -819,7 +821,7 @@ var SwarmMessenger = class {
   async signal(message) {
     (0, import_invariant2.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
       F: __dxlog_file3,
-      L: 85,
+      L: 86,
       S: this,
       A: [
         "message.data?.signal || message.data?.signalBatch",
@@ -860,7 +862,7 @@ var SwarmMessenger = class {
       msg: networkMessage
     }, {
       F: __dxlog_file3,
-      L: 123,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -876,7 +878,7 @@ var SwarmMessenger = class {
   async _resolveAnswers(message) {
     (0, import_invariant2.invariant)(message.data?.answer?.offerMessageId, "No offerMessageId", {
       F: __dxlog_file3,
-      L: 135,
+      L: 136,
       S: this,
       A: [
         "message.data?.answer?.offerMessageId",
@@ -888,7 +890,7 @@ var SwarmMessenger = class {
       this._offerRecords.delete(message.data.answer.offerMessageId);
       (0, import_invariant2.invariant)(message.data?.answer, "No answer", {
         F: __dxlog_file3,
-        L: 139,
+        L: 140,
         S: this,
         A: [
           "message.data?.answer",
@@ -899,7 +901,7 @@ var SwarmMessenger = class {
         answer: message.data.answer
       }, {
         F: __dxlog_file3,
-        L: 140,
+        L: 141,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -909,7 +911,7 @@ var SwarmMessenger = class {
   async _handleOffer({ author, recipient, message }) {
     (0, import_invariant2.invariant)(message.data.offer, "No offer", {
       F: __dxlog_file3,
-      L: 154,
+      L: 155,
       S: this,
       A: [
         "message.data.offer",
@@ -944,7 +946,7 @@ var SwarmMessenger = class {
           err
         }, {
           F: __dxlog_file3,
-          L: 175,
+          L: 176,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -953,7 +955,7 @@ var SwarmMessenger = class {
           err
         }, {
           F: __dxlog_file3,
-          L: 177,
+          L: 178,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -963,7 +965,7 @@ var SwarmMessenger = class {
   async _handleSignal({ author, recipient, message }) {
     (0, import_invariant2.invariant)(message.messageId, void 0, {
       F: __dxlog_file3,
-      L: 191,
+      L: 192,
       S: this,
       A: [
         "message.messageId",
@@ -972,7 +974,7 @@ var SwarmMessenger = class {
     });
     (0, import_invariant2.invariant)(message.data.signal || message.data.signalBatch, "Invalid message", {
       F: __dxlog_file3,
-      L: 192,
+      L: 193,
       S: this,
       A: [
         "message.data.signal || message.data.signalBatch",
@@ -1009,10 +1011,10 @@ var ConnectionDisplacedError = class extends import_protocols4.SystemError {
 };
 var CONNECTION_COUNTS_STABLE_AFTER = 5e3;
 var Peer = class {
-  constructor(id, topic, localPeerId, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
-    this.id = id;
+  constructor(remoteInfo, topic, localInfo, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
+    this.remoteInfo = remoteInfo;
     this.topic = topic;
-    this.localPeerId = localPeerId;
+    this.localInfo = localInfo;
     this._signalMessaging = _signalMessaging;
     this._protocolProvider = _protocolProvider;
     this._transportFactory = _transportFactory;
@@ -1022,7 +1024,7 @@ var Peer = class {
     this.availableToConnect = true;
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file4,
-      L: 79
+      L: 80
     });
     this.advertizing = false;
     this.initiating = false;
@@ -1032,7 +1034,7 @@ var Peer = class {
   * Respond to remote offer.
   */
   async onOffer(message) {
-    const remoteId = message.author;
+    const remote = message.author;
     if (this.connection && ![
       ConnectionState.CREATED,
       ConnectionState.INITIAL,
@@ -1040,7 +1042,7 @@ var Peer = class {
     ].includes(this.connection.state)) {
       import_log5.log.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
         F: __dxlog_file4,
-        L: 114,
+        L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1049,15 +1051,15 @@ var Peer = class {
       };
     }
     if (this.connection || this.initiating) {
-      if (remoteId.toHex() < this.localPeerId.toHex()) {
+      if (remote.peerKey < this.localInfo.peerKey) {
         (0, import_log5.log)("close local connection", {
-          localPeerId: this.id,
+          localPeer: this.localInfo,
           topic: this.topic,
-          remotePeerId: this.localPeerId,
+          remotePeer: this.remoteInfo,
           sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file4,
-          L: 123,
+          L: 124,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1070,11 +1072,11 @@ var Peer = class {
         };
       }
     }
-    if (await this._callbacks.onOffer(remoteId)) {
+    if (await this._callbacks.onOffer(remote)) {
       if (!this.connection) {
         (0, import_invariant4.invariant)(message.sessionId, void 0, {
           F: __dxlog_file4,
-          L: 143,
+          L: 144,
           S: this,
           A: [
             "message.sessionId",
@@ -1090,12 +1092,12 @@ var Peer = class {
           if (!(err instanceof import_protocols4.CancelledError)) {
             import_log5.log.info("connection error", {
               topic: this.topic,
-              peerId: this.localPeerId,
-              remoteId: this.id,
+              peerId: this.localInfo,
+              remoteId: this.remoteInfo,
               err
             }, {
               F: __dxlog_file4,
-              L: 153,
+              L: 154,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1117,7 +1119,7 @@ var Peer = class {
   async initiateConnection() {
     (0, import_invariant4.invariant)(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file4,
-      L: 170,
+      L: 171,
       S: this,
       A: [
         "!this.initiating",
@@ -1126,7 +1128,7 @@ var Peer = class {
     });
     (0, import_invariant4.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file4,
-      L: 171,
+      L: 172,
       S: this,
       A: [
         "!this.connection",
@@ -1135,13 +1137,13 @@ var Peer = class {
     });
     const sessionId = import_keys4.PublicKey.random();
     (0, import_log5.log)("initiating...", {
-      ownPeerId: this.localPeerId,
+      local: this.localInfo,
       topic: this.topic,
-      remotePeerId: this.id,
+      remote: this.remoteInfo,
       sessionId
     }, {
       F: __dxlog_file4,
-      L: 173,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1152,8 +1154,8 @@ var Peer = class {
       await this._connectionLimiter.connecting(sessionId);
       connection.initiate();
       answer = await this._signalMessaging.offer({
-        author: this.localPeerId,
-        recipient: this.id,
+        author: this.localInfo,
+        recipient: this.remoteInfo,
         sessionId,
         topic: this.topic,
         data: {
@@ -1163,18 +1165,18 @@ var Peer = class {
       (0, import_log5.log)("received", {
         answer,
         topic: this.topic,
-        ownId: this.localPeerId,
-        remoteId: this.id
+        local: this.localInfo,
+        remote: this.remoteInfo
       }, {
         F: __dxlog_file4,
-        L: 190,
+        L: 191,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         (0, import_log5.log)("ignoring response", void 0, {
           F: __dxlog_file4,
-          L: 192,
+          L: 193,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1184,11 +1186,11 @@ var Peer = class {
       (0, import_log5.log)("initiation error: send offer", {
         err,
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id
+        local: this.localInfo,
+        remote: this.remoteInfo
       }, {
         F: __dxlog_file4,
-        L: 196,
+        L: 197,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1206,11 +1208,11 @@ var Peer = class {
       (0, import_log5.log)("initiation error: accept answer", {
         err,
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id
+        local: this.localInfo,
+        remote: this.remoteInfo
       }, {
         F: __dxlog_file4,
-        L: 209,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1222,7 +1224,7 @@ var Peer = class {
     try {
       (0, import_log5.log)("opening connection as initiator", void 0, {
         F: __dxlog_file4,
-        L: 222,
+        L: 223,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1232,11 +1234,11 @@ var Peer = class {
       (0, import_log5.log)("initiation error: open connection", {
         err,
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id
+        local: this.localInfo,
+        remote: this.remoteInfo
       }, {
         F: __dxlog_file4,
-        L: 226,
+        L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1244,7 +1246,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 233,
+        L: 234,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1261,19 +1263,19 @@ var Peer = class {
   _createConnection(initiator, sessionId) {
     (0, import_log5.log)("creating connection", {
       topic: this.topic,
-      peerId: this.localPeerId,
-      remoteId: this.id,
+      peerId: this.localInfo,
+      remoteId: this.remoteInfo,
       initiator,
       sessionId
     }, {
       F: __dxlog_file4,
-      L: 247,
+      L: 248,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file4,
-      L: 254,
+      L: 255,
       S: this,
       A: [
         "!this.connection",
@@ -1282,16 +1284,16 @@ var Peer = class {
     });
     const connection = new Connection(
       this.topic,
-      this.localPeerId,
-      this.id,
+      this.localInfo,
+      this.remoteInfo,
       sessionId,
       initiator,
       this._signalMessaging,
       // TODO(dmaretskyi): Init only when connection is established.
       this._protocolProvider({
         initiator,
-        localPeerId: this.localPeerId,
-        remotePeerId: this.id,
+        localPeerId: import_keys4.PublicKey.from(this.localInfo.peerKey),
+        remotePeerId: import_keys4.PublicKey.from(this.remoteInfo.peerKey),
         topic: this.topic
       }),
       this._transportFactory,
@@ -1303,13 +1305,13 @@ var Peer = class {
           this._connectionLimiter.doneConnecting(sessionId);
           import_log5.log.trace("dxos.mesh.connection.connected", {
             topic: this.topic,
-            localPeerId: this.localPeerId,
-            remotePeerId: this.id,
+            localPeerId: this.localInfo,
+            remotePeerId: this.remoteInfo,
             sessionId,
             initiator
           }, {
             F: __dxlog_file4,
-            L: 273,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1317,19 +1319,19 @@ var Peer = class {
         onClosed: (err) => {
           (0, import_log5.log)("connection closed", {
             topic: this.topic,
-            peerId: this.localPeerId,
-            remoteId: this.id,
+            peerId: this.localInfo,
+            remoteId: this.remoteInfo,
             initiator
           }, {
             F: __dxlog_file4,
-            L: 282,
+            L: 288,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           (0, import_invariant4.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file4,
-            L: 287,
+            L: 293,
             S: this,
             A: [
               "this.connection === connection",
@@ -1338,13 +1340,13 @@ var Peer = class {
           });
           import_log5.log.trace("dxos.mesh.connection.closed", {
             topic: this.topic,
-            localPeerId: this.localPeerId,
-            remotePeerId: this.id,
+            localPeerId: this.localInfo,
+            remotePeerId: this.remoteInfo,
             sessionId,
             initiator
           }, {
             F: __dxlog_file4,
-            L: 289,
+            L: 295,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1373,26 +1375,26 @@ var Peer = class {
     connection.errors.handle((err) => {
       import_log5.log.info("connection error, closing", {
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id,
+        peerId: this.localInfo,
+        remoteId: this.remoteInfo,
         initiator,
         err
       }, {
         F: __dxlog_file4,
-        L: 329,
+        L: 335,
         S: this,
         C: (f, a) => f(...a)
       });
       import_log5.log.trace("dxos.mesh.connection.error", {
         topic: this.topic,
-        localPeerId: this.localPeerId,
-        remotePeerId: this.id,
+        localPeerId: this.localInfo,
+        remotePeerId: this.remoteInfo,
         sessionId,
         initiator,
         err
       }, {
         F: __dxlog_file4,
-        L: 336,
+        L: 342,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1407,21 +1409,21 @@ var Peer = class {
     }
     const connection = this.connection;
     (0, import_log5.log)("closing...", {
-      peerId: this.id,
+      peerId: this.remoteInfo,
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file4,
-      L: 361,
+      L: 367,
       S: this,
       C: (f, a) => f(...a)
     });
     await connection.close(err);
     (0, import_log5.log)("closed", {
-      peerId: this.id,
+      peerId: this.remoteInfo,
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file4,
-      L: 367,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1432,7 +1434,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file4,
-        L: 372,
+        L: 378,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1443,11 +1445,11 @@ var Peer = class {
   async safeDestroy(reason) {
     await this._ctx.dispose();
     (0, import_log5.log)("Destroying peer", {
-      peerId: this.id,
+      peerId: this.remoteInfo,
       topic: this.topic
     }, {
       F: __dxlog_file4,
-      L: 382,
+      L: 388,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1485,9 +1487,9 @@ var getClassName = (obj) => Object.getPrototypeOf(obj).constructor.name;
 var Swarm = class {
   // TODO(burdon): Swarm => Peer.create/destroy =< Connection.open/close
   // TODO(burdon): Pass in object.
-  constructor(_topic, _ownPeerId, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter, _initiationDelay = INITIATION_DELAY) {
+  constructor(_topic, _ownPeer, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter, _initiationDelay = INITIATION_DELAY) {
     this._topic = _topic;
-    this._ownPeerId = _ownPeerId;
+    this._ownPeer = _ownPeer;
     this._topology = _topology;
     this._protocolProvider = _protocolProvider;
     this._messenger = _messenger;
@@ -1497,10 +1499,10 @@ var Swarm = class {
     this._initiationDelay = _initiationDelay;
     this._ctx = new import_context3.Context(void 0, {
       F: __dxlog_file5,
-      L: 39
+      L: 38
     });
     this._listeningHandle = void 0;
-    this._peers = new import_util3.ComplexMap(import_keys3.PublicKey.hash);
+    this._peers = new import_util3.ComplexMap(import_messaging.PeerInfoHash);
     this._instanceId = import_keys3.PublicKey.random().toHex();
     this.connectionAdded = new import_async3.Event();
     this.disconnected = new import_async3.Event();
@@ -1510,19 +1512,19 @@ var Swarm = class {
       id: this._instanceId,
       data: {
         topic: this._topic.toHex(),
-        peerId: this._ownPeerId.toHex()
+        peer: this._ownPeer
       }
     }), {
       F: __dxlog_file5,
-      L: 89,
+      L: 88,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log4.log)("creating swarm", {
-      peerId: _ownPeerId
+      peerId: _ownPeer
     }, {
       F: __dxlog_file5,
-      L: 93,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1537,7 +1539,7 @@ var Swarm = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 102,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1546,7 +1548,10 @@ var Swarm = class {
     return Array.from(this._peers.values()).map((peer) => peer.connection).filter(import_util3.isNotNullOrUndefined);
   }
   get ownPeerId() {
-    return this._ownPeerId;
+    return import_keys3.PublicKey.from(this._ownPeer.peerKey);
+  }
+  get ownPeer() {
+    return this._ownPeer;
   }
   /**
   * Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
@@ -1560,7 +1565,7 @@ var Swarm = class {
   async open() {
     (0, import_invariant3.invariant)(!this._listeningHandle, void 0, {
       F: __dxlog_file5,
-      L: 129,
+      L: 132,
       S: this,
       A: [
         "!this._listeningHandle",
@@ -1568,14 +1573,14 @@ var Swarm = class {
       ]
     });
     this._listeningHandle = await this._messenger.listen({
-      peerId: this._ownPeerId,
+      peer: this._ownPeer,
       payloadType: "dxos.mesh.swarm.SwarmMessage",
       onMessage: async (message) => {
         await this._swarmMessenger.receiveMessage(message).catch((err) => import_log4.log.info("Error while receiving message", {
           err
         }, {
           F: __dxlog_file5,
-          L: 137,
+          L: 140,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -1585,7 +1590,7 @@ var Swarm = class {
   async destroy() {
     (0, import_log4.log)("destroying...", void 0, {
       F: __dxlog_file5,
-      L: 143,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1596,7 +1601,7 @@ var Swarm = class {
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key, "swarm destroyed")));
     (0, import_log4.log)("destroyed", void 0, {
       F: __dxlog_file5,
-      L: 150,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1604,7 +1609,7 @@ var Swarm = class {
   async setTopology(topology) {
     (0, import_invariant3.invariant)(!this._ctx.disposed, "Swarm is offline", {
       F: __dxlog_file5,
-      L: 154,
+      L: 157,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1619,7 +1624,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       F: __dxlog_file5,
-      L: 158,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1633,51 +1638,51 @@ var Swarm = class {
       swarmEvent
     }, {
       F: __dxlog_file5,
-      L: 171,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       (0, import_log4.log)("swarm event ignored for disposed swarm", void 0, {
         F: __dxlog_file5,
-        L: 174,
+        L: 177,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
     if (swarmEvent.peerAvailable) {
-      const peerId = import_keys3.PublicKey.from(swarmEvent.peerAvailable.peer);
-      if (!peerId.equals(this._ownPeerId)) {
+      const peerId = swarmEvent.peerAvailable.peer.peerKey;
+      if (peerId !== this._ownPeer.peerKey) {
         (0, import_log4.log)("new peer", {
           peerId
         }, {
           F: __dxlog_file5,
-          L: 181,
+          L: 184,
           S: this,
           C: (f, a) => f(...a)
         });
-        const peer = this._getOrCreatePeer(peerId);
+        const peer = this._getOrCreatePeer(swarmEvent.peerAvailable.peer);
         peer.advertizing = true;
       }
     } else if (swarmEvent.peerLeft) {
-      const peer = this._peers.get(import_keys3.PublicKey.from(swarmEvent.peerLeft.peer));
+      const peer = this._peers.get(swarmEvent.peerLeft.peer);
       if (peer) {
         peer.advertizing = false;
         if (peer.connection?.state !== ConnectionState.CONNECTED) {
-          void this._destroyPeer(peer.id, "peer left").catch((err) => import_log4.log.catch(err, void 0, {
+          void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => import_log4.log.catch(err, void 0, {
             F: __dxlog_file5,
-            L: 191,
+            L: 194,
             S: this,
             C: (f, a) => f(...a)
           }));
         }
       } else {
         (0, import_log4.log)("received peerLeft but no peer found", {
-          peer: swarmEvent.peerLeft.peer
+          peer: swarmEvent.peerLeft.peer.peerKey
         }, {
           F: __dxlog_file5,
-          L: 194,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1690,14 +1695,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file5,
-      L: 203,
+      L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       (0, import_log4.log)("ignored for disposed swarm", void 0, {
         F: __dxlog_file5,
-        L: 205,
+        L: 208,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1707,19 +1712,19 @@ var Swarm = class {
     }
     (0, import_invariant3.invariant)(message.author, void 0, {
       F: __dxlog_file5,
-      L: 210,
+      L: 213,
       S: this,
       A: [
         "message.author",
         ""
       ]
     });
-    if (!message.recipient?.equals(this._ownPeerId)) {
+    if (message.recipient.peerKey !== this._ownPeer.peerKey) {
       (0, import_log4.log)("rejecting offer with incorrect peerId", {
         message
       }, {
         F: __dxlog_file5,
-        L: 212,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1732,7 +1737,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file5,
-        L: 216,
+        L: 219,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1750,31 +1755,31 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file5,
-      L: 227,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       import_log4.log.info("ignored for offline swarm", void 0, {
         F: __dxlog_file5,
-        L: 229,
+        L: 232,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    (0, import_invariant3.invariant)(message.recipient?.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
+    (0, import_invariant3.invariant)(message.recipient.peerKey === this._ownPeer.peerKey, `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
       F: __dxlog_file5,
-      L: 232,
+      L: 235,
       S: this,
       A: [
-        "message.recipient?.equals(this._ownPeerId)",
+        "message.recipient.peerKey === this._ownPeer.peerKey",
         "`Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`"
       ]
     });
     (0, import_invariant3.invariant)(message.topic?.equals(this._topic), void 0, {
       F: __dxlog_file5,
-      L: 236,
+      L: 239,
       S: this,
       A: [
         "message.topic?.equals(this._topic)",
@@ -1783,7 +1788,7 @@ var Swarm = class {
     });
     (0, import_invariant3.invariant)(message.author, void 0, {
       F: __dxlog_file5,
-      L: 237,
+      L: 240,
       S: this,
       A: [
         "message.author",
@@ -1804,77 +1809,86 @@ var Swarm = class {
   async goOnline() {
     this._ctx = new import_context3.Context(void 0, {
       F: __dxlog_file5,
-      L: 253
+      L: 256
     });
   }
-  _getOrCreatePeer(peerId) {
-    let peer = this._peers.get(peerId);
+  _getOrCreatePeer(peerInfo) {
+    (0, import_invariant3.invariant)(peerInfo.peerKey, "PeerInfo.peerKey is required", {
+      F: __dxlog_file5,
+      L: 260,
+      S: this,
+      A: [
+        "peerInfo.peerKey",
+        "'PeerInfo.peerKey is required'"
+      ]
+    });
+    let peer = this._peers.get(peerInfo);
     if (!peer) {
-      peer = new Peer(peerId, this._topic, this._ownPeerId, this._swarmMessenger, this._protocolProvider, this._transportFactory, this._connectionLimiter, {
+      peer = new Peer(peerInfo, this._topic, this._ownPeer, this._swarmMessenger, this._protocolProvider, this._transportFactory, this._connectionLimiter, {
         onInitiated: (connection) => {
           this.connectionAdded.emit(connection);
         },
         onConnected: () => {
-          this.connected.emit(peerId);
+          this.connected.emit(peerInfo);
         },
         onDisconnected: async () => {
           if (this._isUnregistered(peer)) {
             return;
           }
           if (!peer.advertizing) {
-            await this._destroyPeer(peer.id, "peer disconnected");
+            await this._destroyPeer(peerInfo, "peer disconnected");
           }
-          this.disconnected.emit(peerId);
+          this.disconnected.emit(peerInfo);
           this._topology.update();
         },
         onRejected: () => {
           if (!this._isUnregistered(peer)) {
             (0, import_log4.log)("peer rejected connection", {
-              peerId
+              peerInfo
             }, {
               F: __dxlog_file5,
-              L: 289,
+              L: 293,
               S: this,
               C: (f, a) => f(...a)
             });
-            void this._destroyPeer(peerId, "peer rejected connection");
+            void this._destroyPeer(peerInfo, "peer rejected connection");
           }
         },
         onAccepted: () => {
           this._topology.update();
         },
         onOffer: (remoteId) => {
-          return this._topology.onOffer(remoteId);
+          return this._topology.onOffer(import_keys3.PublicKey.from(remoteId.peerKey));
         },
         onPeerAvailable: () => {
           this._topology.update();
         }
       });
-      this._peers.set(peerId, peer);
+      this._peers.set(peerInfo, peer);
     }
     return peer;
   }
-  async _destroyPeer(peerId, reason) {
-    const peer = this._peers.get(peerId);
+  async _destroyPeer(peerInfo, reason) {
+    const peer = this._peers.get(peerInfo);
     (0, import_invariant3.invariant)(peer, void 0, {
       F: __dxlog_file5,
-      L: 312,
+      L: 316,
       S: this,
       A: [
         "peer",
         ""
       ]
     });
-    this._peers.delete(peerId);
+    this._peers.delete(peerInfo);
     await peer.safeDestroy(new Error(reason));
   }
   _getSwarmController() {
     return {
       getState: () => ({
-        ownPeerId: this._ownPeerId,
-        connected: Array.from(this._peers.values()).filter((peer) => peer.connection).map((peer) => peer.id),
-        candidates: Array.from(this._peers.values()).filter((peer) => !peer.connection && peer.advertizing && peer.availableToConnect).map((peer) => peer.id),
-        allPeers: Array.from(this._peers.values()).map((peer) => peer.id)
+        ownPeerId: import_keys3.PublicKey.from(this._ownPeer.peerKey),
+        connected: Array.from(this._peers.entries()).filter(([_, peer]) => peer.connection).map(([info]) => import_keys3.PublicKey.from(info.peerKey)),
+        candidates: Array.from(this._peers.entries()).filter(([_, peer]) => !peer.connection && peer.advertizing && peer.availableToConnect).map(([info]) => import_keys3.PublicKey.from(info.peerKey)),
+        allPeers: Array.from(this._peers.keys()).map((info) => import_keys3.PublicKey.from(info.peerKey))
       }),
       connect: (peer) => {
         if (this._ctx.disposed) {
@@ -1882,11 +1896,13 @@ var Swarm = class {
         }
         (0, import_async3.scheduleTask)(this._ctx, async () => {
           try {
-            await this._initiateConnection(peer);
+            await this._initiateConnection({
+              peerKey: peer.toHex()
+            });
           } catch (err) {
             (0, import_log4.log)("initiation error", err, {
               F: __dxlog_file5,
-              L: 339,
+              L: 343,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1898,7 +1914,9 @@ var Swarm = class {
           return;
         }
         (0, import_async3.scheduleTask)(this._ctx, async () => {
-          await this._closeConnection(peer);
+          await this._closeConnection({
+            peerKey: peer.toHex()
+          });
           this._topology.update();
         });
       }
@@ -1907,15 +1925,15 @@ var Swarm = class {
   /**
   * Creates a connection then sends message over signal network.
   */
-  async _initiateConnection(remoteId) {
+  async _initiateConnection(remotePeer) {
     const ctx = this._ctx;
-    const peer = this._getOrCreatePeer(remoteId);
-    if (remoteId.toHex() < this._ownPeerId.toHex()) {
+    const peer = this._getOrCreatePeer(remotePeer);
+    if (remotePeer.peerKey < this._ownPeer.peerKey) {
       (0, import_log4.log)("initiation delay", {
-        remoteId
+        remotePeer
       }, {
         F: __dxlog_file5,
-        L: 367,
+        L: 371,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1931,33 +1949,33 @@ var Swarm = class {
       return;
     }
     (0, import_log4.log)("initiating connection...", {
-      remoteId
+      remotePeer
     }, {
       F: __dxlog_file5,
-      L: 383,
+      L: 387,
       S: this,
       C: (f, a) => f(...a)
     });
     await peer.initiateConnection();
     this._topology.update();
     (0, import_log4.log)("initiated", {
-      remoteId
+      remotePeer
     }, {
       F: __dxlog_file5,
-      L: 386,
+      L: 390,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async _closeConnection(peerId) {
-    const peer = this._peers.get(peerId);
+  async _closeConnection(peerInfo) {
+    const peer = this._peers.get(peerInfo);
     if (!peer) {
       return;
     }
     await peer.closeConnection();
   }
   _isUnregistered(peer) {
-    return !peer || this._peers.get(peer.id) !== peer;
+    return !peer || this._peers.get(peer.remoteInfo) !== peer;
   }
 };
 _ts_decorate3([
@@ -1965,7 +1983,7 @@ _ts_decorate3([
 ], Swarm.prototype, "_instanceId", void 0);
 _ts_decorate3([
   import_log4.logInfo
-], Swarm.prototype, "ownPeerId", null);
+], Swarm.prototype, "ownPeer", null);
 _ts_decorate3([
   import_log4.logInfo
 ], Swarm.prototype, "topic", null);
@@ -1989,12 +2007,12 @@ var SwarmMapper = class {
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new import_async5.EventSubscriptions();
-    this._connectionSubscriptions = new import_util4.ComplexMap(import_keys5.PublicKey.hash);
-    this._peers = new import_util4.ComplexMap(import_keys5.PublicKey.hash);
+    this._connectionSubscriptions = new import_util4.ComplexMap(import_messaging2.PeerInfoHash);
+    this._peers = new import_util4.ComplexMap(import_messaging2.PeerInfoHash);
     this.mapUpdated = new import_async5.Event();
     this._subscriptions.add(_swarm.connectionAdded.on((connection) => {
       this._update();
-      this._connectionSubscriptions.set(connection.remoteId, connection.stateChanged.on(() => {
+      this._connectionSubscriptions.set(connection.remoteInfo, connection.stateChanged.on(() => {
         this._update();
       }));
     }));
@@ -2008,19 +2026,19 @@ var SwarmMapper = class {
   _update() {
     (0, import_log6.log)("updating swarm", void 0, {
       F: __dxlog_file6,
-      L: 72,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
     this._peers.clear();
-    this._peers.set(this._swarm.ownPeerId, {
+    this._peers.set(this._swarm.ownPeer, {
       id: this._swarm.ownPeerId,
       state: "ME",
       connections: []
     });
     for (const connection of this._swarm.connections) {
-      this._peers.set(connection.remoteId, {
-        id: connection.remoteId,
+      this._peers.set(connection.remoteInfo, {
+        id: import_keys5.PublicKey.from(connection.remoteInfo.peerKey),
         state: connection.state,
         connections: [
           this._swarm.ownPeerId
@@ -2032,7 +2050,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file6,
-      L: 113,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2151,7 +2169,7 @@ var ConnectionLog = class {
       const connectionInfo = {
         state: ConnectionState.CREATED,
         closeReason: connection.closeReason,
-        remotePeerId: connection.remoteId,
+        remotePeerId: import_keys7.PublicKey.from(connection.remoteInfo.peerKey),
         sessionId: connection.sessionId,
         transport: connection.transport && Object.getPrototypeOf(connection.transport).constructor.name,
         protocolExtensions: [],
@@ -2212,25 +2230,27 @@ function _ts_decorate4(decorators, target, key, desc) {
 }
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
 var SwarmNetworkManager = class {
-  constructor({ transportFactory, signalManager, log: log17 }) {
+  constructor({ transportFactory, signalManager, enableDevtoolsLogging, peerInfo }) {
     this._swarms = new import_util7.ComplexMap(import_keys8.PublicKey.hash);
     this._mappers = new import_util7.ComplexMap(import_keys8.PublicKey.hash);
     this._instanceId = import_keys8.PublicKey.random().toHex();
+    this._peerInfo = void 0;
     this._connectionState = import_services.ConnectionState.ONLINE;
     this.connectionStateChanged = new import_async8.Event();
     this.topicsUpdated = new import_async8.Event();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
-    this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => this._swarms.get(topic)?.onSwarmEvent(event));
-    this._messenger = new import_messaging.Messenger({
+    this._signalManager.swarmEvent.on((event) => this._swarms.get(event.topic)?.onSwarmEvent(event));
+    this._messenger = new import_messaging3.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 (log17) {
+    if (enableDevtoolsLogging) {
       this._connectionLog = new ConnectionLog();
     }
   }
@@ -2251,12 +2271,15 @@ var SwarmNetworkManager = class {
   getSwarm(topic) {
     return this._swarms.get(topic);
   }
+  setPeerInfo(peerInfo) {
+    this._peerInfo = peerInfo;
+  }
   async open() {
     import_log8.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file8,
-      L: 126,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2266,7 +2289,7 @@ var SwarmNetworkManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file8,
-      L: 129,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2276,7 +2299,7 @@ var SwarmNetworkManager = class {
       await this.leaveSwarm(topic).catch((err) => {
         (0, import_log8.log)(err, void 0, {
           F: __dxlog_file8,
-          L: 135,
+          L: 142,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2288,28 +2311,43 @@ var SwarmNetworkManager = class {
   /**
   * Join the swarm.
   */
-  async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, label }) {
+  async joinSwarm({ topic, peerInfo, topology, protocolProvider: protocol, label }) {
     (0, import_invariant6.invariant)(import_keys8.PublicKey.isPublicKey(topic), void 0, {
       F: __dxlog_file8,
-      L: 154,
+      L: 161,
       S: this,
       A: [
         "PublicKey.isPublicKey(topic)",
         ""
       ]
     });
-    (0, import_invariant6.invariant)(import_keys8.PublicKey.isPublicKey(peerId), void 0, {
+    if (!peerInfo) {
+      peerInfo = {
+        peerKey: this._peerInfo?.peerKey ?? import_keys8.PublicKey.random().toHex(),
+        identityKey: this._peerInfo?.identityKey ?? import_keys8.PublicKey.random().toHex()
+      };
+    }
+    (0, import_invariant6.invariant)(import_keys8.PublicKey.from(peerInfo.peerKey), void 0, {
       F: __dxlog_file8,
-      L: 155,
+      L: 168,
+      S: this,
+      A: [
+        "PublicKey.from(peerInfo.peerKey)",
+        ""
+      ]
+    });
+    (0, import_invariant6.invariant)(import_keys8.PublicKey.from(peerInfo.identityKey), void 0, {
+      F: __dxlog_file8,
+      L: 169,
       S: this,
       A: [
-        "PublicKey.isPublicKey(peerId)",
+        "PublicKey.from(peerInfo.identityKey!)",
         ""
       ]
     });
     (0, import_invariant6.invariant)(topology, void 0, {
       F: __dxlog_file8,
-      L: 156,
+      L: 170,
       S: this,
       A: [
         "topology",
@@ -2318,7 +2356,7 @@ var SwarmNetworkManager = class {
     });
     (0, import_invariant6.invariant)(typeof protocol === "function", void 0, {
       F: __dxlog_file8,
-      L: 157,
+      L: 171,
       S: this,
       A: [
         "typeof protocol === 'function'",
@@ -2330,21 +2368,21 @@ var SwarmNetworkManager = class {
     }
     (0, import_log8.log)("joining", {
       topic: import_keys8.PublicKey.from(topic),
-      peerId,
+      peerInfo,
       topology: topology.toString()
     }, {
       F: __dxlog_file8,
-      L: 162,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
-    const swarm = new Swarm(topic, peerId, topology, protocol, this._messenger, this._transportFactory, label, this._connectionLimiter);
+    const swarm = new Swarm(topic, peerInfo, topology, protocol, this._messenger, this._transportFactory, label, this._connectionLimiter);
     swarm.errors.handle((error) => {
       (0, import_log8.log)("swarm error", {
         error
       }, {
         F: __dxlog_file8,
-        L: 175,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2354,10 +2392,10 @@ var SwarmNetworkManager = class {
     await swarm.open();
     this._signalConnection.join({
       topic,
-      peerId
+      peer: peerInfo
     }).catch((error) => import_log8.log.catch(error, void 0, {
       F: __dxlog_file8,
-      L: 184,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -2368,7 +2406,7 @@ var SwarmNetworkManager = class {
       count: this._swarms.size
     }, {
       F: __dxlog_file8,
-      L: 188,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2387,14 +2425,14 @@ var SwarmNetworkManager = class {
       topic: import_keys8.PublicKey.from(topic)
     }, {
       F: __dxlog_file8,
-      L: 205,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
     const swarm = this._swarms.get(topic);
     await this._signalConnection.leave({
       topic,
-      peerId: swarm.ownPeerId
+      peer: swarm.ownPeer
     });
     const map = this._mappers.get(topic);
     map.destroy();
@@ -2408,7 +2446,7 @@ var SwarmNetworkManager = class {
       count: this._swarms.size
     }, {
       F: __dxlog_file8,
-      L: 219,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4261,4 +4299,4 @@ var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   createSimplePeerTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-DZJ3BJOK.cjs.map
+//# sourceMappingURL=chunk-IQBYIEAR.cjs.map