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

package/dist/types/src/signal/swarm-messenger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uCAAuC,CAAC;AAGvF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClG,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoF;IACjH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6C;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;gBAE9F,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAOtE,cAAc,CAAC,EACnB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE;QACD,MAAM,EAAE,SAAS,CAAC;QAClB,SAAS,EAAE,SAAS,CAAC;QACrB,OAAO,EAAE,GAAG,CAAC;KACd,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BX,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YAerC,oBAAoB;YA0BpB,eAAe;YAWf,YAAY;YAqCZ,aAAa;CAuB5B"}
+{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uCAAuC,CAAC;AAGvF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6C;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;gBAE9F,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAOtE,cAAc,CAAC,EACnB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE;QACD,MAAM,EAAE,QAAQ,CAAC;QACjB,SAAS,EAAE,QAAQ,CAAC;QACpB,OAAO,EAAE,GAAG,CAAC;KACd,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BX,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YAerC,oBAAoB;YA0BpB,eAAe;YAWf,YAAY;YAqCZ,aAAa;CAuB5B"}

package/dist/types/src/swarm/connection.d.ts

@@ -1,6 +1,7 @@
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
+import { type PeerInfo } from '@dxos/messaging';
 import { type SignalMessage, type SignalMessenger } from '../signal';
 import { type Transport, type TransportFactory, type TransportStats } from '../transport';
 import { type WireProtocol } from '../wire-protocol';
@@ -52,8 +53,8 @@ export declare enum ConnectionState {
  */
 export declare class Connection {
     readonly topic: PublicKey;
-    readonly ownId: PublicKey;
-    readonly remoteId: PublicKey;
+    readonly localInfo: PeerInfo;
+    readonly remoteInfo: PeerInfo;
     readonly sessionId: PublicKey;
     readonly initiator: boolean;
     private readonly _signalMessaging;
@@ -75,8 +76,7 @@ export declare class Connection {
     readonly transportStats: Event<TransportStats>;
     private readonly _signalSendTask;
     private _signallingDelay;
-    constructor(topic: PublicKey, ownId: PublicKey, // TODO(burdon): peerID?
-    remoteId: PublicKey, sessionId: PublicKey, initiator: boolean, _signalMessaging: SignalMessenger, _protocol: WireProtocol, _transportFactory: TransportFactory, _callbacks?: ConnectionCallbacks | undefined);
+    constructor(topic: PublicKey, localInfo: PeerInfo, remoteInfo: PeerInfo, sessionId: PublicKey, initiator: boolean, _signalMessaging: SignalMessenger, _protocol: WireProtocol, _transportFactory: TransportFactory, _callbacks?: ConnectionCallbacks | undefined);
     get sessionIdString(): string;
     get state(): ConnectionState;
     get transport(): Transport | undefined;

package/dist/types/src/swarm/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/swarm/connection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAAoE,MAAM,aAAa,CAAC;AAEpH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAavC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAoBrD,UAAU,mBAAmB;IAC3B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED;;GAEG;AACH,oBAAY,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,MAAM,WAAW;IAEjB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED;;;GAGG;AACH,qBAAa,UAAU;aA4BH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAnC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,uBAAuB,CAAiB;IAEhD,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,gBAAgB,CAAiB;IAEzC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,qBAAqB,CAAgB;IAC7C,OAAO,CAAC,qBAAqB,CAAgB;IAE7C,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;IAE7B,WAAW,SAA8B;IAEhD,SAAgB,cAAc,wBAA+B;IAE7D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAE7B;IAEH,OAAO,CAAC,gBAAgB,CAA6B;gBAGnC,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,YAAY,EACvB,iBAAiB,EAAE,gBAAgB,EACnC,UAAU,CAAC,EAAE,mBAAmB,YAAA;IAWnD,IACI,eAAe,IAAI,MAAM,CAE5B;IAED,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,iBAEX;IAED;;OAEG;IACG,cAAc;IAiGd,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK;IAsCjB,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK;YA2CT,cAAc;YAMd,eAAe;IAM7B,OAAO,CAAC,WAAW;YAKL,kBAAkB;IAqChC;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,aAAa;IA2B/B,QAAQ;IAIR,OAAO,CAAC,YAAY;YAON,mBAAmB;CAMlC"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/swarm/connection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAAoE,MAAM,aAAa,CAAC;AAEpH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAYhD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAoBrD,UAAU,mBAAmB;IAC3B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED;;GAEG;AACH,oBAAY,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,MAAM,WAAW;IAEjB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED;;;GAGG;AACH,qBAAa,UAAU;aA4BH,KAAK,EAAE,SAAS;aAChB,SAAS,EAAE,QAAQ;aACnB,UAAU,EAAE,QAAQ;aACpB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAnC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,uBAAuB,CAAiB;IAEhD,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,gBAAgB,CAAiB;IAEzC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,qBAAqB,CAAgB;IAC7C,OAAO,CAAC,qBAAqB,CAAgB;IAE7C,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;IAE7B,WAAW,SAA8B;IAEhD,SAAgB,cAAc,wBAA+B;IAE7D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAE7B;IAEH,OAAO,CAAC,gBAAgB,CAA6B;gBAGnC,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,QAAQ,EACnB,UAAU,EAAE,QAAQ,EACpB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,YAAY,EACvB,iBAAiB,EAAE,gBAAgB,EACnC,UAAU,CAAC,EAAE,mBAAmB,YAAA;IAWnD,IACI,eAAe,IAAI,MAAM,CAE5B;IAED,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,iBAEX;IAED;;OAEG;IACG,cAAc;IAiGd,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK;IAsCjB,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK;YA2CT,cAAc;YAMd,eAAe;IAM7B,OAAO,CAAC,WAAW;YAKL,kBAAkB;IAqChC;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,aAAa;IA2B/B,QAAQ;IAIR,OAAO,CAAC,YAAY;YAON,mBAAmB;CAMlC"}

package/dist/types/src/swarm/peer.d.ts

@@ -1,5 +1,6 @@
 import { Event } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
+import { type PeerInfo } from '@dxos/messaging';
 import { SystemError } from '@dxos/protocols';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { Connection } from './connection';
@@ -34,7 +35,7 @@ interface PeerCallbacks {
     /**
      * Returns true if the remote peer's offer should be accepted.
      */
-    onOffer: (remoteId: PublicKey) => Promise<boolean>;
+    onOffer: (remote: PeerInfo) => Promise<boolean>;
     /**
      * Peer is available to connect.
      */
@@ -45,9 +46,9 @@ interface PeerCallbacks {
  * Can open and close multiple connections to the remote peer.
  */
 export declare class Peer {
-    readonly id: PublicKey;
+    readonly remoteInfo: PeerInfo;
     readonly topic: PublicKey;
-    readonly localPeerId: PublicKey;
+    readonly localInfo: PeerInfo;
     private readonly _signalMessaging;
     private readonly _protocolProvider;
     private readonly _transportFactory;
@@ -68,7 +69,7 @@ export declare class Peer {
     advertizing: boolean;
     initiating: boolean;
     readonly connectionDisplaced: Event<Connection>;
-    constructor(id: PublicKey, topic: PublicKey, localPeerId: PublicKey, _signalMessaging: SignalMessenger, _protocolProvider: WireProtocolProvider, _transportFactory: TransportFactory, _connectionLimiter: ConnectionLimiter, _callbacks: PeerCallbacks);
+    constructor(remoteInfo: PeerInfo, topic: PublicKey, localInfo: PeerInfo, _signalMessaging: SignalMessenger, _protocolProvider: WireProtocolProvider, _transportFactory: TransportFactory, _connectionLimiter: ConnectionLimiter, _callbacks: PeerCallbacks);
     /**
      * Respond to remote offer.
      */

package/dist/types/src/swarm/peer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer.d.ts","sourceRoot":"","sources":["../../../../src/swarm/peer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA8B,MAAM,aAAa,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAkB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACxF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,qBAAa,wBAAyB,SAAQ,WAAW;;CAIxD;AAED,UAAU,aAAa;IACrB;;OAEG;IACH,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAE9C;;OAEG;IACH,WAAW,EAAE,MAAM,IAAI,CAAC;IAExB;;OAEG;IACH,cAAc,EAAE,MAAM,IAAI,CAAC;IAE3B;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB;;OAEG;IACH,OAAO,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnD;;OAEG;IACH,eAAe,EAAE,MAAM,IAAI,CAAC;CAC7B;AAOD;;;GAGG;AACH,qBAAa,IAAI;aAuBG,EAAE,EAAE,SAAS;aACb,KAAK,EAAE,SAAS;aAChB,WAAW,EAAE,SAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU;IA7B7B;;OAEG;IACH,OAAO,CAAC,eAAe,CAAK;IACrB,kBAAkB,UAAQ;IACjC,OAAO,CAAC,mBAAmB,CAAC,CAAS;IAErC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAU;IAE1B,UAAU,CAAC,EAAE,UAAU,CAAC;IAE/B;;OAEG;IACI,WAAW,UAAS;IAEpB,UAAU,UAAS;IAE1B,SAAgB,mBAAmB,oBAA2B;gBAG5C,EAAE,EAAE,SAAS,EACb,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,SAAS,EACrB,gBAAgB,EAAE,eAAe,EACjC,iBAAiB,EAAE,oBAAoB,EACvC,iBAAiB,EAAE,gBAAgB,EACnC,kBAAkB,EAAE,iBAAiB,EACrC,UAAU,EAAE,aAAa;IAG5C;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IA2DrD;;OAEG;IACG,kBAAkB;IAyExB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IA4GnB,eAAe,CAAC,GAAG,CAAC,EAAE,KAAK;IAgB3B,QAAQ,CAAC,OAAO,EAAE,aAAa;IAU/B,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK;CAOjC"}
+{"version":3,"file":"peer.d.ts","sourceRoot":"","sources":["../../../../src/swarm/peer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA8B,MAAM,aAAa,CAAC;AAGhE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAkB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACxF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,qBAAa,wBAAyB,SAAQ,WAAW;;CAIxD;AAED,UAAU,aAAa;IACrB;;OAEG;IACH,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAE9C;;OAEG;IACH,WAAW,EAAE,MAAM,IAAI,CAAC;IAExB;;OAEG;IACH,cAAc,EAAE,MAAM,IAAI,CAAC;IAE3B;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB;;OAEG;IACH,OAAO,EAAE,CAAC,MAAM,EAAE,QAAQ,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhD;;OAEG;IACH,eAAe,EAAE,MAAM,IAAI,CAAC;CAC7B;AAOD;;;GAGG;AACH,qBAAa,IAAI;aAuBG,UAAU,EAAE,QAAQ;aACpB,KAAK,EAAE,SAAS;aAChB,SAAS,EAAE,QAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU;IA7B7B;;OAEG;IACH,OAAO,CAAC,eAAe,CAAK;IACrB,kBAAkB,UAAQ;IACjC,OAAO,CAAC,mBAAmB,CAAC,CAAS;IAErC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAU;IAE1B,UAAU,CAAC,EAAE,UAAU,CAAC;IAE/B;;OAEG;IACI,WAAW,UAAS;IAEpB,UAAU,UAAS;IAE1B,SAAgB,mBAAmB,oBAA2B;gBAG5C,UAAU,EAAE,QAAQ,EACpB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,QAAQ,EAClB,gBAAgB,EAAE,eAAe,EACjC,iBAAiB,EAAE,oBAAoB,EACvC,iBAAiB,EAAE,gBAAgB,EACnC,kBAAkB,EAAE,iBAAiB,EACrC,UAAU,EAAE,aAAa;IAG5C;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IA2DrD;;OAEG;IACG,kBAAkB;IAyExB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAiHnB,eAAe,CAAC,GAAG,CAAC,EAAE,KAAK;IAgB3B,QAAQ,CAAC,OAAO,EAAE,aAAa;IAU/B,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK;CAOjC"}

package/dist/types/src/swarm/swarm-mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarm-mapper.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm-mapper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAsB,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,sBAAsB,GAAG,IAAI,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,SAAS,EAAE,CAAC;CAC1B;AAID,qBAAa,WAAW;IAWV,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA0D;IACnG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAE9E,QAAQ,CAAC,UAAU,oBAA2B;IAE9C,IAAI,KAAK,IAAI,QAAQ,EAAE,CAEtB;gBAE4B,MAAM,EAAE,KAAK;IA+B1C,OAAO,CAAC,OAAO;IAmDf,OAAO;CAIR"}
+{"version":3,"file":"swarm-mapper.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm-mapper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAsB,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,sBAAsB,GAAG,IAAI,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,SAAS,EAAE,CAAC;CAC1B;AAID,qBAAa,WAAW;IAWV,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4D;IACrG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyD;IAEhF,QAAQ,CAAC,UAAU,oBAA2B;IAE9C,IAAI,KAAK,IAAI,QAAQ,EAAE,CAEtB;gBAE4B,MAAM,EAAE,KAAK;IA+B1C,OAAO,CAAC,OAAO;IAmDf,OAAO;CAIR"}

package/dist/types/src/swarm/swarm.d.ts

@@ -1,7 +1,6 @@
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
-import { type Messenger } from '@dxos/messaging';
-import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { type SwarmEvent, type Messenger, type PeerInfo } from '@dxos/messaging';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { type Connection } from './connection';
 import { type ConnectionLimiter } from './connection-limiter';
@@ -17,7 +16,7 @@ import { type WireProtocolProvider } from '../wire-protocol';
  */
 export declare class Swarm {
     private readonly _topic;
-    private readonly _ownPeerId;
+    private readonly _ownPeer;
     private _topology;
     private readonly _protocolProvider;
     private readonly _messenger;
@@ -33,9 +32,10 @@ export declare class Swarm {
      */
     readonly _instanceId: string;
     readonly errors: ErrorStream;
-    constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: WireProtocolProvider, _messenger: Messenger, _transportFactory: TransportFactory, _label: string | undefined, _connectionLimiter: ConnectionLimiter, _initiationDelay?: number);
+    constructor(_topic: PublicKey, _ownPeer: PeerInfo, _topology: Topology, _protocolProvider: WireProtocolProvider, _messenger: Messenger, _transportFactory: TransportFactory, _label: string | undefined, _connectionLimiter: ConnectionLimiter, _initiationDelay?: number);
     get connections(): Connection[];
     get ownPeerId(): PublicKey;
+    get ownPeer(): PeerInfo;
     /**
      * Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
      */

package/dist/types/src/swarm/swarm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAkB,MAAM,WAAW,CAAC;AAClF,OAAO,EAAwB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAO7D;;;;GAIG;AACH,qBAAa,KAAK;IA0Cd,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAlDnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,IAAI,CAAiB;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAA8B;IAOvD;;OAEG;IAEH,QAAQ,CAAC,WAAW,SAA8B;IAoBlD,QAAQ,CAAC,MAAM,cAAqB;gBAMjB,MAAM,EAAE,SAAS,EAEjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,oBAAoB,EACvC,UAAU,EAAE,SAAS,EACrB,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,kBAAkB,EAAE,iBAAiB,EACrC,gBAAgB,SAAmB;IAkBtD,IAAI,WAAW,iBAId;IAED,IACI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAEK,IAAI;IAcJ,OAAO;IAWP,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAiBpC,YAAY,CAAC,UAAU,EAAE,UAAU;IAgC7B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAwB/C,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/C,SAAS;IAOT,QAAQ;IAId,OAAO,CAAC,gBAAgB;YAsDV,YAAY;IAO1B,OAAO,CAAC,mBAAmB;IAwC3B;;OAEG;YACW,mBAAmB;YA6BnB,gBAAgB;IAS9B,OAAO,CAAC,eAAe;CAGxB"}
+{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,UAAU,EAAwB,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAgB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAkB,MAAM,WAAW,CAAC;AAClF,OAAO,EAAwB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAO7D;;;;GAIG;AACH,qBAAa,KAAK;IA2Cd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAlDnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,IAAI,CAAiB;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAA8B;IAQvD;;OAEG;IAEH,QAAQ,CAAC,WAAW,SAA8B;IAoBlD,QAAQ,CAAC,MAAM,cAAqB;gBAMjB,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,QAAQ,EAC3B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,oBAAoB,EACvC,UAAU,EAAE,SAAS,EACrB,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,kBAAkB,EAAE,iBAAiB,EACrC,gBAAgB,SAAmB;IAkBtD,IAAI,WAAW,iBAId;IAED,IAAI,SAAS,cAEZ;IAED,IACI,OAAO,aAEV;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAEK,IAAI;IAcJ,OAAO;IAWP,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAiBpC,YAAY,CAAC,UAAU,EAAE,UAAU;IAgC7B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAwB/C,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/C,SAAS;IAOT,QAAQ;IAId,OAAO,CAAC,gBAAgB;YAuDV,YAAY;IAO1B,OAAO,CAAC,mBAAmB;IAwC3B;;OAEG;YACW,mBAAmB;YA6BnB,gBAAgB;IAS9B,OAAO,CAAC,eAAe;CAGxB"}

package/dist/types/src/tests/basic-test-suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-test-suite.d.ts","sourceRoot":"","sources":["../../../../src/tests/basic-test-suite.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAK9C;;GAEG;AACH,eAAO,MAAM,cAAc,gBAAiB,WAAW,6BAyLtD,CAAC"}
+{"version":3,"file":"basic-test-suite.d.ts","sourceRoot":"","sources":["../../../../src/tests/basic-test-suite.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAK9C;;GAEG;AACH,eAAO,MAAM,cAAc,gBAAiB,WAAW,6BA4LtD,CAAC"}

package/dist/types/src/tests/property-test-suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"property-test-suite.d.ts","sourceRoot":"","sources":["../../../../src/tests/property-test-suite.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,eAAO,MAAM,iBAAiB,YAuM7B,CAAC"}
+{"version":3,"file":"property-test-suite.d.ts","sourceRoot":"","sources":["../../../../src/tests/property-test-suite.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,eAAO,MAAM,iBAAiB,YA0M7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.6.8-main.3be982f",
+  "version": "0.6.8-staging.63bcb81",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -51,22 +51,23 @@
     "tiny-invariant": "^1.3.1",
     "ws": "^8.14.2",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.6.8-main.3be982f",
-    "@dxos/config": "0.6.8-main.3be982f",
-    "@dxos/context": "0.6.8-main.3be982f",
-    "@dxos/codec-protobuf": "0.6.8-main.3be982f",
-    "@dxos/credentials": "0.6.8-main.3be982f",
-    "@dxos/crypto": "0.6.8-main.3be982f",
-    "@dxos/debug": "0.6.8-main.3be982f",
-    "@dxos/keys": "0.6.8-main.3be982f",
-    "@dxos/log": "0.6.8-main.3be982f",
-    "@dxos/invariant": "0.6.8-main.3be982f",
-    "@dxos/messaging": "0.6.8-main.3be982f",
-    "@dxos/node-std": "0.6.8-main.3be982f",
-    "@dxos/rpc": "0.6.8-main.3be982f",
-    "@dxos/teleport": "0.6.8-main.3be982f",
-    "@dxos/util": "0.6.8-main.3be982f",
-    "@dxos/protocols": "0.6.8-main.3be982f"
+    "@dxos/async": "0.6.8-staging.63bcb81",
+    "@dxos/codec-protobuf": "0.6.8-staging.63bcb81",
+    "@dxos/config": "0.6.8-staging.63bcb81",
+    "@dxos/crypto": "0.6.8-staging.63bcb81",
+    "@dxos/debug": "0.6.8-staging.63bcb81",
+    "@dxos/context": "0.6.8-staging.63bcb81",
+    "@dxos/credentials": "0.6.8-staging.63bcb81",
+    "@dxos/edge-client": "0.6.8-staging.63bcb81",
+    "@dxos/invariant": "0.6.8-staging.63bcb81",
+    "@dxos/keys": "0.6.8-staging.63bcb81",
+    "@dxos/log": "0.6.8-staging.63bcb81",
+    "@dxos/messaging": "0.6.8-staging.63bcb81",
+    "@dxos/node-std": "0.6.8-staging.63bcb81",
+    "@dxos/protocols": "0.6.8-staging.63bcb81",
+    "@dxos/rpc": "0.6.8-staging.63bcb81",
+    "@dxos/teleport": "0.6.8-staging.63bcb81",
+    "@dxos/util": "0.6.8-staging.63bcb81"
   },
   "devDependencies": {
     "@swc-node/register": "1.9.1",
@@ -76,7 +77,7 @@
     "fast-check": "^3.19.0",
     "fetch-mock": "^11.0.0",
     "typescript": "^5.5.4",
-    "@dxos/signal": "0.6.8-main.3be982f"
+    "@dxos/signal": "0.6.8-staging.63bcb81"
   },
   "publishConfig": {
     "access": "public"

package/src/connection-log.ts

@@ -54,7 +54,7 @@ export class ConnectionLog {
       const connectionInfo: ConnectionInfo = {
         state: ConnectionState.CREATED,
         closeReason: connection.closeReason,
-        remotePeerId: connection.remoteId,
+        remotePeerId: PublicKey.from(connection.remoteInfo.peerKey),
         sessionId: connection.sessionId,
         transport: connection.transport && Object.getPrototypeOf(connection.transport).constructor.name,
         protocolExtensions: [], // TODO(dmaretskyi): Fix.

package/src/network-manager.ts

@@ -6,7 +6,7 @@ import { Event, synchronized } from '@dxos/async';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { Messenger, type SignalManager } from '@dxos/messaging';
+import { Messenger, type PeerInfo, type SignalManager } from '@dxos/messaging';
 import { trace } from '@dxos/protocols';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { ComplexMap } from '@dxos/util';
@@ -32,9 +32,9 @@ export type SwarmOptions = {
   topic: PublicKey;
 
   /**
-   * This node's peer id.
+   * This node's peer info.
    */
-  peerId: PublicKey;
+  peerInfo?: PeerInfo;
 
   /**
    * Protocol to use for every connection.
@@ -56,7 +56,8 @@ export type SwarmOptions = {
 export type SwarmNetworkManagerOptions = {
   transportFactory: TransportFactory;
   signalManager: SignalManager;
-  log?: boolean; // Log to devtools.
+  enableDevtoolsLogging?: boolean; // Log to devtools.
+  peerInfo?: PeerInfo;
 };
 
 /**
@@ -76,26 +77,28 @@ export class SwarmNetworkManager {
   private readonly _connectionLimiter: ConnectionLimiter;
   private readonly _connectionLog?: ConnectionLog;
   private readonly _instanceId = PublicKey.random().toHex();
+  private _peerInfo?: PeerInfo = undefined;
 
   private _connectionState = ConnectionState.ONLINE;
   public readonly connectionStateChanged = new Event<ConnectionState>();
   public readonly topicsUpdated = new Event<void>();
 
-  constructor({ transportFactory, signalManager, log }: SwarmNetworkManagerOptions) {
+  constructor({ transportFactory, signalManager, enableDevtoolsLogging, peerInfo }: SwarmNetworkManagerOptions) {
     this._transportFactory = transportFactory;
 
     // Listen for signal manager events.
     this._signalManager = signalManager;
-    this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => this._swarms.get(topic)?.onSwarmEvent(event));
+    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();
     // TODO(burdon): Inject listener (generic pattern).
-    if (log) {
+    if (enableDevtoolsLogging) {
       this._connectionLog = new ConnectionLog();
     }
   }
@@ -122,6 +125,10 @@ export class SwarmNetworkManager {
     return this._swarms.get(topic);
   }
 
+  setPeerInfo(peerInfo: PeerInfo) {
+    this._peerInfo = peerInfo;
+  }
+
   async open() {
     log.trace('dxos.mesh.network-manager.open', trace.begin({ id: this._instanceId }));
     await this._messenger.open();
@@ -146,23 +153,30 @@ export class SwarmNetworkManager {
   @synchronized
   async joinSwarm({
     topic,
-    peerId,
+    peerInfo,
     topology,
     protocolProvider: protocol,
     label,
   }: SwarmOptions): Promise<SwarmConnection> {
     invariant(PublicKey.isPublicKey(topic));
-    invariant(PublicKey.isPublicKey(peerId));
+    if (!peerInfo) {
+      peerInfo = {
+        peerKey: this._peerInfo?.peerKey ?? PublicKey.random().toHex(),
+        identityKey: this._peerInfo?.identityKey ?? PublicKey.random().toHex(),
+      };
+    }
+    invariant(PublicKey.from(peerInfo.peerKey));
+    invariant(PublicKey.from(peerInfo.identityKey!));
     invariant(topology);
     invariant(typeof protocol === 'function');
     if (this._swarms.has(topic)) {
       throw new Error(`Already connected to swarm: ${PublicKey.from(topic)}`);
     }
 
-    log('joining', { topic: PublicKey.from(topic), peerId, topology: topology.toString() }); // TODO(burdon): Log peerId.
+    log('joining', { topic: PublicKey.from(topic), peerInfo, topology: topology.toString() }); // TODO(burdon): Log peerId.
     const swarm = new Swarm(
       topic,
-      peerId,
+      peerInfo,
       topology,
       protocol,
       this._messenger,
@@ -181,7 +195,7 @@ export class SwarmNetworkManager {
     // Open before joining.
     await swarm.open();
 
-    this._signalConnection.join({ topic, peerId }).catch((error) => log.catch(error));
+    this._signalConnection.join({ topic, peer: peerInfo }).catch((error) => log.catch(error));
 
     this.topicsUpdated.emit();
     this._connectionLog?.joinedSwarm(swarm);
@@ -204,7 +218,7 @@ export class SwarmNetworkManager {
 
     log('leaving', { topic: PublicKey.from(topic) });
     const swarm = this._swarms.get(topic)!;
-    await this._signalConnection.leave({ topic, peerId: swarm.ownPeerId });
+    await this._signalConnection.leave({ topic, peer: swarm.ownPeer });
 
     const map = this._mappers.get(topic)!;
     map.destroy();

package/src/signal/integration.test.ts

@@ -8,7 +8,7 @@ import { expect } from 'earljs';
 import waitForExpect from 'wait-for-expect';
 
 import { PublicKey } from '@dxos/keys';
-import { Messenger, WebsocketSignalManager } from '@dxos/messaging';
+import { Messenger, type PeerInfo, WebsocketSignalManager } from '@dxos/messaging';
 import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
 import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
 
@@ -26,7 +26,13 @@ describe('Signal Integration Test', () => {
     void broker.stop();
   });
 
-  const setupPeer = async ({ peerId, topic = PublicKey.random() }: { peerId: PublicKey; topic?: PublicKey }) => {
+  const setupPeer = async ({
+    peer = { peerKey: PublicKey.random().toHex() },
+    topic = PublicKey.random(),
+  }: {
+    peer?: PeerInfo;
+    topic?: PublicKey;
+  }) => {
     const signalManager = new WebsocketSignalManager([{ server: broker.url() }]);
     await signalManager.open();
     afterTest(() => signalManager.close());
@@ -37,7 +43,7 @@ describe('Signal Integration Test', () => {
     messenger.open();
     afterTest(() => messenger.close());
     await messenger.listen({
-      peerId,
+      peer,
       onMessage: async (message) => await messageRouter.receiveMessage(message),
     });
 
@@ -53,6 +59,8 @@ describe('Signal Integration Test', () => {
     });
 
     return {
+      peer,
+      topic,
       signalManager,
       messenger,
       receivedSignals,
@@ -61,21 +69,19 @@ describe('Signal Integration Test', () => {
   };
 
   test('two peers connecting', async () => {
-    const peer1 = PublicKey.random();
-    const peer2 = PublicKey.random();
     const topic = PublicKey.random();
 
-    const peerNetworking1 = await setupPeer({ peerId: peer1, topic });
-    const peerNetworking2 = await setupPeer({ peerId: peer2, topic });
+    const peerNetworking1 = await setupPeer({ topic });
+    const peerNetworking2 = await setupPeer({ topic });
     const promise1 = peerNetworking1.signalManager.swarmEvent.waitFor(
-      ({ swarmEvent }) => !!swarmEvent.peerAvailable && peer2.equals(swarmEvent.peerAvailable.peer),
+      ({ peerAvailable }) => !!peerAvailable && peerNetworking2.peer.peerKey === peerAvailable.peer.peerKey,
     );
     const promise2 = peerNetworking1.signalManager.swarmEvent.waitFor(
-      ({ swarmEvent }) => !!swarmEvent.peerAvailable && peer1.equals(swarmEvent.peerAvailable.peer),
+      ({ peerAvailable }) => !!peerAvailable && peerNetworking1.peer.peerKey === peerAvailable.peer.peerKey,
     );
 
-    await peerNetworking1.signalManager.join({ topic, peerId: peer1 });
-    await peerNetworking2.signalManager.join({ topic, peerId: peer2 });
+    await peerNetworking1.signalManager.join({ topic, peer: peerNetworking1.peer });
+    await peerNetworking2.signalManager.join({ topic, peer: peerNetworking2.peer });
 
     await promise1;
     await promise2;
@@ -83,8 +89,8 @@ describe('Signal Integration Test', () => {
     expect(
       await peerNetworking1.messageRouter.offer({
         topic,
-        author: peer1,
-        recipient: peer2,
+        author: peerNetworking1.peer,
+        recipient: peerNetworking2.peer,
         sessionId: PublicKey.random(),
         data: {
           offer: {},
@@ -95,8 +101,8 @@ describe('Signal Integration Test', () => {
     expect(
       await peerNetworking2.messageRouter.offer({
         topic,
-        author: peer2,
-        recipient: peer1,
+        author: peerNetworking2.peer,
+        recipient: peerNetworking1.peer,
         sessionId: PublicKey.random(),
         data: {
           offer: {},
@@ -107,8 +113,8 @@ describe('Signal Integration Test', () => {
     {
       const message: SignalMessage = {
         topic,
-        author: peer1,
-        recipient: peer2,
+        author: peerNetworking1.peer,
+        recipient: peerNetworking2.peer,
         sessionId: PublicKey.random(),
         data: {
           signal: { payload: { message: 'Hello world!' } },
@@ -125,8 +131,8 @@ describe('Signal Integration Test', () => {
     {
       const message: SignalMessage = {
         topic,
-        author: peer2,
-        recipient: peer1,
+        author: peerNetworking2.peer,
+        recipient: peerNetworking1.peer,
         sessionId: PublicKey.random(),
         data: {
           signal: { payload: { foo: 'bar' } },

package/src/signal/signal-connection.ts

@@ -3,6 +3,7 @@
 //
 
 import { type PublicKey } from '@dxos/keys';
+import { type PeerInfo } from '@dxos/messaging';
 
 /**
  * Signal peer discovery interface.
@@ -11,10 +12,10 @@ export interface SignalConnection {
   /**
    * Join topic on signal network, to be discoverable by other peers.
    */
-  join(params: { topic: PublicKey; peerId: PublicKey }): Promise<void>;
+  join(params: { topic: PublicKey; peer: PeerInfo }): Promise<void>;
 
   /**
    * Leave topic on signal network, to stop being discoverable by other peers.
    */
-  leave(params: { topic: PublicKey; peerId: PublicKey }): Promise<void>;
+  leave(params: { topic: PublicKey; peer: PeerInfo }): Promise<void>;
 }

package/src/signal/signal-messenger.ts

@@ -3,19 +3,20 @@
 //
 
 import { type PublicKey } from '@dxos/keys';
+import { type PeerInfo } from '@dxos/messaging';
 import { type Answer, type Offer, type Signal, type SignalBatch } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 export interface OfferMessage {
-  author: PublicKey;
-  recipient: PublicKey;
+  author: PeerInfo;
+  recipient: PeerInfo;
   topic: PublicKey;
   sessionId: PublicKey;
   data: { offer: Offer };
 }
 
 export interface SignalMessage {
-  author: PublicKey;
-  recipient: PublicKey;
+  author: PeerInfo;
+  recipient: PeerInfo;
   topic: PublicKey;
   sessionId: PublicKey;
   data: { signal?: Signal; signalBatch?: SignalBatch };