@dxos/messaging 0.5.8 → 0.5.9-main.079a532

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

@@ -1,82 +1,56 @@
 import { Event } from '@dxos/async';
 import { type Any } from '@dxos/codec-protobuf';
+import { Resource } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { type Message, type SignalClientMethods, type SignalStatus } from '../signal-methods';
-export type CommandTrace = {
-    messageId: string;
-    host: string;
-    incoming: boolean;
-    time: number;
-    method: string;
-    payload: any;
-    response?: any;
-    error?: string;
-};
 /**
  * KUBE-specific signaling client.
  * 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.
  */
-export declare class SignalClient implements SignalClientMethods {
+export declare class SignalClient extends Resource implements SignalClientMethods {
     private readonly _host;
-    private readonly _onMessage;
-    private readonly _onSwarmEvent;
     private readonly _getMetadata?;
+    private readonly _monitor;
     private _state;
     private _lastError?;
-    /**
-     * Number of milliseconds after which the connection will be attempted again in case of error.
-     */
-    private _reconnectAfter;
-    /**
-     * Timestamp of when the connection attempt was began.
-     */
-    private _connectionStarted;
-    /**
-     * Timestamp of last state change.
-     */
-    private _lastStateChange;
-    private _client?;
+    private _lastReconciliationFailed;
     private readonly _clientReady;
-    private _ctx?;
     private _connectionCtx?;
+    private _client?;
     private _reconcileTask?;
     private _reconnectTask?;
-    readonly statusChanged: Event<SignalStatus>;
-    readonly commandTrace: Event<CommandTrace>;
-    /**
-     * Swarm events streams. Keys represent actually joined topic and peerId.
-     */
-    private readonly _swarmStreams;
-    /**
-     * Represent desired joined topic and peerId.
-     */
-    private readonly _joinedTopics;
     /**
-     * Represent desired message subscriptions.
+     * Number of milliseconds after which the connection will be attempted again in case of error.
      */
-    private readonly _subscribedMessages;
+    private _reconnectAfter;
     private readonly _instanceId;
-    private readonly _performance;
+    readonly statusChanged: Event<SignalStatus>;
     /**
      * @param _host Signal server websocket URL.
+     * @param onMessage called when a new message is received.
+     * @param onSwarmEvent called when a new swarm event is received.
+     * @param _getMetadata signal-message metadata provider, called for every message.
      */
-    constructor(_host: string, _onMessage: (params: {
+    constructor(_host: string, onMessage: (params: {
         author: PublicKey;
         recipient: PublicKey;
         payload: Any;
-    }) => Promise<void>, _onSwarmEvent: (params: {
+    }) => Promise<void>, onSwarmEvent: (params: {
         topic: PublicKey;
         swarmEvent: SwarmEvent;
     }) => Promise<void>, _getMetadata?: (() => any) | undefined);
-    open(): Promise<void>;
-    close(): Promise<void>;
+    protected _open(): Promise<void>;
+    protected _catch(err: Error): Promise<void>;
+    protected _close(): Promise<void>;
     getStatus(): SignalStatus;
-    join({ topic, peerId }: {
+    join(args: {
         topic: PublicKey;
         peerId: PublicKey;
     }): Promise<void>;
-    leave({ topic, peerId }: {
+    leave(args: {
         topic: PublicKey;
         peerId: PublicKey;
     }): Promise<void>;
@@ -84,11 +58,12 @@ export declare class SignalClient implements SignalClientMethods {
     subscribeMessages(peerId: PublicKey): Promise<void>;
     unsubscribeMessages(peerId: PublicKey): Promise<void>;
     private _scheduleReconcileAfterError;
-    private _setState;
     private _createClient;
-    private _incrementReconnectTimeout;
     private _reconnect;
-    private _reconcileSwarmSubscriptions;
-    private _reconcileMessageSubscriptions;
+    private _onConnected;
+    private _onDisconnected;
+    private _setState;
+    private _updateReconnectTimeout;
+    private _safeResetClient;
 }
 //# sourceMappingURL=signal-client.d.ts.map

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":"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"}
+{"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"}

package/dist/types/src/signal-client/signal-local-state.d.ts

@@ -0,0 +1,46 @@
+import type { Any } from '@dxos/codec-protobuf';
+import { type Context } from '@dxos/context';
+import { PublicKey } from '@dxos/keys';
+import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { type SignalRPCClient } from './signal-rpc-client';
+export declare class SignalLocalState {
+    private readonly _onMessage;
+    private readonly _onSwarmEvent;
+    /**
+     * Swarm events streams. Keys represent actually joined topic and peerId.
+     */
+    private readonly _swarmStreams;
+    /**
+     * Represent desired joined topic and peerId.
+     */
+    private readonly _joinedTopics;
+    /**
+     * Represent desired message subscriptions.
+     */
+    private readonly _subscribedMessages;
+    constructor(_onMessage: (params: {
+        author: PublicKey;
+        recipient: PublicKey;
+        payload: Any;
+    }) => Promise<void>, _onSwarmEvent: (params: {
+        topic: PublicKey;
+        swarmEvent: SwarmEvent;
+    }) => Promise<void>);
+    safeCloseStreams(): Promise<{
+        failureCount: number;
+    }>;
+    join({ topic, peerId }: {
+        topic: PublicKey;
+        peerId: PublicKey;
+    }): void;
+    leave({ topic, peerId }: {
+        topic: PublicKey;
+        peerId: PublicKey;
+    }): void;
+    subscribeMessages(peerId: PublicKey): void;
+    unsubscribeMessages(peerId: PublicKey): void;
+    reconcile(ctx: Context, client: SignalRPCClient): Promise<void>;
+    private _reconcileSwarmSubscriptions;
+    private _reconcileMessageSubscriptions;
+}
+//# sourceMappingURL=signal-local-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signal-local-state.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-local-state.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAU,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAiC,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAGxG,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG3D,qBAAa,gBAAgB;IAiCzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAjChC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAE5B;IAEF;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAE5B;IAEF;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAyE;gBAe1F,UAAU,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,EAChG,aAAa,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC;IAGnG,gBAAgB,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAQ3D,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAI/D,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAMhE,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAInC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAOxB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe;YAM9C,4BAA4B;YAkC5B,8BAA8B;CAkC7C"}

package/dist/types/src/signal-client/signal-rpc-client-monitor.d.ts

@@ -0,0 +1,6 @@
+export declare class SignalRpcClientMonitor {
+    recordClientCloseFailure(params: {
+        failureReason: string;
+    }): void;
+}
+//# sourceMappingURL=signal-rpc-client-monitor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signal-rpc-client-monitor.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-rpc-client-monitor.ts"],"names":[],"mappings":"AAMA,qBAAa,sBAAsB;IAC1B,wBAAwB,CAAC,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE;CAOlE"}

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

@@ -16,14 +16,15 @@ export type SignalRPCClientParams = {
     callbacks?: SignalCallbacks;
 };
 export declare class SignalRPCClient {
-    private _socket?;
-    private _rpc?;
+    private readonly _socket;
+    private readonly _rpc;
     private readonly _connectTrigger;
     private _keepaliveCtx?;
     private _closed;
     private readonly _url;
     private readonly _callbacks;
     private readonly _closeComplete;
+    private readonly _monitor;
     constructor({ url, callbacks }: SignalRPCClientParams);
     close(): Promise<void>;
     join({ topic, peerId }: {
@@ -36,5 +37,6 @@ export declare class SignalRPCClient {
         recipient: PublicKey;
         payload: Any;
     }): Promise<void>;
+    private _safeCloseRpc;
 }
 //# sourceMappingURL=signal-rpc-client.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"signal-rpc-client.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-rpc-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,OAAO,IAAI,aAAa,EAAe,MAAM,wCAAwC,CAAC;AASpG,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAC,CAAY;IAC5B,OAAO,CAAC,IAAI,CAAC,CAAyB;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,aAAa,CAAC,CAAU;IAEhC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEpC,EAAE,GAAG,EAAE,SAAc,EAAE,EAAE,qBAAqB;IA2FpD,KAAK;IAgBL,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAc/D,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAYlE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;CAY5G"}
+{"version":3,"file":"signal-rpc-client.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-rpc-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,OAAO,IAAI,aAAa,EAAe,MAAM,wCAAwC,CAAC;AAWpG,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAC9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,aAAa,CAAC,CAAU;IAEhC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;gBAE7C,EAAE,GAAG,EAAE,SAAc,EAAE,EAAE,qBAAqB;IA2FpD,KAAK;IAsBL,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAa/D,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAWlE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;YAY7F,aAAa;CAQ5B"}

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

@@ -4,7 +4,6 @@ import { PublicKey } from '@dxos/keys';
 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 } from '../signal-client';
 import { type SignalStatus } from '../signal-methods';
 /**
  * Common signaling context that connects multiple MemorySignalManager instances.
@@ -23,7 +22,6 @@ export declare class MemorySignalManagerContext {
 export declare class MemorySignalManager implements SignalManager {
     private readonly _context;
     readonly statusChanged: Event<SignalStatus[]>;
-    readonly commandTrace: Event<CommandTrace>;
     readonly swarmEvent: Event<{
         topic: PublicKey;
         swarmEvent: SwarmEvent;

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

@@ -1 +1 @@
-{"version":3,"file":"memory-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/memory-signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;GAEG;AACH,qBAAa,0BAA0B;IAErC,QAAQ,CAAC,UAAU;eACV,SAAS;oBACJ,UAAU;OACnB;IAGL,QAAQ,CAAC,MAAM,+CAAoE;IAGnF,QAAQ,CAAC,WAAW,6CAAkE;CACvF;AAED;;GAEG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IAwB3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAvBrC,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,gEAAgE;IAChE,OAAO,CAAC,aAAa,CAEnB;IAEF,OAAO,CAAC,IAAI,CAAW;IAGvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;gBAE1B,QAAQ,EAAE,0BAA0B;IAM3D,IAAI;IAUJ,KAAK;IAkBX,SAAS,IAAI,YAAY,EAAE;IAIrB,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAoC/D,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAoBhE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;IAoCrG,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAKnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAK3C,MAAM;IAIN,QAAQ;CAGT"}
+{"version":3,"file":"memory-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/memory-signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;GAEG;AACH,qBAAa,0BAA0B;IAErC,QAAQ,CAAC,UAAU;eACV,SAAS;oBACJ,UAAU;OACnB;IAGL,QAAQ,CAAC,MAAM,+CAAoE;IAGnF,QAAQ,CAAC,WAAW,6CAAkE;CACvF;AAED;;GAEG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IAuB3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAtBrC,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,gEAAgE;IAChE,OAAO,CAAC,aAAa,CAEnB;IAEF,OAAO,CAAC,IAAI,CAAW;IAGvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;gBAE1B,QAAQ,EAAE,0BAA0B;IAM3D,IAAI;IAUJ,KAAK;IAkBX,SAAS,IAAI,YAAY,EAAE;IAIrB,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAoC/D,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAoBhE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;IAoCrG,iBAAiB,CAAC,MAAM,EAAE,SAAS;IAKnC,mBAAmB,CAAC,MAAM,EAAE,SAAS;IAK3C,MAAM;IAIN,QAAQ;CAGT"}

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

@@ -1,7 +1,6 @@
 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 } from '../signal-client';
 import { type Message, type SignalMethods, type SignalStatus } from '../signal-methods';
 /**
  * Manages a collection of signaling clients.
@@ -11,7 +10,6 @@ export interface SignalManager extends SignalMethods {
     close(): Promise<void>;
     getStatus(): SignalStatus[];
     statusChanged: Event<SignalStatus[]>;
-    commandTrace: Event<CommandTrace>;
     swarmEvent: Event<{
         topic: PublicKey;
         swarmEvent: SwarmEvent;

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,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,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;IAEvB,SAAS,IAAI,YAAY,EAAE,CAAC;IAE5B,aAAa,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IACrC,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAClC,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;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"}

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

@@ -0,0 +1,8 @@
+export declare class WebsocketSignalManagerMonitor {
+    recordRateLimitExceeded(): void;
+    recordServerFailure(params: {
+        serverName: string;
+        willRestart: boolean;
+    }): void;
+}
+//# sourceMappingURL=websocket-signal-manager-monitor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-signal-manager-monitor.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/websocket-signal-manager-monitor.ts"],"names":[],"mappings":"AAMA,qBAAa,6BAA6B;IACjC,uBAAuB;IAIvB,mBAAmB,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE;CAQhF"}

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

@@ -4,7 +4,6 @@ import { PublicKey } from '@dxos/keys';
 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 } from '../signal-client';
 import { type SignalStatus } from '../signal-methods';
 /**
  * Manages connection to multiple Signal Servers over WebSocket
@@ -13,11 +12,15 @@ export declare class WebsocketSignalManager implements SignalManager {
     private readonly _hosts;
     private readonly _getMetadata?;
     private readonly _servers;
+    private readonly _monitor;
+    /**
+     * Used to avoid logging failed server restarts more than once until the server actually recovers.
+     */
+    private readonly _failedServersBitfield;
     private _ctx;
     private _opened;
     readonly failureCount: Map<string, number>;
     readonly statusChanged: Event<SignalStatus[]>;
-    readonly commandTrace: Event<CommandTrace>;
     readonly swarmEvent: Event<{
         topic: PublicKey;
         swarmEvent: SwarmEvent;
@@ -46,7 +49,8 @@ export declare class WebsocketSignalManager implements SignalManager {
         recipient: PublicKey;
         payload: Any;
     }): Promise<void>;
-    checkServerFailure(serverName: string): Promise<void>;
+    checkServerFailure(serverName: string, index: number): Promise<void>;
+    private _clearServerFailedFlag;
     subscribeMessages(peerId: PublicKey): Promise<void>;
     unsubscribeMessages(peerId: PublicKey): Promise<void>;
     private _initContext;

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,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"}
+{"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"}

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

@@ -1,10 +1,12 @@
-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;
+    payload: {
+        type_url: string;
+        value: Uint8Array;
+    };
 }
 export type SignalStatus = {
     host: string;
@@ -49,8 +51,8 @@ export interface SignalMethods {
  * Signaling client.
  */
 export interface SignalClientMethods extends SignalMethods {
-    open(): Promise<void>;
-    close(): Promise<void>;
+    open(): Promise<this>;
+    close(): Promise<this>;
     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;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"}
+{"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"}

package/package.json

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

package/src/messenger-monitor.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { trace } from '@dxos/tracing';
+
+export class MessengerMonitor {
+  public recordMessageAckFailed() {
+    trace.metrics.increment('mesh.signal.messenger.failed-ack', 1);
+  }
+
+  public recordReliableMessage(params: { sendAttempts: number; sent: boolean }) {
+    trace.metrics.increment('mesh.signal.messenger.reliable-send', 1, {
+      tags: {
+        success: params.sent,
+        attempts: params.sendAttempts,
+      },
+    });
+  }
+}

package/src/messenger.ts

@@ -12,6 +12,7 @@ import { TimeoutError as ProtocolTimeoutError, schema, trace } from '@dxos/proto
 import { type ReliablePayload } from '@dxos/protocols/proto/dxos/mesh/messaging';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
+import { MessengerMonitor } from './messenger-monitor';
 import { type SignalManager } from './signal-manager';
 import { type Message } from './signal-methods';
 import { MESSAGE_TIMEOUT } from './timeouts';
@@ -32,6 +33,7 @@ const RECEIVED_MESSAGES_GC_INTERVAL = 120_000;
  * Reliable messenger that works trough signal network.
  */
 export class Messenger {
+  private readonly _monitor = new MessengerMonitor();
   private readonly _signalManager: SignalManager;
   // { peerId, payloadType } => listeners set
   private readonly _listeners = new ComplexMap<{ peerId: PublicKey; payloadType: string }, Set<OnMessage>>(
@@ -111,6 +113,7 @@ export class Messenger {
 
     let messageReceived: () => void;
     let timeoutHit: (err: Error) => void;
+    let sendAttempts = 0;
 
     const promise = new Promise<void>((resolve, reject) => {
       messageReceived = resolve;
@@ -122,6 +125,7 @@ export class Messenger {
       messageContext,
       async () => {
         log('retrying message', { messageId: reliablePayload.messageId });
+        sendAttempts++;
         await this._encodeAndSend({ author, recipient, reliablePayload }).catch((err) =>
           log('failed to send message', { err }),
         );
@@ -141,6 +145,7 @@ export class Messenger {
           ),
         );
         void messageContext.dispose();
+        this._monitor.recordReliableMessage({ sendAttempts, sent: false });
       },
       MESSAGE_TIMEOUT,
     );
@@ -149,6 +154,7 @@ export class Messenger {
       messageReceived();
       this._onAckCallbacks.delete(reliablePayload.messageId!);
       void messageContext.dispose();
+      this._monitor.recordReliableMessage({ sendAttempts, sent: true });
     });
 
     await this._encodeAndSend({ author, recipient, reliablePayload });
@@ -234,11 +240,16 @@ export class Messenger {
 
     log('handling message', { messageId: reliablePayload.messageId });
 
-    await this._sendAcknowledgement({
-      author,
-      recipient,
-      messageId: reliablePayload.messageId,
-    });
+    try {
+      await this._sendAcknowledgement({
+        author,
+        recipient,
+        messageId: reliablePayload.messageId,
+      });
+    } catch (err) {
+      this._monitor.recordMessageAckFailed();
+      throw err;
+    }
 
     // Ignore message if it was already received, i.e. from multiple signal servers.
     if (this._receivedMessages.has(reliablePayload.messageId!)) {

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

@@ -0,0 +1,111 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { trace } from '@dxos/tracing';
+
+import type { Message } from '../signal-methods';
+
+export class SignalClientMonitor {
+  private readonly _performance = {
+    sentMessages: 0,
+    receivedMessages: 0,
+    reconnectCounter: 0,
+    joinCounter: 0,
+    leaveCounter: 0,
+  };
+
+  /**
+   * Timestamp of when the connection attempt was began.
+   */
+  private _connectionStarted = new Date();
+  /**
+   * Timestamp of last state change.
+   */
+  private _lastStateChange = new Date();
+
+  public getRecordedTimestamps() {
+    return {
+      connectionStarted: this._connectionStarted,
+      lastStateChange: this._lastStateChange,
+    };
+  }
+
+  public recordStateChangeTime() {
+    this._lastStateChange = new Date();
+  }
+
+  public recordConnectionStartTime() {
+    this._connectionStarted = new Date();
+  }
+
+  public recordReconnect(params: { success: boolean }) {
+    this._performance.reconnectCounter++;
+    trace.metrics.increment('mesh.signal.signal-client.reconnect', 1, {
+      tags: {
+        success: params.success,
+      },
+    });
+  }
+
+  public recordJoin() {
+    this._performance.joinCounter++;
+  }
+
+  public recordLeave() {
+    this._performance.leaveCounter++;
+  }
+
+  public recordMessageReceived(message: Message) {
+    this._performance.receivedMessages++;
+    trace.metrics.increment('mesh.signal.signal-client.received-total', 1, {
+      tags: createIdentityTags(message),
+    });
+    trace.metrics.distribution('mesh.signal.signal-client.bytes-in', getByteCount(message), {
+      tags: createIdentityTags(message),
+    });
+  }
+
+  public async recordMessageSending(message: Message, sendMessage: () => Promise<void>) {
+    this._performance.sentMessages++;
+    const tags = createIdentityTags(message);
+    let success = true;
+    try {
+      const reqStart = Date.now();
+      await sendMessage();
+      const reqDuration = Date.now() - reqStart;
+      trace.metrics.distribution('mesh.signal.signal-client.send-duration', reqDuration, { tags });
+      trace.metrics.distribution('mesh.signal.signal-client.bytes-out', getByteCount(message), { tags });
+    } catch (err) {
+      success = false;
+    }
+    trace.metrics.increment('mesh.signal.signal-client.sent-total', 1, {
+      tags: { ...tags, success },
+    });
+  }
+
+  public recordStreamCloseErrors(count: number) {
+    trace.metrics.increment('mesh.signal.signal-client.stream-close-errors', count);
+  }
+
+  public recordReconciliation(params: { success: boolean }) {
+    trace.metrics.increment('mesh.signal.signal-client.reconciliation', 1, {
+      tags: {
+        success: params.success,
+      },
+    });
+  }
+}
+
+const getByteCount = (message: Message): number => {
+  return (
+    message.author.asUint8Array().length +
+    message.recipient.asUint8Array().length +
+    message.payload.type_url.length +
+    message.payload.value.length
+  );
+};
+
+const createIdentityTags = (message: Message) => {
+  return { peer: message.author.toHex() };
+};