@dxos/network-manager 0.6.12 → 0.6.13-main.548ca8d

package/src/testing/test-builder.ts

@@ -16,19 +16,12 @@ import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { createLinkedPorts, createProtoRpcPeer, type ProtoRpcPeer } from '@dxos/rpc';
 import { ComplexMap } from '@dxos/util';
 
+import { TcpTransportFactory } from '#tcp-transport';
 import { type TestTeleportExtensionFactory, TestWireProtocol } from './test-wire-protocol';
 import { SwarmNetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
-import {
-  createLibDataChannelTransportFactory,
-  createSimplePeerTransportFactory,
-  MemoryTransportFactory,
-  SimplePeerTransportProxyFactory,
-  SimplePeerTransportService,
-  type TransportFactory,
-  TransportKind,
-} from '../transport';
-import { TcpTransportFactory } from '../transport/tcp-transport';
+import { MemoryTransportFactory, type TransportFactory, TransportKind } from '../transport';
+import { createRtcTransportFactory, RtcTransportProxyFactory, RtcTransportService } from '../transport';
 
 // Signal server will be started by the setup script.
 const port = process.env.SIGNAL_PORT ?? 4000;
@@ -85,18 +78,12 @@ export class TestPeer {
   constructor(
     private readonly testBuilder: TestBuilder,
     public readonly peerId: PublicKey,
-    public readonly transport?: TransportKind,
+    public readonly transport: TransportKind = testBuilder.options.signalHosts
+      ? TransportKind.WEB_RTC
+      : TransportKind.MEMORY,
   ) {
     this._signalManager = this.testBuilder.createSignalManager();
-    if (!transport) {
-      if (this.testBuilder.options.signalHosts) {
-        // TODO(nf): configure better
-        transport = process.env.MOCHA_ENV === 'nodejs' ? TransportKind.LIBDATACHANNEL : TransportKind.SIMPLE_PEER;
-      } else {
-        transport = TransportKind.MEMORY;
-      }
-    }
-    this._networkManager = this.createNetworkManager(transport);
+    this._networkManager = this.createNetworkManager(this.transport);
   }
 
   // TODO(burdon): Move to TestBuilder.
@@ -110,13 +97,10 @@ export class TestPeer {
         case TransportKind.TCP:
           transportFactory = TcpTransportFactory;
           break;
-        case TransportKind.SIMPLE_PEER:
-          transportFactory = createSimplePeerTransportFactory();
-          break;
-        case TransportKind.LIBDATACHANNEL:
-          transportFactory = createLibDataChannelTransportFactory();
+        case TransportKind.WEB_RTC:
+          transportFactory = createRtcTransportFactory();
           break;
-        case TransportKind.SIMPLE_PEER_PROXY:
+        case TransportKind.WEB_RTC_PROXY:
           {
             // Simulates bridge to shared worker.
             const [proxyPort, servicePort] = createLinkedPorts();
@@ -137,14 +121,14 @@ export class TestPeer {
               exposed: {
                 BridgeService: schema.getService('dxos.mesh.bridge.BridgeService'),
               },
-              handlers: { BridgeService: new SimplePeerTransportService() },
+              handlers: { BridgeService: new RtcTransportService() },
               noHandshake: true,
               encodingOptions: {
                 preserveAny: true,
               },
             });
 
-            transportFactory = new SimplePeerTransportProxyFactory().setBridgeService(this._proxy.rpc.BridgeService);
+            transportFactory = new RtcTransportProxyFactory().setBridgeService(this._proxy.rpc.BridgeService);
           }
           break;
         default:

package/src/tests/basic-test-suite.ts

@@ -2,13 +2,11 @@
 // Copyright 2021 DXOS.org
 //
 
-import { expect } from 'chai';
-import waitForExpect from 'wait-for-expect';
+import { onTestFinished, expect, test } from 'vitest';
 
 import { asyncTimeout } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { afterTest, test } from '@dxos/test';
 import { range } from '@dxos/util';
 
 import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
@@ -25,7 +23,7 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     return;
   }
 
-  test('joins swarm, sends messages, and cleanly exits', async () => {
+  test.skip('joins swarm, sends messages, and cleanly exits', async () => {
     const peer1 = testBuilder.createPeer();
     const peer2 = testBuilder.createPeer();
     await openAndCloseAfterTest([peer1, peer2]);
@@ -34,24 +32,24 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic, () => new FullyConnectedTopology());
     await exchangeMessages(swarm1, swarm2);
     await leaveSwarm([peer1, peer2], topic);
-  }).tag('flaky');
+  });
 
   // TODO(burdon): Test with more peers (configure and test messaging).
