@dxos/network-manager 0.1.41 → 0.1.45-next.45667d4

package/src/signal/message-router.test.ts

@@ -11,7 +11,7 @@ import { Awaited } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { Messenger, WebsocketSignalManager } from '@dxos/messaging';
 import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
-import { createTestBroker } from '@dxos/signal';
+import { runTestSignalServer } from '@dxos/signal';
 import { afterAll, beforeAll, describe, test, afterTest } from '@dxos/test';
 
 import { MessageRouter } from './message-router';
@@ -20,10 +20,10 @@ import { OfferMessage, SignalMessage } from './signal-messenger';
 describe('MessageRouter', () => {
   let topic: PublicKey;
 
-  let broker1: Awaited<ReturnType<typeof createTestBroker>>;
+  let broker1: Awaited<ReturnType<typeof runTestSignalServer>>;
 
   beforeAll(async () => {
-    broker1 = await createTestBroker();
+    broker1 = await runTestSignalServer();
   });
 
   beforeEach(() => {
@@ -38,7 +38,7 @@ describe('MessageRouter', () => {
     signalApiUrl,
     onSignal = (async () => {}) as any,
     onOffer = async () => ({ accept: true }),
-    topic
+    topic,
   }: {
     signalApiUrl: string;
     onSignal?: (msg: SignalMessage) => Promise<void>;
@@ -54,7 +54,7 @@ describe('MessageRouter', () => {
     await messenger.listen({
       peerId,
       payloadType: 'dxos.mesh.swarm.SwarmMessage',
-      onMessage: async (message) => await router.receiveMessage(message)
+      onMessage: async (message) => await router.receiveMessage(message),
     });
 
     const router: MessageRouter = new MessageRouter({
@@ -62,13 +62,13 @@ describe('MessageRouter', () => {
       sendMessage: async (message) => await messenger.sendMessage(message),
       onSignal,
       onOffer,
-      topic
+      topic,
     });
 
     return {
       peerId,
       signalManager,
-      router
+      router,
     };
   };
 
@@ -80,15 +80,15 @@ describe('MessageRouter', () => {
     const { signalManager: signalManager1, peerId: peer1 } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock1,
-      topic
+      topic,
     });
     const {
       signalManager: signalManager2,
       router: router2,
-      peerId: peer2
+      peerId: peer2,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
-      topic
+      topic,
     });
 
     await signalManager1.join({ topic, peerId: peer1 });
@@ -99,7 +99,7 @@ describe('MessageRouter', () => {
       recipient: peer1,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: 'Some info' } } }
+      data: { signal: { payload: { msg: 'Some info' } } },
     };
     await router2.signal(msg);
 
@@ -112,18 +112,18 @@ describe('MessageRouter', () => {
     const {
       signalManager: signalManager1,
       router: router1,
-      peerId: peer1
+      peerId: peer1,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
     const { signalManager: signalManager2, peerId: peer2 } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
 
     await signalManager1.join({ topic, peerId: peer1 });
@@ -133,7 +133,7 @@ describe('MessageRouter', () => {
       recipient: peer2,
       sessionId: PublicKey.random(),
       topic,
-      data: { offer: {} }
+      data: { offer: {} },
     });
     expect(answer.accept).toEqual(true);
   }).timeout(5_000);
@@ -146,12 +146,12 @@ describe('MessageRouter', () => {
     const {
       signalManager: signalManager1,
       router: router1,
-      peerId: peer1
+      peerId: peer1,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock1,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
     const received2: SignalMessage[] = [];
     const signalMock2 = async (msg: SignalMessage) => {
@@ -160,12 +160,12 @@ describe('MessageRouter', () => {
     const {
       signalManager: signalManager2,
       router: router2,
-      peerId: peer2
+      peerId: peer2,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock2,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
     const received3: SignalMessage[] = [];
     const signalMock3 = async (msg: SignalMessage) => {
@@ -174,12 +174,12 @@ describe('MessageRouter', () => {
     const {
       signalManager: signalManager3,
       router: router3,
-      peerId: peer3
+      peerId: peer3,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: signalMock3,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
 
     await signalManager1.join({ topic, peerId: peer1 });
@@ -192,7 +192,7 @@ describe('MessageRouter', () => {
       recipient: peer3,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: '1to3' } } }
+      data: { signal: { payload: { msg: '1to3' } } },
     };
     await router1.signal(msg1to3);
     await waitForExpect(() => {
@@ -205,7 +205,7 @@ describe('MessageRouter', () => {
       recipient: peer3,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: '2to3' } } }
+      data: { signal: { payload: { msg: '2to3' } } },
     };
     await router2.signal(msg2to3);
     await waitForExpect(() => {
@@ -218,7 +218,7 @@ describe('MessageRouter', () => {
       recipient: peer1,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: '3to1' } } }
+      data: { signal: { payload: { msg: '3to1' } } },
     };
     await router3.signal(msg3to1);
     await waitForExpect(() => {
@@ -230,22 +230,22 @@ describe('MessageRouter', () => {
     const {
       signalManager: signalManager1,
       router: router1,
-      peerId: peer1
+      peerId: peer1,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
     const {
       signalManager: signalManager2,
       router: router2,
-      peerId: peer2
+      peerId: peer2,
     } = await createSignalClientAndMessageRouter({
       signalApiUrl: broker1.url(),
       onSignal: (async () => {}) as any,
       onOffer: async () => ({ accept: true }),
-      topic
+      topic,
     });
 
     await signalManager1.join({ topic, peerId: peer1 });
@@ -257,7 +257,7 @@ describe('MessageRouter', () => {
       recipient: peer2,
       sessionId: PublicKey.random(),
       topic,
-      data: { offer: {} }
+      data: { offer: {} },
     });
     expect(answer1.accept).toEqual(true);
 
@@ -267,7 +267,7 @@ describe('MessageRouter', () => {
       recipient: peer1,
       sessionId: PublicKey.random(),
       topic,
-      data: { offer: {} }
+      data: { offer: {} },
     });
     expect(answer2.accept).toEqual(true);
   }).timeout(5_000);

package/src/signal/message-router.ts

@@ -47,7 +47,7 @@ export class MessageRouter implements SignalMessenger {
   async receiveMessage({
     author,
     recipient,
-    payload
+    payload,
   }: {
     author: PublicKey;
     recipient: PublicKey;
@@ -80,21 +80,21 @@ export class MessageRouter implements SignalMessenger {
     await this._sendReliableMessage({
       author: message.author,
       recipient: message.recipient,
-      message
+      message,
     });
   }
 
   async offer(message: OfferMessage): Promise<Answer> {
     const networkMessage: SwarmMessage = {
       ...message,
-      messageId: PublicKey.random()
+      messageId: PublicKey.random(),
     };
     return new Promise<Answer>((resolve, reject) => {
       this._offerRecords.set(networkMessage.messageId!, { resolve, reject });
       return this._sendReliableMessage({
         author: message.author,
         recipient: message.recipient,
-        message: networkMessage
+        message: networkMessage,
       });
     });
   }
@@ -102,7 +102,7 @@ export class MessageRouter implements SignalMessenger {
   private async _sendReliableMessage({
     author,
     recipient,
-    message
+    message,
   }: {
     author: PublicKey;
     recipient: PublicKey;
@@ -111,7 +111,7 @@ export class MessageRouter implements SignalMessenger {
     const networkMessage: SwarmMessage = {
       ...message,
       // Setting unique message_id if it not specified yet.
-      messageId: message.messageId ?? PublicKey.random()
+      messageId: message.messageId ?? PublicKey.random(),
     };
 
     log('sending', { from: author, to: recipient, msg: networkMessage });
@@ -121,7 +121,7 @@ export class MessageRouter implements SignalMessenger {
   private async _encodeAndSend({
     author,
     recipient,
-    message
+    message,
   }: {
     author: PublicKey;
     recipient: PublicKey;
@@ -132,8 +132,8 @@ export class MessageRouter implements SignalMessenger {
       recipient,
       payload: {
         type_url: 'dxos.mesh.swarm.SwarmMessage',
-        value: schema.getCodecForType('dxos.mesh.swarm.SwarmMessage').encode(message)
-      }
+        value: schema.getCodecForType('dxos.mesh.swarm.SwarmMessage').encode(message),
+      },
     });
   }
 
@@ -151,7 +151,7 @@ export class MessageRouter implements SignalMessenger {
   private async _handleOffer({
     author,
     recipient,
-    message
+    message,
   }: {
     author: PublicKey;
     recipient: PublicKey;
@@ -162,7 +162,7 @@ export class MessageRouter implements SignalMessenger {
       author,
       recipient,
       ...message,
-      data: { offer: message.data.offer }
+      data: { offer: message.data.offer },
     };
     const answer = await this._onOffer(offerMessage);
     answer.offerMessageId = message.messageId;
@@ -172,15 +172,15 @@ export class MessageRouter implements SignalMessenger {
       message: {
         topic: message.topic,
         sessionId: message.sessionId,
-        data: { answer }
-      }
+        data: { answer },
+      },
     });
   }
 
   private async _handleSignal({
     author,
     recipient,
-    message
+    message,
   }: {
     author: PublicKey;
     recipient: PublicKey;
@@ -192,7 +192,7 @@ export class MessageRouter implements SignalMessenger {
       author,
       recipient,
       ...message,
-      data: { signal: message.data.signal }
+      data: { signal: message.data.signal },
     };
 
     await this._onSignal(signalMessage);

package/src/swarm/connection.ts

@@ -43,7 +43,7 @@ export enum ConnectionState {
   /**
    * Connection closed.
    */
-  CLOSED = 'CLOSED'
+  CLOSED = 'CLOSED',
 }
 
 /**
@@ -59,10 +59,6 @@ export class Connection {
   readonly errors = new ErrorStream();
 
   public _instanceId = PublicKey.random().toHex();
-  public _traceParent?: string;
-  public _performance = {
-    signalsSent: 0
-  };
 
   constructor(
     public readonly topic: PublicKey,
@@ -72,7 +68,7 @@ export class Connection {
     public readonly initiator: boolean,
     private readonly _signalMessaging: SignalMessenger,
     private readonly _protocol: WireProtocol,
-    private readonly _transportFactory: TransportFactory
+    private readonly _transportFactory: TransportFactory,
   ) {}
 
   get state() {
@@ -93,8 +89,9 @@ export class Connection {
   // TODO(burdon): Make async?
   openConnection() {
     assert(this._state === ConnectionState.INITIAL, 'Invalid state.');
+    log.trace('dxos.mesh.connection.open-connection', trace.begin({ id: this._instanceId }));
+
     this._changeState(ConnectionState.CONNECTING);
-    log.trace('dxos.mesh.connection', trace.begin({ id: this._instanceId, parentId: this._traceParent }));
 
     // TODO(dmaretskyi): Initialize only after the transport has established connection.
     this._protocol.initialize().catch((err) => {
@@ -111,16 +108,14 @@ export class Connection {
     this._transport = this._transportFactory.createTransport({
       initiator: this.initiator,
       stream: this._protocol.stream,
-      sendSignal: async (signal) => {
-        this._performance.signalsSent++;
-        await this._signalMessaging.signal({
+      sendSignal: async (signal) =>
+        this._signalMessaging.signal({
           author: this.ownId,
           recipient: this.remoteId,
           sessionId: this.sessionId,
           topic: this.topic,
-          data: { signal }
-        });
-      }
+          data: { signal },
+        }),
     });
 
     this._transport.connected.once(() => {
@@ -144,6 +139,8 @@ export class Connection {
     }
 
     this._bufferedSignals = [];
+
+    log.trace('dxos.mesh.connection.open-connection', trace.end({ id: this._instanceId }));
   }
 
   @synchronized
@@ -171,10 +168,6 @@ export class Connection {
 
     log('closed', { peerId: this.ownId });
     this._changeState(ConnectionState.CLOSED);
-    log.trace(
-      'dxos.mesh.connection',
-      trace.end({ id: this._instanceId, status: 'ok', data: { performance: this._performance } })
-    );
   }
 
   async signal(msg: SignalMessage) {

package/src/swarm/peer.ts

@@ -81,8 +81,6 @@ export class Peer {
 
   public initiating = false;
 
-  public _traceParent?: string;
-
   constructor(
     public readonly id: PublicKey,
     public readonly topic: PublicKey,
@@ -90,7 +88,7 @@ export class Peer {
     private readonly _signalMessaging: SignalMessenger,
     private readonly _protocolProvider: WireProtocolProvider,
     private readonly _transportFactory: TransportFactory,
-    private readonly _callbacks: PeerCallbacks
+    private readonly _callbacks: PeerCallbacks,
   ) {}
 
   /**
@@ -107,7 +105,7 @@ export class Peer {
         log("closing local connection and accepting remote peer's offer", {
           id: this.id,
           topic: this.topic,
-          peerId: this.localPeerId
+          peerId: this.localPeerId,
         });
 
         if (this.connection) {
@@ -156,7 +154,7 @@ export class Peer {
         recipient: this.id,
         sessionId,
         topic: this.topic,
-        data: { offer: {} }
+        data: { offer: {} },
       });
       log('received', { answer, topic: this.topic, ownId: this.localPeerId, remoteId: this.id });
       if (connection.state !== ConnectionState.INITIAL) {
@@ -190,7 +188,7 @@ export class Peer {
       peerId: this.localPeerId,
       remoteId: this.id,
       initiator,
-      sessionId
+      sessionId,
     });
     assert(!this.connection, 'Already connected.');
 
@@ -203,9 +201,8 @@ export class Peer {
       this._signalMessaging,
       // TODO(dmaretskyi): Init only when connection is established.
       this._protocolProvider({ initiator, localPeerId: this.localPeerId, remotePeerId: this.id, topic: this.topic }),
-      this._transportFactory
+      this._transportFactory,
     );
-    connection._traceParent = this._traceParent;
     this._callbacks.onInitiated(connection);
 
     void this._connectionCtx?.dispose();
@@ -241,7 +238,7 @@ export class Peer {
               this.availableToConnect = true;
               this._callbacks.onPeerAvailable();
             },
-            this._availableAfter
+            this._availableAfter,
           );
 
           break;

package/src/swarm/swarm-mapper.ts

@@ -78,14 +78,14 @@ export class SwarmMapper {
     this._peers.set(this._swarm.ownPeerId, {
       id: this._swarm.ownPeerId,
       state: 'ME', // TODO(burdon): Enum (rename "local").
-      connections: []
+      connections: [],
     });
 
     for (const connection of this._swarm.connections) {
       this._peers.set(connection.remoteId, {
         id: connection.remoteId,
         state: connection.state,
-        connections: [this._swarm.ownPeerId]
+        connections: [this._swarm.ownPeerId],
       });
     }
 
@@ -115,7 +115,7 @@ export class SwarmMapper {
 
     log('graph changed', {
       directConnections: this._swarm.connections.length,
-      totalPeersInSwarm: this._peers.size
+      totalPeersInSwarm: this._peers.size,
     });
 
     this.mapUpdated.emit(Array.from(this._peers.values()));

package/src/swarm/swarm.test.ts

@@ -35,7 +35,7 @@ describe('Swarm', () => {
       protocol.factory,
       new Messenger({ signalManager }),
       createWebRTCTransportFactory(),
-      undefined
+      undefined,
     );
 
     afterTest(async () => {
@@ -59,22 +59,22 @@ describe('Swarm', () => {
 
     const promise = Promise.all([
       asyncTimeout(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
-      asyncTimeout(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
+      asyncTimeout(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.')),
     ]);
 
     // Behavior of the Signal Server.
     swarm1.onSwarmEvent({
       peerAvailable: {
         peer: peerId1.asUint8Array(),
-        since: new Date()
-      }
+        since: new Date(),
+      },
     });
 
     swarm1.onSwarmEvent({
       peerAvailable: {
         peer: peerId2.asUint8Array(),
-        since: new Date()
-      }
+        since: new Date(),
+      },
     });
 
     log('Candidates changed');
@@ -100,15 +100,15 @@ describe('Swarm', () => {
     swarm1.onSwarmEvent({
       peerAvailable: {
         peer: peerId2.asUint8Array(),
-        since: new Date()
-      }
+        since: new Date(),
+      },
     });
 
     swarm2.onSwarmEvent({
       peerAvailable: {
         peer: peerId1.asUint8Array(),
-        since: new Date()
-      }
+        since: new Date(),
+      },
     });
 
     await connectPromises;
@@ -131,15 +131,15 @@ describe('Swarm', () => {
     swarm1.onSwarmEvent({
       peerAvailable: {
         peer: peerId2.asUint8Array(),
-        since: new Date()
-      }
+        since: new Date(),
+      },
     });
     await sleep(15);
     swarm2.onSwarmEvent({
       peerAvailable: {
         peer: peerId1.asUint8Array(),
-        since: new Date()
-      }
+        since: new Date(),
+      },
     });
 
     await connectPromises;

package/src/swarm/swarm.ts

@@ -79,8 +79,12 @@ export class Swarm {
     private readonly _protocolProvider: WireProtocolProvider,
     private readonly _messenger: Messenger,
     private readonly _transportFactory: TransportFactory,
-    private readonly _label: string | undefined
+    private readonly _label: string | undefined,
   ) {
+    log.trace(
+      'dxos.mesh.swarm.constructor',
+      trace.begin({ id: this._instanceId, data: { topic: this._topic.toHex(), peerId: this._ownPeerId.toHex() } }),
+    );
     log('creating swarm', { peerId: _ownPeerId });
     _topology.init(this._getSwarmController());
 
@@ -88,21 +92,18 @@ export class Swarm {
       sendMessage: async (msg) => await this._messenger.sendMessage(msg),
       onSignal: async (msg) => await this.onSignal(msg),
       onOffer: async (msg) => await this.onOffer(msg),
-      topic: this._topic
+      topic: this._topic,
     });
 
     this._messenger
       .listen({
         peerId: this._ownPeerId,
         payloadType: 'dxos.mesh.swarm.SwarmMessage',
-        onMessage: async (message) => await this._swarmMessenger.receiveMessage(message)
+        onMessage: async (message) => await this._swarmMessenger.receiveMessage(message),
       })
       .catch((error) => log.catch(error));
 
-    log.trace(
-      'dxos.mesh.swarm',
-      trace.begin({ id: this._instanceId, data: { topic: this._topic.toHex(), peerId: this._ownPeerId.toHex() } })
-    );
+    log.trace('dxos.mesh.swarm.constructor', trace.end({ id: this._instanceId }));
   }
 
   get connections() {
@@ -135,7 +136,6 @@ export class Swarm {
     await this._topology.destroy();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     log('destroyed');
-    log.trace('dxos.mesh.swarm', trace.end({ id: this._instanceId }));
   }
 
   async setTopology(topology: Topology) {
@@ -145,7 +145,7 @@ export class Swarm {
     }
     log('setting topology', {
       previous: getClassName(this._topology),
-      topology: getClassName(topology)
+      topology: getClassName(topology),
     });
 
     await this._topology.destroy();
@@ -218,7 +218,7 @@ export class Swarm {
     }
     assert(
       message.recipient?.equals(this._ownPeerId),
-      `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`
+      `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`,
     );
     assert(message.topic?.equals(this._topic));
     assert(message.author);
@@ -280,10 +280,9 @@ export class Swarm {
           },
           onPeerAvailable: () => {
             this._topology.update();
-          }
-        }
+          },
+        },
       );
-      peer._traceParent = this._instanceId;
       this._peers.set(peerId, peer);
     }
 
@@ -305,7 +304,7 @@ export class Swarm {
           .map((peer) => peer.id),
         candidates: Array.from(this._peers.values())
           .filter((peer) => !peer.connection && peer.advertizing && peer.availableToConnect)
-          .map((peer) => peer.id)
+          .map((peer) => peer.id),
       }),
       connect: (peer) => {
         if (this._ctx.disposed) {
@@ -331,7 +330,7 @@ export class Swarm {
           await this._closeConnection(peer);
           this._topology.update();
         });
-      }
+      },
     };
   }