@dxos/messaging 0.4.10-main.fd4f2a3 → 0.4.10-main.fd8ea31

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;AAEzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,YAAY,EAAgB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAItF;;GAEG;AACH,qBAAa,sBAAuB,YAAW,aAAa;IAuBxD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAvBhC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,OAAO,CAAS;IAExB,QAAQ,CAAC,YAAY,sBAA6B;IAClD,QAAQ,CAAC,aAAa,wBAA+B;IACrD,QAAQ,CAAC,YAAY,sBAA6B;IAClD,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;IAWL,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;IAOhE,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;IAoBX,kBAAkB,CAAC,UAAU,EAAE,MAAM;IAWrC,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAOnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAO3C,OAAO,CAAC,YAAY;YAMN,cAAc;CAK7B"}
+{"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;AAEzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKpG;;GAEG;AACH,qBAAa,sBAAuB,YAAW,aAAa;IAuBxD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAvBhC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0C;IAEnE,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,OAAO,CAAS;IAExB,QAAQ,CAAC,YAAY,sBAA6B;IAClD,QAAQ,CAAC,aAAa,wBAA+B;IACrD,QAAQ,CAAC,YAAY,sBAA6B;IAClD,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;IAiBJ,KAAK;IAWL,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;IAOhE,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;IAoBX,kBAAkB,CAAC,UAAU,EAAE,MAAM;IAYrC,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAOnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAO3C,OAAO,CAAC,YAAY;YAMN,cAAc;CAK7B"}

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

@@ -1,10 +1,22 @@
 import { type Any } from '@dxos/codec-protobuf';
 import { type PublicKey } from '@dxos/keys';
