stitchkit 0.94.0 → 0.94.1

package/dist/entrypoints/index.js

@@ -15,7 +15,7 @@ import {
   createUrlBuilders,
   parseNDJSON,
   parseSSE
-} from "../index-e87kakm4.js";
+} from "../index-ham5sz8m.js";
 import {
   REALTIME_REJECTION_KEY,
   asRealtimeRejection,
@@ -23,7 +23,7 @@ import {
   isModuleNotFound,
   parseRealtimeRequestAcknowledgement,
   parseRealtimeRequestArguments
-} from "../index-x4799c19.js";
+} from "../index-ndddxtyx.js";
 import {
   RealtimeRequestDisconnectedError,
   RealtimeRequestInvalidAcknowledgementError,
@@ -31,7 +31,7 @@ import {
   RealtimeRequestPhaseSchema,
   RealtimeRequestRejectedError,
   RealtimeRequestTimeoutError
-} from "../index-2qzskm8h.js";
+} from "../index-dce5wxcq.js";
 import"../index-48ffdxgk.js";
 import {
   createContractFactory,
@@ -39,7 +39,7 @@ import {
   defineErrors,
   encodeCursor,
   paginatedSchema
-} from "../index-r7nmqpsg.js";
+} from "../index-7p1f0vp2.js";
 import {
   ContractStreamFrameSchema,
   DEFAULT_CONTRACT_STREAM_FRAME_BYTES
@@ -49,19 +49,20 @@ import {
   LiveStatePhaseSchema,
   LiveStateStopReasonSchema,
   createLiveStateController
-} from "../index-mkm15s49.js";
+} from "../index-1j8pm5t0.js";
 import"../index-d9pk3td4.js";
 import {
   ApiError,
   createHttpClient
-} from "../index-zeemqhqx.js";
+} from "../index-v260df89.js";
 import"../index-rxfy4cq7.js";
 import {
   ALL_TRANSPORTS,
   TOOL_TRANSPORTS,
   defineContract,
   withToolView
-} from "../index-gyr48nzg.js";
+} from "../index-k30h66yd.js";
+import"../index-4gcnakhx.js";
 import {
   ManagedFilePathSchema,
   ManagedFileRefSchema
@@ -92,93 +93,7 @@ import {
 } from "../index-2vtcmrj9.js";
 import"../index-kzfs85xp.js";
 import"../index-hffjpmq9.js";
-// src/browser/resumable.ts
-var DEFAULT_RETRY = { minDelayMs: 100, maxDelayMs: 30000, jitter: 0.5 };
-
-class ResumableAbortError extends Error {
-  constructor() {
-    super("Resumable iterator was aborted");
-    this.name = "ResumableAbortError";
-  }
-}
-function sleep(ms, signal) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      signal?.removeEventListener("abort", onAbort);
-      resolve();
-    }, ms);
-    function onAbort() {
-      clearTimeout(timer);
-      reject(new ResumableAbortError);
-    }
-    if (signal?.aborted) {
-      clearTimeout(timer);
-      reject(new ResumableAbortError);
-      return;
-    }
-    signal?.addEventListener("abort", onAbort, { once: true });
-  });
-}
-async function* resumableIterator(config) {
-  const backoff = createBackoff(config.retry ?? DEFAULT_RETRY, config.random);
-  let cursor;
-  let attempt = 0;
-  for (;; ) {
-    if (config.signal?.aborted)
-      return;
-    try {
-      const source = await config.open(cursor);
-      for await (const item of source) {
-        if (config.signal?.aborted)
-          return;
-        attempt = 0;
-        backoff.reset();
-        cursor = config.advance(item, cursor);
-        yield item;
-        if (config.isTerminal?.(item))
-          return;
-      }
-      throw new Error("Resumable source ended without a terminal item");
-    } catch (error) {
-      if (config.signal?.aborted || error instanceof ResumableAbortError)
-        return;
-      attempt += 1;
-      const delayMs = backoff.next();
-      config.onAttempt?.({ number: attempt, delayMs, error });
-      try {
-        await sleep(delayMs, config.signal);
-      } catch {
-        return;
-      }
-    }
-  }
-}
-// src/browser/retained.ts
-function createRetainedTopics() {
-  const last = {};
-  return {
-    record(topic, payload) {
-      last[topic] = payload;
-    },
-    replay(topic, handler) {
-      const value = last[topic];
-      if (value !== undefined)
-        handler(value);
-    },
-    get(topic) {
-      return last[topic];
-    },
-    clear(topic) {
-      if (topic !== undefined) {
-        delete last[topic];
-        return;
-      }
-      for (const key of Object.keys(last))
-        Reflect.deleteProperty(last, key);
-    }
-  };
-}
-// src/browser/socket-io.ts
+// src/browser/socket-io-trace.ts
 var realtimeRequestTraces = new WeakMap;
 function observeRealtimeRequestPhase(trace, phase) {
   const observation = {
@@ -241,52 +156,83 @@ function socketIoPacketIdentity(data, expected) {
 function packetIdentityKey(identity) {
   return `${identity.namespace}:${identity.id}`;
 }
-var SOCKET_IO_CLIENT = "socket.io-client";
-var ioLoader = null;
-function loadIo() {
-  if (!ioLoader) {
-    ioLoader = import(/* webpackIgnore: true */ SOCKET_IO_CLIENT).then((mod) => mod.io, (cause) => {
-      ioLoader = null;
-      throw new Error("stitchkit: createSocketIOClient needs the \"socket.io-client\" peer — install it (e.g. `bun add socket.io-client`). Shipping one self-contained artifact instead? Pass `peers: { client: () => import('socket.io-client') }` so your bundler puts it inside.", { cause });
-    });
-  }
-  return ioLoader;
-}
-function isIoModule(module) {
-  if (typeof module !== "object" || module === null)
-    return false;
-  return typeof Reflect.get(module, "io") === "function";
-}
-function createIoResolver(injected) {
-  if (!injected)
-    return loadIo;
-  let pending = null;
-  return () => {
-    if (!pending) {
-      pending = injected().then((module) => {
-        const io = isIoModule(module) ? module.io : null;
-        if (!io) {
-          pending = null;
-          throw new Error("stitchkit: the loader passed in `peers.client` did not return the \"socket.io-client\" module — it must resolve to the module itself, as `() => import('socket.io-client')`.");
-        }
-        return io;
-      }, (cause) => {
-        pending = null;
-        if (!isModuleNotFound(cause))
-          throw cause;
-        throw new Error('stitchkit: createSocketIOClient could not load "socket.io-client" through the loader passed in `peers` — the artifact does not contain it. Check that the loader is a literal `import(\'socket.io-client\')` your bundler can follow, and that "socket.io-client" is a dependency of the package being bundled.', { cause });
+function createRequestTracer(onRequestPhase) {
+  const requestTracesByNativeKey = new Map;
+  const observedRequestEngines = new WeakSet;
+  let startingRequestTrace = null;
+  return {
+    start(event, onPhase) {
+      if (!onRequestPhase && !onPhase)
+        return;
+      const trace = {
+        requestId: randomHex(16),
+        event,
+        startedAt: performance.now(),
+        observeClient: onRequestPhase,
+        observeRequest: onPhase,
+        closed: false
+      };
+      return trace;
+    },
+    close(trace, phase) {
+      if (!trace || trace.closed)
+        return;
+      trace.closed = true;
+      if (trace.nativeKey)
+        requestTracesByNativeKey.delete(trace.nativeKey);
+      observeRealtimeRequestPhase(trace, phase);
+    },
+    starting(trace, emit) {
+      startingRequestTrace = trace ?? null;
+      try {
+        return emit();
+      } finally {
+        startingRequestTrace = null;
+      }
+    },
+    observeEachOpen(target, current) {
+      if (!onRequestPhase)
+        return;
+      target.io.on("open", () => {
+        const socket = current();
+        if (socket)
+          this.observe(socket);
+      });
+    },
+    observe(target) {
+      const engine = target.io.engine;
+      if (!engine || observedRequestEngines.has(engine))
+        return;
+      observedRequestEngines.add(engine);
+      engine.on("packetCreate", (packet) => {
+        if (!startingRequestTrace || packet.type !== "message")
+          return;
+        const identity = socketIoPacketIdentity(packet.data, "event");
+        if (!identity)
+          return;
+        const key = packetIdentityKey(identity);
+        startingRequestTrace.nativeKey = key;
+        requestTracesByNativeKey.set(key, startingRequestTrace);
+        observeRealtimeRequestPhase(startingRequestTrace, "engine-handoff");
+      });
+      engine.on("packet", (packet) => {
+        if (packet.type !== "message")
+          return;
+        const identity = socketIoPacketIdentity(packet.data, "ack");
+        if (!identity)
+          return;
+        const key = packetIdentityKey(identity);
+        const trace = requestTracesByNativeKey.get(key);
+        if (!trace || trace.closed)
+          return;
+        observeRealtimeRequestPhase(trace, "engine-ack-received");
+        requestTracesByNativeKey.delete(key);
       });
     }
-    return pending;
-  };
-}
-function toIoAuth(auth) {
-  if (typeof auth !== "function")
-    return auth;
-  return (cb) => {
-    Promise.resolve().then(auth).then(cb, () => cb({}));
   };
 }
+
+// src/browser/realtime-client.ts
 function assertRealtimeClientTransport(transport) {
   for (const capability of ["on", "emit", "emitWithAck", "onConnectionChange"]) {
     if (typeof Reflect.get(transport, capability) !== "function") {
@@ -361,6 +307,244 @@ function bindRealtimeClient(contract, transport, { onRejected, logger } = {}) {
     onConnectionChange: (listener) => transport.onConnectionChange(listener)
   };
 }
+// src/browser/resumable.ts
+var DEFAULT_RETRY = { minDelayMs: 100, maxDelayMs: 30000, jitter: 0.5 };
+
+class ResumableAbortError extends Error {
+  constructor() {
+    super("Resumable iterator was aborted");
+    this.name = "ResumableAbortError";
+  }
+}
+function sleep(ms, signal) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    function onAbort() {
+      clearTimeout(timer);
+      reject(new ResumableAbortError);
+    }
+    if (signal?.aborted) {
+      clearTimeout(timer);
+      reject(new ResumableAbortError);
+      return;
+    }
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+async function* resumableIterator(config) {
+  const backoff = createBackoff(config.retry ?? DEFAULT_RETRY, config.random);
+  let cursor;
+  let attempt = 0;
+  for (;; ) {
+    if (config.signal?.aborted)
+      return;
+    try {
+      const source = await config.open(cursor);
+      for await (const item of source) {
+        if (config.signal?.aborted)
+          return;
+        attempt = 0;
+        backoff.reset();
+        cursor = config.advance(item, cursor);
+        yield item;
+        if (config.isTerminal?.(item))
+          return;
+      }
+      throw new Error("Resumable source ended without a terminal item");
+    } catch (error) {
+      if (config.signal?.aborted || error instanceof ResumableAbortError)
+        return;
+      attempt += 1;
+      const delayMs = backoff.next();
+      config.onAttempt?.({ number: attempt, delayMs, error });
+      try {
+        await sleep(delayMs, config.signal);
+      } catch {
+        return;
+      }
+    }
+  }
+}
+// src/browser/retained.ts
+function createRetainedTopics() {
+  const last = {};
+  return {
+    record(topic, payload) {
+      last[topic] = payload;
+    },
+    replay(topic, handler) {
+      const value = last[topic];
+      if (value !== undefined)
+        handler(value);
+    },
+    get(topic) {
+      return last[topic];
+    },
+    clear(topic) {
+      if (topic !== undefined) {
+        delete last[topic];
+        return;
+      }
+      for (const key of Object.keys(last))
+        Reflect.deleteProperty(last, key);
+    }
+  };
+}
+// src/browser/socket-io-connection.ts
+function toIoAuth(auth) {
+  if (typeof auth !== "function")
+    return auth;
+  return (cb) => {
+    Promise.resolve().then(auth).then(cb, () => cb({}));
+  };
+}
+function ioOptions(config) {
+  return {
+    path: config.path ?? "/socket.io/",
+    withCredentials: config.withCredentials ?? true,
+    auth: toIoAuth(config.auth),
+    ...config.query && { query: config.query },
+    ...config.extraHeaders && { extraHeaders: config.extraHeaders },
+    transports: config.transports ?? ["websocket", "polling"],
+    autoConnect: false,
+    reconnection: true,
+    reconnectionAttempts: config.reconnectionAttempts ?? Infinity,
+    reconnectionDelay: config.reconnectionDelay ?? 1000,
+    reconnectionDelayMax: config.reconnectionDelayMax ?? 5000,
+    timeout: config.timeout ?? 20000
+  };
+}
+function reportPeerFailure(config, error) {
+  if (!config.onConnectError)
+    throw error;
+  config.onConnectError({
+    message: error instanceof Error ? error.message : String(error),
+    data: error,
+    terminal: true
+  });
+}
+function awaitAcknowledgement(input) {
+  const { active, event } = input;
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const finish = (result) => {
+      if (settled)
+        return;
+      settled = true;
+      input.pendingRequestDisconnects.delete(onDisconnect);
+      active.off("disconnect", onDisconnect);
+      result();
+    };
+    const onDisconnect = () => {
+      finish(() => {
+        input.closeTrace("disconnected");
+        reject(new RealtimeRequestDisconnectedError(event));
+      });
+    };
+    input.pendingRequestDisconnects.add(onDisconnect);
+    active.on("disconnect", onDisconnect);
+    const acknowledgement = input.emit();
+    acknowledgement.then((value) => finish(() => resolve(value)), () => {
+      finish(() => {
+        const connected = active.connected;
+        input.closeTrace(connected ? "timeout" : "disconnected");
+        reject(connected ? new RealtimeRequestTimeoutError(event, input.timeoutMs) : new RealtimeRequestDisconnectedError(event));
+      });
+    });
+  });
+}
+function createStickyEvents(retain) {
+  const names = retain ? retain.map(String) : [];
+  const known = new Set(names);
+  const retained = names.length > 0 ? createRetainedTopics() : null;
+  return {
+    record(socket) {
+      if (!retained)
+        return;
+      for (const name of names) {
+        socket.on(name, (payload) => retained.record(name, payload));
+      }
+    },
+    replay(name, handler) {
+      if (retained && known.has(name))
+        retained.replay(name, (payload) => handler(payload));
+    }
+  };
+}
+function createRecycle(delay) {
+  let timer = null;
+  const clear = () => {
+    if (timer === null)
+      return;
+    clearTimeout(timer);
+    timer = null;
+  };
+  return {
+    clear,
+    schedule(run) {
+      if (delay === false)
+        return;
+      clear();
+      timer = setTimeout(() => {
+        timer = null;
+        run();
+      }, delay);
+    }
+  };
+}
+function connectErrorReport(error, socket) {
+  return {
+    message: error.message,
+    data: Reflect.get(error, "data"),
+    terminal: socket !== null && !socket.active
+  };
+}
+
+// src/browser/socket-io-peer.ts
+var SOCKET_IO_CLIENT = "socket.io-client";
+var ioLoader = null;
+function loadIo() {
+  if (!ioLoader) {
+    ioLoader = import(/* webpackIgnore: true */ SOCKET_IO_CLIENT).then((mod) => mod.io, (cause) => {
+      ioLoader = null;
+      throw new Error("stitchkit: createSocketIOClient needs the \"socket.io-client\" peer — install it (e.g. `bun add socket.io-client`). Shipping one self-contained artifact instead? Pass `peers: { client: () => import('socket.io-client') }` so your bundler puts it inside.", { cause });
+    });
+  }
+  return ioLoader;
+}
+function isIoModule(module) {
+  if (typeof module !== "object" || module === null)
+    return false;
+  return typeof Reflect.get(module, "io") === "function";
+}
+function createIoResolver(injected) {
+  if (!injected)
+    return loadIo;
+  let pending = null;
+  return () => {
+    if (!pending) {
+      pending = injected().then((module) => {
+        const io = isIoModule(module) ? module.io : null;
+        if (!io) {
+          pending = null;
+          throw new Error("stitchkit: the loader passed in `peers.client` did not return the \"socket.io-client\" module — it must resolve to the module itself, as `() => import('socket.io-client')`.");
+        }
+        return io;
+      }, (cause) => {
+        pending = null;
+        if (!isModuleNotFound(cause))
+          throw cause;
+        throw new Error('stitchkit: createSocketIOClient could not load "socket.io-client" through the loader passed in `peers` — the artifact does not contain it. Check that the loader is a literal `import(\'socket.io-client\')` your bundler can follow, and that "socket.io-client" is a dependency of the package being bundled.', { cause });
+      });
+    }
+    return pending;
+  };
+}
+
+// src/browser/socket-io.ts
 function createRealtimeClient(contract, { onRejected, logger, onRequestPhase, ...config }) {
   const transport = createSocketIOClientInternal(config, onRequestPhase);
   const bound = bindRealtimeClient(contract, transport, { onRejected, logger });
@@ -381,125 +565,46 @@ function createSocketIOClientInternal(config, onRequestPhase) {
   const resolveIo = createIoResolver(config.peers?.client);
   let desiredConnected = false;
   let loadingPeer = false;
-  let reconnectTimer = null;
+  const recycle = createRecycle(config.reconnectOnServerDisconnect ?? 1000);
   const pendingRequestDisconnects = new Set;
-  const requestTracesByNativeKey = new Map;
-  const observedRequestEngines = new WeakSet;
-  let startingRequestTrace = null;
-  const serverDisconnectDelay = config.reconnectOnServerDisconnect ?? 1000;
+  const tracer = createRequestTracer(onRequestPhase);
   const connectionListeners = new Set;
   const subscriptions = new Set;
-  const retainNames = config.retain ? config.retain.map(String) : [];
-  const retainSet = new Set(retainNames);
-  const retained = retainNames.length > 0 ? createRetainedTopics() : null;
+  const sticky = createStickyEvents(config.retain);
   function notifyConnection(connected, reason) {
     for (const listener of connectionListeners)
       listener(connected, reason);
   }
-  function clearReconnectTimer() {
-    if (reconnectTimer !== null) {
-      clearTimeout(reconnectTimer);
-      reconnectTimer = null;
-    }
-  }
-  function attachRequestPhaseEngineListeners(target) {
-    const engine = target.io.engine;
-    if (!engine || observedRequestEngines.has(engine))
-      return;
-    observedRequestEngines.add(engine);
-    engine.on("packetCreate", (packet) => {
-      if (!startingRequestTrace || packet.type !== "message")
-        return;
-      const identity = socketIoPacketIdentity(packet.data, "event");
-      if (!identity)
-        return;
-      const key = packetIdentityKey(identity);
-      startingRequestTrace.nativeKey = key;
-      requestTracesByNativeKey.set(key, startingRequestTrace);
-      observeRealtimeRequestPhase(startingRequestTrace, "engine-handoff");
-    });
-    engine.on("packet", (packet) => {
-      if (packet.type !== "message")
-        return;
-      const identity = socketIoPacketIdentity(packet.data, "ack");
-      if (!identity)
-        return;
-      const key = packetIdentityKey(identity);
-      const trace = requestTracesByNativeKey.get(key);
-      if (!trace || trace.closed)
-        return;
-      observeRealtimeRequestPhase(trace, "engine-ack-received");
-      requestTracesByNativeKey.delete(key);
-    });
-  }
   function openSocket(io) {
     if (!desiredConnected || socket)
       return;
-    socket = io(config.url, {
-      path: config.path ?? "/socket.io/",
-      withCredentials: config.withCredentials ?? true,
-      auth: toIoAuth(config.auth),
-      ...config.query && { query: config.query },
-      ...config.extraHeaders && { extraHeaders: config.extraHeaders },
-      transports: config.transports ?? ["websocket", "polling"],
-      autoConnect: false,
-      reconnection: true,
-      reconnectionAttempts: config.reconnectionAttempts ?? Infinity,
-      reconnectionDelay: config.reconnectionDelay ?? 1000,
-      reconnectionDelayMax: config.reconnectionDelayMax ?? 5000,
-      timeout: config.timeout ?? 20000
-    });
-    if (onRequestPhase) {
-      socket.io.on("open", () => {
-        if (socket)
-          attachRequestPhaseEngineListeners(socket);
-      });
-    }
+    socket = io(config.url, ioOptions(config));
+    tracer.observeEachOpen(socket, () => socket);
     socket.on("connect", () => notifyConnection(true));
     socket.on("disconnect", (reason) => {
       notifyConnection(false, reason);
-      if (reason === "io server disconnect" && serverDisconnectDelay !== false) {
+      if (reason === "io server disconnect") {
         const current = socket;
-        clearReconnectTimer();
-        reconnectTimer = setTimeout(() => {
-          reconnectTimer = null;
+        recycle.schedule(() => {
           if (socket === current && current && !current.connected)
             current.connect();
-        }, serverDisconnectDelay);
+        });
       }
     });
     socket.io.on("reconnect_failed", () => {
       desiredConnected = false;
     });
     socket.on("connect_error", (error) => {
-      const terminal = socket !== null && !socket.active;
-      if (terminal)
+      const report = connectErrorReport(error, socket);
+      if (report.terminal)
         desiredConnected = false;
-      config.onConnectError?.({
-        message: error.message,
-        data: Reflect.get(error, "data"),
-        terminal
-      });
+      config.onConnectError?.(report);
     });
-    if (retained) {
-      for (const name of retainNames) {
-        socket.on(name, (payload) => retained.record(name, payload));
-      }
-    }
+    sticky.record(socket);
     for (const attach of subscriptions)
       attach(socket);
     socket.connect();
   }
-  function reportPeerFailure(error) {
-    desiredConnected = false;
-    if (!config.onConnectError)
-      throw error;
-    config.onConnectError({
-      message: error instanceof Error ? error.message : String(error),
-      data: error,
-      terminal: true
-    });
-  }
   return {
     get connected() {
       return socket?.connected ?? false;
@@ -520,12 +625,13 @@ function createSocketIOClientInternal(config, onRequestPhase) {
         openSocket(io);
       }, (error) => {
         loadingPeer = false;
-        reportPeerFailure(error);
+        desiredConnected = false;
+        reportPeerFailure(config, error);
       });
     },
     disconnect() {
       desiredConnected = false;
-      clearReconnectTimer();
+      recycle.clear();
       for (const reject of [...pendingRequestDisconnects])
         reject();
       if (!socket)
@@ -545,10 +651,8 @@ function createSocketIOClientInternal(config, onRequestPhase) {
       subscriptions.add(attach);
       if (socket)
         attach(socket);
-      if (retained && retainSet.has(name)) {
-        const fn = handler;
-        retained.replay(name, (payload) => fn(payload));
-      }
+      const fn = handler;
+      sticky.replay(name, fn);
       return () => {
         subscriptions.delete(attach);
         socket?.off(name, handler);
@@ -564,22 +668,8 @@ function createSocketIOClientInternal(config, onRequestPhase) {
       return true;
     },
     emitWithAck(event, args, options) {
-      const trace = onRequestPhase || options.onPhase ? {
-        requestId: randomHex(16),
-        event,
-        startedAt: performance.now(),
-        observeClient: onRequestPhase,
-        observeRequest: options.onPhase,
-        closed: false
-      } : undefined;
-      const closeTrace = (phase) => {
-        if (!trace || trace.closed)
-          return;
-        trace.closed = true;
-        if (trace.nativeKey)
-          requestTracesByNativeKey.delete(trace.nativeKey);
-        observeRealtimeRequestPhase(trace, phase);
-      };
+      const trace = tracer.start(event, options.onPhase);
+      const closeTrace = (phase) => tracer.close(trace, phase);
       const active = socket;
       if (!active?.connected) {
         const pending2 = Promise.reject(new RealtimeRequestDisconnectedError(event));
@@ -589,39 +679,15 @@ function createSocketIOClientInternal(config, onRequestPhase) {
         return pending2;
       }
       if (trace)
-        attachRequestPhaseEngineListeners(active);
-      const pending = new Promise((resolve, reject) => {
-        let settled = false;
-        const finish = (result) => {
-          if (settled)
-            return;
-          settled = true;
-          pendingRequestDisconnects.delete(onDisconnect);
-          active.off("disconnect", onDisconnect);
-          result();
-        };
-        const onDisconnect = () => {
-          finish(() => {
-            closeTrace("disconnected");
-            reject(new RealtimeRequestDisconnectedError(event));
-          });
-        };
-        pendingRequestDisconnects.add(onDisconnect);
-        active.on("disconnect", onDisconnect);
-        let acknowledgement;
-        startingRequestTrace = trace ?? null;
-        try {
-          acknowledgement = active.timeout(options.timeoutMs).emitWithAck(event, ...args);
-        } finally {
-          startingRequestTrace = null;
-        }
-        acknowledgement.then((value) => finish(() => resolve(value)), () => {
-          finish(() => {
-            const connected = active.connected;
-            closeTrace(connected ? "timeout" : "disconnected");
-            reject(connected ? new RealtimeRequestTimeoutError(event, options.timeoutMs) : new RealtimeRequestDisconnectedError(event));
-          });
-        });
+        tracer.observe(active);
+      const pending = awaitAcknowledgement({
+        active,
+        event,
+        args,
+        timeoutMs: options.timeoutMs,
+        pendingRequestDisconnects,
+        closeTrace,
+        emit: () => tracer.starting(trace, () => active.timeout(options.timeoutMs).emitWithAck(event, ...args))
       });
       if (trace)
         realtimeRequestTraces.set(pending, trace);