@dxos/network-manager 0.1.46 → 0.1.47

package/dist/types/src/signal/index.d.ts

@@ -1,4 +1,4 @@
-export * from './message-router';
+export * from './swarm-messenger';
 export * from './signal-connection';
 export * from './signal-messenger';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/signal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/signal/index.ts"],"names":[],"mappings":"AAIA,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/signal/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}

package/dist/types/src/signal/{message-router.d.ts → swarm-messenger.d.ts}

@@ -2,7 +2,7 @@ import { Any } from '@dxos/codec-protobuf';
 import { PublicKey } from '@dxos/keys';
 import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { OfferMessage, SignalMessage, SignalMessenger } from './signal-messenger';
-interface MessageRouterOptions {
+export type SwarmMessengerOptions = {
     sendMessage: (params: {
         author: PublicKey;
         recipient: PublicKey;
@@ -11,17 +11,18 @@ interface MessageRouterOptions {
     onOffer: (message: OfferMessage) => Promise<Answer>;
     onSignal: (message: SignalMessage) => Promise<void>;
     topic: PublicKey;
-}
+};
 /**
  * Adds offer/answer and signal interfaces.
  */
-export declare class MessageRouter implements SignalMessenger {
+export declare class SwarmMessenger implements SignalMessenger {
+    private readonly _ctx;
     private readonly _onSignal;
     private readonly _sendMessage;
     private readonly _onOffer;
     private readonly _topic;
     private readonly _offerRecords;
-    constructor({ sendMessage, onSignal, onOffer, topic }: MessageRouterOptions);
+    constructor({ sendMessage, onSignal, onOffer, topic }: SwarmMessengerOptions);
     receiveMessage({ author, recipient, payload, }: {
         author: PublicKey;
         recipient: PublicKey;
@@ -30,10 +31,8 @@ export declare class MessageRouter implements SignalMessenger {
     signal(message: SignalMessage): Promise<void>;
     offer(message: OfferMessage): Promise<Answer>;
     private _sendReliableMessage;
-    private _encodeAndSend;
     private _resolveAnswers;
     private _handleOffer;
     private _handleSignal;
 }
-export {};
-//# sourceMappingURL=message-router.d.ts.map
+//# sourceMappingURL=swarm-messenger.d.ts.map

package/dist/types/src/signal/swarm-messenger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAgB,MAAM,uCAAuC,CAAC;AAG7E,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMlF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClG,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoF;IAEjH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6C;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;gBAE9F,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAOtE,cAAc,CAAC,EACnB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE;QACD,MAAM,EAAE,SAAS,CAAC;QAClB,SAAS,EAAE,SAAS,CAAC;QACrB,OAAO,EAAE,GAAG,CAAC;KACd,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBX,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YAerC,oBAAoB;YA0BpB,eAAe;YAWf,YAAY;YA6BZ,aAAa;CAoB5B"}

package/dist/types/src/signal/swarm-messenger.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=swarm-messenger.test.d.ts.map

package/dist/types/src/signal/swarm-messenger.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"swarm-messenger.test.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.test.ts"],"names":[],"mappings":""}

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;AAE5C,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,WAAW,SAA8B;IAoBlD,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;IA2B7C,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;YAiDV,YAAY;IAM1B,OAAO,CAAC,mBAAmB;IAuC3B;;OAEG;YACW,mBAAmB;YA0BnB,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;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG/D,OAAO,EAAkB,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACxE,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,CAAiB;IAEjD,OAAO,CAAC,IAAI,CAAiB;IAE7B;;OAEG;IAEH,QAAQ,CAAC,WAAW,SAA8B;IAoBlD,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;IA2B7C,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;YAiDV,YAAY;IAM1B,OAAO,CAAC,mBAAmB;IAuC3B;;OAEG;YACW,mBAAmB;YA0BnB,gBAAgB;CAQ/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "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.46",
-    "@dxos/codec-protobuf": "0.1.46",
-    "@dxos/context": "0.1.46",
-    "@dxos/credentials": "0.1.46",
-    "@dxos/crypto": "0.1.46",
-    "@dxos/debug": "0.1.46",
-    "@dxos/keys": "0.1.46",
-    "@dxos/log": "0.1.46",
-    "@dxos/messaging": "0.1.46",
-    "@dxos/node-std": "0.1.46",
-    "@dxos/protocols": "0.1.46",
-    "@dxos/rpc": "0.1.46",
-    "@dxos/teleport": "0.1.46",
-    "@dxos/util": "0.1.46"
+    "@dxos/async": "0.1.47",
+    "@dxos/codec-protobuf": "0.1.47",
+    "@dxos/context": "0.1.47",
+    "@dxos/credentials": "0.1.47",
+    "@dxos/crypto": "0.1.47",
+    "@dxos/debug": "0.1.47",
+    "@dxos/keys": "0.1.47",
+    "@dxos/log": "0.1.47",
+    "@dxos/messaging": "0.1.47",
+    "@dxos/node-std": "0.1.47",
+    "@dxos/protocols": "0.1.47",
+    "@dxos/rpc": "0.1.47",
+    "@dxos/teleport": "0.1.47",
+    "@dxos/util": "0.1.47"
   },
   "devDependencies": {
     "@swc-node/register": "1.5.4",
@@ -48,7 +48,7 @@
     "earljs": "~0.1.10",
     "fast-check": "~3.3.0",
     "typescript": "^5.0.4",
-    "@dxos/signal": "0.1.46"
+    "@dxos/signal": "0.1.47"
   },
   "publishConfig": {
     "access": "public"

package/src/signal/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2020 DXOS.org
 //
 
-export * from './message-router';
+export * from './swarm-messenger';
 export * from './signal-connection';
 export * from './signal-messenger';

package/src/signal/integration.test.ts

@@ -12,8 +12,8 @@ import { Messenger, WebsocketSignalManager } from '@dxos/messaging';
 import { runTestSignalServer, SignalServerRunner } from '@dxos/signal';
 import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
 
-import { MessageRouter } from './message-router';
 import { SignalMessage } from './signal-messenger';
+import { SwarmMessenger } from './swarm-messenger';
 
 describe('Signal Integration Test', () => {
   let broker: SignalServerRunner;
@@ -45,7 +45,7 @@ describe('Signal Integration Test', () => {
     const signalMock = async (msg: SignalMessage) => {
       receivedSignals.push(msg);
     };
-    const messageRouter = new MessageRouter({
+    const messageRouter = new SwarmMessenger({
       sendMessage: messenger.sendMessage.bind(messenger),
       onSignal: signalMock,
       onOffer: async () => ({ accept: true }),

package/src/signal/{message-router.test.ts → swarm-messenger.test.ts}

@@ -14,10 +14,10 @@ import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { runTestSignalServer } from '@dxos/signal';
 import { afterAll, beforeAll, describe, test, afterTest } from '@dxos/test';
 
-import { MessageRouter } from './message-router';
 import { OfferMessage, SignalMessage } from './signal-messenger';
+import { SwarmMessenger } from './swarm-messenger';
 
-describe('MessageRouter', () => {
+describe('SwarmMessenger', () => {
   let topic: PublicKey;
 
   let broker1: Awaited<ReturnType<typeof runTestSignalServer>>;
@@ -57,7 +57,7 @@ describe('MessageRouter', () => {
       onMessage: async (message) => await router.receiveMessage(message),
     });
 
-    const router: MessageRouter = new MessageRouter({
+    const router: SwarmMessenger = new SwarmMessenger({
       // todo(mykola): added catch to avoid not finished request.
       sendMessage: async (message) => await messenger.sendMessage(message),
       onSignal,

package/src/signal/{message-router.ts → swarm-messenger.ts}

@@ -5,6 +5,7 @@
 import assert from 'node:assert';
 
 import { Any } from '@dxos/codec-protobuf';
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
@@ -15,20 +16,20 @@ import { OfferMessage, SignalMessage, SignalMessenger } from './signal-messenger
 
 interface OfferRecord {
   resolve: (answer: Answer) => void;
-  reject: (error?: Error) => void;
 }
 
-interface MessageRouterOptions {
+export type SwarmMessengerOptions = {
   sendMessage: (params: { author: PublicKey; recipient: PublicKey; payload: Any }) => Promise<void>;
   onOffer: (message: OfferMessage) => Promise<Answer>;
   onSignal: (message: SignalMessage) => Promise<void>;
   topic: PublicKey;
-}
+};
 
 /**
  * Adds offer/answer and signal interfaces.
  */
-export class MessageRouter implements SignalMessenger {
+export class SwarmMessenger implements SignalMessenger {
+  private readonly _ctx = new Context();
   private readonly _onSignal: (message: SignalMessage) => Promise<void>;
   private readonly _sendMessage: (msg: { author: PublicKey; recipient: PublicKey; payload: Any }) => Promise<void>;
 
@@ -37,7 +38,7 @@ export class MessageRouter implements SignalMessenger {
 
   private readonly _offerRecords: ComplexMap<PublicKey, OfferRecord> = new ComplexMap((key) => key.toHex());
 
-  constructor({ sendMessage, onSignal, onOffer, topic }: MessageRouterOptions) {
+  constructor({ sendMessage, onSignal, onOffer, topic }: SwarmMessengerOptions) {
     this._sendMessage = sendMessage;
     this._onSignal = onSignal;
     this._onOffer = onOffer;
@@ -77,11 +78,11 @@ export class MessageRouter implements SignalMessenger {
 
   async signal(message: SignalMessage): Promise<void> {
     assert(message.data?.signal);
-    await this._sendReliableMessage({
+    return this._sendReliableMessage({
       author: message.author,
       recipient: message.recipient,
       message,
-    });
+    }).catch((err) => log.catch(err));
   }
 
   async offer(message: OfferMessage): Promise<Answer> {
@@ -90,12 +91,12 @@ export class MessageRouter implements SignalMessenger {
       messageId: PublicKey.random(),
     };
     return new Promise<Answer>((resolve, reject) => {
-      this._offerRecords.set(networkMessage.messageId!, { resolve, reject });
-      return this._sendReliableMessage({
+      this._offerRecords.set(networkMessage.messageId!, { resolve });
+      this._sendReliableMessage({
         author: message.author,
         recipient: message.recipient,
         message: networkMessage,
-      });
+      }).catch((err) => reject(err));
     });
   }
 
@@ -115,24 +116,12 @@ export class MessageRouter implements SignalMessenger {
     };
 
     log('sending', { from: author, to: recipient, msg: networkMessage });
-    await this._encodeAndSend({ author, recipient, message: networkMessage });
-  }
-
-  private async _encodeAndSend({
-    author,
-    recipient,
-    message,
-  }: {
-    author: PublicKey;
-    recipient: PublicKey;
-    message: SwarmMessage;
-  }) {
-    await this._sendMessage({
+    return this._sendMessage({
       author,
       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(networkMessage),
       },
     });
   }
@@ -174,7 +163,7 @@ export class MessageRouter implements SignalMessenger {
         sessionId: message.sessionId,
         data: { answer },
       },
-    });
+    }).catch((err) => log.catch(err));
   }
 
   private async _handleSignal({

package/src/swarm/peer.ts

@@ -169,7 +169,7 @@ export class Peer {
       connection.openConnection();
       this._callbacks.onAccepted();
     } catch (err: any) {
-      log.warn('initiation error', { topic: this.topic, peerId: this.localPeerId, remoteId: this.id, err });
+      log('initiation error', { err, topic: this.topic, peerId: this.localPeerId, remoteId: this.id });
       // Calls `onStateChange` with CLOSED state.
       await this.closeConnection();
       throw err;

package/src/swarm/swarm.ts

@@ -15,7 +15,7 @@ import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap, isNotNullOrUndefined } from '@dxos/util';
 
-import { MessageRouter, OfferMessage, SignalMessage } from '../signal';
+import { SwarmMessenger, OfferMessage, SignalMessage } from '../signal';
 import { SwarmController, Topology } from '../topology';
 import { TransportFactory } from '../transport';
 import { Topic } from '../types';
@@ -39,7 +39,7 @@ export class Swarm {
    */
   readonly _peers = new ComplexMap<PublicKey, Peer>(PublicKey.hash);
 
-  private readonly _swarmMessenger: MessageRouter;
+  private readonly _swarmMessenger: SwarmMessenger;
 
   private _ctx = new Context();
 
@@ -88,7 +88,7 @@ export class Swarm {
     log('creating swarm', { peerId: _ownPeerId });
     _topology.init(this._getSwarmController());
 
-    this._swarmMessenger = new MessageRouter({
+    this._swarmMessenger = new SwarmMessenger({
       sendMessage: async (msg) => await this._messenger.sendMessage(msg),
       onSignal: async (msg) => await this.onSignal(msg),
       onOffer: async (msg) => await this.onOffer(msg),
@@ -316,7 +316,7 @@ export class Swarm {
           try {
             await this._initiateConnection(peer);
           } catch (err: any) {
-            log.warn('initiation error', err);
+            log('initiation error', err);
           }
         });
       },

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

@@ -4,9 +4,7 @@
 
 // @dxos/test platform=nodejs
 
-import expect from 'expect';
-
-import { sleep, TestStream } from '@dxos/async';
+import { TestStream } from '@dxos/async';
 import { schema } from '@dxos/protocols';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
@@ -76,18 +74,9 @@ describe('WebRTCTransportProxy', () => {
   test('open and close', async () => {
     const { webRTCTransportProxy: connection } = await setupProxy();
 
-    let callsCounter = 0;
-    const closedCb = () => {
-      callsCounter++;
-    };
-    connection.closed.once(closedCb);
-
-    await sleep(10); // Let simple-peer process events.
+    const wait = connection.closed.waitForCount(1);
     await connection.destroy();
-
-    await sleep(1); // Process events.
-
-    expect(callsCounter).toEqual(1);
+    await wait;
   }).timeout(1_000);
 
   test('establish connection and send data through with protocol', async () => {
@@ -96,8 +85,7 @@ describe('WebRTCTransportProxy', () => {
       initiator: true,
       stream: stream1,
       sendSignal: async (signal) => {
-        await sleep(10);
-        await connection2.signal(signal);
+        connection2.signal(signal);
       },
     });
     afterTest(() => connection1.errors.assertNoUnhandledErrors());
@@ -107,8 +95,7 @@ describe('WebRTCTransportProxy', () => {
       initiator: false,
       stream: stream2,
       sendSignal: async (signal) => {
-        await sleep(10);
-        await connection1.signal(signal);
+        connection1.signal(signal);
       },
     });
     afterTest(() => connection2.errors.assertNoUnhandledErrors());
@@ -160,24 +147,28 @@ describe('WebRTCTransportProxy', () => {
         initiator: true,
         stream: stream1,
         sendSignal: async (signal) => {
-          await sleep(10);
-          await proxy2.signal(signal);
+          proxy2.signal(signal);
         },
         bridgeService: rpcClient.rpc.BridgeService,
       });
-      afterTest(() => proxy1.errors.assertNoUnhandledErrors());
+      afterTest(async () => {
+        proxy1.errors.assertNoUnhandledErrors();
+        await proxy1.destroy();
+      });
 
       const stream2 = new TestStream();
       const proxy2 = new WebRTCTransportProxy({
         initiator: false,
         stream: stream2,
         sendSignal: async (signal) => {
-          await sleep(10);
-          await proxy1.signal(signal);
+          proxy1.signal(signal);
         },
         bridgeService: rpcClient.rpc.BridgeService,
       });
-      afterTest(() => proxy2.errors.assertNoUnhandledErrors());
+      afterTest(async () => {
+        proxy2.errors.assertNoUnhandledErrors();
+        await proxy2.destroy();
+      });
 
       await TestStream.assertConnectivity(stream1, stream2);
     }).timeout(3_000);

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

@@ -2,7 +2,6 @@
 // Copyright 2020 DXOS.org
 //
 
-import expect from 'expect';
 import { Duplex } from 'stream';
 
 import { sleep, TestStream } from '@dxos/async';
@@ -19,17 +18,9 @@ describe('WebRTCTransport', () => {
       sendSignal: async () => {},
     });
 
-    let callsCounter = 0;
-    const closedCb = () => {
-      callsCounter++;
-    };
-
-    connection.closed.once(closedCb);
-    await sleep(10); // Let simple-peer process events.
+    const wait = connection.closed.waitForCount(1);
     await connection.destroy();
-
-    await sleep(10); // Process events.
-    expect(callsCounter).toEqual(1);
+    await wait;
   })
     .timeout(1_000)
     .retries(3);