-  test('joins swarm with star topology', async () => {
+  test.skip('joins swarm with star topology', async () => {
     const peer1 = testBuilder.createPeer();
-    afterTest(() => peer1.close());
+    onTestFinished(() => peer1.close());
     const peer2 = testBuilder.createPeer();
-    afterTest(() => peer2.close());
+    onTestFinished(() => peer2.close());
     await openAndCloseAfterTest([peer1, peer2]);
 
     const topic = PublicKey.random();
     const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic, () => new StarTopology(peer1.peerId)); // NOTE: Same peer.
     await exchangeMessages(swarm1, swarm2);
     await leaveSwarm([peer1, peer2], topic);
-  }).tag('flaky');
+  });
 
   // TODO(burdon): Fails when trying to reconnect to same topic.
-  test('joins swarm multiple times', async () => {
+  test.skip('joins swarm multiple times', async () => {
     const peer1 = testBuilder.createPeer();
     const peer2 = testBuilder.createPeer();
     await openAndCloseAfterTest([peer1, peer2]);
@@ -75,9 +73,9 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
       await exchangeMessages(swarm1, swarm2);
       await leaveSwarm([peer1, peer2], topic2);
     }
-  }).tag('flaky');
+  });
 
-  test('joins multiple swarms', async () => {
+  test.skip('joins multiple swarms', async () => {
     // TODO(burdon): N peers.
     // TODO(burdon): Merge with test below.
     const peer1 = testBuilder.createPeer();
@@ -87,9 +85,9 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     const numSwarms = 5;
     const topics = Array.from(Array(numSwarms)).map(() => PublicKey.random());
     expect(topics).to.have.length(numSwarms);
-  }).tag('flaky');
+  });
 
-  test('joins multiple swarms concurrently', async () => {
+  test.skip('joins multiple swarms concurrently', async () => {
     const createSwarm = async () => {
       const topicA = PublicKey.random();
       const peer1a = testBuilder.createPeer();
@@ -109,9 +107,9 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
       test1.swarm1a.protocol.testConnection(test1.peer2a.peerId),
       test2.swarm1a.protocol.testConnection(test2.peer2a.peerId),
     ]);
-  }).tag('flaky');
+  });
 
-  test('peers reconnect after and error in connection', async () => {
+  test.skip('peers reconnect after and error in connection', async () => {
     const peer1 = testBuilder.createPeer();
     const peer2 = testBuilder.createPeer();
     await openAndCloseAfterTest([peer1, peer2]);
@@ -131,9 +129,9 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     await exchangeMessages(swarm1, swarm2);
 
     await leaveSwarm([peer1, peer2], topic);
-  }).tag('flaky');
+  });
 
-  test('going offline and back online', async () => {
+  test.skip('going offline and back online', { timeout: 2_000 }, async () => {
     const peer1 = testBuilder.createPeer();
     const peer2 = testBuilder.createPeer();
     await openAndCloseAfterTest([peer1, peer2]);
@@ -158,28 +156,31 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     await peerLeft;
 
     // Wait for peer to be removed from the swarm.
-    await waitForExpect(() => {
-      expect(!!peer2._networkManager.getSwarm(topic)!._peers.get({ peerKey: peer1.peerId.toHex() })?.advertizing).to.be
-        .false;
-    }, 1_000);
+    await expect
+      .poll(() => !!peer2._networkManager.getSwarm(topic)!._peers.get({ peerKey: peer1.peerId.toHex() })?.advertizing, {
+        timeout: 1_000,
+      })
+      .toBe(false);
 
     await peer1.goOnline();
 
-    await waitForExpect(() => {
-      expect(peer1._networkManager.getSwarm(topic)?._peers.get({ peerKey: peer2.peerId.toHex() })?.advertizing).to.be
-        .true;
-      expect(peer2._networkManager.getSwarm(topic)?._peers.get({ peerKey: peer1.peerId.toHex() })?.advertizing).to.be
-        .true;
-    }, 2_000);
+    await expect
+      .poll(() => peer1._networkManager.getSwarm(topic)?._peers.get({ peerKey: peer2.peerId.toHex() })?.advertizing, {
+        timeout: 2_000,
+      })
+      .toBe(true);
+    await expect
+      .poll(() => peer2._networkManager.getSwarm(topic)?._peers.get({ peerKey: peer1.peerId.toHex() })?.advertizing, {
+        timeout: 2_000,
+      })
+      .toBe(true);
 
     await exchangeMessages(swarm1, swarm2);
     await leaveSwarm([peer1, peer2], topic);
-  })
-    .tag('flaky')
-    .timeout(2_000);
+  });
 
   // TODO(mykola): Fails with large amount of peers ~10.
