@dxos/messaging 0.6.5 → 0.6.6-main.e1a6e1f

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

@@ -1 +1 @@
-{"version":3,"file":"signal-client.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAAsD,MAAM,aAAa,CAAC;AACtG,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAmC,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAKtF,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAO9F;;;;;GAKG;AAEH,qBAAa,YAAa,SAAQ,QAAS,YAAW,mBAAmB;IAmCrE,OAAO,CAAC,QAAQ,CAAC,KAAK;IAGtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IArChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IAEtD,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,yBAAyB,CAAS;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAiB;IAC9C,OAAO,CAAC,cAAc,CAAC,CAAU;IACjC,OAAO,CAAC,OAAO,CAAC,CAAkB;IAElC,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAC,CAAe;IAEtC;;OAEG;IACH,OAAO,CAAC,eAAe,CAA6B;IAEpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;IAO1D,QAAQ,CAAC,aAAa,sBAA6B;IAEnD;;;;;OAKG;gBAEgB,KAAK,EAAE,MAAM,EAC9B,SAAS,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,EAC/F,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,EACpE,YAAY,CAAC,SAAQ,GAAG,aAAA;cAalB,KAAK;cA+CL,MAAM,CAAC,GAAG,EAAE,KAAK;cAWjB,MAAM;IAY/B,SAAS,IAAI,YAAY;IAUnB,IAAI,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlE,KAAK,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnE,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxC,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAMnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAK3C,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,aAAa;YAuDP,UAAU;IAmBxB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,uBAAuB;YAOjB,gBAAgB;CAQ/B"}
+{"version":3,"file":"signal-client.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAAsD,MAAM,aAAa,CAAC;AACtG,OAAO,EAAmC,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAKtF,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAO9F;;;;;GAKG;AAEH,qBAAa,YAAa,SAAQ,QAAS,YAAW,mBAAmB;IAsCrE,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAtChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IAEtD,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,yBAAyB,CAAS;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAiB;IAC9C,OAAO,CAAC,cAAc,CAAC,CAAU;IACjC,OAAO,CAAC,OAAO,CAAC,CAAkB;IAElC,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAC,CAAe;IAEtC;;OAEG;IACH,OAAO,CAAC,eAAe,CAA6B;IAEpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;IAO1D,QAAQ,CAAC,aAAa,sBAA6B;IAEnD,SAAgB,SAAS,iBAAwB;IACjD,SAAgB,UAAU;eAAsB,SAAS;oBAAc,UAAU;OAAM;IAEvF;;;;;OAKG;gBAEgB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,SAAQ,GAAG,aAAA;cAgBlB,KAAK;cA+CL,MAAM,CAAC,GAAG,EAAE,KAAK;cAWjB,MAAM;IAY/B,SAAS,IAAI,YAAY;IAUnB,IAAI,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlE,KAAK,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnE,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxC,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAMnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAK3C,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,aAAa;YAuDP,UAAU;IAmBxB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,uBAAuB;YAOjB,gBAAgB;CAQ/B"}

package/dist/types/src/signal-manager/edge-signal-manager.d.ts

@@ -0,0 +1,39 @@
+import { Event } from '@dxos/async';
+import { Resource } from '@dxos/context';
+import { type EdgeClient } from '@dxos/edge-client';
+import { PublicKey } from '@dxos/keys';
+import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { type Message, type SignalMethods } from '../signal-methods';
+export declare class EdgeSignal extends Resource implements SignalMethods {
+    swarmEvent: Event<{
+        topic: PublicKey;
+        swarmEvent: SwarmEvent;
+    }>;
+    onMessage: Event<Message>;
+    /**
+     * swarm key -> peers in the swarm
+     */
+    private readonly _swarmPeers;
+    private readonly _messengerClient;
+    constructor({ messengerClient }: {
+        messengerClient: EdgeClient;
+    });
+    protected _open(): Promise<void>;
+    /**
+     * Warning: PeerId is inferred from messengerClient
+     */
+    join({ topic }: {
+        topic: PublicKey;
+        peerId: PublicKey;
+    }): Promise<void>;
+    leave({ topic }: {
+        topic: PublicKey;
+        peerId: PublicKey;
+    }): Promise<void>;
+    sendMessage(message: Message): Promise<void>;
+    subscribeMessages(peerId: PublicKey): Promise<void>;
+    unsubscribeMessages(peerId: PublicKey): Promise<void>;
+    private _onMessage;
+    private _processSwarmResponse;
+}
+//# sourceMappingURL=edge-signal-manager.d.ts.map

