@dxos/network-manager 0.1.23 → 0.1.24

package/dist/types/src/connection-log.d.ts

@@ -17,7 +17,7 @@ export declare class ConnectionLog {
     readonly update: Event<void>;
     getSwarmInfo(swarmId: PublicKey): SwarmInfo;
     get swarms(): SwarmInfo[];
-    swarmJoined(swarm: Swarm): void;
-    swarmLeft(swarm: Swarm): void;
+    joinedSwarm(swarm: Swarm): void;
+    leftSwarm(swarm: Swarm): void;
 }
 //# sourceMappingURL=connection-log.d.ts.map

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":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzC;;GAEG;AACH,eAAO,MAAM,cAAc,gBAAiB,WAAW,6BA8JtD,CAAC"}
+{"version":3,"file":"basic-test-suite.d.ts","sourceRoot":"","sources":["../../../../src/tests/basic-test-suite.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzC;;GAEG;AACH,eAAO,MAAM,cAAc,gBAAiB,WAAW,6BAsKtD,CAAC"}

package/dist/types/src/tests/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/tests/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMvC;;GAEG;AACH,eAAO,MAAM,qBAAqB,UAAiB,QAAQ,EAAE,kBAK5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,UAAiB,QAAQ,EAAE,SAAS,SAAS,aAAa,SAAS,QAAQ,CAAC,mCAOjG,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,UAAiB,QAAQ,EAAE,SAAS,SAAS,mCAOnE,CAAC;AAEF;;GAEG;AAGH,eAAO,MAAM,gBAAgB,WAAkB,mBAAmB,UAAU,mBAAmB,kBAG9F,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/tests/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMvC;;GAEG;AACH,eAAO,MAAM,qBAAqB,UAAiB,QAAQ,EAAE,kBAK5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,UAAiB,QAAQ,EAAE,SAAS,SAAS,aAAa,SAAS,QAAQ,CAAC,mCAOjG,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,UAAiB,QAAQ,EAAE,SAAS,SAAS,mCAOnE,CAAC;AAEF;;GAEG;AAGH,eAAO,MAAM,gBAAgB,WAAkB,mBAAmB,UAAU,mBAAmB,kBAG9F,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,20 +25,20 @@
     "simple-peer": "9.11.0",
     "ws": "^7.4.4",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.1.23",
-    "@dxos/codec-protobuf": "0.1.23",
-    "@dxos/context": "0.1.23",
-    "@dxos/credentials": "0.1.23",
-    "@dxos/crypto": "0.1.23",
-    "@dxos/debug": "0.1.23",
-    "@dxos/keys": "0.1.23",
-    "@dxos/log": "0.1.23",
-    "@dxos/messaging": "0.1.23",
-    "@dxos/node-std": "0.1.23",
-    "@dxos/protocols": "0.1.23",
-    "@dxos/rpc": "0.1.23",
-    "@dxos/teleport": "0.1.23",
-    "@dxos/util": "0.1.23"
+    "@dxos/async": "0.1.24",
+    "@dxos/codec-protobuf": "0.1.24",
+    "@dxos/context": "0.1.24",
+    "@dxos/credentials": "0.1.24",
+    "@dxos/crypto": "0.1.24",
+    "@dxos/debug": "0.1.24",
+    "@dxos/keys": "0.1.24",
+    "@dxos/log": "0.1.24",
+    "@dxos/messaging": "0.1.24",
+    "@dxos/node-std": "0.1.24",
+    "@dxos/protocols": "0.1.24",
+    "@dxos/rpc": "0.1.24",
+    "@dxos/teleport": "0.1.24",
+    "@dxos/util": "0.1.24"
   },
   "devDependencies": {
     "@swc-node/register": "^1.5.4",
@@ -48,7 +48,7 @@
     "earljs": "~0.1.10",
     "fast-check": "~3.3.0",
     "typescript": "^4.8.4",
-    "@dxos/signal": "0.1.23"
+    "@dxos/signal": "0.1.24"
   },
   "publishConfig": {
     "access": "public"

package/src/connection-log.ts

@@ -34,7 +34,7 @@ export class ConnectionLog {
     return Array.from(this._swarms.values());
   }
 
-  swarmJoined(swarm: Swarm) {
+  joinedSwarm(swarm: Swarm) {
     const info: SwarmInfo = {
       id: swarm.instanceId,
       topic: swarm.topic,
@@ -95,7 +95,7 @@ export class ConnectionLog {
     });
   }
 
-  swarmLeft(swarm: Swarm) {
+  leftSwarm(swarm: Swarm) {
     this.getSwarmInfo(swarm.instanceId).isActive = false;
     this.update.emit();
   }

package/src/network-manager.ts

@@ -170,7 +170,7 @@ export class NetworkManager {
     this._mappers.set(topic, new SwarmMapper(swarm));
 
     this.topicsUpdated.emit();
-    this._connectionLog?.swarmJoined(swarm);
+    this._connectionLog?.joinedSwarm(swarm);
     log('joined', { topic: PublicKey.from(topic), count: this._swarms.size });
 
     return {
@@ -195,7 +195,7 @@ export class NetworkManager {
     map.destroy();
     this._mappers.delete(topic);
 
-    this._connectionLog?.swarmLeft(swarm);
+    this._connectionLog?.leftSwarm(swarm);
 
     await swarm.destroy();
     this._swarms.delete(topic);
@@ -221,8 +221,8 @@ export class NetworkManager {
       case ConnectionState.ONLINE: {
         this._connectionState = state;
         // go online
-        await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOnline()));
         this._messenger.open();
+        await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOnline()));
         await this._signalManager.open();
         break;
       }

package/src/swarm/swarm.ts

@@ -152,7 +152,7 @@ export class Swarm {
     log('swarm event', { swarmEvent }); // TODO(burdon): Stringify.
 
     if (this._ctx.disposed) {
-      log.warn('ignored for offline swarm');
+      log('swarm event ignored for disposed swarm');
       return;
     }
 
@@ -181,7 +181,7 @@ export class Swarm {
   async onOffer(message: OfferMessage): Promise<Answer> {
     log('offer', { message });
     if (this._ctx.disposed) {
-      log.info('ignored for offline swarm');
+      log('ignored for disposed swarm');
       return { accept: false };
     }
 

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

@@ -5,6 +5,7 @@
 import { expect } from 'chai';
 import waitForExpect from 'wait-for-expect';
 
+import { asyncTimeout } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { afterTest, test } from '@dxos/test';
@@ -76,7 +77,7 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     }
   });
 
-  test.skip('joins multiple swarms', async () => {
+  test('joins multiple swarms', async () => {
     // TODO(burdon): N peers.
     // TODO(burdon): Merge with test below.
     const peer1 = testBuilder.createPeer();
@@ -88,7 +89,7 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     expect(topics).to.have.length(numSwarms);
   });
 
-  test.skip('joins multiple swarms concurrently', async () => {
+  test('joins multiple swarms concurrently', async () => {
     const createSwarm = async () => {
       const topicA = PublicKey.random();
       const peer1a = testBuilder.createPeer();
@@ -106,75 +107,83 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
 
     await Promise.all([
       test1.swarm1a.protocol.testConnection(test1.peer2a.peerId),
-      test2.swarm1a.protocol.testConnection(test1.peer2a.peerId)
+      test2.swarm1a.protocol.testConnection(test2.peer2a.peerId)
     ]);
   });
 
-  // TODO(mykola): Flaky test because of test signal server.
-  test
-    .skip('going offline and back online', async () => {
-      const peer1 = testBuilder.createPeer();
-      const peer2 = testBuilder.createPeer();
-      await openAndCloseAfterTest([peer1, peer2]);
+  test('going offline and back online', async () => {
+    const peer1 = testBuilder.createPeer();
+    const peer2 = testBuilder.createPeer();
+    await openAndCloseAfterTest([peer1, peer2]);
 
-      const topic = PublicKey.random();
+    const topic = PublicKey.random();
 
-      const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic);
-      await exchangeMessages(swarm1, swarm2);
+    const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic);
+    await exchangeMessages(swarm1, swarm2);
 
-      //
-      // Going offline and back online
-      //
-      const connectionDropped = peer2._networkManager
-        .getSwarm(topic)
-        ?.disconnected.waitFor((peerId) => peerId.equals(peer1.peerId));
+    //
+    // Going offline and back online
+    //
+    const connectionDropped = peer2._networkManager
+      .getSwarm(topic)
+      ?.disconnected.waitFor((peerId) => peerId.equals(peer1.peerId));
 
-      const peerLeft = peer2._networkManager.signalManager.swarmEvent.waitFor(
-        (event) => !!event.swarmEvent.peerLeft && peer1.peerId.equals(event.swarmEvent.peerLeft?.peer)
-      );
+    const peerLeft = peer2._networkManager.signalManager.swarmEvent.waitFor(
+      (event) => !!event.swarmEvent.peerLeft && peer1.peerId.equals(event.swarmEvent.peerLeft?.peer)
+    );
 
-      await peer1.goOffline();
-      await connectionDropped;
-      await peerLeft;
+    await peer1.goOffline();
+    await connectionDropped;
+    await peerLeft;
 
-      // Wait for peer to be removed from the swarm.
-      await waitForExpect(() => {
-        expect(!!peer2._networkManager.getSwarm(topic)!._peers.get(peer1.peerId)?.advertizing).to.be.false;
-      }, 1_000);
+    // Wait for peer to be removed from the swarm.
+    await waitForExpect(() => {
+      expect(!!peer2._networkManager.getSwarm(topic)!._peers.get(peer1.peerId)?.advertizing).to.be.false;
+    }, 1_000);
 
-      await peer1.goOnline();
+    await peer1.goOnline();
 
-      await waitForExpect(() => {
-        expect(peer1._networkManager.getSwarm(topic)?._peers.get(peer2.peerId)?.advertizing).to.be.true;
+    await waitForExpect(() => {
+      expect(peer1._networkManager.getSwarm(topic)?._peers.get(peer2.peerId)?.advertizing).to.be.true;
 
-        expect(peer2._networkManager.getSwarm(topic)?._peers.get(peer1.peerId)?.advertizing).to.be.true;
-      }, 2_000);
+      expect(peer2._networkManager.getSwarm(topic)?._peers.get(peer1.peerId)?.advertizing).to.be.true;
+    }, 2_000);
 
-      await exchangeMessages(swarm1, swarm2);
-      await leaveSwarm([peer1, peer2], topic);
-    })
+    await exchangeMessages(swarm1, swarm2);
+    await leaveSwarm([peer1, peer2], topic);
+  })
+    .tag('e2e')
     .timeout(2_000);
 
-  // TODO(mykola): broken.
+  // TODO(mykola): Fails with large amount of peers ~10.
+  // Time wasted: 1 hour (increment when you work on it).
   test.skip('many peers and connections', async () => {
-    const numTopics = 5;
-    const peersPerTopic = 5;
-
-    await Promise.all(
-      range(numTopics).map(async () => {
-        const topic = PublicKey.random();
-
-        await Promise.all(
-          range(peersPerTopic).map(async () => {
-            const peer = testBuilder.createPeer();
-            await openAndCloseAfterTest([peer]);
-            const swarm = await peer.createSwarm(topic).join();
-            await swarm.protocol.connected.waitForCondition(
-              () => swarm.protocol.connections.size === peersPerTopic - 1
-            );
-          })
-        );
-      })
+    const numTopics = 2;
+    const peersPerTopic = 3;
+    const swarmsAllPeersConnected: Promise<any>[] = [];
+
+    await asyncTimeout(
+      Promise.all(
+        range(numTopics).map(async () => {
+          const topic = PublicKey.random();
+
+          return Promise.all(
+            range(peersPerTopic).map(async () => {
+              const peer = testBuilder.createPeer();
+              await openAndCloseAfterTest([peer]);
+              const swarm = peer.createSwarm(topic);
+
+              swarmsAllPeersConnected.push(
+                swarm.protocol.connected.waitFor(() => swarm.protocol.connections.size === peersPerTopic - 1)
+              );
+              await swarm.join();
+            })
+          );
+        })
+      ),
+      2_000
     );
+
+    await asyncTimeout(Promise.all(swarmsAllPeersConnected), 2_000);
   });
 };

package/src/tests/utils.ts

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

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

@@ -16,8 +16,7 @@ import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
 import { WebRTCTransportProxy } from './webrtc-transport-proxy';
 import { WebRTCTransportService } from './webrtc-transport-service';
 
-// TODO(burdon): Flaky.
-describe.skip('WebRTCTransportProxy', () => {
+describe('WebRTCTransportProxy', () => {
   const setupProxy = async ({
     initiator = true,
     stream = new TestStream(),
@@ -91,7 +90,7 @@ describe.skip('WebRTCTransportProxy', () => {
     expect(callsCounter).toEqual(1);
   })
     .timeout(1_000)
-    .retries(3);
+    .tag('e2e');
 
   test('establish connection and send data through with protocol', async () => {
     const stream1 = new TestStream();
@@ -118,7 +117,7 @@ describe.skip('WebRTCTransportProxy', () => {
     await TestStream.assertConnectivity(stream1, stream2);
   })
     .timeout(2_000)
-    .retries(3);
+    .tag('e2e');
 
   describe('Multiplexing', () => {
     let service: any;
@@ -186,7 +185,7 @@ describe.skip('WebRTCTransportProxy', () => {
 
       await TestStream.assertConnectivity(stream1, stream2);
     })
-      .timeout(5_000)
-      .retries(3);
+      .timeout(3_000)
+      .tag('e2e');
   });
 });