+import { type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
 export interface Message {
     author: PublicKey;
     recipient: PublicKey;
     payload: Any;
 }
+export type SignalStatus = {
+    host: string;
+    state: SignalState;
+    error?: string;
+    reconnectIn: number;
+    connectionStarted: Date;
+    lastStateChange: Date;
+};
+/**
+ * Message routing interface.
+ */
 export interface SignalMethods {
     /**
      * Join topic on signal network, to be discoverable by other peers.
@@ -33,4 +45,12 @@ export interface SignalMethods {
      */
     unsubscribeMessages: (peerId: PublicKey) => Promise<void>;
 }
+/**
+ * Signaling client.
+ */
+export interface SignalClientMethods extends SignalMethods {
+    open(): Promise<void>;
+    close(): Promise<void>;
+    getStatus(): SignalStatus;
+}
 //# sourceMappingURL=signal-methods.d.ts.map

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,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,GAAG,CAAC;CACd;AAED,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;IACH,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"}
+{"version":3,"file":"signal-methods.d.ts","sourceRoot":"","sources":["../../../src/signal-methods.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,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,GAAG,CAAC;CACd;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;IACH,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/messaging",
-  "version": "0.4.10-main.fd4f2a3",
+  "version": "0.4.10-main.fd8ea31",
   "description": "Messaging",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -19,23 +19,23 @@
   "dependencies": {
     "isomorphic-ws": "^4.0.1",
     "ws": "^8.14.2",
-    "@dxos/codec-protobuf": "0.4.10-main.fd4f2a3",
-    "@dxos/async": "0.4.10-main.fd4f2a3",
-    "@dxos/context": "0.4.10-main.fd4f2a3",
-    "@dxos/keys": "0.4.10-main.fd4f2a3",
-    "@dxos/log": "0.4.10-main.fd4f2a3",
-    "@dxos/protocols": "0.4.10-main.fd4f2a3",
-    "@dxos/node-std": "0.4.10-main.fd4f2a3",
-    "@dxos/util": "0.4.10-main.fd4f2a3",
-    "@dxos/rpc": "0.4.10-main.fd4f2a3",
-    "@dxos/invariant": "0.4.10-main.fd4f2a3"
+    "@dxos/async": "0.4.10-main.fd8ea31",
+    "@dxos/context": "0.4.10-main.fd8ea31",
+    "@dxos/codec-protobuf": "0.4.10-main.fd8ea31",
+    "@dxos/invariant": "0.4.10-main.fd8ea31",
+    "@dxos/log": "0.4.10-main.fd8ea31",
+    "@dxos/keys": "0.4.10-main.fd8ea31",
+    "@dxos/node-std": "0.4.10-main.fd8ea31",
+    "@dxos/rpc": "0.4.10-main.fd8ea31",
+    "@dxos/util": "0.4.10-main.fd8ea31",
+    "@dxos/protocols": "0.4.10-main.fd8ea31"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "earljs": "~0.1.10",
     "typescript": "^5.2.2",
     "wait-for-expect": "^3.0.2",
-    "@dxos/signal": "0.4.10-main.fd4f2a3"
+    "@dxos/signal": "0.4.10-main.fd8ea31"
   },
   "publishConfig": {
     "access": "public"

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

@@ -52,10 +52,10 @@ describe('SignalClient', () => {
       },
       async () => {},
     );
-    api1.open();
+    void api1.open();
     afterTest(() => api1.close());
     const api2 = new SignalClient(broker1.url(), (async () => {}) as any, async () => {});
-    api2.open();
+    void api2.open();
     afterTest(() => api2.close());
 
     await api1.subscribeMessages(peer1);
@@ -87,7 +87,7 @@ describe('SignalClient', () => {
         }
       },
     );
-    api1.open();
+    void api1.open();
     afterTest(() => api1.close());
 
     const trigger2 = new Trigger();
@@ -100,7 +100,7 @@ describe('SignalClient', () => {
         }
       },
     );
-    api2.open();
+    void api2.open();
     afterTest(() => api2.close());
     await api1.join({ topic, peerId: peer1 });
     await api2.join({ topic, peerId: peer2 });
@@ -122,7 +122,7 @@ describe('SignalClient', () => {
       },
       async () => {},
     );
-    api1.open();
+    void api1.open();
     afterTest(() => api1.close());
 
     await api1.subscribeMessages(peer1);
@@ -150,11 +150,11 @@ describe('SignalClient', () => {
       },
       async () => {},
     );
-    client1.open();
+    void client1.open();
     afterTest(() => client1.close());
 
     const client2 = new SignalClient(broker1.url(), (async () => {}) as any, async () => {});
-    client2.open();
+    void client2.open();
     afterTest(() => client2.close());
 
     await client1.subscribeMessages(peer1);
@@ -203,11 +203,11 @@ describe('SignalClient', () => {
       },
       async () => {},
     );
-    client1.open();
+    void client1.open();
     afterTest(() => client1.close());
 
     const client2 = new SignalClient(broker1.url(), (async () => {}) as any, async () => {});
-    client2.open();
+    void client2.open();
     afterTest(() => client2.close());
 
     const message = {
@@ -233,7 +233,7 @@ describe('SignalClient', () => {
     //
 
     await client1.close();
-    client1.open();
+    void client1.open();
     await waitForSubscription(client1, peer1);
 
     {
@@ -259,14 +259,14 @@ describe('SignalClient', () => {
         async () => {},
         async () => {},
       );
-      api1.open();
+      void api1.open();
       afterTest(() => api1.close());
       const api2 = new SignalClient(
         broker2.url(),
         async () => {},
         async () => {},
       );
-      api2.open();
+      void api2.open();
       afterTest(() => api2.close());
 
       await api1.join({ topic, peerId: peer1 });
@@ -300,10 +300,10 @@ describe('SignalClient', () => {
         async () => {},
         async () => {},
       );
-      api1.open();
+      void api1.open();
       afterTest(() => api1.close());
       const api2 = new SignalClient(broker2.url(), signalMock, async () => {});
-      api2.open();
+      void api2.open();
       afterTest(() => api2.close());
 
       await api1.join({ topic, peerId: peer1 });

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

@@ -13,22 +13,13 @@ import { type Message as SignalMessage, SignalState, type SwarmEvent } from '@dx
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
 import { SignalRPCClient } from './signal-rpc-client';
-import { type Message, type SignalMethods } from '../signal-methods';
+import { type Message, type SignalClientMethods, type SignalStatus } from '../signal-methods';
 
 const DEFAULT_RECONNECT_TIMEOUT = 100;
-const MAX_RECONNECT_TIMEOUT = 5000;
-const ERROR_RECONCILE_DELAY = 1000;
+const MAX_RECONNECT_TIMEOUT = 5_000;
+const ERROR_RECONCILE_DELAY = 1_000;
 const RECONCILE_INTERVAL = 5_000;
 
-export type SignalStatus = {
-  host: string;
-  state: SignalState;
-  error?: string;
-  reconnectIn: number;
-  connectionStarted: Date;
-  lastStateChange: Date;
-};
-
 export type CommandTrace = {
   messageId: string;
   host: string;
@@ -41,9 +32,11 @@ export type CommandTrace = {
 };
 
 /**
+ * KUBE-specific signaling client.
  * Establishes a websocket connection to signal server and provides RPC methods.
  */
-export class SignalClient implements SignalMethods {
+// TODO(burdon): Rename impl.
+export class SignalClient implements SignalClientMethods {
   private _state = SignalState.CLOSED;
 
   private _lastError?: Error;
@@ -119,7 +112,6 @@ export class SignalClient implements SignalMethods {
 
   /**
    * @param _host Signal server websocket URL.
-   * @param _onMessage
    */
   constructor(
     private readonly _host: string,
@@ -132,7 +124,7 @@ export class SignalClient implements SignalMethods {
     }
   }
 
-  open() {
+  async open() {
     log.trace('dxos.mesh.signal-client.open', trace.begin({ id: this._instanceId }));
 
     if ([SignalState.CONNECTED, SignalState.CONNECTING].includes(this._state)) {
@@ -213,7 +205,6 @@ export class SignalClient implements SignalMethods {
   async leave({ topic, peerId }: { topic: PublicKey; peerId: PublicKey }): Promise<void> {
     this._performance.leaveCounter++;
     log('leaving', { topic, peerId });
-
     void this._swarmStreams.get({ topic, peerId })?.close();
     this._swarmStreams.delete({ topic, peerId });
     this._joinedTopics.delete({ topic, peerId });
@@ -380,7 +371,7 @@ export class SignalClient implements SignalMethods {
 
       const swarmStream = await asyncTimeout(
         cancelWithContext(this._connectionCtx!, client.join({ topic, peerId })),
-        5000,
+        5_000,
       );
       // Subscribing to swarm events.
       // TODO(mykola): What happens when the swarm stream is closed? Maybe send leave event for each peer?
@@ -419,7 +410,7 @@ export class SignalClient implements SignalMethods {
 
       const messageStream = await asyncTimeout(
         cancelWithContext(this._connectionCtx!, client.receiveMessages(peerId)),
-        5000,
+        5_000,
       );
       messageStream.subscribe(async (message: SignalMessage) => {
         this._performance.receivedMessages++;

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

@@ -13,7 +13,8 @@ import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
 import { type SignalManager } from './signal-manager';
-import { type CommandTrace, type SignalStatus } from '../signal-client';
+import { type CommandTrace } from '../signal-client';
+import { type SignalStatus } from '../signal-methods';
 
 /**
  * Common signaling context that connects multiple MemorySignalManager instances.

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

@@ -6,20 +6,20 @@ import { type Event } from '@dxos/async';
 import { type PublicKey } from '@dxos/keys';
 import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 
-import { type CommandTrace, type SignalStatus } from '../signal-client';
-import { type Message, type SignalMethods } from '../signal-methods';
+import { type CommandTrace } from '../signal-client';
+import { type Message, type SignalMethods, type SignalStatus } from '../signal-methods';
 
 /**
- *
+ * Manages a collection of signaling clients.
  */
 export interface SignalManager extends SignalMethods {
+  open(): Promise<void>;
+  close(): Promise<void>;
+
+  getStatus(): SignalStatus[];
+
   statusChanged: Event<SignalStatus[]>;
   commandTrace: Event<CommandTrace>;
   swarmEvent: Event<{ topic: PublicKey; swarmEvent: SwarmEvent }>;
   onMessage: Event<Message>;
-
-  getStatus(): SignalStatus[];
-
-  open(): Promise<void>;
-  close(): Promise<void>;
 }

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

@@ -13,15 +13,17 @@ import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 
 import { type SignalManager } from './signal-manager';
-import { type CommandTrace, SignalClient, type SignalStatus } from '../signal-client';
+import { type CommandTrace, SignalClient } from '../signal-client';
+import { type SignalClientMethods, type SignalMethods, type SignalStatus } from '../signal-methods';
 
 const MAX_SERVER_FAILURES = 5;
 const WSS_SIGNAL_SERVER_REBOOT_DELAY = 3_000;
+
 /**
  * Manages connection to multiple Signal Servers over WebSocket
  */
 export class WebsocketSignalManager implements SignalManager {
-  private readonly _servers = new Map<string, SignalClient>();
+  private readonly _servers = new Map<string, SignalClientMethods>();
 
   private _ctx!: Context;
   private _opened = false;
@@ -51,12 +53,15 @@ export class WebsocketSignalManager implements SignalManager {
       if (this._servers.has(host.server)) {
         continue;
       }
+
+      // 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,
       );
+
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
 
       this._servers.set(host.server, server);
@@ -75,6 +80,7 @@ export class WebsocketSignalManager implements SignalManager {
 
     this._initContext();
 
+    // TODO(burdon): Await.
     [...this._servers.values()].forEach((server) => server.open());
 
     this._opened = true;
@@ -94,7 +100,7 @@ export class WebsocketSignalManager implements SignalManager {
   }
 
   async restartServer(serverName: string) {
-    log('Restarting server', { serverName });
+    log('restarting server', { serverName });
     invariant(this._opened, 'server already closed');
 
     const server = this._servers.get(serverName);
@@ -111,7 +117,7 @@ export class WebsocketSignalManager implements SignalManager {
 
   @synchronized
   async join({ topic, peerId }: { topic: PublicKey; peerId: PublicKey }) {
-    log('Join', { topic, peerId });
+    log('join', { topic, peerId });
     invariant(this._opened, 'Closed');
     await this._forEachServer((server) => server.join({ topic, peerId }));
   }
@@ -133,7 +139,7 @@ export class WebsocketSignalManager implements SignalManager {
     recipient: PublicKey;
     payload: Any;
   }): Promise<void> {
-    log(`Signal ${recipient.truncate()}`);
+    log('signal', { recipient });
     invariant(this._opened, 'Closed');
 
     void this._forEachServer(async (server, serverName) => {
@@ -155,23 +161,24 @@ export class WebsocketSignalManager implements SignalManager {
   async checkServerFailure(serverName: string) {
     const failureCount = this.failureCount.get(serverName!) ?? 0;
     if (failureCount > MAX_SERVER_FAILURES) {
-      log.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`);
+      log.warn(`too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`);
       await this.restartServer(serverName!);
       this.failureCount.set(serverName!, 0);
       return;
     }
+
     this.failureCount.set(serverName!, (this.failureCount.get(serverName!) ?? 0) + 1);
   }
 
   async subscribeMessages(peerId: PublicKey) {
-    log(`Subscribed for message stream peerId=${peerId}`);
+    log('subscribed for message stream', { peerId });
     invariant(this._opened, 'Closed');
 
     await this._forEachServer(async (server) => server.subscribeMessages(peerId));
   }
 
   async unsubscribeMessages(peerId: PublicKey) {
-    log(`Subscribed for message stream peerId=${peerId}`);
+    log('subscribed for message stream', { peerId });
     invariant(this._opened, 'Closed');
 
     await this._forEachServer(async (server) => server.unsubscribeMessages(peerId));
@@ -184,7 +191,7 @@ export class WebsocketSignalManager implements SignalManager {
   }
 
   private async _forEachServer<ReturnType>(
-    fn: (server: SignalClient, serverName: string) => Promise<ReturnType>,
+    fn: (server: SignalMethods, serverName: string) => Promise<ReturnType>,
   ): Promise<ReturnType[]> {
     return Promise.all(Array.from(this._servers.entries()).map(([serverName, server]) => fn(server, serverName)));
   }

package/src/signal-methods.ts

@@ -4,6 +4,7 @@
 
 import { type Any } from '@dxos/codec-protobuf';
 import { type PublicKey } from '@dxos/keys';
+import { type SignalState } from '@dxos/protocols/proto/dxos/mesh/signal';
 
 export interface Message {
   author: PublicKey;
@@ -11,6 +12,18 @@ export interface Message {
   payload: Any;
 }
 
+export type SignalStatus = {
+  host: string;
+  state: SignalState;
+  error?: string;
+  reconnectIn: number;
+  connectionStarted: Date;
+  lastStateChange: Date;
+};
+
+/**
+ * Message routing interface.
+ */
 export interface SignalMethods {
   /**
    * Join topic on signal network, to be discoverable by other peers.
@@ -37,3 +50,12 @@ export interface SignalMethods {
    */
   unsubscribeMessages: (peerId: PublicKey) => Promise<void>;
 }
+
+/**
+ * Signaling client.
+ */
+export interface SignalClientMethods extends SignalMethods {
+  open(): Promise<void>;
+  close(): Promise<void>;
+  getStatus(): SignalStatus;
+}