-  test('many peers and connections', async () => {
+  test.skip('many peers and connections', async () => {
     const numTopics = 2;
     const peersPerTopic = 3;
     const swarmsAllPeersConnected: Promise<any>[] = [];
@@ -207,5 +208,5 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     );
 
     await asyncTimeout(Promise.all(swarmsAllPeersConnected), 2_000);
-  }).tag('stress');
+  });
 };

package/src/tests/memory-transport.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2021 DXOS.org
 //
 
-import { randomBytes } from 'crypto';
+import { randomBytes } from 'node:crypto';
+import { describe, test } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
-import { test } from '@dxos/test';
 import { range } from '@dxos/util';
 
 import { basicTestSuite } from './basic-test-suite';
@@ -17,47 +17,45 @@ describe('Memory transport', () => {
   const testBuilder = new TestBuilder();
   basicTestSuite(testBuilder);
 
-  test
-    .skip('load', async () => {
-      const NUM_PAIRS = 100;
-      const NUM_ROUNDS = 10_000;
-      const PACKET_SIZE = 1_000;
-
-      const pairs = await Promise.all(
-        range(NUM_PAIRS).map(async () => {
-          const peer1 = testBuilder.createPeer();
-          const peer2 = testBuilder.createPeer();
-          await openAndCloseAfterTest([peer1, peer2]);
-
-          const topic = PublicKey.random();
-          const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic, () => new FullyConnectedTopology());
-
-          return {
-            peer1,
-            peer2,
-            topic,
-            swarm1,
-            swarm2,
-          };
-        }),
-      );
-
-      const message = randomBytes(PACKET_SIZE / 2).toString('hex');
-
-      for (let i = 0; i < NUM_ROUNDS; i++) {
-        // console.log(`Round ${i}/${NUM_ROUNDS}`);
-        await Promise.all(
-          pairs.map(async ({ swarm1, swarm2 }) => {
-            await exchangeMessages(swarm1, swarm2, message);
-          }),
-        );
-      }
-
+  test.skip('load', { timeout: 1_000_000 }, async () => {
+    const NUM_PAIRS = 100;
+    const NUM_ROUNDS = 10_000;
+    const PACKET_SIZE = 1_000;
+
+    const pairs = await Promise.all(
+      range(NUM_PAIRS).map(async () => {
+        const peer1 = testBuilder.createPeer();
+        const peer2 = testBuilder.createPeer();
+        await openAndCloseAfterTest([peer1, peer2]);
+
+        const topic = PublicKey.random();
+        const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic, () => new FullyConnectedTopology());
+
+        return {
+          peer1,
+          peer2,
+          topic,
+          swarm1,
+          swarm2,
+        };
+      }),
+    );
+
+    const message = randomBytes(PACKET_SIZE / 2).toString('hex');
+
+    for (let i = 0; i < NUM_ROUNDS; i++) {
+      // console.log(`Round ${i}/${NUM_ROUNDS}`);
       await Promise.all(
-        pairs.map(async ({ peer1, peer2, topic }) => {
-          await leaveSwarm([peer1, peer2], topic);
+        pairs.map(async ({ swarm1, swarm2 }) => {
+          await exchangeMessages(swarm1, swarm2, message);
         }),
       );
-    })
-    .timeout(1_000_000);
+    }
+
+    await Promise.all(
+      pairs.map(async ({ peer1, peer2, topic }) => {
+        await leaveSwarm([peer1, peer2], topic);
+      }),
+    );
+  });
 });

package/src/tests/property-test-suite.ts

@@ -4,11 +4,10 @@
 
 import * as fc from 'fast-check';
 import { type ModelRunSetup } from 'fast-check';
-import waitForExpect from 'wait-for-expect';
+import { test } from 'vitest';
 
 import { todo } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
-import { test } from '@dxos/test';
 import { ComplexMap, ComplexSet, range } from '@dxos/util';
 
 import { type SwarmNetworkManager } from '../network-manager';
