@fuzdev/fuz_app 0.22.0 → 0.24.0

package/dist/actions/socket.svelte.js

@@ -5,16 +5,28 @@
  * Drop into any SvelteKit frontend as the underlying connection for
  * `FrontendWebsocketTransport`. Handles auto-reconnect with exponential
  * backoff, respects `WS_CLOSE_SESSION_REVOKED` (no reconnect loop after the
- * server revokes auth), and exposes reactive status for UI indicators.
+ * server revokes auth), exposes reactive status for UI indicators, and ships
+ * three correctness primitives default-on:
  *
- * First cut: no message queue, no heartbeat. Those live in consumer-specific
- * wrappers today (see zzz's `Socket` Cell); extract into fuz_app when two
- * independent consumers motivate the shape.
+ * - {@link FrontendWebsocketClient.request} — promise-based JSON-RPC with
+ *   auto-assigned ids and a pending-id map. Intercepts responses on the
+ *   message path so request/response correlation is transport-level rather
+ *   than re-invented per consumer.
+ * - **Durable queue** — `request()` calls made while disconnected buffer up
+ *   to {@link DEFAULT_QUEUE_MAX_SIZE} requests and flush on reopen. Overflow
+ *   rejects with `queue_overflow`. Raw {@link FrontendWebsocketClient.send}
+ *   is drop-on-disconnect (fire-and-forget notifications want that).
+ * - **Activity-aware heartbeat** — idles fire a shared `heartbeat` request;
+ *   receive-silence past {@link DEFAULT_HEARTBEAT_RECEIVE_TIMEOUT} closes
+ *   with {@link WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT} and lets auto-reconnect
+ *   pick back up.
  *
  * @module
  */
 import { BROWSER } from 'esm-env';
-import { WS_CLOSE_SESSION_REVOKED } from './transports.js';
+import { JSONRPC_VERSION } from '../http/jsonrpc.js';
+import { WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT, WS_CLOSE_SESSION_REVOKED } from './transports.js';
+import { HEARTBEAT_METHOD } from './heartbeat.js';
 /** Default WebSocket close code (normal closure). */
 export const DEFAULT_CLOSE_CODE = 1000;
 /** Base reconnect delay in ms. */
@@ -23,6 +35,12 @@ export const DEFAULT_RECONNECT_DELAY = 1000;
 export const DEFAULT_RECONNECT_DELAY_MAX = 10000;
 /** Exponential backoff factor: delay = base * factor^(attempt-1). */
 export const DEFAULT_BACKOFF_FACTOR = 1.5;
+/** Idle interval before sending a heartbeat (ms). */
+export const DEFAULT_HEARTBEAT_INTERVAL = 30_000;
+/** Max receive silence before closing with {@link WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT} (ms). */
+export const DEFAULT_HEARTBEAT_RECEIVE_TIMEOUT = 60_000;
+/** Default bound on buffered requests while disconnected. Overflow rejects. */
+export const DEFAULT_QUEUE_MAX_SIZE = 100;
 /**
  * Reactive WebSocket client implementing `WebsocketConnection`.
  *
@@ -40,7 +58,20 @@ export class FrontendWebsocketClient {
     #reconnect_delay;
     #reconnect_delay_max;
     #backoff_factor;
+    #heartbeat_enabled;
+    #heartbeat_interval;
+    #heartbeat_receive_timeout;
+    #queue_enabled;
+    #queue_max_size;
     #log;
+    #next_request_id = 0;
+    #pending = new Map();
+    #queue = [];
+    #heartbeat_timer = null;
+    /** Epoch ms of the last outgoing send — used by the heartbeat activity check. */
+    #last_send_time = null;
+    /** Epoch ms of the last incoming message — used by the heartbeat activity check. */
+    #last_receive_time = null;
     ws = $state.raw(null);
     status = $state.raw('initial');
     reconnect_count = $state.raw(0);
@@ -77,6 +108,16 @@ export class FrontendWebsocketClient {
         this.#reconnect_delay = config.delay ?? DEFAULT_RECONNECT_DELAY;
         this.#reconnect_delay_max = config.delay_max ?? DEFAULT_RECONNECT_DELAY_MAX;
         this.#backoff_factor = config.factor ?? DEFAULT_BACKOFF_FACTOR;
+        const heartbeat = options.heartbeat;
+        this.#heartbeat_enabled = heartbeat !== false;
+        const heartbeat_config = typeof heartbeat === 'object' ? heartbeat : {};
+        this.#heartbeat_interval = heartbeat_config.interval ?? DEFAULT_HEARTBEAT_INTERVAL;
+        this.#heartbeat_receive_timeout =
+            heartbeat_config.receive_timeout ?? DEFAULT_HEARTBEAT_RECEIVE_TIMEOUT;
+        const queue = options.queue;
+        this.#queue_enabled = queue !== false;
+        const queue_config = typeof queue === 'object' ? queue : {};
+        this.#queue_max_size = queue_config.max_size ?? DEFAULT_QUEUE_MAX_SIZE;
         this.#log = options.log ?? null;
     }
     /**
@@ -184,10 +225,12 @@ export class FrontendWebsocketClient {
      */
     disconnect(code = DEFAULT_CLOSE_CODE) {
         this.#cancel_reconnect();
+        this.#cancel_heartbeat();
         this.#teardown(code);
         this.status = 'closed';
         this.reconnect_count = 0;
         this.current_reconnect_delay = 0;
+        this.#reject_all('client disconnected');
     }
     /** Explicit-resource-management hook — supports `using client = new FrontendWebsocketClient(url)`. */
     [Symbol.dispose]() {
@@ -199,6 +242,7 @@ export class FrontendWebsocketClient {
         try {
             this.ws.send(JSON.stringify(data));
             this.last_send_error = null;
+            this.#last_send_time = Date.now();
             return true;
         }
         catch (error) {
@@ -207,6 +251,81 @@ export class FrontendWebsocketClient {
             return false;
         }
     }
+    /**
+     * Promise-based JSON-RPC over the socket. Auto-assigns a monotonic request
+     * id, tracks the pending promise, and resolves when the server sends a
+     * matching response (or rejects on error frame, socket close, or aborted
+     * signal).
+     *
+     * While the socket is disconnected, the request is buffered in a bounded
+     * queue (default-on, {@link DEFAULT_QUEUE_MAX_SIZE}) and flushed on
+     * reopen. Pass `{queue: false}` to reject immediately when disconnected
+     * — used internally by the heartbeat, which must not fight the queue for
+     * the disconnect-detection slot.
+     *
+     * `AbortSignal` integration today rejects the local promise; the
+     * server-side cancel protocol (sending a `cancel` notification to abort
+     * the in-flight handler) lands in Phase 3c as a follow-up PR.
+     */
+    request(method, params = {}, options = {}) {
+        return new Promise((resolve, reject) => {
+            const resolve_typed = resolve;
+            const reject_typed = reject;
+            if (this.#revoked) {
+                reject_typed(new Error('[socket] session revoked'));
+                return;
+            }
+            const { signal = null } = options;
+            if (signal?.aborted) {
+                reject_typed(this.#build_abort_error(method));
+                return;
+            }
+            const id = ++this.#next_request_id;
+            const frame = { jsonrpc: JSONRPC_VERSION, id, method, params };
+            // Bind the signal listener up-front so `#detach_signal` can find it by
+            // reference regardless of which settlement path runs (inline send,
+            // queued flush, close-time reject).
+            let pending = null;
+            const signal_handler = signal
+                ? () => {
+                    if (!pending)
+                        return;
+                    this.#pending.delete(id);
+                    this.#drop_queued(id);
+                    this.#detach_signal(pending);
+                    pending = null;
+                    reject_typed(this.#build_abort_error(method));
+                }
+                : null;
+            if (signal && signal_handler)
+                signal.addEventListener('abort', signal_handler);
+            pending = { method, resolve: resolve_typed, reject: reject_typed, signal, signal_handler };
+            const should_queue = options.queue !== false && this.#queue_enabled;
+            if (this.connected && this.ws) {
+                const sent = this.send(frame);
+                if (sent) {
+                    this.#pending.set(id, pending);
+                    return;
+                }
+                // Send failed mid-connected (serialization, buffer full). Requeue if
+                // the queue is on, otherwise reject — this socket is in an odd
+                // state but the caller asked for non-durable semantics.
+                if (should_queue) {
+                    this.#enqueue({ ...pending, id, frame });
+                    return;
+                }
+                this.#detach_signal(pending);
+                reject_typed(new Error(`[socket] send failed for ${method}`));
+                return;
+            }
+            if (should_queue) {
+                this.#enqueue({ ...pending, id, frame });
+                return;
+            }
+            this.#detach_signal(pending);
+            reject_typed(new Error(`[socket] not connected (method=${method})`));
+        });
+    }
     add_message_handler(handler) {
         this.#message_handlers.add(handler);
         return () => this.#message_handlers.delete(handler);
@@ -215,6 +334,124 @@ export class FrontendWebsocketClient {
         this.#error_handlers.add(handler);
         return () => this.#error_handlers.delete(handler);
     }
+    #build_abort_error(method) {
+        return new Error(`[socket] request aborted (method=${method})`);
+    }
+    #detach_signal(pending) {
+        if (pending.signal && pending.signal_handler) {
+            pending.signal.removeEventListener('abort', pending.signal_handler);
+        }
+    }
+    #enqueue(queued) {
+        if (this.#queue.length >= this.#queue_max_size) {
+            this.#detach_signal(queued);
+            queued.reject(new Error(`[socket] request queue overflow (method=${queued.method}, max=${this.#queue_max_size})`));
+            return;
+        }
+        this.#queue.push(queued);
+    }
+    #drop_queued(id) {
+        const index = this.#queue.findIndex((q) => q.id === id);
+        if (index !== -1)
+            this.#queue.splice(index, 1);
+    }
+    #flush_queue() {
+        if (!this.connected || !this.ws)
+            return;
+        const queued = this.#queue;
+        this.#queue = [];
+        for (const q of queued) {
+            if (q.signal?.aborted) {
+                this.#detach_signal(q);
+                q.reject(this.#build_abort_error(q.method));
+                continue;
+            }
+            const sent = this.send(q.frame);
+            if (sent) {
+                this.#pending.set(q.id, {
+                    method: q.method,
+                    resolve: q.resolve,
+                    reject: q.reject,
+                    signal: q.signal,
+                    signal_handler: q.signal_handler,
+                });
+            }
+            else {
+                this.#detach_signal(q);
+                q.reject(new Error(`[socket] queued request send failed (method=${q.method})`));
+            }
+        }
+    }
+    #reject_all(reason) {
+        const pending = this.#pending;
+        this.#pending = new Map();
+        for (const [id, p] of pending) {
+            this.#detach_signal(p);
+            p.reject(new Error(`[socket] ${reason} (method=${p.method}, id=${id})`));
+        }
+        const queued = this.#queue;
+        this.#queue = [];
+        for (const q of queued) {
+            this.#detach_signal(q);
+            q.reject(new Error(`[socket] ${reason} (method=${q.method})`));
+        }
+    }
+    #reject_pending_only(reason) {
+        // Socket closed but auto-reconnect will try again — pending requests were
+        // in flight on the old socket so we can't correlate them after reopen;
+        // queued requests haven't been sent yet and stay buffered for the flush.
+        const pending = this.#pending;
+        this.#pending = new Map();
+        for (const [id, p] of pending) {
+            this.#detach_signal(p);
+            p.reject(new Error(`[socket] ${reason} (method=${p.method}, id=${id})`));
+        }
+    }
+    #start_heartbeat() {
+        this.#cancel_heartbeat();
+        if (!this.#heartbeat_enabled)
+            return;
+        const now = Date.now();
+        this.#last_send_time = now;
+        this.#last_receive_time = now;
+        // Run the check at half the interval so any event-loop blockage pauses
+        // the timer itself; a dead-because-blocked socket is close enough to
+        // dead-because-unresponsive that closing is arguably correct.
+        const tick = Math.max(100, Math.floor(this.#heartbeat_interval / 2));
+        this.#heartbeat_timer = setInterval(() => this.#heartbeat_tick(), tick);
+    }
+    #cancel_heartbeat() {
+        if (this.#heartbeat_timer !== null) {
+            clearInterval(this.#heartbeat_timer);
+            this.#heartbeat_timer = null;
+        }
+    }
+    #heartbeat_tick() {
+        if (!this.connected || !this.ws)
+            return;
+        const now = Date.now();
+        const last_receive = this.#last_receive_time ?? now;
+        if (now - last_receive >= this.#heartbeat_receive_timeout) {
+            this.#log?.info(`[socket] receive timeout (${now - last_receive}ms) — closing ${WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT}`);
+            try {
+                this.ws.close(WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT, 'client heartbeat timeout');
+            }
+            catch (error) {
+                this.#log?.error('[socket] heartbeat timeout close failed:', error);
+            }
+            return;
+        }
+        const last_activity = Math.max(this.#last_send_time ?? 0, last_receive);
+        if (now - last_activity >= this.#heartbeat_interval) {
+            // Fire-and-forget the heartbeat. If it fails (network, serialization),
+            // receive-silence detection above will close the socket on the next
+            // tick. No queue — the heartbeat is the thing that tells us the
+            // queue needs flushing, it must not fight the queue for the slot.
+            void this.request(HEARTBEAT_METHOD, {}, { queue: false }).catch((error) => {
+                this.#log?.debug('[socket] heartbeat request failed:', error);
+            });
+        }
+    }
     #teardown(close_code) {
         if (!this.ws)
             return;
@@ -222,6 +459,7 @@ export class FrontendWebsocketClient {
         this.ws.removeEventListener('close', this.#handle_close);
         this.ws.removeEventListener('error', this.#handle_error);
         this.ws.removeEventListener('message', this.#handle_message);
+        this.#cancel_heartbeat();
         if (this.ws.readyState === WebSocket.OPEN || this.ws.readyState === WebSocket.CONNECTING) {
             try {
                 this.ws.close(close_code);
@@ -230,8 +468,10 @@ export class FrontendWebsocketClient {
                 this.#log?.error('[socket] close failed:', error);
             }
             // Listeners are gone, so `#handle_close` won't fire for this close —
-            // record it here so the client-initiated close is still observable.
+            // record it here so the client-initiated close is still observable,
+            // and reject any pending requests that can never resolve now.
             this.#record_close(close_code, '');
+            this.#reject_pending_only(`socket torn down (code ${close_code})`);
         }
         this.ws = null;
     }
@@ -267,12 +507,16 @@ export class FrontendWebsocketClient {
         this.current_reconnect_delay = 0;
         this.last_connect_time = Date.now();
         this.#cancel_reconnect();
+        this.#start_heartbeat();
+        // Flush buffered requests before anyone else can observe the open state.
+        this.#flush_queue();
     };
     #handle_close = (event) => {
         // Drop the dead-socket reference so consumers reading `client.ws` never
         // see a CLOSED WebSocket during the reconnect window.
         this.ws = null;
         this.#record_close(event.code, event.reason);
+        this.#cancel_heartbeat();
         // Session revocation is terminal — reconnecting would 401 in a loop.
         if (event.code === WS_CLOSE_SESSION_REVOKED) {
             this.#revoked = true;
@@ -280,8 +524,12 @@ export class FrontendWebsocketClient {
             this.#cancel_reconnect();
             this.reconnect_count = 0;
             this.current_reconnect_delay = 0;
+            this.#reject_all('session revoked');
             return;
         }
+        // Pending in-flight requests can't be correlated post-reconnect; reject
+        // them. Queue stays so the flush on reopen replays unsent work.
+        this.#reject_pending_only(`connection closed (code ${event.code})`);
         // Let `#schedule_reconnect` set `status: 'reconnecting'` directly to avoid
         // a transient `'closed'` flicker; only set `'closed'` when reconnect is off.
         if (this.#auto_reconnect) {
@@ -289,6 +537,7 @@ export class FrontendWebsocketClient {
         }
         else {
             this.status = 'closed';
+            this.#reject_all('connection closed, auto-reconnect disabled');
         }
     };
     #handle_error = (event) => {
@@ -304,6 +553,39 @@ export class FrontendWebsocketClient {
         // Browsers fire `close` after error; reconnect logic lives there.
     };
     #handle_message = (event) => {
+        this.#last_receive_time = Date.now();
+        // Intercept JSON-RPC responses for pending `request()` calls. Parse
+        // defensively — if the frame isn't valid JSON or isn't a response, fall
+        // through to the registered message handlers (which still see every
+        // notification, plus any stray response we don't own).
+        let json;
+        try {
+            json = JSON.parse(String(event.data));
+        }
+        catch {
+            json = undefined;
+        }
+        if (typeof json === 'object' &&
+            json !== null &&
+            'id' in json &&
+            ('result' in json || 'error' in json)) {
+            const id = json.id;
+            if (id !== null) {
+                const pending = this.#pending.get(id);
+                if (pending) {
+                    this.#pending.delete(id);
+                    this.#detach_signal(pending);
+                    if ('error' in json && json.error) {
+                        const err = json.error;
+                        pending.reject(new Error(`[rpc ${pending.method} #${id}] ${err.code ?? '?'} ${err.message ?? 'unknown error'}`));
+                    }
+                    else {
+                        pending.resolve(json.result);
+                    }
+                    return;
+                }
+            }
+        }
         for (const handler of this.#message_handlers) {
             try {
                 handler(event);

package/dist/actions/transports.d.ts

@@ -10,6 +10,10 @@ import { z } from 'zod';
 import type { JsonrpcMessageFromClientToServer, JsonrpcMessageFromServerToClient, JsonrpcNotification, JsonrpcRequest, JsonrpcResponseOrError, JsonrpcErrorResponse } from '../http/jsonrpc.js';
 /** WebSocket close code for session revocation. */
 export declare const WS_CLOSE_SESSION_REVOKED = 4001;
+/** WebSocket close code — client timed out waiting for a response. */
+export declare const WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT = 4002;
+/** WebSocket close code — server timed out with no incoming activity. */
+export declare const WS_CLOSE_SERVER_HEARTBEAT_TIMEOUT = 4003;
 export declare const TransportName: z.ZodString;
 export type TransportName = z.infer<typeof TransportName>;
 export interface Transport {

package/dist/actions/transports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transports.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/actions/transports.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,KAAK,EACX,gCAAgC,EAChC,gCAAgC,EAChC,mBAAmB,EACnB,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,mDAAmD;AACnD,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAK7C,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,MAAM,WAAW,SAAS;IACzB,cAAc,EAAE,aAAa,CAAC;IAE9B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACzE,IAAI,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;IAClG,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,qBAAa,UAAU;;IAItB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAQ;IAE/B;;OAEG;IACH,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAS9C,qBAAqB,CAAC,cAAc,EAAE,aAAa,GAAG,IAAI;IAM1D;;;;;OAKG;IACH,aAAa,CAAC,cAAc,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAO/D,QAAQ,IAAI,OAAO,GAAG,IAAI;IAM1B,qBAAqB,IAAI,SAAS,GAAG,IAAI;IAIzC,0BAA0B,IAAI,aAAa,GAAG,IAAI;IAIlD,qBAAqB,CAAC,cAAc,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;CAqDtE"}
+{"version":3,"file":"transports.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/actions/transports.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,KAAK,EACX,gCAAgC,EAChC,gCAAgC,EAChC,mBAAmB,EACnB,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,mDAAmD;AACnD,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,sEAAsE;AACtE,eAAO,MAAM,iCAAiC,OAAO,CAAC;AACtD,yEAAyE;AACzE,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAKtD,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,MAAM,WAAW,SAAS;IACzB,cAAc,EAAE,aAAa,CAAC;IAE9B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACzE,IAAI,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;IAClG,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,qBAAa,UAAU;;IAItB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAQ;IAE/B;;OAEG;IACH,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAS9C,qBAAqB,CAAC,cAAc,EAAE,aAAa,GAAG,IAAI;IAM1D;;;;;OAKG;IACH,aAAa,CAAC,cAAc,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAO/D,QAAQ,IAAI,OAAO,GAAG,IAAI;IAM1B,qBAAqB,IAAI,SAAS,GAAG,IAAI;IAIzC,0BAA0B,IAAI,aAAa,GAAG,IAAI;IAIlD,qBAAqB,CAAC,cAAc,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;CAqDtE"}

package/dist/actions/transports.js

@@ -9,6 +9,10 @@
 import { z } from 'zod';
 /** WebSocket close code for session revocation. */
 export const WS_CLOSE_SESSION_REVOKED = 4001;
+/** WebSocket close code — client timed out waiting for a response. */
+export const WS_CLOSE_CLIENT_HEARTBEAT_TIMEOUT = 4002;
+/** WebSocket close code — server timed out with no incoming activity. */
+export const WS_CLOSE_SERVER_HEARTBEAT_TIMEOUT = 4003;
 // TODO figure out the symmetry of frontend and backend transports (none/partial/full?) --
 // we may also need orthogonal abstractions to clarify the transport role
 export const TransportName = z.string(); // not branded for convenience, will just error at runtime, the schema is just for docs atm

package/dist/testing/ws_round_trip.d.ts

@@ -8,16 +8,25 @@
  * token id), and exposes a `connect()` factory returning a
  * `MockWsClient` per connection.
  *
- * Two layers are exported:
+ * Three layers are exported:
  *
  *   - **Primitives** (`create_fake_ws`, `create_fake_hono_context`,
- *     `create_stub_upgrade`, `MinimalActionEnvironment`) — used by
- *     fuz_app's own dispatcher tests and by consumers wiring tight
- *     one-off tests.
+ *     `create_stub_upgrade`, `MinimalActionEnvironment`,
+ *     `dispatch_ws_message`) — used by fuz_app's own dispatcher tests
+ *     and by consumers wiring tight one-off tests.
  *   - **Harness** (`create_ws_test_harness`, `MockWsClient`,
  *     `keeper_identity`) — the high-level driver. Give it specs +
- *     handlers, get back `{transport, connect()}`. Use this unless you
- *     need bare primitives.
+ *     handlers, get back `{transport, connect()}`. `connect()` is async
+ *     and resolves after `on_socket_open` completes, so broadcasts sent
+ *     immediately after `await harness.connect()` reach the client.
+ *   - **Round-trip helpers** — `is_notification` / `is_notification_with`
+ *     / `is_response_for` predicates, JSON-RPC wire-frame types
+ *     (`JsonrpcNotificationFrame`, `JsonrpcSuccessResponseFrame`,
+ *     `JsonrpcErrorResponseFrame` — distinct from the runtime Zod types
+ *     in `http/jsonrpc.ts` so tests can narrow `params` / `result`),
+ *     and `build_broadcast_api` for wiring a typed broadcast API against
+ *     the harness's transport. Used by consumer round-trip test suites
+ *     to replace ~100 lines of verbatim-identical glue.
  *
  * Hono's wire upgrade is skipped — the Node test runtime has no
  * `@hono/node-ws` adapter — but the full dispatch path is exercised
@@ -31,11 +40,13 @@ import type { Context } from 'hono';
 import { WSContext, type UpgradeWebSocket, type WSEvents } from 'hono/ws';
 import { Logger } from '@fuzdev/fuz_util/log.js';
 import type { ActionSpecUnion } from '../actions/action_spec.js';
+import type { Action } from '../actions/action_types.js';
 import type { ActionEventEnvironment } from '../actions/action_event_types.js';
-import { type BaseHandlerContext, type RegisterActionWsOptions, type WsActionHandler } from '../actions/register_action_ws.js';
+import { type BaseHandlerContext, type RegisterActionWsOptions } from '../actions/register_action_ws.js';
 import { BackendWebsocketTransport } from '../actions/transports_ws_backend.js';
 import { type RequestContext } from '../auth/request_context.js';
 import { type CredentialType } from '../hono_context.js';
+import { JSONRPC_VERSION } from '../http/jsonrpc.js';
 import { type Uuid } from '../uuid.js';
 /**
  * A `WSContext` paired with capture arrays. Use `sends` to assert on
@@ -120,6 +131,16 @@ export interface WsConnectIdentity {
 export interface MockWsClient {
     /** Send a JSON-RPC message (request or notification) to the server. */
     send: (message: unknown) => Promise<void>;
+    /**
+     * Send a JSON-RPC request and await its response. Resolves with the
+     * `result`; throws with a useful message (code, text, and any `data`
+     * payload) on an error frame — without this, asserting on
+     * `result.foo` for a failed request throws
+     * `Cannot read property 'foo' of undefined`, which hides the real
+     * cause. Use `send` + `wait_for(is_response_for(id))` directly when
+     * you need to assert on the error frame itself.
+     */
+    request: <R = unknown>(id: number | string, method: string, params: unknown, timeout_ms?: number) => Promise<R>;
     /**
      * Close the connection, firing `onClose`. Returns a promise that
      * resolves once `on_socket_close` (and the transport's own cleanup)
@@ -132,16 +153,72 @@ export interface MockWsClient {
      * Wait until a message satisfies `predicate`. Matches are checked
      * against already-received messages first, then new arrivals until
      * the timeout (defaults to 1000ms).
+     *
+     * When `predicate` is a type guard (e.g. `is_notification_with<P>`),
+     * the result is narrowed automatically and callers don't need to
+     * spell `<JsonrpcNotificationFrame<P>>` on the call site.
      */
-    wait_for: <T = unknown>(predicate: (msg: unknown) => boolean, timeout_ms?: number) => Promise<T>;
+    wait_for: {
+        <T>(predicate: (msg: unknown) => msg is T, timeout_ms?: number): Promise<T>;
+        <T = unknown>(predicate: (msg: unknown) => boolean, timeout_ms?: number): Promise<T>;
+    };
+}
+export interface JsonrpcNotificationFrame<P = unknown> {
+    jsonrpc: typeof JSONRPC_VERSION;
+    method: string;
+    params: P;
+}
+export interface JsonrpcSuccessResponseFrame<R = unknown> {
+    jsonrpc: typeof JSONRPC_VERSION;
+    id: number | string;
+    result: R;
+}
+export interface JsonrpcErrorResponseFrame<D = unknown> {
+    jsonrpc: typeof JSONRPC_VERSION;
+    id: number | string;
+    error: {
+        code: number;
+        message: string;
+        data?: D;
+    };
 }
+/** Predicate matching a JSON-RPC notification with the given method name. */
+export declare const is_notification: (method: string) => (msg: unknown) => boolean;
+/**
+ * Type-guard combinator: match a notification whose typed `params` satisfies
+ * `match`. Collapses the common test pattern of casting `msg` to
+ * `JsonrpcNotificationFrame<P>` in every predicate body.
+ *
+ * ```ts
+ * const match_roster_for = (id: Uuid) =>
+ *   is_notification_with<RosterChangedParams>(
+ *     WORLD_METHODS.roster_changed,
+ *     (params) => params.character_id === id && !params.removed,
+ *   );
+ * const roster = await client.wait_for(match_roster_for(char_id));
+ * ```
+ */
+export declare const is_notification_with: <P>(method: string, match: (params: P) => boolean) => (msg: unknown) => msg is JsonrpcNotificationFrame<P>;
+/** Predicate matching a JSON-RPC response frame (success or error) for the given request id. */
+export declare const is_response_for: (id: number | string) => (msg: unknown) => boolean;
 /** Options for `create_ws_test_harness`. */
 export interface CreateWsTestHarnessOptions<TCtx extends BaseHandlerContext> {
-    specs: ReadonlyArray<ActionSpecUnion>;
-    handlers: Record<string, WsActionHandler<TCtx>>;
+    /**
+     * The actions registered on this endpoint — matches the shape
+     * `register_action_ws` accepts. Each entry is a `{spec, handler?}` tuple;
+     * shared fuz_app primitives (like `heartbeat_action`) can be spread in
+     * alongside consumer-specific actions.
+     */
+    actions: ReadonlyArray<Action<TCtx>>;
     extend_context?: RegisterActionWsOptions<TCtx>['extend_context'];
     /** Pass a pre-created transport to share with a broadcast API. */
     transport?: BackendWebsocketTransport;
+    /**
+     * Threaded through to `register_action_ws`. Defaults to `false` in tests —
+     * fake timers + receive-silence detection need explicit opt-in and per-
+     * test tuning to avoid spurious closes.
+     */
+    heartbeat?: RegisterActionWsOptions<TCtx>['heartbeat'];
     /** Optional logger. Defaults to a silent `[ws-test]` logger. */
     log?: Logger;
     /** Threaded straight through to `register_action_ws`. */
@@ -152,7 +229,14 @@ export interface CreateWsTestHarnessOptions<TCtx extends BaseHandlerContext> {
 /** A harness instance — transport handle + connection factory. */
 export interface WsTestHarness {
     transport: BackendWebsocketTransport;
-    connect: (identity?: WsConnectIdentity) => MockWsClient;
+    /**
+     * Open a mock connection. Resolves after `on_socket_open` (and the
+     * transport's `register_ws`) completes, so broadcasts issued
+     * immediately after the `await` reach the connection. Earlier
+     * revisions returned synchronously and required a `settle_open()`
+     * microtask drain — no longer necessary.
+     */
+    connect: (identity?: WsConnectIdentity) => Promise<MockWsClient>;
 }
 /**
  * Create a WebSocket test harness for the given specs + handlers.
@@ -166,4 +250,25 @@ export interface WsTestHarness {
 export declare const create_ws_test_harness: <TCtx extends BaseHandlerContext>(options: CreateWsTestHarnessOptions<TCtx>) => WsTestHarness;
 /** Convenience: default identity for keeper-authenticated connections. */
 export declare const keeper_identity: () => WsConnectIdentity;
+/**
+ * Wire a typed broadcast API against the harness's transport, matching
+ * how a consumer's real backend composes the stack. Returns the typed
+ * API so tests can call `.tx_run_created(...)` / `.workspace_changed(...)`
+ * etc. directly.
+ *
+ * ```ts
+ * const harness = create_ws_test_harness<BaseHandlerContext>({specs, handlers});
+ * const broadcast = build_broadcast_api<MyBackendActionsApi>({
+ *   harness,
+ *   specs: my_broadcast_action_specs,
+ * });
+ * const client = await harness.connect(keeper_identity());
+ * await broadcast.tx_run_created({run_id: '...', ...});
+ * await client.wait_for(is_notification('tx_run_created'));
+ * ```
+ */
+export declare const build_broadcast_api: <TApi>(options: {
+    harness: WsTestHarness;
+    specs: ReadonlyArray<ActionSpecUnion>;
+}) => TApi;
 //# sourceMappingURL=ws_round_trip.d.ts.map

package/dist/testing/ws_round_trip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws_round_trip.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/testing/ws_round_trip.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAC,OAAO,EAAO,MAAM,MAAM,CAAC;AACxC,OAAO,EACN,SAAS,EAET,KAAK,gBAAgB,EAErB,KAAK,QAAQ,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AAE/C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAEN,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,eAAe,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,yBAAyB,EAAC,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAsB,KAAK,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAEpF,OAAO,EAA6C,KAAK,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACnG,OAAO,EAAc,KAAK,IAAI,EAAC,MAAM,YAAY,CAAC;AAMlD;;;GAGG;AACH,MAAM,WAAW,MAAM;IACtB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;CAChD;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,QAAO,MAajC,CAAC;AAEF,8CAA8C;AAC9C,MAAM,WAAW,sBAAsB;IACtC,eAAe,EAAE,cAAc,CAAC;IAChC,gEAAgE;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,eAAe,CAAC,EAAE,cAAc,CAAC;CACjC;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAI,MAAM,sBAAsB,KAAG,OAWvE,CAAC;AAEF,uFAAuF;AACvF,MAAM,WAAW,WAAW;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC,CAAC,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACtE;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAO,WAatC,CAAC;AAEF;;;;GAIG;AACH,qBAAa,wBAAyB,YAAW,sBAAsB;;IACtE,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAa;gBAEjC,KAAK,EAAE,aAAa,CAAC,eAAe,CAAC;IAGjD,qBAAqB,IAAI,SAAS;IAGlC,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;CAG/D;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC/B,YAAY,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAC9C,OAAO,YAAY,EACnB,IAAI,SAAS,KACX,OAAO,CAAC,IAAI,CAId,CAAC;AAMF,2CAA2C;AAC3C,MAAM,WAAW,iBAAiB;IACjC,wEAAwE;IACxE,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,yFAAyF;IACzF,eAAe,CAAC,EAAE,cAAc,CAAC;IACjC,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,kFAAkF;IAClF,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACtB;AAED,wEAAwE;AACxE,MAAM,WAAW,YAAY;IAC5B,uEAAuE;IACvE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C;;;;OAIG;IACH,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C;;;;OAIG;IACH,QAAQ,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CACjG;AAED,4CAA4C;AAC5C,MAAM,WAAW,0BAA0B,CAAC,IAAI,SAAS,kBAAkB;IAC1E,KAAK,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,cAAc,CAAC,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACjE,kEAAkE;IAClE,SAAS,CAAC,EAAE,yBAAyB,CAAC;IACtC,gEAAgE;IAChE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,cAAc,CAAC,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACjE,yDAAyD;IACzD,eAAe,CAAC,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,CAAC;CACnE;AAED,kEAAkE;AAClE,MAAM,WAAW,aAAa;IAC7B,SAAS,EAAE,yBAAyB,CAAC;IACrC,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,iBAAiB,KAAK,YAAY,CAAC;CACxD;AA4FD;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,GAAI,IAAI,SAAS,kBAAkB,EACrE,SAAS,0BAA0B,CAAC,IAAI,CAAC,KACvC,aAoJF,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,eAAe,QAAO,iBAGjC,CAAC"}
+{"version":3,"file":"ws_round_trip.d.ts","sourceRoot":"../src/lib/","sources":["../../src/lib/testing/ws_round_trip.ts"],"names":[],"mappings":"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"}