@dxos/network-manager 0.1.21 → 0.1.23

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

@@ -22,7 +22,6 @@ export declare class Swarm {
     private readonly _messenger;
     private readonly _transportFactory;
     private readonly _label;
-    private readonly _peers;
     private readonly _swarmMessenger;
     private _ctx;
     /**

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":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG/D,OAAO,EAAiB,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAmB,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAQ3D;;;;GAIG;AACH,qBAAa,KAAK;IAqCd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,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;IA1CzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;IAE1E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgB;IAEhD,OAAO,CAAC,IAAI,CAAiB;IAE7B;;OAEG;IAEH,QAAQ,CAAC,UAAU,YAAsB;IAoBzC,QAAQ,CAAC,MAAM,cAAqB;gBAMjB,MAAM,EAAE,SAAS,EACjB,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;IAqB7C,IAAI,WAAW,iBAId;IAED,IACI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAGK,OAAO;IAQP,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAiBpC,YAAY,CAAC,UAAU,EAAE,UAAU;IA6B7B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAwB/C,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/C,SAAS;IAUT,QAAQ;IASd,OAAO,CAAC,gBAAgB;YA8CV,YAAY;IAM1B,OAAO,CAAC,mBAAmB;IAuC3B;;OAEG;YACW,mBAAmB;YAwBnB,gBAAgB;CAQ/B"}
+{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG/D,OAAO,EAAiB,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAmB,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAQ3D;;;;GAIG;AACH,qBAAa,KAAK;IAwCd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,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;IAxCzB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgB;IAEhD,OAAO,CAAC,IAAI,CAAiB;IAE7B;;OAEG;IAEH,QAAQ,CAAC,UAAU,YAAsB;IAoBzC,QAAQ,CAAC,MAAM,cAAqB;gBAMjB,MAAM,EAAE,SAAS,EACjB,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;IAqB7C,IAAI,WAAW,iBAId;IAED,IACI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAGK,OAAO;IAQP,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAiBpC,YAAY,CAAC,UAAU,EAAE,UAAU;IA8B7B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAyB/C,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/C,SAAS;IAOT,QAAQ;IAId,OAAO,CAAC,gBAAgB;YA8CV,YAAY;IAM1B,OAAO,CAAC,mBAAmB;IAuC3B;;OAEG;YACW,mBAAmB;YA0BnB,gBAAgB;CAQ/B"}

package/dist/types/src/testing/test-wire-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-wire-protocol.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-wire-protocol.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIxC,qBAAa,gBAAgB;aAIC,MAAM,EAAE,SAAS;IAH7C,SAAgB,WAAW,uCAA4D;IACvF,SAAgB,SAAS,mBAA0B;gBAEvB,MAAM,EAAE,SAAS;IAE7C,QAAQ,CAAC,OAAO,kDAUb;IAEG,iBAAiB,CAAC,MAAM,EAAE,SAAS;IASnC,cAAc,CAAC,MAAM,EAAE,SAAS;CAIvC"}
+{"version":3,"file":"test-wire-protocol.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-wire-protocol.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIxC,qBAAa,gBAAgB;aAIC,MAAM,EAAE,SAAS;IAH7C,SAAgB,WAAW,uCAA4D;IACvF,SAAgB,SAAS,mBAA0B;gBAEvB,MAAM,EAAE,SAAS;IAE7C,QAAQ,CAAC,OAAO,kDAUb;IAEG,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAYnC,cAAc,CAAC,MAAM,EAAE,SAAS;CAIvC"}

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":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzC;;GAEG;AACH,eAAO,MAAM,cAAc,gBAAiB,WAAW,6BAuItD,CAAC"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "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.21",
-    "@dxos/codec-protobuf": "0.1.21",
-    "@dxos/context": "0.1.21",
-    "@dxos/credentials": "0.1.21",
-    "@dxos/crypto": "0.1.21",
-    "@dxos/debug": "0.1.21",
-    "@dxos/keys": "0.1.21",
-    "@dxos/log": "0.1.21",
-    "@dxos/messaging": "0.1.21",
-    "@dxos/node-std": "0.1.21",
-    "@dxos/protocols": "0.1.21",
-    "@dxos/rpc": "0.1.21",
-    "@dxos/teleport": "0.1.21",
-    "@dxos/util": "0.1.21"
+    "@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"
   },
   "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.21"
+    "@dxos/signal": "0.1.23"
   },
   "publishConfig": {
     "access": "public"

package/src/network-manager.ts

@@ -213,17 +213,17 @@ export class NetworkManager {
       case ConnectionState.OFFLINE: {
         this._connectionState = state;
         // go offline
+        await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOffline()));
         await this._messenger.close();
         await this._signalManager.close();
-        await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOffline()));
         break;
       }
       case ConnectionState.ONLINE: {
         this._connectionState = state;
         // go online
+        await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOnline()));
         this._messenger.open();
         await this._signalManager.open();
-        await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOnline()));
         break;
       }
     }

package/src/swarm/swarm.ts

@@ -33,7 +33,10 @@ const getClassName = (obj: any) => Object.getPrototypeOf(obj).constructor.name;
  * Routes signal events and maintains swarm topology.
  */
 export class Swarm {
-  private readonly _peers = new ComplexMap<PublicKey, Peer>(PublicKey.hash);
+  /**
+   * @internal
+   */
+  readonly _peers = new ComplexMap<PublicKey, Peer>(PublicKey.hash);
 
   private readonly _swarmMessenger: MessageRouter;
 
@@ -148,11 +151,12 @@ export class Swarm {
   onSwarmEvent(swarmEvent: SwarmEvent) {
     log('swarm event', { swarmEvent }); // TODO(burdon): Stringify.
 
+    if (this._ctx.disposed) {
+      log.warn('ignored for offline swarm');
+      return;
+    }
+
     if (swarmEvent.peerAvailable) {
-      if (this._ctx.disposed) {
-        log.warn('ignored for offline swarm');
-        return;
-      }
       const peerId = PublicKey.from(swarmEvent.peerAvailable.peer);
       log('new peer', { peerId });
       if (!peerId.equals(this._ownPeerId)) {
@@ -163,7 +167,7 @@ export class Swarm {
       const peer = this._peers.get(PublicKey.from(swarmEvent.peerLeft.peer));
       if (peer) {
         peer.advertizing = false;
-        if (!peer.connection || peer.connection.state !== ConnectionState.CONNECTED) {
+        if (peer.connection?.state !== ConnectionState.CONNECTED) {
           // Destroy peer only if there is no p2p-connection established
           void this._destroyPeer(peer.id).catch((err) => log.catch(err));
         }
@@ -198,6 +202,7 @@ export class Swarm {
     return answer;
   }
 
+  @synchronized
   async onSignal(message: SignalMessage): Promise<void> {
     log('signal', { message });
     if (this._ctx.disposed) {
@@ -216,23 +221,16 @@ export class Swarm {
   }
 
   // For debug purposes
+  @synchronized
   async goOffline() {
     await this._ctx.dispose();
-    [...this._peers.values()].forEach((peer) => {
-      peer.advertizing = false;
-    });
-    await Promise.all([...this._peers.keys()].map((peerId) => this._closeConnection(peerId)));
+    await Promise.all([...this._peers.keys()].map((peerId) => this._destroyPeer(peerId)));
   }
 
   // For debug purposes
   @synchronized
   async goOnline() {
     this._ctx = new Context();
-
-    [...this._peers.values()].forEach((peer) => {
-      peer.advertizing = true;
-    });
-    this._topology.update();
   }
 
   private _getOrCreatePeer(peerId: PublicKey): Peer {
@@ -330,13 +328,15 @@ export class Swarm {
    * Creates a connection then sends message over signal network.
    */
   private async _initiateConnection(remoteId: PublicKey) {
+    const ctx = this._ctx; // Copy to avoid getting reset while sleeping.
+
     // It is likely that the other peer will also try to connect to us at the same time.
     // If our peerId is higher, we will wait for a bit so that other peer has a chance to connect first.
     if (remoteId.toHex() < this._ownPeerId.toHex()) {
       log('initiation delay', { remoteId });
       await sleep(INITIATION_DELAY);
     }
-    if (this._ctx.disposed) {
+    if (ctx.disposed) {
       return;
     }
 

package/src/testing/test-wire-protocol.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event } from '@dxos/async';
+import { asyncTimeout, Event } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { TestExtension } from '@dxos/teleport';
@@ -33,7 +33,10 @@ export class TestWireProtocol {
       return this.connections.get(peerId)!;
     }
     log('waitForConnection', { peerId });
-    await this.connected.waitFor((connectedId) => connectedId.equals(peerId));
+    await asyncTimeout(
+      this.connected.waitFor((connectedId) => connectedId.equals(peerId)),
+      1_000
+    );
     return this.connections.get(peerId)!;
   }
 

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

@@ -3,6 +3,7 @@
 //
 
 import { expect } from 'chai';
+import waitForExpect from 'wait-for-expect';
 
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -109,27 +110,50 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     ]);
   });
 
-  test('going offline and back online', async () => {
-    const peer1 = testBuilder.createPeer();
-    const peer2 = testBuilder.createPeer();
-    await openAndCloseAfterTest([peer1, peer2]);
+  // 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]);
 
-    const topic1 = PublicKey.random();
+      const topic = PublicKey.random();
 
-    const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic1);
-    await exchangeMessages(swarm1, swarm2);
+      const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic);
+      await exchangeMessages(swarm1, swarm2);
 
-    //
-    // Going offline and back online
-    //
-    const peerLeft = peer2._networkManager.signalManager.swarmEvent.waitFor((event) => !!event.swarmEvent.peerLeft);
-    await peer1.goOffline();
-    await peerLeft;
-    await peer1.goOnline();
+      //
+      // Going offline and back online
+      //
+      const connectionDropped = peer2._networkManager
+        .getSwarm(topic)
+        ?.disconnected.waitFor((peerId) => peerId.equals(peer1.peerId));
 
-    await exchangeMessages(swarm1, swarm2);
-    await leaveSwarm([peer1, peer2], topic1);
-  }).timeout(2_000);
+      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;
+
+      // 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 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);
+
+      await exchangeMessages(swarm1, swarm2);
+      await leaveSwarm([peer1, peer2], topic);
+    })
+    .timeout(2_000);
 
   // TODO(mykola): broken.
   test.skip('many peers and connections', async () => {

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

@@ -10,10 +10,7 @@ describe('WebRTC transport', () => {
   basicTestSuite(testBuilder);
 }).timeout(10_000);
 
-/*
-// TODO(burdon): Flaky.
 describe('WebRTC transport proxy', () => {
   const testBuilder = new TestBuilder({ signalHosts: [TEST_SIGNAL_URL], bridge: true });
   basicTestSuite(testBuilder);
 }).timeout(10_000);
-*/