package/dist/types/src/signal-manager/edge-signal-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/edge-signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQvC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAGzE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGrE,qBAAa,UAAW,SAAQ,QAAS,YAAW,aAAa;IACxD,UAAU;eAAsB,SAAS;oBAAc,UAAU;OAAM;IACvE,SAAS,iBAAwB;IAExC;;OAEG;IAEH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAa;gBAElC,EAAE,eAAe,EAAE,EAAE;QAAE,eAAe,EAAE,UAAU,CAAA;KAAE;cAKvC,KAAK;IAI9B;;OAEG;IACG,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvE,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUxE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,qBAAqB;CAuC9B"}

package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts

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

package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts.map

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

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

@@ -1,7 +1,5 @@
 import { type Event } from '@dxos/async';
-import { type PublicKey } from '@dxos/keys';
-import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
-import { type Message, type SignalMethods, type SignalStatus } from '../signal-methods';
+import { type SignalMethods, type SignalStatus } from '../signal-methods';
 /**
  * Manages a collection of signaling clients.
  */
@@ -10,10 +8,5 @@ export interface SignalManager extends SignalMethods {
     close(): Promise<void>;
     getStatus(): SignalStatus[];
     statusChanged: Event<SignalStatus[]>;
-    swarmEvent: Event<{
-        topic: PublicKey;
-        swarmEvent: SwarmEvent;
-    }>;
-    onMessage: Event<Message>;
 }
 //# sourceMappingURL=signal-manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAEzE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAExF;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,aAAa;IAClD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,IAAI,YAAY,EAAE,CAAC;IAE5B,aAAa,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;IAChE,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;CAC3B"}
+{"version":3,"file":"signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,aAAa;IAClD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,IAAI,YAAY,EAAE,CAAC;IAE5B,aAAa,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;CACtC"}

package/dist/types/src/signal-manager/websocket-signal-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/websocket-signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAuB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAGzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKpG;;GAEG;AACH,qBAAa,sBAAuB,YAAW,aAAa;IA4BxD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IA5BhC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0C;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuC;IAEhE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAa;IAEpD,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,OAAO,CAAS;IAExB,QAAQ,CAAC,YAAY,sBAA6B;IAClD,QAAQ,CAAC,aAAa,wBAA+B;IACrD,QAAQ,CAAC,UAAU;eACV,SAAS;oBACJ,UAAU;OACnB;IAEL,QAAQ,CAAC,SAAS;gBACR,SAAS;mBACN,SAAS;iBACX,GAAG;OACT;IAEL,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGvC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,EACjC,YAAY,CAAC,SAAQ,GAAG,aAAA;IAyBrC,IAAI;IAgBJ,KAAK;IASL,aAAa,CAAC,UAAU,EAAE,MAAM;IAYtC,SAAS,IAAI,YAAY,EAAE;IAKrB,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAO/D,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAMhE,WAAW,CAAC,EAChB,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;IAwBX,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiB1D,OAAO,CAAC,sBAAsB;IAQxB,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAOnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAO3C,OAAO,CAAC,YAAY;YAMN,cAAc;CAO7B"}
+{"version":3,"file":"websocket-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/websocket-signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAuB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAGzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKpG;;GAEG;AACH,qBAAa,sBAAuB,YAAW,aAAa;IA4BxD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IA5BhC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0C;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuC;IAEhE;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAa;IAEpD,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,OAAO,CAAS;IAExB,QAAQ,CAAC,YAAY,sBAA6B;IAClD,QAAQ,CAAC,aAAa,wBAA+B;IACrD,QAAQ,CAAC,UAAU;eACV,SAAS;oBACJ,UAAU;OACnB;IAEL,QAAQ,CAAC,SAAS;gBACR,SAAS;mBACN,SAAS;iBACX,GAAG;OACT;IAEL,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGvC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,EACjC,YAAY,CAAC,SAAQ,GAAG,aAAA;IAsBrC,IAAI;IAgBJ,KAAK;IASL,aAAa,CAAC,UAAU,EAAE,MAAM;IAYtC,SAAS,IAAI,YAAY,EAAE;IAKrB,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAO/D,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAMhE,WAAW,CAAC,EAChB,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;IAwBX,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiB1D,OAAO,CAAC,sBAAsB;IAQxB,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAOnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAO3C,OAAO,CAAC,YAAY;YAMN,cAAc;CAO7B"}

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