@@ -37,29 +36,29 @@ export const propertyTestSuite = () => {
     }
 
     const assertState = async (model: Model, real: Real) => {
-      await waitForExpect(() => {
-        for (const peer of real.peers.values()) {
-          if (peer.presence) {
-            for (const expectedPeerId of model.joinedPeers) {
-              if (expectedPeerId.equals(peer.presence.peerId)) {
-                continue;
-              }
-
-              const actuallyConnectedPeers = peer.presence!.peers;
-              if (!actuallyConnectedPeers.some((peer: any) => PublicKey.equals(expectedPeerId, peer))) {
-                // TODO(burdon): More concise error.
-                const context = {
-                  peerId: peer.presence.peerId,
-                  expectedPeerId: expectedPeerId.truncate(),
-                  connectedPeerIds: actuallyConnectedPeers.map((key: any) => key.toString('hex')),
-                };
-
-                throw new Error(`Expected peer to be in the list of joined peers: ${context}`);
-              }
+      // await waitForExpect(() => {
+      for (const peer of real.peers.values()) {
+        if (peer.presence) {
+          for (const expectedPeerId of model.joinedPeers) {
+            if (expectedPeerId.equals(peer.presence.peerId)) {
+              continue;
+            }
+
+            const actuallyConnectedPeers = peer.presence!.peers;
+            if (!actuallyConnectedPeers.some((peer: any) => PublicKey.equals(expectedPeerId, peer))) {
+              // TODO(burdon): More concise error.
+              const context = {
+                peerId: peer.presence.peerId,
+                expectedPeerId: expectedPeerId.truncate(),
+                connectedPeerIds: actuallyConnectedPeers.map((key: any) => key.toString('hex')),
+              };
+
+              throw new Error(`Expected peer to be in the list of joined peers: ${context}`);
             }
           }
         }
-      }, 5_000);
+      }
+      // }, 5_000);
 
       real.peers.forEach((peer) =>
         peer.networkManager.topics.forEach((topic) => {

package/src/tests/tcp-transport.node.test.ts

@@ -0,0 +1,65 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import { randomBytes } from 'node:crypto';
+import { describe, test } from 'vitest';
+
+import { PublicKey } from '@dxos/keys';
+import { range } from '@dxos/util';
+
+import { basicTestSuite } from './basic-test-suite';
+import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
+import { TestBuilder } from '../testing';
+import { FullyConnectedTopology } from '../topology';
+import { TransportKind } from '../transport';
+
+describe('Tcp transport', () => {
+  const testBuilder = new TestBuilder({
+    transport: TransportKind.TCP,
+  });
+
+  basicTestSuite(testBuilder);
+
+  test.skip('load', { timeout: 1_000_000 }, async () => {
+    const NUM_PAIRS = 100;
+    const NUM_ROUNDS = 10_000;
+    const PACKET_SIZE = 1_000;
+
+    const pairs = await Promise.all(
+      range(NUM_PAIRS).map(async () => {
+        const peer1 = testBuilder.createPeer();
+        const peer2 = testBuilder.createPeer();
+        await openAndCloseAfterTest([peer1, peer2]);
+
+        const topic = PublicKey.random();
+        const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic, () => new FullyConnectedTopology());
+
+        return {
+          peer1,
+          peer2,
+          topic,
+          swarm1,
+          swarm2,
+        };
+      }),
+    );
+
+    const message = randomBytes(PACKET_SIZE / 2).toString('hex');
+
+    for (let i = 0; i < NUM_ROUNDS; i++) {
+      // console.log(`Round ${i}/${NUM_ROUNDS}`);
+      await Promise.all(
+        pairs.map(async ({ swarm1, swarm2 }) => {
+          await exchangeMessages(swarm1, swarm2, message);
+        }),
+      );
+    }
+
+    await Promise.all(
+      pairs.map(async ({ peer1, peer2, topic }) => {
+        await leaveSwarm([peer1, peer2], topic);
+      }),
+    );
+  });
+});

package/src/tests/utils.ts

@@ -2,9 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
+import { onTestFinished } from 'vitest';
+
 import { asyncTimeout } from '@dxos/async';
 import { type PublicKey } from '@dxos/keys';
-import { afterTest } from '@dxos/test';
 import { type Provider } from '@dxos/util';
 
 import { type TestPeer, type TestSwarmConnection } from '../testing';
@@ -19,7 +20,7 @@ import { type Topology } from '../topology';
  */
 export const openAndCloseAfterTest = async (peers: TestPeer[]) => {
   await Promise.all(peers.map((peer) => peer.open()));
-  afterTest(async () => {
+  onTestFinished(async () => {
     await asyncTimeout(Promise.all(peers.map((peer) => peer.close())), 1_000);
   });
 };

package/src/tests/webrtc-transport.test.ts

@@ -2,29 +2,29 @@
 // Copyright 2021 DXOS.org
 //
 
-import { describe } from '@dxos/test';
+import { describe } from 'vitest';
 
 import { basicTestSuite } from './basic-test-suite';
 import { TEST_SIGNAL_HOSTS, TestBuilder } from '../testing';
 
-describe('WebRTC transport', () => {
+describe('WebRTC transport', { timeout: 10_000 }, () => {
   const testBuilder = new TestBuilder();
   basicTestSuite(testBuilder);
-}).timeout(10_000);
+});
 
-describe('WebRTC transport proxy', () => {
+describe('WebRTC transport proxy', { timeout: 10_000 }, () => {
   const testBuilder = new TestBuilder({ bridge: true });
   basicTestSuite(testBuilder);
-}).timeout(10_000);
+});
 
 describe('test with signal server', () => {
-  describe('WebRTC transport', () => {
+  describe('WebRTC transport', { timeout: 10_000 }, () => {
     const testBuilder = new TestBuilder({ signalHosts: TEST_SIGNAL_HOSTS });
     basicTestSuite(testBuilder);
-  }).timeout(10_000);
+  });
 
-  describe('WebRTC transport proxy', () => {
+  describe('WebRTC transport proxy', { timeout: 10_000 }, () => {
     const testBuilder = new TestBuilder({ signalHosts: TEST_SIGNAL_HOSTS, bridge: true });
     basicTestSuite(testBuilder);
-  }).timeout(10_000);
+  });
 });

package/src/transport/index.ts

@@ -4,8 +4,4 @@
 
 export * from './memory-transport';
 export * from './transport';
-export * from './simplepeer-transport';
-export * from './simplepeer-transport-service';
-export * from './simplepeer-transport-proxy';
-export * from './libdatachannel-transport';
-export * from './tcp-transport';
+export * from './webrtc';

package/src/transport/memory-transport.ts

@@ -123,6 +123,7 @@ export class MemoryTransport implements Transport {
           this.errors.raise(err);
         });
     }
+    return this;
   }
 
   async close() {
@@ -155,6 +156,7 @@ export class MemoryTransport implements Transport {
 
     this.closed.emit();
     log('closed');
+    return this;
   }
 
   async onSignal({ payload }: Signal) {

package/src/transport/tcp/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './tcp-transport';

package/src/transport/{tcp-transport.browser.ts → tcp/tcp-transport.browser.ts}

@@ -5,7 +5,7 @@
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 
-import { type Transport, type TransportFactory, type TransportStats } from './transport';
+import { type Transport, type TransportFactory, type TransportStats } from '../transport';
 
 export const TcpTransportFactory: TransportFactory = {
   createTransport: () => new TcpTransport(),
@@ -23,9 +23,13 @@ export class TcpTransport implements Transport {
     return true;
   }
 
-  async open() {}
+  async open() {
+    return this;
+  }
 
-  async close() {}
+  async close() {
+    return this;
+  }
 
   async onSignal() {
     throw new Error('Method not implemented.');

package/src/transport/{tcp-transport.ts → tcp/tcp-transport.ts}

@@ -9,7 +9,7 @@ import { ErrorStream } from '@dxos/debug';
 import { log } from '@dxos/log';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from '../transport';
 
 export const TcpTransportFactory: TransportFactory = {
   createTransport: (options) => new TcpTransport(options),
@@ -72,6 +72,7 @@ export class TcpTransport implements Transport {
         this._server.listen(0);
       });
     }
+    return this;
   }
 
   async close() {
@@ -79,6 +80,7 @@ export class TcpTransport implements Transport {
     this._socket?.destroy();
     this._server?.close();
     this._closed = true;
+    return this;
   }
 
   async onSignal({ payload }: Signal) {

package/src/transport/transport.ts

@@ -8,9 +8,8 @@ import { type PublicKey } from '@dxos/keys';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 export enum TransportKind {
-  SIMPLE_PEER = 'SIMPLE_PEER',
-  SIMPLE_PEER_PROXY = 'SIMPLE_PEER_PROXY',
-  LIBDATACHANNEL = 'LIBDATACHANNEL',
+  WEB_RTC = 'WEB-RTC',
+  WEB_RTC_PROXY = 'WEB-RTC_PROXY',
   MEMORY = 'MEMORY',
   TCP = 'TCP',
 }
@@ -25,10 +24,8 @@ export interface Transport {
   connected: Event;
   errors: ErrorStream;
 
-  open(): Promise<void>;
-  close(): Promise<void>;
-
-  get isOpen(): boolean;
+  open(): Promise<this>;
+  close(): Promise<this>;
 
   /**
    * Handle message from signaling.
@@ -50,6 +47,10 @@ export interface Transport {
  * Common options for all transports.
  */
 export type TransportOptions = {
+  ownPeerKey: string;
+  remotePeerKey: string;
+
+  topic: string;
   /**
    * Did local node initiate this connection.
    */

package/src/transport/webrtc/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './rtc-transport-factory';
+export * from './rtc-transport-proxy';
+export * from './rtc-transport-service';