@dxos/network-manager 0.1.22 → 0.1.24-next.6b1f434

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/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":"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.22",
+  "version": "0.1.24-next.6b1f434",
   "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.22",
-    "@dxos/codec-protobuf": "0.1.22",
-    "@dxos/context": "0.1.22",
-    "@dxos/credentials": "0.1.22",
-    "@dxos/crypto": "0.1.22",
-    "@dxos/debug": "0.1.22",
-    "@dxos/keys": "0.1.22",
-    "@dxos/log": "0.1.22",
-    "@dxos/messaging": "0.1.22",
-    "@dxos/node-std": "0.1.22",
-    "@dxos/protocols": "0.1.22",
-    "@dxos/rpc": "0.1.22",
-    "@dxos/teleport": "0.1.22",
-    "@dxos/util": "0.1.22"
+    "@dxos/async": "0.1.24-next.6b1f434",
+    "@dxos/codec-protobuf": "0.1.24-next.6b1f434",
+    "@dxos/context": "0.1.24-next.6b1f434",
+    "@dxos/credentials": "0.1.24-next.6b1f434",
+    "@dxos/crypto": "0.1.24-next.6b1f434",
+    "@dxos/debug": "0.1.24-next.6b1f434",
+    "@dxos/keys": "0.1.24-next.6b1f434",
+    "@dxos/log": "0.1.24-next.6b1f434",
+    "@dxos/messaging": "0.1.24-next.6b1f434",
+    "@dxos/node-std": "0.1.24-next.6b1f434",
+    "@dxos/protocols": "0.1.24-next.6b1f434",
+    "@dxos/rpc": "0.1.24-next.6b1f434",
+    "@dxos/teleport": "0.1.24-next.6b1f434",
+    "@dxos/util": "0.1.24-next.6b1f434"
   },
   "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.22"
+    "@dxos/signal": "0.1.24-next.6b1f434"
   },
   "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);
@@ -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
         this._messenger.open();
-        await this._signalManager.open();
         await Promise.all([...this._swarms.values()].map((swarm) => swarm.goOnline()));
+        await this._signalManager.open();
         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('swarm event ignored for disposed 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));
         }
@@ -177,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 };
     }
 
@@ -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,7 +3,9 @@
 //
 
 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';
@@ -75,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();
@@ -87,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();
@@ -105,7 +107,7 @@ 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)
     ]);
   });
 
@@ -114,43 +116,74 @@ export const basicTestSuite = (testBuilder: TestBuilder, runTests = true) => {
     const peer2 = testBuilder.createPeer();
     await openAndCloseAfterTest([peer1, peer2]);
 
-    const topic1 = PublicKey.random();
+    const topic = PublicKey.random();
 
-    const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic1);
+    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);
+    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)
+    );
+
     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], topic1);
-  }).timeout(2_000);
+    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/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);
-*/

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');
   });
 });