@dxos/messaging 0.7.4 → 0.7.5-labs.071a3e2

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

@@ -1,18 +1,13 @@
 import { type Event } from '@dxos/async';
 import { type Lifecycle } from '@dxos/context';
 import { type PublicKey } from '@dxos/keys';
-import { type Peer } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { type SwarmResponse } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { type Peer } from '@dxos/protocols/proto/dxos/edge/messenger';
+import { type Message, type SwarmEvent } from '@dxos/protocols/proto/dxos/edge/signal';
 import { type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
-export type PeerInfo = Partial<Peer> & Required<Pick<Peer, 'peerKey'>>;
+export type { Message, SwarmEvent };
+export type PeerInfo = Peer;
 export declare const PeerInfoHash: ({ peerKey }: PeerInfo) => string;
-export interface Message {
-    author: PeerInfo;
-    recipient: PeerInfo;
-    payload: {
-        type_url: string;
-        value: Uint8Array;
-    };
-}
 export type SignalStatus = {
     host: string;
     state: SignalState;
@@ -21,34 +16,24 @@ export type SignalStatus = {
     connectionStarted: Date;
     lastStateChange: Date;
 };
-export type SwarmEvent = {
-    topic: PublicKey;
-    /**
-     * The peer was announced as available on the swarm.
-     */
-    peerAvailable?: {
-        peer: PeerInfo;
-        since: Date;
-    };
-    /**
-     * The peer left, or their announcement timed out.
-     */
-    peerLeft?: {
-        peer: PeerInfo;
-    };
-};
 /**
  * Message routing interface.
  */
 export interface SignalMethods {
     /**
      * Emits when other peers join or leave the swarm.
+     * @deprecated
+     * TODO(mykola): Use swarmState in network-manager instead.
      */
     swarmEvent: Event<SwarmEvent>;
     /**
      * Emits when a message is received.
      */
     onMessage: Event<Message>;
+    /**
+     * Emits when the swarm state changes.
+     */
+    swarmState?: Event<SwarmResponse>;
     /**
      * Join topic on signal network, to be discoverable by other peers.
      */
@@ -69,15 +54,19 @@ export interface SignalMethods {
     sendMessage: (message: Message) => Promise<void>;
     /**
      * Start receiving messages from peer.
+     * @deprecated
      */
     subscribeMessages: (peer: PeerInfo) => Promise<void>;
     /**
      * Stop receiving messages from peer.
+     * @deprecated
      */
     unsubscribeMessages: (peer: PeerInfo) => Promise<void>;
 }
 /**
  * Signaling client.
+ * TODO(mykola): Delete.
+ * @deprecated
  */
 export interface SignalClientMethods extends SignalMethods, Required<Lifecycle> {
     getStatus(): SignalStatus;

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,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1E,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;AACvE,eAAO,MAAM,YAAY,gBAAiB,QAAQ,WAAY,CAAC;AAE/D,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,QAAQ,CAAC;IACjB,SAAS,EAAE,QAAQ,CAAC;IACpB,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,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,aAAa,CAAC,EAAE;QACd,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,IAAI,CAAC;KACb,CAAC;IAEF;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,QAAQ,CAAC;KAChB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAE9B;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAE1B;;OAEG;IACH,IAAI,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE;;OAEG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;OAEG;IAEH,iBAAiB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;OAEG;IACH,mBAAmB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,aAAa,EAAE,QAAQ,CAAC,SAAS,CAAC;IAC7E,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,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,2CAA2C,CAAC;AACtE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1E,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACpC,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC;AAC5B,eAAO,MAAM,YAAY,gBAAiB,QAAQ,WAAY,CAAC;AAE/D,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;;;;OAIG;IACH,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAE9B;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAE1B;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IAElC;;OAEG;IACH,IAAI,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE;;OAEG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;OAGG;IAEH,iBAAiB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;;OAGG;IACH,mBAAmB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAED;;;;GAIG;AACH,MAAM,WAAW,mBAAoB,SAAQ,aAAa,EAAE,QAAQ,CAAC,SAAS,CAAC;IAC7E,SAAS,IAAI,YAAY,CAAC;CAC3B"}

package/dist/types/src/testing/test-peer.d.ts

@@ -14,8 +14,8 @@ export declare class TestPeer extends Resource {
     constructor(testBuilder: TestBuilder);
     get peerInfo(): PeerInfo;
     waitTillReceive(message: Message): Promise<Message>;
-    waitForPeerAvailable(topic: PublicKey, peer: PeerInfo): Promise<import("../signal-methods").SwarmEvent>;
-    waitForPeerLeft(topic: PublicKey, peer: PeerInfo): Promise<import("../signal-methods").SwarmEvent>;
+    waitForPeerAvailable(topic: PublicKey, peer: PeerInfo): Promise<import("packages/core/protocols/dist/esm/src/proto/gen/dxos/edge/signal").SwarmEvent>;
+    waitForPeerLeft(topic: PublicKey, peer: PeerInfo): Promise<import("packages/core/protocols/dist/esm/src/proto/gen/dxos/edge/signal").SwarmEvent>;
     protected _open(): Promise<void>;
     protected _close(): Promise<void>;
 }

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

@@ -2,8 +2,8 @@ import { type Event } from '@dxos/async';
 import { type Any } from '@dxos/codec-protobuf';
 import { PublicKey } from '@dxos/keys';
 import { type SignalMethods, type Message, type PeerInfo } from '../signal-methods';
-export declare const expectPeerAvailable: (client: SignalMethods, expectedTopic: PublicKey, peer: PeerInfo) => Promise<import("../signal-methods").SwarmEvent>;
-export declare const expectPeerLeft: (client: SignalMethods, expectedTopic: PublicKey, peer: PeerInfo) => Promise<import("../signal-methods").SwarmEvent>;
+export declare const expectPeerAvailable: (client: SignalMethods, expectedTopic: PublicKey, peer: PeerInfo) => Promise<import("packages/core/protocols/dist/esm/src/proto/gen/dxos/edge/signal").SwarmEvent>;
+export declare const expectPeerLeft: (client: SignalMethods, expectedTopic: PublicKey, peer: PeerInfo) => Promise<import("packages/core/protocols/dist/esm/src/proto/gen/dxos/edge/signal").SwarmEvent>;
 export declare const expectReceivedMessage: (event: Event<Message>, expectedMessage: Message) => Promise<Message>;
 export declare const createMessage: (author: PeerInfo, recipient: PeerInfo, payload?: Any) => Message;
 export declare const messageEqual: (msg1: Message, msg2: Message) => boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/testing/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEpF,eAAO,MAAM,mBAAmB,WAAY,aAAa,iBAAiB,SAAS,QAAQ,QAAQ,oDAOhG,CAAC;AAEJ,eAAO,MAAM,cAAc,WAAY,aAAa,iBAAiB,SAAS,QAAQ,QAAQ,oDAM3F,CAAC;AAEJ,eAAO,MAAM,qBAAqB,UAAW,KAAK,CAAC,OAAO,CAAC,mBAAmB,OAAO,qBAUpF,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,QAAQ,aAAa,QAAQ,YAAW,GAAG,KAAe,OAI9F,CAAC;AAEH,eAAO,MAAM,YAAY,SAAU,OAAO,QAAQ,OAAO,YAGM,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/testing/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEpF,eAAO,MAAM,mBAAmB,WAAY,aAAa,iBAAiB,SAAS,QAAQ,QAAQ,kGAOhG,CAAC;AAEJ,eAAO,MAAM,cAAc,WAAY,aAAa,iBAAiB,SAAS,QAAQ,QAAQ,kGAM3F,CAAC;AAEJ,eAAO,MAAM,qBAAqB,UAAW,KAAK,CAAC,OAAO,CAAC,mBAAmB,OAAO,qBAUpF,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,QAAQ,aAAa,QAAQ,YAAW,GAAG,KAAe,OAI9F,CAAC;AAEH,eAAO,MAAM,YAAY,SAAU,OAAO,QAAQ,OAAO,YAGM,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.7.4",
+  "version": "0.7.5-labs.071a3e2",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,23 +35,23 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.7.4",
-    "@dxos/codec-protobuf": "0.7.4",
-    "@dxos/edge-client": "0.7.4",
-    "@dxos/invariant": "0.7.4",
-    "@dxos/context": "0.7.4",
-    "@dxos/keys": "0.7.4",
-    "@dxos/log": "0.7.4",
-    "@dxos/protocols": "0.7.4",
-    "@dxos/rpc": "0.7.4",
-    "@dxos/node-std": "0.7.4",
-    "@dxos/tracing": "0.7.4",
-    "@dxos/util": "0.7.4"
+    "@dxos/async": "0.7.5-labs.071a3e2",
+    "@dxos/codec-protobuf": "0.7.5-labs.071a3e2",
+    "@dxos/edge-client": "0.7.5-labs.071a3e2",
+    "@dxos/invariant": "0.7.5-labs.071a3e2",
+    "@dxos/keys": "0.7.5-labs.071a3e2",
+    "@dxos/context": "0.7.5-labs.071a3e2",
+    "@dxos/log": "0.7.5-labs.071a3e2",
+    "@dxos/node-std": "0.7.5-labs.071a3e2",
+    "@dxos/rpc": "0.7.5-labs.071a3e2",
+    "@dxos/util": "0.7.5-labs.071a3e2",
+    "@dxos/tracing": "0.7.5-labs.071a3e2",
+    "@dxos/protocols": "0.7.5-labs.071a3e2"
   },
   "devDependencies": {
-    "@dxos/keyring": "0.7.4",
-    "@dxos/signal": "0.7.4",
-    "@dxos/test-utils": "0.7.4"
+    "@dxos/keyring": "0.7.5-labs.071a3e2",
+    "@dxos/signal": "0.7.5-labs.071a3e2",
+    "@dxos/test-utils": "0.7.5-labs.071a3e2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -31,6 +31,8 @@ const RECONCILE_INTERVAL = 5_000;
  * Establishes a websocket connection to signal server and provides RPC methods.
  * Subscription state updates are executed immediately against the local state which
  * is reconciled periodically.
+ * TODO(mykola): Delete.
+ * @deprecated
  */
 // TODO(burdon): Rename impl.
 export class SignalClient extends Resource implements SignalClientMethods {

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

@@ -3,7 +3,7 @@
 //
 
 import { asyncTimeout, Event } from '@dxos/async';
-import type { Stream } from '@dxos/codec-protobuf';
+import type { Stream } from '@dxos/codec-protobuf/stream';
 import { cancelWithContext, type Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';

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

@@ -41,6 +41,11 @@ export type SignalRPCClientParams = {
   callbacks?: SignalCallbacks;
 };
 
+/**
+ * Signal RPC client.
+ * TODO(mykola): Delete.
+ * @deprecated
+ */
 export class SignalRPCClient {
   private readonly _socket: WebSocket;
   private readonly _rpc: ProtoRpcPeer<Services>;

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

@@ -16,6 +16,7 @@ import {
   SwarmResponseSchema,
   type Message as EdgeMessage,
   type PeerSchema,
+  type SwarmResponse,
 } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
@@ -24,13 +25,18 @@ import { type PeerInfo, type Message, type SwarmEvent, PeerInfoHash } from '../s
 
 export class EdgeSignalManager extends Resource implements SignalManager {
   public swarmEvent = new Event<SwarmEvent>();
+  public swarmState = new Event<SwarmResponse>();
   public onMessage = new Event<Message>();
 
   /**
-   * swarm key -> peerKeys in the swarm
+   * Swarm key -> { peer: <own peer info>, joinedPeers: <state of 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<PeerInfo>>(PublicKey.hash);
+  // TODO(mykola): This class should not contain swarm state joinedPeers. Temporary before network-manager API changes to accept list of peers.
+  private readonly _swarmPeers = new ComplexMap<
+    PublicKey,
+    { lastState?: Uint8Array; joinedPeers: ComplexSet<PeerInfo> }
+  >(PublicKey.hash);
+
   private readonly _edgeConnection: EdgeConnection;
 
   constructor({ edgeConnection }: { edgeConnection: EdgeConnection }) {
@@ -60,12 +66,15 @@ export class EdgeSignalManager extends Resource implements SignalManager {
           identityKey: this._edgeConnection.identityKey,
         },
       });
+
+      peer.identityKey = this._edgeConnection.identityKey;
+      peer.peerKey = this._edgeConnection.peerKey;
     }
 
-    this._swarmPeers.set(topic, new ComplexSet<PeerInfo>(PeerInfoHash));
+    this._swarmPeers.set(topic, { lastState: peer.state, joinedPeers: new ComplexSet<PeerInfo>(PeerInfoHash) });
     await this._edgeConnection.send(
       protocol.createMessage(SwarmRequestSchema, {
-        serviceId: EdgeService.SWARM_SERVICE_ID,
+        serviceId: EdgeService.SWARM,
         source: createMessageSource(topic, peer),
         payload: { action: SwarmRequestAction.JOIN, swarmKeys: [topic.toHex()] },
       }),
@@ -76,7 +85,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
     this._swarmPeers.delete(topic);
     await this._edgeConnection.send(
       protocol.createMessage(SwarmRequestSchema, {
-        serviceId: EdgeService.SWARM_SERVICE_ID,
+        serviceId: EdgeService.SWARM,
         source: createMessageSource(topic, peer),
         payload: { action: SwarmRequestAction.LEAVE, swarmKeys: [topic.toHex()] },
       }),
@@ -94,7 +103,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
 
     await this._edgeConnection.send(
       protocol.createMessage(bufWkt.AnySchema, {
-        serviceId: EdgeService.SIGNAL_SERVICE_ID,
+        serviceId: EdgeService.SIGNAL,
         source: message.author,
         target: [message.recipient],
         payload: { typeUrl: message.payload.type_url, value: message.payload.value },
@@ -112,11 +121,11 @@ export class EdgeSignalManager extends Resource implements SignalManager {
 
   private _onMessage(message: EdgeMessage) {
     switch (message.serviceId) {
-      case EdgeService.SWARM_SERVICE_ID: {
+      case EdgeService.SWARM: {
         this._processSwarmResponse(message);
         break;
       }
-      case EdgeService.SIGNAL_SERVICE_ID: {
+      case EdgeService.SIGNAL: {
         this._processMessage(message);
       }
     }
@@ -125,12 +134,13 @@ export class EdgeSignalManager extends Resource implements SignalManager {
   private _processSwarmResponse(message: EdgeMessage) {
     invariant(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, 'Wrong payload type');
     const payload = protocol.getPayload(message, SwarmResponseSchema);
+    this.swarmState.emit(payload);
     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 { joinedPeers: oldPeers } = this._swarmPeers.get(topic)!;
     const timestamp = message.timestamp ? new Date(Date.parse(message.timestamp)) : new Date();
     const newPeers = new ComplexSet<PeerInfo>(PeerInfoHash, payload.peers);
 
@@ -156,7 +166,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
       });
     }
 
-    this._swarmPeers.set(topic, newPeers);
+    this._swarmPeers.get(topic)!.joinedPeers = newPeers;
   }
 
   private _processMessage(message: EdgeMessage) {
@@ -185,10 +195,14 @@ export class EdgeSignalManager extends Resource implements SignalManager {
   private async _rejoinAllSwarms() {
     log('rejoin swarms', { swarms: Array.from(this._swarmPeers.keys()) });
     // Clear all swarms. But leave keys in the map.
-    for (const topic of this._swarmPeers.keys()) {
+    for (const [topic, { lastState }] of this._swarmPeers.entries()) {
       await this.join({
         topic,
-        peer: { peerKey: this._edgeConnection.peerKey, identityKey: this._edgeConnection.identityKey },
+        peer: {
+          peerKey: this._edgeConnection.peerKey,
+          identityKey: this._edgeConnection.identityKey,
+          state: lastState,
+        },
       });
     }
   }
@@ -197,7 +211,6 @@ export class EdgeSignalManager extends Resource implements SignalManager {
 const createMessageSource = (topic: PublicKey, peerInfo: PeerInfo): buf.MessageInitShape<typeof PeerSchema> => {
   return {
     swarmKey: topic.toHex(),
-    identityKey: peerInfo.identityKey,
-    peerKey: peerInfo.peerKey,
+    ...peerInfo,
   };
 };

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

@@ -28,6 +28,8 @@ const WSS_SIGNAL_SERVER_REBOOT_DELAY = 3_000;
 
 /**
  * Manages connection to multiple Signal Servers over WebSocket
+ * TODO(mykola): Delete.
+ * @deprecated
  */
 export class WebsocketSignalManager extends Resource implements SignalManager {
   private readonly _servers = new Map<string, SignalClientMethods>();

package/src/signal-methods.ts

@@ -5,21 +5,15 @@
 import { type Event } from '@dxos/async';
 import { type Lifecycle } from '@dxos/context';
 import { type PublicKey } from '@dxos/keys';
-import { type Peer } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { type SwarmResponse } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { type Peer } from '@dxos/protocols/proto/dxos/edge/messenger';
+import { type Message, type SwarmEvent } from '@dxos/protocols/proto/dxos/edge/signal';
 import { type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
 
-export type PeerInfo = Partial<Peer> & Required<Pick<Peer, 'peerKey'>>;
+export type { Message, SwarmEvent };
+export type PeerInfo = Peer;
 export const PeerInfoHash = ({ peerKey }: PeerInfo) => peerKey;
 
-export interface Message {
-  author: PeerInfo;
-  recipient: PeerInfo;
-  payload: {
-    type_url: string;
-    value: Uint8Array;
-  };
-}
-
 export type SignalStatus = {
   host: string;
   state: SignalState;
@@ -29,31 +23,14 @@ export type SignalStatus = {
   lastStateChange: Date;
 };
 
-export type SwarmEvent = {
-  topic: PublicKey;
-
-  /**
-   * The peer was announced as available on the swarm.
-   */
-  peerAvailable?: {
-    peer: PeerInfo;
-    since: Date;
-  };
-
-  /**
-   * The peer left, or their announcement timed out.
-   */
-  peerLeft?: {
-    peer: PeerInfo;
-  };
-};
-
 /**
  * Message routing interface.
  */
 export interface SignalMethods {
   /**
    * Emits when other peers join or leave the swarm.
+   * @deprecated
+   * TODO(mykola): Use swarmState in network-manager instead.
    */
   swarmEvent: Event<SwarmEvent>;
 
@@ -62,6 +39,11 @@ export interface SignalMethods {
    */
   onMessage: Event<Message>;
 
+  /**
+   * Emits when the swarm state changes.
+   */
+  swarmState?: Event<SwarmResponse>;
+
   /**
    * Join topic on signal network, to be discoverable by other peers.
    */
@@ -79,18 +61,22 @@ export interface SignalMethods {
 
   /**
    * Start receiving messages from peer.
+   * @deprecated
    */
   // TODO(burdon): Return unsubscribe function. Encapsulate callback/routing here.
   subscribeMessages: (peer: PeerInfo) => Promise<void>;
 
   /**
    * Stop receiving messages from peer.
+   * @deprecated
    */
   unsubscribeMessages: (peer: PeerInfo) => Promise<void>;
 }
 
 /**
  * Signaling client.
+ * TODO(mykola): Delete.
+ * @deprecated
  */
 export interface SignalClientMethods extends SignalMethods, Required<Lifecycle> {
   getStatus(): SignalStatus;