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

package/src/signal/swarm-messenger.test.ts

@@ -45,14 +45,14 @@ describe('SwarmMessenger', () => {
     onOffer?: (msg: OfferMessage) => Promise<Answer>;
     topic: PublicKey;
   }) => {
-    const peerId = PublicKey.random();
+    const peer = { peerKey: PublicKey.random().toHex() };
     const signalManager = new WebsocketSignalManager([{ server: signalApiUrl }]);
     await signalManager.open();
     afterTest(() => signalManager.close());
 
     const messenger = new Messenger({ signalManager });
     await messenger.listen({
-      peerId,
+      peer,
       payloadType: 'dxos.mesh.swarm.SwarmMessage',
       onMessage: async (message) => await router.receiveMessage(message),
     });
@@ -66,7 +66,7 @@ describe('SwarmMessenger', () => {
     });
 
     return {
-      peerId,
+      peer,
       signalManager,
       router,
     };
@@ -77,7 +77,7 @@ describe('SwarmMessenger', () => {
     const signalMock1 = async (msg: SignalMessage) => {
       received.push(msg);
     };
-    const { signalManager: signalManager1, peerId: peer1 } = await createSignalClientAndMessageRouter({
+    const { signalManager: signalManager1, peer: peer1 } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock1,
       topic,
@@ -85,14 +85,14 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager2,
       router: router2,
-      peerId: peer2,
+      peer: peer2,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       topic,
     });
 
-    await signalManager1.join({ topic, peerId: peer1 });
-    await signalManager2.join({ topic, peerId: peer2 });
+    await signalManager1.join({ topic, peer: peer1 });
+    await signalManager2.join({ topic, peer: peer2 });
 
     const msg: SignalMessage = {
       author: peer2,
@@ -115,22 +115,22 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager1,
       router: router1,
-      peerId: peer1,
+      peer: peer1,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
       onOffer: async () => ({ accept: true }),
       topic,
     });
-    const { signalManager: signalManager2, peerId: peer2 } = await createSignalClientAndMessageRouter({
+    const { signalManager: signalManager2, peer: peer2 } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
       onOffer: async () => ({ accept: true }),
       topic,
     });
 
-    await signalManager1.join({ topic, peerId: peer1 });
-    await signalManager2.join({ topic, peerId: peer2 });
+    await signalManager1.join({ topic, peer: peer1 });
+    await signalManager2.join({ topic, peer: peer2 });
     const answer = await router1.offer({
       author: peer1,
       recipient: peer2,
@@ -149,7 +149,7 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager1,
       router: router1,
-      peerId: peer1,
+      peer: peer1,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock1,
@@ -163,7 +163,7 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager2,
       router: router2,
-      peerId: peer2,
+      peer: peer2,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock2,
@@ -177,7 +177,7 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager3,
       router: router3,
-      peerId: peer3,
+      peer: peer3,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock3,
@@ -185,9 +185,9 @@ describe('SwarmMessenger', () => {
       topic,
     });
 
-    await signalManager1.join({ topic, peerId: peer1 });
-    await signalManager2.join({ topic, peerId: peer2 });
-    await signalManager3.join({ topic, peerId: peer3 });
+    await signalManager1.join({ topic, peer: peer1 });
+    await signalManager2.join({ topic, peer: peer2 });
+    await signalManager3.join({ topic, peer: peer3 });
 
     // sending signal from peer1 to peer3.
     const msg1to3: SignalMessage = {
@@ -233,7 +233,7 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager1,
       router: router1,
-      peerId: peer1,
+      peer: peer1,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
@@ -243,7 +243,7 @@ describe('SwarmMessenger', () => {
     const {
       signalManager: signalManager2,
       router: router2,
-      peerId: peer2,
+      peer: peer2,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
@@ -251,8 +251,8 @@ describe('SwarmMessenger', () => {
       topic,
     });
 
-    await signalManager1.join({ topic, peerId: peer1 });
-    await signalManager2.join({ topic, peerId: peer2 });
+    await signalManager1.join({ topic, peer: peer1 });
+    await signalManager2.join({ topic, peer: peer2 });
 
     // sending offer from peer1 to peer2.
     const answer1 = await router1.offer({

package/src/signal/swarm-messenger.ts

@@ -7,6 +7,7 @@ import { Context } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { type PeerInfo, type Message } from '@dxos/messaging';
 import { schema, TimeoutError } from '@dxos/protocols';
 import { type Answer, type SwarmMessage } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap, type MakeOptional } from '@dxos/util';
@@ -18,7 +19,7 @@ interface OfferRecord {
 }
 
 export type SwarmMessengerOptions = {
-  sendMessage: (params: { author: PublicKey; recipient: PublicKey; payload: Any }) => Promise<void>;
+  sendMessage: (params: Message) => Promise<void>;
   onOffer: (message: OfferMessage) => Promise<Answer>;
   onSignal: (message: SignalMessage) => Promise<void>;
   topic: PublicKey;
@@ -32,7 +33,7 @@ const SwarmMessage = schema.getCodecForType('dxos.mesh.swarm.SwarmMessage');
 export class SwarmMessenger implements SignalMessenger {
   private readonly _ctx = new Context();
 
-  private readonly _sendMessage: (msg: { author: PublicKey; recipient: PublicKey; payload: Any }) => Promise<void>;
+  private readonly _sendMessage: (msg: Message) => Promise<void>;
   private readonly _onSignal: (message: SignalMessage) => Promise<void>;
   private readonly _onOffer: (message: OfferMessage) => Promise<Answer>;
   private readonly _topic: PublicKey;
@@ -51,8 +52,8 @@ export class SwarmMessenger implements SignalMessenger {
     recipient,
     payload,
   }: {
-    author: PublicKey;
-    recipient: PublicKey;
+    author: PeerInfo;
+    recipient: PeerInfo;
     payload: Any;
   }): Promise<void> {
     if (payload.type_url !== 'dxos.mesh.swarm.SwarmMessage') {
@@ -110,8 +111,8 @@ export class SwarmMessenger implements SignalMessenger {
     recipient,
     message,
   }: {
-    author: PublicKey;
-    recipient: PublicKey;
+    author: PeerInfo;
+    recipient: PeerInfo;
     message: MakeOptional<SwarmMessage, 'messageId'>;
   }): Promise<void> {
     const networkMessage: SwarmMessage = {
@@ -147,8 +148,8 @@ export class SwarmMessenger implements SignalMessenger {
     recipient,
     message,
   }: {
-    author: PublicKey;
-    recipient: PublicKey;
+    author: PeerInfo;
+    recipient: PeerInfo;
     message: SwarmMessage;
   }): Promise<void> {
     invariant(message.data.offer, 'No offer');
@@ -184,8 +185,8 @@ export class SwarmMessenger implements SignalMessenger {
     recipient,
     message,
   }: {
-    author: PublicKey;
-    recipient: PublicKey;
+    author: PeerInfo;
+    recipient: PeerInfo;
     message: SwarmMessage;
   }): Promise<void> {
     invariant(message.messageId);

package/src/swarm/connection.test.ts

@@ -4,7 +4,6 @@
 
 import { sleep } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
 import { describe, test } from '@dxos/test';
 
 import { Connection } from './connection';
@@ -13,18 +12,18 @@ import { createLibDataChannelTransportFactory, createSimplePeerTransportFactory
 
 describe('Connection', () => {
   test('initiator opens after responder', async () => {
-    const [topic, peerId1, peerId2, sessionId] = PublicKey.randomSequence();
-    const protocol1 = new TestWireProtocol(peerId1);
+    const [topic, sessionId] = PublicKey.randomSequence();
+    const peer1 = { peerKey: PublicKey.random().toHex() };
+    const peer2 = { peerKey: PublicKey.random().toHex() };
+    const protocol1 = new TestWireProtocol(PublicKey.from(peer1.peerKey));
     const connection1 = new Connection(
       topic,
-      peerId1,
-      peerId2,
+      peer1,
+      peer2,
       sessionId,
       true,
       {
         offer: async (msg) => {
-          log('offer', { msg });
-
           return { accept: true };
         },
         signal: async (msg) => {
@@ -33,32 +32,35 @@ describe('Connection', () => {
       },
       protocol1.factory({
         initiator: true,
-        localPeerId: peerId1,
-        remotePeerId: peerId2,
+        localPeerId: PublicKey.from(peer1.peerKey),
+        remotePeerId: PublicKey.from(peer2.peerKey),
         topic,
       }),
       // TODO(nf): configure better
       process.env.MOCHA_ENV === 'nodejs' ? createLibDataChannelTransportFactory() : createSimplePeerTransportFactory(),
     );
 
-    const protocol2 = new TestWireProtocol(peerId2);
+    const protocol2 = new TestWireProtocol(PublicKey.from(peer2.peerKey));
     const connection2 = new Connection(
       topic,
-      peerId2,
-      peerId1,
+      peer2,
+      peer1,
       sessionId,
       false,
       {
         offer: async (msg) => {
-          log('offer', { msg });
-
           return { accept: true };
         },
         signal: async (msg) => {
           await connection1.signal(msg);
         },
       },
-      protocol2.factory({ initiator: false, localPeerId: peerId2, remotePeerId: peerId1, topic }),
+      protocol2.factory({
+        initiator: false,
+        localPeerId: PublicKey.from(peer2.peerKey),
+        remotePeerId: PublicKey.from(peer1.peerKey),
+        topic,
+      }),
       // TODO(nf): configure better
       process.env.MOCHA_ENV === 'nodejs' ? createLibDataChannelTransportFactory() : createSimplePeerTransportFactory(),
     );
@@ -70,8 +72,8 @@ describe('Connection', () => {
     connection1.initiate();
     await connection1.openConnection();
     await Promise.all([
-      protocol1.testConnection(peerId2, 'test message 1'),
-      protocol2.testConnection(peerId1, 'test message 2'),
+      protocol1.testConnection(PublicKey.from(peer2.peerKey), 'test message 1'),
+      protocol2.testConnection(PublicKey.from(peer1.peerKey), 'test message 2'),
     ]);
   });
 });

package/src/swarm/connection.ts

@@ -8,6 +8,7 @@ import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
+import { type PeerInfo } from '@dxos/messaging';
 import {
   CancelledError,
   ProtocolError,
@@ -125,8 +126,8 @@ export class Connection {
 
   constructor(
     public readonly topic: PublicKey,
-    public readonly ownId: PublicKey, // TODO(burdon): peerID?
-    public readonly remoteId: PublicKey,
+    public readonly localInfo: PeerInfo,
+    public readonly remoteInfo: PeerInfo,
     public readonly sessionId: PublicKey,
     public readonly initiator: boolean,
     private readonly _signalMessaging: SignalMessenger,
@@ -137,8 +138,8 @@ export class Connection {
     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,
     });
   }
@@ -169,8 +170,8 @@ export class Connection {
     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,
     });
 
@@ -317,7 +318,7 @@ export class Connection {
     await this.connectedTimeoutContext.dispose();
     await this._ctx.dispose();
 
-    log('closing...', { peerId: this.ownId });
+    log('closing...', { peerId: this.localInfo });
 
     let abortProtocol = false;
     if (lastState !== ConnectionState.CONNECTED) {
@@ -336,7 +337,7 @@ export class Connection {
       log.catch(err);
     }
 
-    log('closed', { peerId: this.ownId });
+    log('closed', { peerId: this.localInfo });
     this._changeState(ConnectionState.CLOSED);
     this._callbacks?.onClosed?.(err);
   }
@@ -373,8 +374,8 @@ export class Connection {
       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: { signalBatch: { signals } },
@@ -405,8 +406,8 @@ export class Connection {
       return;
     }
     invariant(msg.data.signal || msg.data.signalBatch);
-    invariant(msg.author?.equals(this.remoteId));
-    invariant(msg.recipient?.equals(this.ownId));
+    invariant(msg.author.peerKey === this.remoteInfo.peerKey);
+    invariant(msg.recipient.peerKey === this.localInfo.peerKey);
 
     const signals = msg.data.signalBatch ? msg.data.signalBatch.signals ?? [] : [msg.data.signal];
     for (const signal of signals) {
@@ -415,11 +416,11 @@ export class Connection {
       }
 
       if ([ConnectionState.CREATED, ConnectionState.INITIAL].includes(this.state)) {
-        log('buffered signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
+        log('buffered signal', { peerId: this.localInfo, remoteId: this.remoteInfo, msg: msg.data });
         this._incomingSignalBuffer.push(signal);
       } else {
         invariant(this._transport, 'Connection not ready to accept signals.');
-        log('received signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
+        log('received signal', { peerId: this.localInfo, remoteId: this.remoteInfo, msg: msg.data });
         await this._transport.onSignal(signal);
       }
     }
@@ -430,7 +431,7 @@ export class Connection {
   }
 
   private _changeState(state: ConnectionState): void {
-    log('stateChanged', { from: this._state, to: state, peerId: this.ownId });
+    log('stateChanged', { from: this._state, to: state, peerId: this.localInfo });
     invariant(state !== this._state, 'Already in this state.');
     this._state = state;
     this.stateChanged.emit(state);

package/src/swarm/peer.ts

@@ -7,6 +7,7 @@ import { Context } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { type PeerInfo } from '@dxos/messaging';
 import { CancelledError, SystemError } from '@dxos/protocols';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
@@ -51,7 +52,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.
@@ -91,9 +92,9 @@ export class Peer {
   public readonly connectionDisplaced = new Event<Connection>();
 
   constructor(
-    public readonly id: PublicKey,
+    public readonly remoteInfo: PeerInfo,
     public readonly topic: PublicKey,
-    public readonly localPeerId: PublicKey,
+    public readonly localInfo: PeerInfo,
     private readonly _signalMessaging: SignalMessenger,
     private readonly _protocolProvider: WireProtocolProvider,
     private readonly _transportFactory: TransportFactory,
@@ -105,7 +106,7 @@ export class Peer {
    * Respond to remote offer.
    */
   async onOffer(message: OfferMessage): Promise<Answer> {
-    const remoteId = message.author;
+    const remote = message.author;
 
     if (
       this.connection &&
@@ -118,12 +119,12 @@ export class Peer {
     if (this.connection || this.initiating) {
       // Determine the "polite" peer (the one that will accept offers).
       // Peer with the highest Id closes its connection, and accepts remote peer's offer.
-      if (remoteId.toHex() < this.localPeerId.toHex()) {
+      if (remote.peerKey < this.localInfo.peerKey) {
         // TODO(nf): Gets stuck when remote connection is aborted (i.e. closed tab).
         log('close local connection', {
-          localPeerId: this.id,
+          localPeer: this.localInfo,
           topic: this.topic,
-          remotePeerId: this.localPeerId,
+          remotePeer: this.remoteInfo,
           sessionId: this.connection?.sessionId,
         });
 
@@ -137,7 +138,7 @@ export class Peer {
       }
     }
 
-    if (await this._callbacks.onOffer(remoteId)) {
+    if (await this._callbacks.onOffer(remote)) {
       if (!this.connection) {
         // Connection might have been already established.
         invariant(message.sessionId);
@@ -150,7 +151,7 @@ export class Peer {
           await connection.openConnection();
         } catch (err: any) {
           if (!(err instanceof CancelledError)) {
-            log.info('connection error', { topic: this.topic, peerId: this.localPeerId, remoteId: this.id, err });
+            log.info('connection error', { topic: this.topic, peerId: this.localInfo, remoteId: this.remoteInfo, err });
           }
 
           // Calls `onStateChange` with CLOSED state.
@@ -170,7 +171,7 @@ export class Peer {
     invariant(!this.initiating, 'Initiation in progress.');
     invariant(!this.connection, 'Already connected.');
     const sessionId = PublicKey.random();
-    log('initiating...', { ownPeerId: this.localPeerId, topic: this.topic, remotePeerId: this.id, sessionId });
+    log('initiating...', { local: this.localInfo, topic: this.topic, remote: this.remoteInfo, sessionId });
 
     const connection = this._createConnection(true, sessionId);
     this.initiating = true;
@@ -181,19 +182,19 @@ export class Peer {
       connection.initiate();
 
       answer = await this._signalMessaging.offer({
-        author: this.localPeerId,
-        recipient: this.id,
+        author: this.localInfo,
+        recipient: this.remoteInfo,
         sessionId,
         topic: this.topic,
         data: { offer: {} },
       });
-      log('received', { answer, topic: this.topic, ownId: this.localPeerId, remoteId: this.id });
+      log('received', { answer, topic: this.topic, local: this.localInfo, remote: this.remoteInfo });
       if (connection.state !== ConnectionState.INITIAL) {
         log('ignoring response');
         return;
       }
     } catch (err: any) {
-      log('initiation error: send offer', { err, topic: this.topic, peerId: this.localPeerId, remoteId: this.id });
+      log('initiation error: send offer', { err, topic: this.topic, local: this.localInfo, remote: this.remoteInfo });
       await connection.abort(err);
       throw err;
     } finally {
@@ -209,8 +210,8 @@ export class Peer {
       log('initiation error: accept answer', {
         err,
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id,
+        local: this.localInfo,
+        remote: this.remoteInfo,
       });
       await connection.abort(err);
       throw err;
@@ -226,8 +227,8 @@ export class Peer {
       log('initiation error: open connection', {
         err,
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id,
+        local: this.localInfo,
+        remote: this.remoteInfo,
       });
       // TODO(nf): unsure when this will be called and the connection won't abort itself. but if it does fall through we should probably abort and not close.
       log.warn('closing connection due to unhandled error on openConnection', { err });
@@ -246,8 +247,8 @@ export class Peer {
   private _createConnection(initiator: boolean, sessionId: PublicKey) {
     log('creating connection', {
       topic: this.topic,
-      peerId: this.localPeerId,
-      remoteId: this.id,
+      peerId: this.localInfo,
+      remoteId: this.remoteInfo,
       initiator,
       sessionId,
     });
@@ -255,13 +256,18 @@ export class Peer {
 
     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, topic: this.topic }),
+      this._protocolProvider({
+        initiator,
+        localPeerId: PublicKey.from(this.localInfo.peerKey),
+        remotePeerId: PublicKey.from(this.remoteInfo.peerKey),
+        topic: this.topic,
+      }),
       this._transportFactory,
       {
         onConnected: () => {
@@ -272,14 +278,14 @@ export class Peer {
           this._connectionLimiter.doneConnecting(sessionId);
           log.trace('dxos.mesh.connection.connected', {
             topic: this.topic,
-            localPeerId: this.localPeerId,
-            remotePeerId: this.id,
+            localPeerId: this.localInfo,
+            remotePeerId: this.remoteInfo,
             sessionId,
             initiator,
           });
         },
         onClosed: (err) => {
-          log('connection closed', { topic: this.topic, peerId: this.localPeerId, remoteId: this.id, initiator });
+          log('connection closed', { topic: this.topic, peerId: this.localInfo, remoteId: this.remoteInfo, initiator });
 
           // Make sure none of the connections are stuck in the limiter.
           this._connectionLimiter.doneConnecting(sessionId);
@@ -288,8 +294,8 @@ export class Peer {
 
           log.trace('dxos.mesh.connection.closed', {
             topic: this.topic,
-            localPeerId: this.localPeerId,
-            remotePeerId: this.id,
+            localPeerId: this.localInfo,
+            remotePeerId: this.remoteInfo,
             sessionId,
             initiator,
           });
@@ -328,15 +334,15 @@ export class Peer {
     connection.errors.handle((err) => {
       log.info('connection error, closing', {
         topic: this.topic,
-        peerId: this.localPeerId,
-        remoteId: this.id,
+        peerId: this.localInfo,
+        remoteId: this.remoteInfo,
         initiator,
         err,
       });
       log.trace('dxos.mesh.connection.error', {
         topic: this.topic,
-        localPeerId: this.localPeerId,
-        remotePeerId: this.id,
+        localPeerId: this.localInfo,
+        remotePeerId: this.remoteInfo,
         sessionId,
         initiator,
         err,
@@ -358,13 +364,13 @@ export class Peer {
 
     const connection = this.connection;
 
-    log('closing...', { peerId: this.id, sessionId: connection.sessionId });
+    log('closing...', { peerId: this.remoteInfo, sessionId: connection.sessionId });
 
     // Triggers `onStateChange` callback which will clean up the connection.
     // Won't throw.
     await connection.close(err);
 
-    log('closed', { peerId: this.id, sessionId: connection.sessionId });
+    log('closed', { peerId: this.remoteInfo, sessionId: connection.sessionId });
   }
 
   async onSignal(message: SignalMessage) {
@@ -379,7 +385,7 @@ export class Peer {
   @synchronized
   async safeDestroy(reason?: Error) {
     await this._ctx.dispose();
-    log('Destroying peer', { peerId: this.id, topic: this.topic });
+    log('Destroying peer', { peerId: this.remoteInfo, topic: this.topic });
 
     // Won't throw.
     await this?.connection?.close(reason);

package/src/swarm/swarm-mapper.ts

@@ -5,6 +5,7 @@
 import { Event, EventSubscriptions } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { PeerInfoHash, type PeerInfo as MessagingPeer } from '@dxos/messaging';
 import { ComplexMap } from '@dxos/util';
 
 import { type ConnectionState } from './connection';
@@ -28,8 +29,8 @@ type Unsubscribe = () => void;
 
 export class SwarmMapper {
   private readonly _subscriptions = new EventSubscriptions();
-  private readonly _connectionSubscriptions = new ComplexMap<PublicKey, Unsubscribe>(PublicKey.hash);
-  private readonly _peers = new ComplexMap<PublicKey, PeerInfo>(PublicKey.hash);
+  private readonly _connectionSubscriptions = new ComplexMap<MessagingPeer, Unsubscribe>(PeerInfoHash);
+  private readonly _peers = new ComplexMap<MessagingPeer, PeerInfo>(PeerInfoHash);
 
   readonly mapUpdated = new Event<PeerInfo[]>();
 
@@ -42,7 +43,7 @@ export class SwarmMapper {
       _swarm.connectionAdded.on((connection) => {
         this._update();
         this._connectionSubscriptions.set(
-          connection.remoteId,
+          connection.remoteInfo,
           connection.stateChanged.on(() => {
             this._update();
           }),
@@ -72,15 +73,15 @@ export class SwarmMapper {
     log('updating swarm');
 
     this._peers.clear();
-    this._peers.set(this._swarm.ownPeerId, {
+    this._peers.set(this._swarm.ownPeer, {
       id: this._swarm.ownPeerId,
       state: 'ME', // TODO(burdon): Enum (rename "local").
       connections: [],
     });
 
     for (const connection of this._swarm.connections) {
-      this._peers.set(connection.remoteId, {
-        id: connection.remoteId,
+      this._peers.set(connection.remoteInfo, {
+        id: PublicKey.from(connection.remoteInfo.peerKey),
         state: connection.state,
         connections: [this._swarm.ownPeerId],
       });