@dxos/network-manager 0.1.48 → 0.1.49-next.7ec9d52

package/dist/types/src/network-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../../src/network-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,SAAS,CAAC;IAElB;;OAEG;IACH,gBAAgB,EAAE,oBAAoB,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF;;GAEG;AAEH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoD;IAC5E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0D;IAEnF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAErD,OAAO,CAAC,gBAAgB,CAA0B;IAClD,SAAgB,sBAAsB,yBAAgC;IAEtE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAgB;IAEhD,SAAgB,aAAa,cAAqB;IAElD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAE9C,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,qBAAqB;IAmB3E,IAAI,aAAa,8BAEhB;IAED,IAAI,eAAe,oBAElB;IAGD,IAAI,MAAM,gBAET;IAED,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS;IAItD,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS;IAIvC,IAAI;IAOJ,KAAK;IAWX;;OAEG;IACG,SAAS,CAAC,EACd,KAAK,EACL,MAAM,EACN,QAAQ,EACR,gBAAgB,EAAE,QAAQ,EAC1B,KAAK,GACN,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B1C;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,SAAS;IAuB3B,kBAAkB,CAAC,KAAK,EAAE,eAAe;CA0BhD"}
+{"version":3,"file":"network-manager.d.ts","sourceRoot":"","sources":["../../../src/network-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,SAAS,CAAC;IAElB;;OAEG;IACH,gBAAgB,EAAE,oBAAoB,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF;;GAEG;AAEH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoD;IAC5E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0D;IAEnF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAErD,OAAO,CAAC,gBAAgB,CAA0B;IAClD,SAAgB,sBAAsB,yBAAgC;IAEtE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAgB;IAEhD,SAAgB,aAAa,cAAqB;IAElD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAE9C,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,qBAAqB;IAmB3E,IAAI,aAAa,8BAEhB;IAED,IAAI,eAAe,oBAElB;IAGD,IAAI,MAAM,gBAET;IAED,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS;IAItD,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS;IAIvC,IAAI;IAOJ,KAAK;IAWX;;OAEG;IACG,SAAS,CAAC,EACd,KAAK,EACL,MAAM,EACN,QAAQ,EACR,gBAAgB,EAAE,QAAQ,EAC1B,KAAK,GACN,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC1C;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,SAAS;IAuB3B,kBAAkB,CAAC,KAAK,EAAE,eAAe;CA0BhD"}

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

@@ -1,5 +1,5 @@
 import { PublicKey } from '@dxos/keys';
-import { Answer, Offer, Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { Answer, Offer, Signal, SignalBatch } from '@dxos/protocols/proto/dxos/mesh/swarm';
 export interface OfferMessage {
     author: PublicKey;
     recipient: PublicKey;
@@ -15,7 +15,8 @@ export interface SignalMessage {
     topic: PublicKey;
     sessionId: PublicKey;
     data: {
-        signal: Signal;
+        signal?: Signal;
+        signalBatch?: SignalBatch;
     };
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"signal-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/signal-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE9E,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1C;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C"}
+{"version":3,"file":"signal-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/signal-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAE3F,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,WAAW,CAAA;KAAE,CAAC;CACtD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1C;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C"}

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

@@ -1 +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"}
+{"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;IA2BX,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;YAiCZ,aAAa;CAuB5B"}

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

@@ -43,12 +43,16 @@ export declare class Connection {
     private readonly _signalMessaging;
     private readonly _protocol;
     private readonly _transportFactory;
+    private readonly _ctx;
     private _state;
     private _transport;
-    private _bufferedSignals;
+    private _incomingSignalBuffer;
+    private _outgoingSignalBuffer;
     readonly stateChanged: Event<ConnectionState>;
     readonly errors: ErrorStream;
     _instanceId: string;
+    private readonly _signalSendTask;
+    private _signallingDelay;
     constructor(topic: PublicKey, ownId: PublicKey, // TODO(burdon): peerID?
     remoteId: PublicKey, sessionId: PublicKey, initiator: boolean, _signalMessaging: SignalMessenger, _protocol: WireProtocol, _transportFactory: TransportFactory);
     get state(): ConnectionState;
@@ -59,6 +63,11 @@ export declare class Connection {
      */
     openConnection(): void;
     close(): Promise<void>;
+    private _sendSignal;
+    private _flushSignalBuffer;
+    /**
+     * Receive a signal from the remote peer.
+     */
     signal(msg: SignalMessage): Promise<void>;
     private _changeState;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/swarm/connection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;GAEG;AACH,oBAAY,eAAe;IACzB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;;GAGG;AACH,qBAAa,UAAU;aAWH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAjBpC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IAExC,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;IAE7B,WAAW,SAA8B;gBAG9B,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,YAAY,EACvB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,iBAEX;IAED;;OAEG;IAEH,cAAc;IAgER,KAAK;IA0BL,MAAM,CAAC,GAAG,EAAE,aAAa;IAqB/B,OAAO,CAAC,YAAY;CAMrB"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/swarm/connection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,KAAK,EAAuB,MAAM,aAAa,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;GAEG;AACH,oBAAY,eAAe;IACzB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;;GAGG;AACH,qBAAa,UAAU;aAqBH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IA3BpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAE1C,OAAO,CAAC,qBAAqB,CAAgB;IAC7C,OAAO,CAAC,qBAAqB,CAAgB;IAE7C,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;IAE7B,WAAW,SAA8B;IAEhD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAE7B;IAEH,OAAO,CAAC,gBAAgB,CAA6B;gBAGnC,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,YAAY,EACvB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,iBAEX;IAED;;OAEG;IAEH,cAAc;IAkDR,KAAK;IA4BX,OAAO,CAAC,WAAW;YAKL,kBAAkB;IA8BhC;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,aAAa;IA2B/B,OAAO,CAAC,YAAY;CAMrB"}

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

@@ -24,6 +24,7 @@ export declare class Swarm {
     private readonly _label;
     private readonly _swarmMessenger;
     private _ctx;
+    private _listeningHandle?;
     /**
      * Unique id of the swarm, local to the current peer, generated when swarm is joined.
      */
@@ -37,6 +38,7 @@ export declare class Swarm {
      */
     get label(): string | undefined;
     get topic(): Topic;
+    open(): Promise<void>;
     destroy(): Promise<void>;
     setTopology(topology: Topology): Promise<void>;
     onSwarmEvent(swarmEvent: SwarmEvent): void;

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,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;IA+B7C,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,EAAmB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE7D,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;IA0Cd,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,eAAe,CAAiB;IAEjD,OAAO,CAAC,IAAI,CAAiB;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAA8B;IAEvD;;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;IAkB7C,IAAI,WAAW,iBAId;IAED,IACI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAEK,IAAI;IAaJ,OAAO;IAWP,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.48",
+  "version": "0.1.49-next.7ec9d52",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,23 +22,24 @@
     "@koush/wrtc": "^0.5.3",
     "isomorphic-ws": "^4.0.1",
     "nanomessage-rpc": "^3.0.0",
-    "simple-peer": "9.11.0",
+    "simple-peer": "9.11.1",
     "ws": "^7.4.4",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.1.48",
-    "@dxos/codec-protobuf": "0.1.48",
-    "@dxos/context": "0.1.48",
-    "@dxos/credentials": "0.1.48",
-    "@dxos/crypto": "0.1.48",
-    "@dxos/debug": "0.1.48",
-    "@dxos/keys": "0.1.48",
-    "@dxos/log": "0.1.48",
-    "@dxos/messaging": "0.1.48",
-    "@dxos/node-std": "0.1.48",
-    "@dxos/protocols": "0.1.48",
-    "@dxos/rpc": "0.1.48",
-    "@dxos/teleport": "0.1.48",
-    "@dxos/util": "0.1.48"
+    "@dxos/async": "0.1.49-next.7ec9d52",
+    "@dxos/codec-protobuf": "0.1.49-next.7ec9d52",
+    "@dxos/context": "0.1.49-next.7ec9d52",
+    "@dxos/credentials": "0.1.49-next.7ec9d52",
+    "@dxos/crypto": "0.1.49-next.7ec9d52",
+    "@dxos/debug": "0.1.49-next.7ec9d52",
+    "@dxos/errors": "0.1.49-next.7ec9d52",
+    "@dxos/keys": "0.1.49-next.7ec9d52",
+    "@dxos/log": "0.1.49-next.7ec9d52",
+    "@dxos/messaging": "0.1.49-next.7ec9d52",
+    "@dxos/node-std": "0.1.49-next.7ec9d52",
+    "@dxos/protocols": "0.1.49-next.7ec9d52",
+    "@dxos/rpc": "0.1.49-next.7ec9d52",
+    "@dxos/teleport": "0.1.49-next.7ec9d52",
+    "@dxos/util": "0.1.49-next.7ec9d52"
   },
   "devDependencies": {
     "@swc-node/register": "1.5.4",
@@ -48,7 +49,7 @@
     "earljs": "~0.1.10",
     "fast-check": "~3.3.0",
     "typescript": "^5.0.4",
-    "@dxos/signal": "0.1.48"
+    "@dxos/signal": "0.1.49-next.7ec9d52"
   },
   "publishConfig": {
     "access": "public"

package/src/network-manager.ts

@@ -166,9 +166,13 @@ export class NetworkManager {
     });
 
     this._swarms.set(topic, swarm);
-    this._signalConnection.join({ topic, peerId }).catch((error) => log.catch(error));
     this._mappers.set(topic, new SwarmMapper(swarm));
 
+    // Open before joining.
+    await swarm.open();
+
+    this._signalConnection.join({ topic, peerId }).catch((error) => log.catch(error));
+
     this.topicsUpdated.emit();
     this._connectionLog?.joinedSwarm(swarm);
     log('joined', { topic: PublicKey.from(topic), count: this._swarms.size });

package/src/signal/integration.test.ts

@@ -112,6 +112,7 @@ describe('Signal Integration Test', () => {
         sessionId: PublicKey.random(),
         data: {
           signal: { payload: { message: 'Hello world!' } },
+          signalBatch: undefined,
         },
       };
       await peerNetworking1.messageRouter.signal(message);
@@ -129,6 +130,7 @@ describe('Signal Integration Test', () => {
         sessionId: PublicKey.random(),
         data: {
           signal: { payload: { foo: 'bar' } },
+          signalBatch: undefined,
         },
       };
       await peerNetworking2.messageRouter.signal(message);

package/src/signal/signal-messenger.ts

@@ -3,7 +3,7 @@
 //
 
 import { PublicKey } from '@dxos/keys';
-import { Answer, Offer, Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { Answer, Offer, Signal, SignalBatch } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 export interface OfferMessage {
   author: PublicKey;
@@ -18,7 +18,7 @@ export interface SignalMessage {
   recipient: PublicKey;
   topic: PublicKey;
   sessionId: PublicKey;
-  data: { signal: Signal };
+  data: { signal?: Signal; signalBatch?: SignalBatch };
 }
 
 /**

package/src/signal/swarm-messenger.test.ts

@@ -99,7 +99,10 @@ describe('SwarmMessenger', () => {
       recipient: peer1,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: 'Some info' } } },
+      data: {
+        signal: { payload: { msg: 'Some info' } },
+        signalBatch: undefined,
+      },
     };
     await router2.signal(msg);
 
@@ -192,7 +195,7 @@ describe('SwarmMessenger', () => {
       recipient: peer3,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: '1to3' } } },
+      data: { signal: { payload: { msg: '1to3' } }, signalBatch: undefined },
     };
     await router1.signal(msg1to3);
     await waitForExpect(() => {
@@ -205,7 +208,7 @@ describe('SwarmMessenger', () => {
       recipient: peer3,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: '2to3' } } },
+      data: { signal: { payload: { msg: '2to3' } }, signalBatch: undefined },
     };
     await router2.signal(msg2to3);
     await waitForExpect(() => {
@@ -218,7 +221,7 @@ describe('SwarmMessenger', () => {
       recipient: peer1,
       sessionId: PublicKey.random(),
       topic,
-      data: { signal: { payload: { msg: '3to1' } } },
+      data: { signal: { payload: { msg: '3to1' } }, signalBatch: undefined },
     };
     await router3.signal(msg3to1);
     await waitForExpect(() => {

package/src/signal/swarm-messenger.ts

@@ -73,11 +73,15 @@ export class SwarmMessenger implements SignalMessenger {
       await this._resolveAnswers(message);
     } else if (message.data?.signal) {
       await this._handleSignal({ author, recipient, message });
+    } else if (message.data?.signalBatch) {
+      await this._handleSignal({ author, recipient, message });
+    } else {
+      log.warn('unknown message', { message });
     }
   }
 
   async signal(message: SignalMessage): Promise<void> {
-    assert(message.data?.signal);
+    assert(message.data?.signal || message.data?.signalBatch, 'Invalid message');
     await this._sendReliableMessage({
       author: message.author,
       recipient: message.recipient,
@@ -155,15 +159,19 @@ export class SwarmMessenger implements SignalMessenger {
     };
     const answer = await this._onOffer(offerMessage);
     answer.offerMessageId = message.messageId;
-    await this._sendReliableMessage({
-      author: recipient,
-      recipient: author,
-      message: {
-        topic: message.topic,
-        sessionId: message.sessionId,
-        data: { answer },
-      },
-    });
+    try {
+      await this._sendReliableMessage({
+        author: recipient,
+        recipient: author,
+        message: {
+          topic: message.topic,
+          sessionId: message.sessionId,
+          data: { answer },
+        },
+      });
+    } catch (err) {
+      log.warn('error sending answer', { err });
+    }
   }
 
   private async _handleSignal({
@@ -176,12 +184,15 @@ export class SwarmMessenger implements SignalMessenger {
     message: SwarmMessage;
   }): Promise<void> {
     assert(message.messageId);
-    assert(message.data.signal, 'No Signal');
+    assert(message.data.signal || message.data.signalBatch, 'Invalid message');
     const signalMessage: SignalMessage = {
       author,
       recipient,
       ...message,
-      data: { signal: message.data.signal },
+      data: {
+        signal: message.data.signal,
+        signalBatch: message.data.signalBatch,
+      },
     };
 
     await this._onSignal(signalMessage);

package/src/swarm/connection.ts

@@ -4,8 +4,10 @@
 
 import assert from 'node:assert';
 
-import { Event, synchronized } from '@dxos/async';
+import { DeferredTask, Event, sleep, synchronized } from '@dxos/async';
+import { Context, cancelWithContext } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
+import { CancelledError } from '@dxos/errors';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { trace } from '@dxos/protocols';
@@ -15,6 +17,17 @@ import { SignalMessage, SignalMessenger } from '../signal';
 import { Transport, TransportFactory } from '../transport';
 import { WireProtocol } from '../wire-protocol';
 
+/**
+ * How long to wait before sending the signal in case we receive another signal.
+ * This value is increased exponentially.
+ */
+const STARTING_SIGNALLING_DELAY = 10;
+
+/**
+ * Maximum delay between signal batches.
+ */
+const MAX_SIGNALLING_DELAY = 300;
+
 /**
  * State machine for each connection.
  */
@@ -51,15 +64,25 @@ export enum ConnectionState {
  * Owns a transport paired together with a wire-protocol.
  */
 export class Connection {
+  private readonly _ctx = new Context();
+
   private _state: ConnectionState = ConnectionState.INITIAL;
   private _transport: Transport | undefined;
-  private _bufferedSignals: Signal[] = [];
+
+  private _incomingSignalBuffer: Signal[] = [];
+  private _outgoingSignalBuffer: Signal[] = [];
 
   readonly stateChanged = new Event<ConnectionState>();
   readonly errors = new ErrorStream();
 
   public _instanceId = PublicKey.random().toHex();
 
+  private readonly _signalSendTask = new DeferredTask(this._ctx, async () => {
+    await this._flushSignalBuffer();
+  });
+
+  private _signallingDelay = STARTING_SIGNALLING_DELAY;
+
   constructor(
     public readonly topic: PublicKey,
     public readonly ownId: PublicKey, // TODO(burdon): peerID?
@@ -108,21 +131,7 @@ export class Connection {
     this._transport = this._transportFactory.createTransport({
       initiator: this.initiator,
       stream: this._protocol.stream,
-      sendSignal: async (signal) => {
-        try {
-          await this._signalMessaging.signal({
-            author: this.ownId,
-            recipient: this.remoteId,
-            sessionId: this.sessionId,
-            topic: this.topic,
-            data: { signal },
-          });
-        } catch (err) {
-          // If signal fails treat connection as failed
-          log('Signal failed', { err });
-          await this.close();
-        }
-      },
+      sendSignal: async (signal) => this._sendSignal(signal),
     });
 
     this._transport.connected.once(() => {
@@ -141,11 +150,11 @@ export class Connection {
     });
 
     // Replay signals that were received before transport was created.
-    for (const signal of this._bufferedSignals) {
+    for (const signal of this._incomingSignalBuffer) {
       void this._transport.signal(signal); // TODO(burdon): Remove async?
     }
 
-    this._bufferedSignals = [];
+    this._incomingSignalBuffer = [];
 
     log.trace('dxos.mesh.connection.open-connection', trace.end({ id: this._instanceId }));
   }
@@ -157,6 +166,8 @@ export class Connection {
     }
     this._changeState(ConnectionState.CLOSING);
 
+    await this._ctx.dispose();
+
     log('closing...', { peerId: this.ownId });
 
     try {
@@ -177,25 +188,69 @@ export class Connection {
     this._changeState(ConnectionState.CLOSED);
   }
 
+  private _sendSignal(signal: Signal) {
+    this._outgoingSignalBuffer.push(signal);
+    this._signalSendTask.schedule();
+  }
+
+  private async _flushSignalBuffer() {
+    if (this._outgoingSignalBuffer.length === 0) {
+      return;
+    }
+
+    try {
+      await cancelWithContext(this._ctx, sleep(this._signallingDelay));
+      this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
+
+      const signals = [...this._outgoingSignalBuffer];
+      this._outgoingSignalBuffer.length = 0;
+
+      await this._signalMessaging.signal({
+        author: this.ownId,
+        recipient: this.remoteId,
+        sessionId: this.sessionId,
+        topic: this.topic,
+        data: { signalBatch: { signals } },
+      });
+    } catch (err) {
+      if (err instanceof CancelledError) {
+        return;
+      }
+
+      // If signal fails treat connection as failed
+      log.warn('Signal failed', { err });
+      await this.close();
+    }
+  }
+
+  /**
+   * Receive a signal from the remote peer.
+   */
   async signal(msg: SignalMessage) {
     assert(msg.sessionId);
     if (!msg.sessionId.equals(this.sessionId)) {
       log('dropping signal for incorrect session id');
       return;
     }
-    assert(msg.data.signal);
+    assert(msg.data.signal || msg.data.signalBatch);
     assert(msg.author?.equals(this.remoteId));
     assert(msg.recipient?.equals(this.ownId));
 
-    if (this._state === ConnectionState.INITIAL) {
-      log('buffered signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
-      this._bufferedSignals.push(msg.data.signal);
-      return;
-    }
+    const signals = msg.data.signalBatch ? msg.data.signalBatch.signals ?? [] : [msg.data.signal];
+    for (const signal of signals) {
+      if (!signal) {
+        continue;
+      }
 
-    assert(this._transport, 'Connection not ready to accept signals.');
-    log('received signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
-    await this._transport.signal(msg.data.signal);
+      if (this._state === ConnectionState.INITIAL) {
+        log('buffered signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
+        this._incomingSignalBuffer.push(signal);
+      } else {
+        assert(this._transport, 'Connection not ready to accept signals.');
+        log('received signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
+        await this._transport.signal(signal);
+      }
+    }
   }
 
   private _changeState(state: ConnectionState): void {

package/src/swarm/swarm.test.ts

@@ -26,7 +26,7 @@ describe('Swarm', () => {
     afterTest(() => signalManager.close());
   });
 
-  const setupSwarm = ({ topic, peerId }: { topic: PublicKey; peerId: PublicKey }) => {
+  const setupSwarm = async ({ topic, peerId }: { topic: PublicKey; peerId: PublicKey }) => {
     const protocol = new TestWireProtocol(peerId);
     const swarm = new Swarm(
       topic,
@@ -42,6 +42,8 @@ describe('Swarm', () => {
       await swarm.destroy();
     });
 
+    await swarm.open();
+
     return { swarm, protocol };
   };
 
@@ -50,9 +52,9 @@ describe('Swarm', () => {
     const peerId1 = PublicKey.random();
     const peerId2 = PublicKey.random();
 
-    const { swarm: swarm1, protocol: protocol1 } = setupSwarm({ topic, peerId: peerId1 });
+    const { swarm: swarm1, protocol: protocol1 } = await setupSwarm({ topic, peerId: peerId1 });
 
-    const { swarm: swarm2 } = setupSwarm({ topic, peerId: peerId2 });
+    const { swarm: swarm2 } = await setupSwarm({ topic, peerId: peerId2 });
 
     expect(swarm1.connections.length).toEqual(0);
     expect(swarm2.connections.length).toEqual(0);
@@ -89,8 +91,8 @@ describe('Swarm', () => {
     const peerId1 = PublicKey.random();
     const peerId2 = PublicKey.random();
 
-    const { swarm: swarm1 } = setupSwarm({ topic, peerId: peerId1 });
-    const { swarm: swarm2 } = setupSwarm({ topic, peerId: peerId2 });
+    const { swarm: swarm1 } = await setupSwarm({ topic, peerId: peerId1 });
+    const { swarm: swarm2 } = await setupSwarm({ topic, peerId: peerId2 });
 
     expect(swarm1.connections.length).toEqual(0);
     expect(swarm2.connections.length).toEqual(0);
@@ -119,9 +121,9 @@ describe('Swarm', () => {
     const peerId1 = PublicKey.random();
     const peerId2 = PublicKey.random();
 
-    const { swarm: swarm1, protocol: protocol1 } = setupSwarm({ topic, peerId: peerId1 });
+    const { swarm: swarm1, protocol: protocol1 } = await setupSwarm({ topic, peerId: peerId1 });
 
-    const { swarm: swarm2 } = setupSwarm({ topic, peerId: peerId2 });
+    const { swarm: swarm2 } = await setupSwarm({ topic, peerId: peerId2 });
 
     expect(swarm1.connections.length).toEqual(0);
     expect(swarm2.connections.length).toEqual(0);

package/src/swarm/swarm.ts

@@ -9,7 +9,7 @@ import { Context } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
-import { Messenger } from '@dxos/messaging';
+import { ListeningHandle, Messenger } from '@dxos/messaging';
 import { trace } from '@dxos/protocols';
 import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
@@ -43,6 +43,8 @@ export class Swarm {
 
   private _ctx = new Context();
 
+  private _listeningHandle?: ListeningHandle = undefined;
+
   /**
    * Unique id of the swarm, local to the current peer, generated when swarm is joined.
    */
@@ -94,19 +96,6 @@ export class Swarm {
       onOffer: async (msg) => await this.onOffer(msg),
       topic: this._topic,
     });
-
-    this._messenger
-      .listen({
-        peerId: this._ownPeerId,
-        payloadType: 'dxos.mesh.swarm.SwarmMessage',
-        onMessage: async (message) => {
-          await this._swarmMessenger
-            .receiveMessage(message)
-            .catch((err) => log('Error while receiving message', { err }));
-        },
-      })
-      .catch((error) => log.catch(error));
-
     log.trace('dxos.mesh.swarm.constructor', trace.end({ id: this._instanceId }));
   }
 
@@ -133,9 +122,24 @@ export class Swarm {
     return this._topic;
   }
 
-  // TODO(burdon): async open?
+  async open() {
+    assert(!this._listeningHandle);
+    this._listeningHandle = await this._messenger.listen({
+      peerId: this._ownPeerId,
+      payloadType: 'dxos.mesh.swarm.SwarmMessage',
+      onMessage: async (message) => {
+        await this._swarmMessenger
+          .receiveMessage(message)
+          .catch((err) => log.warn('Error while receiving message', { err }));
+      },
+    });
+  }
+
   async destroy() {
     log('destroying...');
+    await this._listeningHandle?.unsubscribe();
+    this._listeningHandle = undefined;
+
     await this._ctx.dispose();
     await this._topology.destroy();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));