@@ -1,5 +1,6 @@
+import { type Event } from '@dxos/async';
 import { type PublicKey } from '@dxos/keys';
-import { type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { type SwarmEvent, type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
 export interface Message {
     author: PublicKey;
     recipient: PublicKey;
@@ -20,6 +21,17 @@ export type SignalStatus = {
  * Message routing interface.
  */
 export interface SignalMethods {
+    /**
+     * Emits when other peers join or leave the swarm.
+     */
+    swarmEvent: Event<{
+        topic: PublicKey;
+        swarmEvent: SwarmEvent;
+    }>;
+    /**
+     * Emits when a message is received.
+     */
+    onMessage: Event<Message>;
     /**
      * Join topic on signal network, to be discoverable by other peers.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"signal-methods.d.ts","sourceRoot":"","sources":["../../../src/signal-methods.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1E,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,UAAU,CAAC;KACnB,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,IAAI,CAAC;IACxB,eAAe,EAAE,IAAI,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E;;OAEG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;OAEG;IAEH,iBAAiB,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;OAEG;IACH,mBAAmB,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACxD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,IAAI,YAAY,CAAC;CAC3B"}
+{"version":3,"file":"signal-methods.d.ts","sourceRoot":"","sources":["../../../src/signal-methods.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE3F,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,UAAU,CAAC;KACnB,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,IAAI,CAAC;IACxB,eAAe,EAAE,IAAI,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,UAAU,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;IAEhE;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAE1B;;OAEG;IACH,IAAI,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E;;OAEG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;OAEG;IAEH,iBAAiB,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;OAEG;IACH,mBAAmB,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACxD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,IAAI,YAAY,CAAC;CAC3B"}

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

@@ -3,7 +3,7 @@ import { PublicKey } from '@dxos/keys';
 import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { Messenger } from './messenger';
 import { type SignalManager } from './signal-manager';
-import { type Message } from './signal-methods';
+import { type SignalMethods, type Message } from './signal-methods';
 export type TestBuilderOptions = {
     signalHosts?: Runtime.Services.Signal[];
     messageDisruption?: (msg: Message) => Message[];
@@ -28,4 +28,13 @@ export declare class TestPeer {
     open(): Promise<void>;
     close(): Promise<void>;
 }
+export declare const expectPeerAvailable: (client: SignalMethods, expectedTopic: PublicKey, peer: PublicKey) => Promise<{
+    topic: PublicKey;
+    swarmEvent: import("packages/core/protocols/dist/esm/src/proto/gen/dxos/mesh/signal").SwarmEvent;
+}>;
+export declare const expectPeerLeft: (client: SignalMethods, expectedTopic: PublicKey, peer: PublicKey) => Promise<{
+    topic: PublicKey;
+    swarmEvent: import("packages/core/protocols/dist/esm/src/proto/gen/dxos/mesh/signal").SwarmEvent;
+}>;
+export declare const expectReceivedMessage: (client: SignalMethods, expectedMessage: Message) => Promise<Message>;
 //# sourceMappingURL=testing.d.ts.map

package/dist/types/src/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACxC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;CACjD,CAAC;AAEF,qBAAa,WAAW;IAIH,OAAO,EAAE,kBAAkB;IAH9C,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;gBAEtB,OAAO,EAAE,kBAAkB;IAE9C,mBAAmB;IAqBnB,UAAU,IAAI,QAAQ;IAMhB,KAAK;CAGZ;AAED,qBAAa,QAAQ;IAMP,OAAO,CAAC,QAAQ,CAAC,WAAW;IALjC,MAAM,YAAsB;IAC5B,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,iBAAwB;gBAEjB,WAAW,EAAE,WAAW;IAKrD,eAAe,CAAC,OAAO,EAAE,OAAO;IAS1B,IAAI;IAaJ,KAAK;CAIZ"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEpE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACxC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;CACjD,CAAC;AAEF,qBAAa,WAAW;IAIH,OAAO,EAAE,kBAAkB;IAH9C,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;gBAEtB,OAAO,EAAE,kBAAkB;IAE9C,mBAAmB;IAqBnB,UAAU,IAAI,QAAQ;IAMhB,KAAK;CAGZ;AAED,qBAAa,QAAQ;IAMP,OAAO,CAAC,QAAQ,CAAC,WAAW;IALjC,MAAM,YAAsB;IAC5B,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,iBAAwB;gBAEjB,WAAW,EAAE,WAAW;IAKrD,eAAe,CAAC,OAAO,EAAE,OAAO;IAS1B,IAAI;IAaJ,KAAK;CAIZ;AAED,eAAO,MAAM,mBAAmB,WAAY,aAAa,iBAAiB,SAAS,QAAQ,SAAS;;;EAIjG,CAAC;AAEJ,eAAO,MAAM,cAAc,WAAY,aAAa,iBAAiB,SAAS,QAAQ,SAAS;;;EAI5F,CAAC;AAEJ,eAAO,MAAM,qBAAqB,WAAY,aAAa,mBAAmB,OAAO,qBAOpF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.6.5",
+  "version": "0.6.6-main.e1a6e1f",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,24 +27,25 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.6.5",
-    "@dxos/codec-protobuf": "0.6.5",
-    "@dxos/invariant": "0.6.5",
-    "@dxos/context": "0.6.5",
-    "@dxos/log": "0.6.5",
-    "@dxos/keys": "0.6.5",
-    "@dxos/node-std": "0.6.5",
-    "@dxos/protocols": "0.6.5",
-    "@dxos/tracing": "0.6.5",
-    "@dxos/rpc": "0.6.5",
-    "@dxos/util": "0.6.5"
+    "@dxos/async": "0.6.6-main.e1a6e1f",
+    "@dxos/context": "0.6.6-main.e1a6e1f",
+    "@dxos/edge-client": "0.6.6-main.e1a6e1f",
+    "@dxos/codec-protobuf": "0.6.6-main.e1a6e1f",
+    "@dxos/invariant": "0.6.6-main.e1a6e1f",
+    "@dxos/keys": "0.6.6-main.e1a6e1f",
+    "@dxos/log": "0.6.6-main.e1a6e1f",
+    "@dxos/rpc": "0.6.6-main.e1a6e1f",
+    "@dxos/protocols": "0.6.6-main.e1a6e1f",
+    "@dxos/node-std": "0.6.6-main.e1a6e1f",
+    "@dxos/tracing": "0.6.6-main.e1a6e1f",
+    "@dxos/util": "0.6.6-main.e1a6e1f"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "earljs": "~0.1.10",
     "typescript": "^5.4.5",
     "wait-for-expect": "^3.0.2",
-    "@dxos/signal": "0.6.5"
+    "@dxos/signal": "0.6.6-main.e1a6e1f"
   },
   "publishConfig": {
     "access": "public"

package/src/signal-client/signal-client.test.ts

@@ -121,20 +121,19 @@ describe('SignalClient', () => {
       let nextMessage: any | null = null;
       const nextMessageTrigger = new Trigger();
       const id = PublicKey.random();
-      const client = new SignalClient(
-        (options?.broker ?? broker1).url(),
-        async (msg) => {
-          nextMessage = msg;
-          nextMessageTrigger.wake();
-        },
-        async (event) => {
-          if (event.swarmEvent.peerAvailable) {
-            peers.add(PublicKey.from(event.swarmEvent.peerAvailable.peer));
-          } else if (event.swarmEvent.peerLeft) {
-            peers.delete(PublicKey.from(event.swarmEvent.peerLeft.peer));
-          }
-        },
-      );
+      const client = new SignalClient((options?.broker ?? broker1).url());
+      client.onMessage.on(async (msg) => {
+        nextMessage = msg;
+        nextMessageTrigger.wake();
+      });
+      client.swarmEvent.on(async ({ swarmEvent }) => {
+        if (swarmEvent.peerAvailable) {
+          peers.add(PublicKey.from(swarmEvent.peerAvailable.peer));
+        } else if (swarmEvent.peerLeft) {
+          peers.delete(PublicKey.from(swarmEvent.peerLeft.peer));
+        }
+      });
+
       void client.open();
       afterTest(async () => {
         await client.close();

package/src/signal-client/signal-client.ts

@@ -3,7 +3,6 @@
 //
 
 import { DeferredTask, Event, Trigger, scheduleTask, scheduleTaskInterval, sleep } from '@dxos/async';
-import { type Any } from '@dxos/codec-protobuf';
 import { type Context, cancelWithContext, Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -56,6 +55,9 @@ export class SignalClient extends Resource implements SignalClientMethods {
 
   readonly statusChanged = new Event<SignalStatus>();
 
+  public readonly onMessage = new Event<Message>();
+  public readonly swarmEvent = new Event<{ topic: PublicKey; swarmEvent: SwarmEvent }>();
+
   /**
    * @param _host Signal server websocket URL.
    * @param onMessage called when a new message is received.
@@ -64,8 +66,6 @@ export class SignalClient extends Resource implements SignalClientMethods {
    */
   constructor(
     private readonly _host: string,
-    onMessage: (params: { author: PublicKey; recipient: PublicKey; payload: Any }) => Promise<void>,
-    onSwarmEvent: (params: { topic: PublicKey; swarmEvent: SwarmEvent }) => Promise<void>,
     private readonly _getMetadata?: () => any,
   ) {
     super();
@@ -73,10 +73,13 @@ export class SignalClient extends Resource implements SignalClientMethods {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
 
-    this.localState = new SignalLocalState((message) => {
-      this._monitor.recordMessageReceived(message);
-      return onMessage(message);
-    }, onSwarmEvent);
+    this.localState = new SignalLocalState(
+      async (message) => {
+        this._monitor.recordMessageReceived(message);
+        this.onMessage.emit(message);
+      },
+      async (event) => this.swarmEvent.emit(event),
+    );
   }
 
   protected override async _open() {

package/src/signal-manager/edge-signal-manager.test.ts

@@ -0,0 +1,71 @@
+//
+// Copyright 2024 DXOS.org
+//
+import { EdgeClient } from '@dxos/edge-client';
+import { PublicKey } from '@dxos/keys';
+import { describe, openAndClose, test } from '@dxos/test';
+
+import { EdgeSignal } from './edge-signal-manager';
+import { type Message } from '../signal-methods';
+import { expectPeerAvailable, expectPeerLeft, expectReceivedMessage } from '../testing';
+
+// TODO(mykola): Expects wrangler dev on edge repo to run. Skip to pass CI.
+describe.skip('EdgeSignalManager', () => {
+  const setupPeer = async () => {
+    const [identityKey, deviceKey] = PublicKey.randomSequence();
+
+    const client = new EdgeClient(identityKey, deviceKey, { socketEndpoint: 'ws://localhost:8787' });
+    await openAndClose(client);
+    const edgeSignal = new EdgeSignal({ messengerClient: client });
+    await openAndClose(edgeSignal);
+
+    return { identityKey, deviceKey, client, edgeSignal };
+  };
+
+  test('two peers discover each other', async () => {
+    const topic = PublicKey.random();
+    const peer1 = await setupPeer();
+    const peer2 = await setupPeer();
+
+    const discover12 = expectPeerAvailable(peer1.edgeSignal, topic, peer2.deviceKey);
+    const discover21 = expectPeerAvailable(peer2.edgeSignal, topic, peer1.deviceKey);
+
+    await peer1.edgeSignal.join({ topic, peerId: peer1.deviceKey });
+    await peer2.edgeSignal.join({ topic, peerId: peer2.deviceKey });
+
+    await discover12;
+    await discover21;
+  });
+
+  test('join and leave swarm', async () => {
+    const topic = PublicKey.random();
+    const peer1 = await setupPeer();
+    const peer2 = await setupPeer();
+
+    const discover12 = expectPeerAvailable(peer1.edgeSignal, topic, peer2.deviceKey);
+    const left12 = expectPeerLeft(peer1.edgeSignal, topic, peer2.deviceKey);
+
+    await peer1.edgeSignal.join({ topic, peerId: peer1.deviceKey });
+    await peer2.edgeSignal.join({ topic, peerId: peer2.deviceKey });
+    await discover12;
+
+    await peer2.edgeSignal.leave({ topic, peerId: peer2.deviceKey });
+    await left12;
+  });
+
+  test('message between peers', async () => {
+    const peer1 = await setupPeer();
+    const peer2 = await setupPeer();
+    const message: Message = {
+      author: peer1.deviceKey,
+      recipient: peer2.deviceKey,
+      payload: { type_url: 'google.protobuf.Any', value: Uint8Array.from([1, 2, 3]) },
+    };
+
+    const receivedMessage = expectReceivedMessage(peer2.edgeSignal, message);
+    await peer2.edgeSignal.subscribeMessages(peer2.deviceKey);
+    await peer1.edgeSignal.sendMessage(message);
+
+    await receivedMessage;
+  });
+});

package/src/signal-manager/edge-signal-manager.ts

@@ -0,0 +1,127 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Event } from '@dxos/async';
+import { Resource } from '@dxos/context';
+import { protocol, type EdgeClient } from '@dxos/edge-client';
+import { invariant } from '@dxos/invariant';
+import { PublicKey } from '@dxos/keys';
+import { log } from '@dxos/log';
+import {
+  SwarmRequestSchema,
+  SwarmRequest_Action as SwarmRequestAction,
+  SwarmResponseSchema,
+  type Message as EdgeMessage,
+} from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { ComplexMap, ComplexSet } from '@dxos/util';
+
+import { type Message, type SignalMethods } from '../signal-methods';
+
+const SWARM_SERVICE_ID = 'swarm';
+export class EdgeSignal extends Resource implements SignalMethods {
+  public swarmEvent = new Event<{ topic: PublicKey; swarmEvent: SwarmEvent }>();
+  public onMessage = new Event<Message>();
+
+  /**
+   * swarm key -> peers in the swarm
+   */
+  // TODO(mykola): This class should not contain swarm state. Temporary before network-manager API changes to accept list of peers.
+  private readonly _swarmPeers = new ComplexMap<PublicKey, ComplexSet<PublicKey>>(PublicKey.hash);
+  private readonly _messengerClient: EdgeClient;
+
+  constructor({ messengerClient }: { messengerClient: EdgeClient }) {
+    super();
+    this._messengerClient = messengerClient;
+  }
+
+  protected override async _open() {
+    this._ctx.onDispose(this._messengerClient.addListener((message) => this._onMessage(message)));
+  }
+
+  /**
+   * Warning: PeerId is inferred from messengerClient
+   */
+  async join({ topic }: { topic: PublicKey; peerId: PublicKey }): Promise<void> {
+    this._swarmPeers.set(topic, new ComplexSet<PublicKey>(PublicKey.hash));
+    await this._messengerClient.send(
+      protocol.createMessage(SwarmRequestSchema, {
+        serviceId: SWARM_SERVICE_ID,
+        payload: { action: SwarmRequestAction.JOIN, swarmKeys: [topic.toHex()] },
+      }),
+    );
+  }
+
+  async leave({ topic }: { topic: PublicKey; peerId: PublicKey }): Promise<void> {
+    this._swarmPeers.delete(topic);
+    await this._messengerClient.send(
+      protocol.createMessage(SwarmRequestSchema, {
+        serviceId: SWARM_SERVICE_ID,
+        payload: { action: SwarmRequestAction.LEAVE, swarmKeys: [topic.toHex()] },
+      }),
+    );
+  }
+
+  async sendMessage(message: Message): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+
+  async subscribeMessages(peerId: PublicKey): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+
+  async unsubscribeMessages(peerId: PublicKey): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+
+  private _onMessage(message: EdgeMessage) {
+    const type = protocol.getPayloadType(message);
+
+    switch (type) {
+      case SwarmResponseSchema.typeName: {
+        this._processSwarmResponse(message);
+      }
+    }
+  }
+
+  private _processSwarmResponse(message: EdgeMessage) {
+    invariant(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, 'Wrong payload type');
+    const payload = protocol.getPayload(message, SwarmResponseSchema);
+    const topic = PublicKey.from(payload.swarmKey);
+    if (!this._swarmPeers.has(topic)) {
+      log.warn('Received message from wrong topic', { topic });
+      return;
+    }
+    const oldPeers = this._swarmPeers.get(topic)!;
+    const timestamp = new Date(Date.parse(message.timestamp));
+    const newPeers = new ComplexSet<PublicKey>(
+      PublicKey.hash,
+      payload.peers.map(({ peerKey }) => PublicKey.from(peerKey)),
+    );
+
+    // Emit new available peers in the swarm.
+    for (const peer of newPeers) {
+      if (oldPeers.has(peer)) {
+        continue;
+      }
+      this.swarmEvent.emit({
+        topic,
+        swarmEvent: { peerAvailable: { peer: peer.asUint8Array(), since: timestamp } },
+      });
+    }
+
+    // Emit peer that left the swarm.
+    for (const peer of oldPeers.values()) {
+      if (newPeers.has(peer)) {
+        continue;
+      }
+      this.swarmEvent.emit({
+        topic,
+        swarmEvent: { peerLeft: { peer: peer.asUint8Array() } },
+      });
+    }
+
+    this._swarmPeers.set(topic, newPeers);
+  }
+}

package/src/signal-manager/signal-manager.ts

@@ -3,10 +3,8 @@
 //
 
 import { type Event } from '@dxos/async';
-import { type PublicKey } from '@dxos/keys';
-import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 
-import { type Message, type SignalMethods, type SignalStatus } from '../signal-methods';
+import { type SignalMethods, type SignalStatus } from '../signal-methods';
 
 /**
  * Manages a collection of signaling clients.
@@ -17,6 +15,4 @@ export interface SignalManager extends SignalMethods {
   getStatus(): SignalStatus[];
 
   statusChanged: Event<SignalStatus[]>;
-  swarmEvent: Event<{ topic: PublicKey; swarmEvent: SwarmEvent }>;
-  onMessage: Event<Message>;
 }

package/src/signal-manager/websocket-signal-manager.test.ts

@@ -8,6 +8,7 @@ import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
 import { afterAll, beforeAll, describe, test, openAndClose } from '@dxos/test';
 
 import { WebsocketSignalManager } from './websocket-signal-manager';
+import { expectPeerAvailable, expectReceivedMessage } from '../testing';
 
 describe('WebSocketSignalManager', () => {
   let broker1: SignalServerRunner;
@@ -31,21 +32,6 @@ describe('WebSocketSignalManager', () => {
     void broker2.stop();
   });
 
-  const expectPeerAvailable = (client: WebsocketSignalManager, expectedTopic: PublicKey, peer: PublicKey) =>
-    client.swarmEvent.waitFor(
-      ({ swarmEvent, topic }) =>
-        !!swarmEvent.peerAvailable && peer.equals(swarmEvent.peerAvailable.peer) && expectedTopic.equals(topic),
-    );
-
-  const expectReceivedMessage = (client: WebsocketSignalManager, expectedMessage: any) => {
-    return client.onMessage.waitFor(
-      (msg) =>
-        msg.author.equals(expectedMessage.author) &&
-        msg.recipient.equals(expectedMessage.recipient) &&
-        PublicKey.from(msg.payload.value).equals(expectedMessage.payload.value),
-    );
-  };
-
   test('join swarm with two brokers', async () => {
     const client1 = new WebsocketSignalManager([{ server: broker1.url() }, { server: broker2.url() }]);
     const client2 = new WebsocketSignalManager([{ server: broker1.url() }]);

package/src/signal-manager/websocket-signal-manager.ts

@@ -62,12 +62,9 @@ export class WebsocketSignalManager implements SignalManager {
       }
 
       // TODO(burdon): Create factory to support different variants.
-      const server = new SignalClient(
-        host.server,
-        async (message) => this.onMessage.emit(message),
-        async (data) => this.swarmEvent.emit(data),
-        this._getMetadata,
-      );
+      const server = new SignalClient(host.server, this._getMetadata);
+      server.swarmEvent.on((data) => this.swarmEvent.emit(data));
+      server.onMessage.on((data) => this.onMessage.emit(data));
 
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
 

package/src/signal-methods.ts

@@ -2,8 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
+import { type Event } from '@dxos/async';
 import { type PublicKey } from '@dxos/keys';
-import { type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { type SwarmEvent, type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
 
 export interface Message {
   author: PublicKey;
@@ -27,6 +28,16 @@ export type SignalStatus = {
  * Message routing interface.
  */
 export interface SignalMethods {
+  /**
+   * Emits when other peers join or leave the swarm.
+   */
+  swarmEvent: Event<{ topic: PublicKey; swarmEvent: SwarmEvent }>;
+
+  /**
+   * Emits when a message is received.
+   */
+  onMessage: Event<Message>;
+
   /**
    * Join topic on signal network, to be discoverable by other peers.
    */

package/src/testing.ts

@@ -14,7 +14,7 @@ import {
   MemorySignalManagerContext,
   WebsocketSignalManager,
 } from './signal-manager';
-import { type Message } from './signal-methods';
+import { type SignalMethods, type Message } from './signal-methods';
 
 export type TestBuilderOptions = {
   signalHosts?: Runtime.Services.Signal[];
@@ -97,3 +97,24 @@ export class TestPeer {
     await this.signalManager.close();
   }
 }
+
+export const expectPeerAvailable = (client: SignalMethods, expectedTopic: PublicKey, peer: PublicKey) =>
+  client.swarmEvent.waitFor(
+    ({ swarmEvent, topic }) =>
+      !!swarmEvent.peerAvailable && peer.equals(swarmEvent.peerAvailable.peer) && expectedTopic.equals(topic),
+  );
+
+export const expectPeerLeft = (client: SignalMethods, expectedTopic: PublicKey, peer: PublicKey) =>
+  client.swarmEvent.waitFor(
+    ({ swarmEvent, topic }) =>
+      !!swarmEvent.peerLeft && peer.equals(swarmEvent.peerLeft.peer) && expectedTopic.equals(topic),
+  );
+
+export const expectReceivedMessage = (client: SignalMethods, expectedMessage: Message) => {
+  return client.onMessage.waitFor(
+    (msg) =>
+      msg.author.equals(expectedMessage.author) &&
+      msg.recipient.equals(expectedMessage.recipient) &&
+      PublicKey.from(msg.payload.value).equals(expectedMessage.payload.value),
+  );
+};