@rocicorp/zero 1.11.0-canary.0 → 1.11.0-canary.10

package/out/zero-cache/src/types/streams.js.map

@@ -1 +1 @@
-{"version":3,"file":"streams.js","names":["#lc","#ws","#closeStream","#messageHandler","#connected","#handleOpen","#handleClose","#handleError","#conn"],"sources":["../../../../../zero-cache/src/types/streams.ts"],"sourcesContent":["import {\n  pipeline,\n  Readable,\n  Transform,\n  Writable,\n  type DuplexOptions,\n} from 'node:stream';\nimport type {LogContext} from '@rocicorp/logger';\nimport {resolver} from '@rocicorp/resolver';\nimport {\n  createWebSocketStream,\n  type CloseEvent,\n  type ErrorEvent,\n  type MessageEvent,\n  type WebSocket,\n} from 'ws';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {BigIntJSON, type JSONValue} from '../../../shared/src/bigint-json.ts';\nimport {Queue} from '../../../shared/src/queue.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {Subscription, type Options} from './subscription.ts';\nimport {\n  closeWithError,\n  expectPingsForLiveness,\n  sendPingsForLiveness,\n} from './ws.ts';\n\n// Consistent with Postgres keepalives, and shorter than the\n// commonly used default idle timeout of 1 minute.\nconst PING_INTERVAL_MS = 30_000;\n\nexport type Source<T> = AsyncIterable<T> & {\n  /**\n   * Immediately terminates all current iterations (i.e. {@link AsyncIterator.next next()})\n   * will return `{value: undefined, done: true}`), and prevents any subsequent iterations\n   * from yielding any values.\n   *\n   * @param err Terminate the iteration by throwing the `err` instead.\n   */\n  cancel: (err?: Error) => void;\n\n  /**\n   * An AbortSignal that can be used to listen for termination or\n   * race a short-lived promise against the termination of the iterable\n   * (via `promiseOrAbort()`)\n   */\n  readonly signal: AbortSignal;\n\n  /**\n   * The presence of a `pipeline` iterable allows the usual \"consumed-on-iterate\" semantics\n   * to be overridden.\n   *\n   * This is suitable for transport layers that serialize messages across processes, such\n   * as the {@link streamOut()} method; pipelining allows the transport to send messages\n   * as they arrive without waiting for the previous message to be acked, streaming\n   * them to the receiving process where they are presumably queued and processed without\n   * a per-message ack delay. The receiving end of the transport then responds with acks\n   * asynchronously as the receiving end processes the messages.\n   */\n  pipeline?: AsyncIterable<{value: T; consumed: () => void}> | undefined;\n};\n\nexport type Sink<T> = {\n  push(message: T): void;\n};\n\n/**\n * Back-pressure-aware transformation of a WebSocket into\n * upstream and downstream {@link Subscription} objects.\n */\n// TODO: Change {@link streamIn} and {@link streamOut} to use this\n//       under the covers so that internal communication is also\n//       responsive to backpressure.\nexport function stream<In extends JSONValue, Out extends JSONValue>(\n  lc: LogContext,\n  ws: WebSocket,\n  inSchema: v.Type<In>,\n  outOptions: Options<Out> = {},\n  inOptions: Options<In> = {},\n  streamOptions: DuplexOptions = {},\n): {outstream: Sink<Out>; instream: Source<In>} {\n  const endpoint = ws.url ?? 'client';\n  function close(err?: unknown) {\n    if (ws.readyState !== ws.CLOSED && ws.readyState !== ws.CLOSING) {\n      if (err) {\n        closeWithError(lc, ws, err);\n      } else {\n        lc.info?.(`closing connection to ${endpoint}`);\n        ws.close();\n      }\n    }\n  }\n\n  const instream = Subscription.create<In>({\n    ...inOptions,\n    cleanup: (unconsumed, err) => {\n      inOptions.cleanup?.(unconsumed, err);\n      close(err);\n    },\n  });\n  const outstream = Subscription.create<Out>({\n    ...outOptions,\n    cleanup: (unconsumed, err) => {\n      outOptions.cleanup?.(unconsumed, err);\n      close(err);\n    },\n  });\n\n  const duplex = createWebSocketStream(ws, {\n    ...streamOptions,\n    decodeStrings: false,\n  });\n\n  // Outgoing transform.\n  function streamOut() {\n    // Mainly used for verifying that back-pressure kicks in tests.\n    duplex.on('drain', () => lc.debug?.(`drained messages to ${endpoint}`));\n\n    pipeline(\n      Readable.from(outstream),\n      new Transform({\n        objectMode: true,\n        transform: (msg, _encoding, callback) =>\n          callback(null, BigIntJSON.stringify(msg)),\n      }),\n      duplex,\n      err => (err ? outstream.fail(err) : outstream.cancel()),\n    );\n  }\n\n  if (ws.readyState === ws.CONNECTING) {\n    ws.on('open', () => {\n      lc.info?.(`connected to ${endpoint}`);\n      streamOut();\n    });\n  } else {\n    streamOut();\n  }\n\n  // Incoming transform.\n  pipe({\n    source: duplex,\n    sink: instream,\n    parse: chunk => {\n      const json = BigIntJSON.parse(chunk.toString());\n      return v.parse(json, inSchema, 'passthrough');\n    },\n  });\n\n  sendPingsForLiveness(lc, ws, PING_INTERVAL_MS);\n\n  return {outstream, instream};\n}\n\ntype PipeOptions<T> = {\n  source: Readable;\n  sink: Subscription<T>;\n  parse: (buffer: Buffer) => T | null;\n  bufferMessages?: number;\n};\n\nexport function pipe<T>({source, sink, parse, bufferMessages}: PipeOptions<T>) {\n  bufferMessages ??= 0;\n  assert(bufferMessages >= 0, 'bufferMessages must be non-negative');\n  const pending: Promise<unknown>[] = [];\n\n  pipeline(\n    source,\n    new Writable({\n      decodeStrings: false,\n      write: (chunk, _encoding, callback) => {\n        let msg: T | null;\n        try {\n          if ((msg = parse(chunk)) === null) {\n            callback();\n            return;\n          }\n        } catch (err) {\n          callback(ensureError(err));\n          return;\n        }\n        // Inbound backpressure is exerted by unconsumed messages in the\n        // subscription. A buffer can be used to allow messages to queue up in\n        // in the Subscription object, which allows the consumer to \"peek\" at\n        // whether there are more messages immediately available\n        // (via {@link Subscription.queued}.\n        const {result} = sink.push(msg);\n        pending.push(result);\n        void result.then(() => pending.shift());\n\n        if (pending.length <= bufferMessages) {\n          // immediately allow more messages\n          callback();\n        } else {\n          // wait for the oldest result in the pending queue\n          pending[0].then(\n            () => callback(),\n            err => callback(ensureError(err)),\n          );\n        }\n      },\n      destroy: (err, callback) => {\n        if (err) {\n          sink.fail(ensureError(err));\n        }\n        // Otherwise, final will handle the cancel.\n        callback();\n      },\n      final: callback => {\n        sink.cancel();\n        callback();\n      },\n    }),\n    err => (err ? sink.fail(err) : sink.cancel()),\n  );\n}\n\nfunction ensureError(err: unknown) {\n  return err instanceof Error ? err : new Error(String(err));\n}\n\nconst ackSchema = v.object({ack: v.number()});\n\ntype Ack = v.Infer<typeof ackSchema>;\n\n/** A parsed JSON value paired with the exact source text it was parsed from. */\nexport type ParsedJSON<T> = {\n  data: T;\n  json: string;\n};\n\nexport function streamOut<T extends JSONValue>(\n  lc: LogContext,\n  source: Source<T>,\n  sink: WebSocket,\n): Promise<void> {\n  return streamOutInternal(lc, source, sink, BigIntJSON.stringify);\n}\n\n/**\n * Streams out a `Source` for which messages are already stringified JSON.\n */\nexport function streamOutStringified(\n  lc: LogContext,\n  source: Source<string>,\n  sink: WebSocket,\n): Promise<void> {\n  return streamOutInternal(lc, source, sink, json => json);\n}\n\nasync function streamOutInternal<T extends JSONValue>(\n  lc: LogContext,\n  source: Source<T>,\n  sink: WebSocket,\n  stringify: (payload: T) => string,\n): Promise<void> {\n  sendPingsForLiveness(lc, sink, PING_INTERVAL_MS);\n\n  const closer = WebSocketCloser.forSource(lc, sink, source);\n\n  const acks = new Queue<Ack>();\n  sink.addEventListener('message', ({data}) => {\n    try {\n      if (typeof data !== 'string') {\n        throw new Error('Expected string message');\n      }\n      acks.enqueue(v.parse(JSON.parse(data), ackSchema));\n    } catch (e) {\n      lc.error?.(`error parsing ack`, e);\n      closer.close(e);\n    }\n  });\n\n  try {\n    let nextID = 0;\n    const {pipeline} = source;\n    if (pipeline) {\n      lc.debug?.(`started pipelined outbound stream`);\n      for await (const {value: msg, consumed} of pipeline) {\n        const id = ++nextID;\n        const data = `{\"id\":${id},\"msg\":${stringify(msg)}}`;\n        // Enable for debugging. Otherwise too verbose.\n        // lc.debug?.(`pipelining`, data);\n        sink.send(data);\n\n        void (async () => {\n          const {ack} = await acks.dequeue();\n          // lc.debug?.(`received ack`, ack);\n          if (ack !== id) {\n            throw new Error(`Unexpected ack for ${id}: ${ack}`);\n          }\n          consumed();\n        })();\n      }\n    } else {\n      lc.debug?.(`started synchronous outbound stream`);\n      for await (const msg of source) {\n        const id = ++nextID;\n        const data = `{\"id\":${id},\"msg\":${stringify(msg)}}`;\n        // Enable for debugging. Otherwise too verbose.\n        // lc.debug?.(`sending`, data);\n        sink.send(data);\n\n        const {ack} = await acks.dequeue();\n        if (ack !== id) {\n          throw new Error(`Unexpected ack for ${id}: ${ack}`);\n        }\n      }\n    }\n    closer.close();\n  } catch (e) {\n    closer.close(e);\n  }\n}\n\nexport function streamIn<T extends JSONValue>(\n  lc: LogContext,\n  source: WebSocket,\n  schema: v.Type<T>,\n): Promise<Source<T>> {\n  return streamInInternal(lc, source, schema, data => data);\n}\n\n/**\n * Streams in messages sent by {@link streamOutStringified}, preserving the\n * exact application-level JSON alongside its parsed and validated value.\n */\nexport function streamInStringified<T extends JSONValue>(\n  lc: LogContext,\n  source: WebSocket,\n  schema: v.Type<T>,\n): Promise<Source<ParsedJSON<T>>> {\n  return streamInInternal(lc, source, schema, (data, frame, id) => ({\n    data,\n    json: extractStringifiedMessage(frame, id),\n  }));\n}\n\nasync function streamInInternal<T extends JSONValue, Out>(\n  lc: LogContext,\n  source: WebSocket,\n  schema: v.Type<T>,\n  transform: (data: T, frame: string, id: number) => Out,\n): Promise<Source<Out>> {\n  expectPingsForLiveness(lc, source, PING_INTERVAL_MS);\n\n  const streamedSchema = v.object({\n    msg: schema,\n    id: v.number(),\n  });\n\n  const sink: Subscription<Out, {id: number; data: Out}> = new Subscription<\n    Out,\n    {id: number; data: Out}\n  >(\n    {\n      consumed: ({id}) => source.send(JSON.stringify({ack: id} satisfies Ack)),\n      cleanup: () => closer.close(),\n    },\n    ({data}) => data,\n  );\n\n  const closer = WebSocketCloser.forSink(lc, source, sink, handleMessage);\n\n  function handleMessage(event: MessageEvent) {\n    const data = event.data.toString();\n    if (!sink.active) {\n      lc.warn?.('dropping ws message received after close', data);\n      return;\n    }\n    try {\n      const value = BigIntJSON.parse(data);\n      const msg = v.parse(value, streamedSchema, 'passthrough');\n      // Enable for debugging. Otherwise too verbose.\n      // lc.debug?.(`received`, data);\n      sink.push({id: msg.id, data: transform(msg.msg, data, msg.id)});\n    } catch (e) {\n      closer.close(e);\n    }\n  }\n\n  await closer.connected;\n  return sink;\n}\n\nfunction extractStringifiedMessage(frame: string, id: number): string {\n  const prefix = `{\"id\":${id},\"msg\":`;\n  assert(\n    frame.startsWith(prefix) && frame.endsWith('}'),\n    `invalid streamed message frame`,\n  );\n  return frame.slice(prefix.length, -1);\n}\n\nclass WebSocketCloser {\n  readonly #lc: LogContext;\n  readonly #ws: WebSocket;\n  readonly #closeStream: () => void;\n  readonly #messageHandler: ((e: MessageEvent) => void | undefined) | null;\n  readonly #connected = resolver();\n\n  get connected(): Promise<void> {\n    return this.#connected.promise;\n  }\n\n  static forSource<T>(lc: LogContext, ws: WebSocket, stream: Source<T>) {\n    // If the websocket is closed, call cancel() to notify the Source of\n    // any unconsumed messages.\n    return new WebSocketCloser(lc, ws, () => stream.cancel());\n  }\n\n  static forSink<T, Input>(\n    lc: LogContext,\n    ws: WebSocket,\n    stream: Subscription<T, Input>,\n    messageHandler: (e: MessageEvent) => void | undefined,\n  ) {\n    // If the websocket is closed, call end() to allow the downstream Sink\n    // to process any pending messages before closing the stream.\n    return new WebSocketCloser(lc, ws, () => stream.end(), messageHandler);\n  }\n\n  private constructor(\n    lc: LogContext,\n    ws: WebSocket,\n    closeStream: () => void,\n    messageHandler?: (e: MessageEvent) => void | undefined,\n  ) {\n    this.#lc = lc;\n    this.#ws = ws;\n    this.#closeStream = closeStream;\n    this.#messageHandler = messageHandler ?? null;\n\n    ws.addEventListener('open', this.#handleOpen);\n    ws.addEventListener('close', this.#handleClose);\n    ws.addEventListener('error', this.#handleError);\n    if (this.#messageHandler) {\n      ws.addEventListener('message', this.#messageHandler);\n    }\n\n    switch (ws.readyState) {\n      case ws.CONNECTING:\n        break; // expected for new connections. resolve or reject in handlers.\n      case ws.OPEN:\n        this.#connected.resolve();\n        break;\n      default:\n        this.#connected.reject(\n          new Error(`websocket already in state ${ws.readyState}`),\n        );\n        break;\n    }\n  }\n\n  get #conn(): string {\n    return 'connection' + (this.#ws.url ? ` to ${this.#ws.url}` : '');\n  }\n\n  #handleOpen = () => {\n    this.#lc.info?.(`${this.#conn} established`);\n    this.#connected.resolve();\n  };\n\n  #handleClose = (e: CloseEvent) => {\n    const {code, reason, wasClean} = e;\n    this.#lc.info?.(`${this.#conn} closed`, {\n      code,\n      reason,\n      wasClean,\n    });\n    this.close();\n    this.#connected.reject(`${this.#conn} closed with code ${code}`);\n  };\n\n  #handleError = ({message, error}: ErrorEvent) => {\n    if (this.#ws.readyState === this.#ws.OPEN) {\n      this.#lc.error?.(`error in ${this.#conn}`, message, error);\n    }\n    this.#connected.reject(error);\n  };\n\n  close(err?: unknown) {\n    if (err) {\n      this.#lc.error?.(`closing stream with error`, err);\n    }\n    this.#closeStream();\n    if (!this.closed()) {\n      this.#ws.close();\n    }\n  }\n\n  closed() {\n    return (\n      this.#ws.readyState === this.#ws.CLOSED ||\n      this.#ws.readyState === this.#ws.CLOSING\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"streams.js","names":["#lc","#ws","#closeStream","#messageHandler","#connected","#handleOpen","#handleClose","#handleError","#conn"],"sources":["../../../../../zero-cache/src/types/streams.ts"],"sourcesContent":["import {\n  pipeline,\n  Readable,\n  Transform,\n  Writable,\n  type DuplexOptions,\n} from 'node:stream';\nimport type {LogContext} from '@rocicorp/logger';\nimport {resolver} from '@rocicorp/resolver';\nimport {\n  createWebSocketStream,\n  type CloseEvent,\n  type ErrorEvent,\n  type MessageEvent,\n  type WebSocket,\n} from 'ws';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {BigIntJSON, type JSONValue} from '../../../shared/src/bigint-json.ts';\nimport {Queue} from '../../../shared/src/queue.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {Subscription, type Options} from './subscription.ts';\nimport {\n  closeWithError,\n  expectPingsForLiveness,\n  sendPingsForLiveness,\n} from './ws.ts';\n\n// Consistent with Postgres keepalives, and shorter than the\n// commonly used default idle timeout of 1 minute.\nconst PING_INTERVAL_MS = 30_000;\n\nexport type Source<T> = AsyncIterable<T> & {\n  /**\n   * Immediately terminates all current iterations (i.e. {@link AsyncIterator.next next()})\n   * will return `{value: undefined, done: true}`), and prevents any subsequent iterations\n   * from yielding any values.\n   *\n   * @param err Terminate the iteration by throwing the `err` instead.\n   */\n  cancel: (err?: Error) => void;\n\n  /**\n   * An AbortSignal that can be used to listen for termination or\n   * race a short-lived promise against the termination of the iterable\n   * (via `promiseOrAbort()`)\n   */\n  readonly signal: AbortSignal;\n\n  /**\n   * The presence of a `pipeline` iterable allows the usual \"consumed-on-iterate\" semantics\n   * to be overridden.\n   *\n   * This is suitable for transport layers that serialize messages across processes, such\n   * as the {@link streamOut()} method; pipelining allows the transport to send messages\n   * as they arrive without waiting for the previous message to be acked, streaming\n   * them to the receiving process where they are presumably queued and processed without\n   * a per-message ack delay. The receiving end of the transport then responds with acks\n   * asynchronously as the receiving end processes the messages.\n   */\n  pipeline?: AsyncIterable<{value: T; consumed: () => void}> | undefined;\n\n  /**\n   * Pipelined batching support: eagerly drains available queued messages up to `maxBatch`.\n   */\n  pipelineBatched?:\n    | ((\n        maxBatch?: number,\n      ) => AsyncIterable<{values: T[]; consumed: () => void}> | undefined)\n    | undefined;\n};\n\nexport type Sink<T> = {\n  push(message: T): void;\n};\n\n/**\n * Back-pressure-aware transformation of a WebSocket into\n * upstream and downstream {@link Subscription} objects.\n */\n// TODO: Change {@link streamIn} and {@link streamOut} to use this\n//       under the covers so that internal communication is also\n//       responsive to backpressure.\nexport function stream<In extends JSONValue, Out extends JSONValue>(\n  lc: LogContext,\n  ws: WebSocket,\n  inSchema: v.Type<In>,\n  outOptions: Options<Out> = {},\n  inOptions: Options<In> = {},\n  streamOptions: DuplexOptions = {},\n): {outstream: Sink<Out>; instream: Source<In>} {\n  const endpoint = ws.url ?? 'client';\n  function close(err?: unknown) {\n    if (ws.readyState !== ws.CLOSED && ws.readyState !== ws.CLOSING) {\n      if (err) {\n        closeWithError(lc, ws, err);\n      } else {\n        lc.info?.(`closing connection to ${endpoint}`);\n        ws.close();\n      }\n    }\n  }\n\n  const instream = Subscription.create<In>({\n    ...inOptions,\n    cleanup: (unconsumed, err) => {\n      inOptions.cleanup?.(unconsumed, err);\n      close(err);\n    },\n  });\n  const outstream = Subscription.create<Out>({\n    ...outOptions,\n    cleanup: (unconsumed, err) => {\n      outOptions.cleanup?.(unconsumed, err);\n      close(err);\n    },\n  });\n\n  const duplex = createWebSocketStream(ws, {\n    ...streamOptions,\n    decodeStrings: false,\n  });\n\n  // Outgoing transform.\n  function streamOut() {\n    // Mainly used for verifying that back-pressure kicks in tests.\n    duplex.on('drain', () => lc.debug?.(`drained messages to ${endpoint}`));\n\n    pipeline(\n      Readable.from(outstream),\n      new Transform({\n        objectMode: true,\n        transform: (msg, _encoding, callback) =>\n          callback(null, BigIntJSON.stringify(msg)),\n      }),\n      duplex,\n      err => (err ? outstream.fail(err) : outstream.cancel()),\n    );\n  }\n\n  if (ws.readyState === ws.CONNECTING) {\n    ws.on('open', () => {\n      lc.info?.(`connected to ${endpoint}`);\n      streamOut();\n    });\n  } else {\n    streamOut();\n  }\n\n  // Incoming transform.\n  pipe({\n    source: duplex,\n    sink: instream,\n    parse: chunk => {\n      const json = BigIntJSON.parse(chunk.toString());\n      return v.parse(json, inSchema, 'passthrough');\n    },\n  });\n\n  sendPingsForLiveness(lc, ws, PING_INTERVAL_MS);\n\n  return {outstream, instream};\n}\n\ntype PipeOptions<T> = {\n  source: Readable;\n  sink: Subscription<T>;\n  parse: (buffer: Buffer) => T | null;\n  bufferMessages?: number;\n};\n\nexport function pipe<T>({source, sink, parse, bufferMessages}: PipeOptions<T>) {\n  bufferMessages ??= 0;\n  assert(bufferMessages >= 0, 'bufferMessages must be non-negative');\n  const pending: Promise<unknown>[] = [];\n\n  pipeline(\n    source,\n    new Writable({\n      decodeStrings: false,\n      write: (chunk, _encoding, callback) => {\n        let msg: T | null;\n        try {\n          if ((msg = parse(chunk)) === null) {\n            callback();\n            return;\n          }\n        } catch (err) {\n          callback(ensureError(err));\n          return;\n        }\n        // Inbound backpressure is exerted by unconsumed messages in the\n        // subscription. A buffer can be used to allow messages to queue up in\n        // in the Subscription object, which allows the consumer to \"peek\" at\n        // whether there are more messages immediately available\n        // (via {@link Subscription.queued}.\n        const {result} = sink.push(msg);\n        pending.push(result);\n        void result.then(() => pending.shift());\n\n        if (pending.length <= bufferMessages) {\n          // immediately allow more messages\n          callback();\n        } else {\n          // wait for the oldest result in the pending queue\n          pending[0].then(\n            () => callback(),\n            err => callback(ensureError(err)),\n          );\n        }\n      },\n      destroy: (err, callback) => {\n        if (err) {\n          sink.fail(ensureError(err));\n        }\n        // Otherwise, final will handle the cancel.\n        callback();\n      },\n      final: callback => {\n        sink.cancel();\n        callback();\n      },\n    }),\n    err => (err ? sink.fail(err) : sink.cancel()),\n  );\n}\n\nfunction ensureError(err: unknown) {\n  return err instanceof Error ? err : new Error(String(err));\n}\n\nconst ackSchema = v.object({ack: v.number()});\n\ntype Ack = v.Infer<typeof ackSchema>;\n\n/** A parsed value paired with its approximate serialized transport size. */\nexport type Sized<T> = {\n  data: T;\n  size: number;\n};\n\nexport type StreamOutOptions = {\n  batched?: boolean | undefined;\n  maxBatchSize?: number | undefined;\n};\n\nexport type PreSerialized = {\n  readonly payload: Buffer;\n  readonly byteLength: number;\n};\n\nexport function isPreSerialized(val: unknown): val is PreSerialized {\n  return (\n    typeof val === 'object' &&\n    val !== null &&\n    'payload' in val &&\n    Buffer.isBuffer((val as PreSerialized).payload)\n  );\n}\n\nfunction sendTextFrame(sink: WebSocket, data: Buffer | string) {\n  if (typeof data === 'string') {\n    sink.send(data);\n  } else {\n    (sink as unknown as {send: (data: unknown, opts?: unknown) => void}).send(\n      data,\n      {binary: false},\n    );\n  }\n}\n\nexport function streamOut<T extends JSONValue>(\n  lc: LogContext,\n  source: Source<T>,\n  sink: WebSocket,\n  options?: StreamOutOptions | undefined,\n): Promise<void> {\n  return streamOutInternal(lc, source, sink, BigIntJSON.stringify, options);\n}\n\n/**\n * Streams out a `Source` for which messages are already stringified JSON or pre-serialized Buffers.\n */\nexport function streamOutStringified(\n  lc: LogContext,\n  source: Source<string | PreSerialized>,\n  sink: WebSocket,\n  options?: StreamOutOptions | undefined,\n): Promise<void> {\n  return streamOutInternal(\n    lc,\n    source,\n    sink,\n    msg => (typeof msg === 'string' ? msg : msg.payload.toString('utf8')),\n    options,\n  );\n}\n\nasync function streamOutInternal<T extends JSONValue | PreSerialized>(\n  lc: LogContext,\n  source: Source<T>,\n  sink: WebSocket,\n  stringify: (payload: T) => string,\n  options?: StreamOutOptions | undefined,\n): Promise<void> {\n  sendPingsForLiveness(lc, sink, PING_INTERVAL_MS);\n\n  const closer = WebSocketCloser.forSource(lc, sink, source);\n\n  const acks = new Queue<Ack>();\n  sink.addEventListener('message', ({data}) => {\n    try {\n      const text = typeof data === 'string' ? data : data.toString();\n      acks.enqueue(v.parse(JSON.parse(text), ackSchema));\n    } catch (e) {\n      lc.error?.(`error parsing ack`, e);\n      closer.close(e);\n    }\n  });\n\n  try {\n    let nextID = 0;\n    const {pipeline} = source;\n    const batched = options?.batched ?? false;\n    const maxBatchSize = Math.max(1, Math.floor(options?.maxBatchSize ?? 64));\n\n    if (batched && source.pipelineBatched) {\n      const batchedIterable = source.pipelineBatched(maxBatchSize);\n      if (batchedIterable) {\n        lc.debug?.(\n          `started batched outbound stream (maxBatchSize=${maxBatchSize})`,\n        );\n        for await (const {values, consumed} of batchedIterable) {\n          if (values.length === 1 && isPreSerialized(values[0])) {\n            const id = ++nextID;\n            const prefix = Buffer.from(`{\"id\":${id}`);\n            const data = Buffer.concat([prefix, values[0].payload]);\n            sendTextFrame(sink, data);\n\n            void (async () => {\n              const {ack} = await acks.dequeue();\n              if (ack !== id) {\n                throw new Error(`Unexpected ack for ${id}: ${ack}`);\n              }\n              consumed();\n            })().catch(e => closer.close(e));\n          } else if (values.some(isPreSerialized)) {\n            let remaining = values.length;\n            const onConsumed = () => {\n              if (--remaining === 0) {\n                consumed();\n              }\n            };\n            for (const val of values) {\n              const id = ++nextID;\n              if (isPreSerialized(val)) {\n                const prefix = Buffer.from(`{\"id\":${id}`);\n                const data = Buffer.concat([prefix, val.payload]);\n                sendTextFrame(sink, data);\n              } else {\n                const data = `{\"id\":${id},\"msg\":${stringify(val)}}`;\n                sink.send(data);\n              }\n              void (async () => {\n                const {ack} = await acks.dequeue();\n                if (ack !== id) {\n                  throw new Error(`Unexpected ack for ${id}: ${ack}`);\n                }\n                onConsumed();\n              })().catch(e => closer.close(e));\n            }\n          } else {\n            const id = ++nextID;\n            const data =\n              values.length === 1\n                ? `{\"id\":${id},\"msg\":${stringify(values[0])}}`\n                : `{\"id\":${id},\"batch\":[${values.map(stringify).join(',')}]}`;\n            sink.send(data);\n\n            void (async () => {\n              const {ack} = await acks.dequeue();\n              if (ack !== id) {\n                throw new Error(`Unexpected ack for ${id}: ${ack}`);\n              }\n              consumed();\n            })().catch(e => closer.close(e));\n          }\n        }\n        closer.close();\n        return;\n      }\n    }\n\n    if (pipeline) {\n      lc.debug?.(`started pipelined outbound stream`);\n      for await (const {value: msg, consumed} of pipeline) {\n        const id = ++nextID;\n        if (isPreSerialized(msg)) {\n          const prefix = Buffer.from(`{\"id\":${id}`);\n          const data = Buffer.concat([prefix, msg.payload]);\n          sendTextFrame(sink, data);\n        } else {\n          const data = `{\"id\":${id},\"msg\":${stringify(msg)}}`;\n          // Enable for debugging. Otherwise too verbose.\n          // lc.debug?.(`pipelining`, data);\n          sink.send(data);\n        }\n\n        // The ack is awaited off the send loop so that the next message can be\n        // sent without waiting for it. A bad ack is a protocol error like in\n        // the synchronous path below: close the socket (which cancels the\n        // source) rather than leaving the rejection unhandled.\n        void (async () => {\n          const {ack} = await acks.dequeue();\n          // lc.debug?.(`received ack`, ack);\n          if (ack !== id) {\n            throw new Error(`Unexpected ack for ${id}: ${ack}`);\n          }\n          consumed();\n        })().catch(e => closer.close(e));\n      }\n    } else {\n      lc.debug?.(`started synchronous outbound stream`);\n      for await (const msg of source) {\n        const id = ++nextID;\n        if (isPreSerialized(msg)) {\n          const prefix = Buffer.from(`{\"id\":${id}`);\n          const data = Buffer.concat([prefix, msg.payload]);\n          sendTextFrame(sink, data);\n        } else {\n          const data = `{\"id\":${id},\"msg\":${stringify(msg)}}`;\n          // Enable for debugging. Otherwise too verbose.\n          // lc.debug?.(`sending`, data);\n          sink.send(data);\n        }\n\n        const {ack} = await acks.dequeue();\n        if (ack !== id) {\n          throw new Error(`Unexpected ack for ${id}: ${ack}`);\n        }\n      }\n    }\n    closer.close();\n  } catch (e) {\n    closer.close(e);\n  }\n}\n\nexport function streamIn<T extends JSONValue>(\n  lc: LogContext,\n  source: WebSocket,\n  schema: v.Type<T>,\n): Promise<Source<T>> {\n  return streamInInternal(lc, source, schema, data => data);\n}\n\n/**\n * Streams in parsed messages while retaining only the transport-frame size.\n * The size bounds downstream batching without keeping or copying the JSON.\n */\nexport function streamInWithSize<T extends JSONValue>(\n  lc: LogContext,\n  source: WebSocket,\n  schema: v.Type<T>,\n): Promise<Source<Sized<T>>> {\n  return streamInInternal(lc, source, schema, (data, _frame, _id, size) => ({\n    data,\n    size,\n  }));\n}\n\nasync function streamInInternal<T extends JSONValue, Out>(\n  lc: LogContext,\n  source: WebSocket,\n  schema: v.Type<T>,\n  transform: (data: T, frame: string, id: number, size: number) => Out,\n): Promise<Source<Out>> {\n  expectPingsForLiveness(lc, source, PING_INTERVAL_MS);\n\n  const streamedSchema = v.object({\n    id: v.number(),\n    msg: schema.optional(),\n    batch: v.array(schema).optional(),\n  });\n\n  type SinkEntry = {\n    consumed: () => void;\n    data: Out;\n  };\n\n  const sink: Subscription<Out, SinkEntry> = new Subscription<Out, SinkEntry>(\n    {\n      consumed: ({consumed}) => consumed(),\n      cleanup: () => closer.close(),\n    },\n    ({data}) => data,\n  );\n\n  const closer = WebSocketCloser.forSink(lc, source, sink, handleMessage);\n\n  function handleMessage(event: MessageEvent) {\n    const data = event.data.toString();\n    if (!sink.active) {\n      lc.warn?.('dropping ws message received after close', data);\n      return;\n    }\n    try {\n      const value = BigIntJSON.parse(data);\n      const parsed = v.parse(value, streamedSchema, 'passthrough');\n      const {id, msg, batch} = parsed;\n\n      const sendAck = () => {\n        if (source.readyState === source.OPEN) {\n          source.send(JSON.stringify({ack: id} satisfies Ack));\n        }\n      };\n\n      if (batch !== undefined && msg !== undefined) {\n        throw new Error(`Message ${id} has both \"msg\" and \"batch\"`);\n      }\n\n      if (batch !== undefined) {\n        let remaining = batch.length;\n        if (remaining === 0) {\n          sendAck();\n          return;\n        }\n        const onConsumed = () => {\n          if (--remaining === 0) {\n            sendAck();\n          }\n        };\n        const itemSize = Math.max(1, Math.round(data.length / batch.length));\n        for (const item of batch) {\n          sink.push({\n            consumed: onConsumed,\n            data: transform(item, data, id, itemSize),\n          });\n        }\n      } else if (msg !== undefined) {\n        sink.push({\n          consumed: sendAck,\n          data: transform(msg, data, id, data.length),\n        });\n      } else {\n        throw new Error(`Message ${id} has neither \"msg\" nor \"batch\"`);\n      }\n    } catch (e) {\n      closer.close(e);\n    }\n  }\n\n  await closer.connected;\n  return sink;\n}\n\nclass WebSocketCloser {\n  readonly #lc: LogContext;\n  readonly #ws: WebSocket;\n  readonly #closeStream: (err?: unknown) => void;\n  readonly #messageHandler: ((e: MessageEvent) => void | undefined) | null;\n  readonly #connected = resolver();\n\n  get connected(): Promise<void> {\n    return this.#connected.promise;\n  }\n\n  static forSource<T>(lc: LogContext, ws: WebSocket, stream: Source<T>) {\n    // If the websocket is closed, call cancel() to notify the Source of\n    // any unconsumed messages.\n    return new WebSocketCloser(lc, ws, (err?: unknown) =>\n      stream.cancel(err instanceof Error ? err : undefined),\n    );\n  }\n\n  static forSink<T, Input>(\n    lc: LogContext,\n    ws: WebSocket,\n    stream: Subscription<T, Input>,\n    messageHandler: (e: MessageEvent) => void | undefined,\n  ) {\n    // If the websocket is closed with an error, fail() the downstream Sink\n    // so consumers catch the error. Otherwise, call end() to allow pending\n    // messages to finish.\n    return new WebSocketCloser(\n      lc,\n      ws,\n      (err?: unknown) => {\n        if (err) {\n          stream.fail(err instanceof Error ? err : new Error(String(err)));\n        } else {\n          stream.end();\n        }\n      },\n      messageHandler,\n    );\n  }\n\n  private constructor(\n    lc: LogContext,\n    ws: WebSocket,\n    closeStream: (err?: unknown) => void,\n    messageHandler?: (e: MessageEvent) => void | undefined,\n  ) {\n    this.#lc = lc;\n    this.#ws = ws;\n    this.#closeStream = closeStream;\n    this.#messageHandler = messageHandler ?? null;\n\n    ws.addEventListener('open', this.#handleOpen);\n    ws.addEventListener('close', this.#handleClose);\n    ws.addEventListener('error', this.#handleError);\n    if (this.#messageHandler) {\n      ws.addEventListener('message', this.#messageHandler);\n    }\n\n    switch (ws.readyState) {\n      case ws.CONNECTING:\n        break; // expected for new connections. resolve or reject in handlers.\n      case ws.OPEN:\n        this.#connected.resolve();\n        break;\n      default:\n        this.#connected.reject(\n          new Error(`websocket already in state ${ws.readyState}`),\n        );\n        break;\n    }\n  }\n\n  get #conn(): string {\n    return 'connection' + (this.#ws.url ? ` to ${this.#ws.url}` : '');\n  }\n\n  #handleOpen = () => {\n    this.#lc.info?.(`${this.#conn} established`);\n    this.#connected.resolve();\n  };\n\n  #handleClose = (e: CloseEvent) => {\n    const {code, reason, wasClean} = e;\n    this.#lc.info?.(`${this.#conn} closed`, {\n      code,\n      reason,\n      wasClean,\n    });\n    this.close();\n    this.#connected.reject(`${this.#conn} closed with code ${code}`);\n  };\n\n  #handleError = ({message, error}: ErrorEvent) => {\n    if (this.#ws.readyState === this.#ws.OPEN) {\n      this.#lc.error?.(`error in ${this.#conn}`, message, error);\n    }\n    this.#connected.reject(error);\n  };\n\n  close(err?: unknown) {\n    if (err) {\n      this.#lc.error?.(`closing stream with error`, err);\n    }\n    this.#closeStream(err);\n    if (!this.closed()) {\n      this.#ws.close();\n    }\n  }\n\n  closed() {\n    return (\n      this.#ws.readyState === this.#ws.CLOSED ||\n      this.#ws.readyState === this.#ws.CLOSING\n    );\n  }\n}\n"],"mappings":";;;;;;;;;;AA6BA,IAAM,mBAAmB;;;;;AAqDzB,SAAgB,OACd,IACA,IACA,UACA,aAA2B,CAAC,GAC5B,YAAyB,CAAC,GAC1B,gBAA+B,CAAC,GACc;CAC9C,MAAM,WAAW,GAAG,OAAO;CAC3B,SAAS,MAAM,KAAe;EAC5B,IAAI,GAAG,eAAe,GAAG,UAAU,GAAG,eAAe,GAAG,SACtD,IAAI,KACF,eAAe,IAAI,IAAI,GAAG;OACrB;GACL,GAAG,OAAO,yBAAyB,UAAU;GAC7C,GAAG,MAAM;EACX;CAEJ;CAEA,MAAM,WAAW,aAAa,OAAW;EACvC,GAAG;EACH,UAAU,YAAY,QAAQ;GAC5B,UAAU,UAAU,YAAY,GAAG;GACnC,MAAM,GAAG;EACX;CACF,CAAC;CACD,MAAM,YAAY,aAAa,OAAY;EACzC,GAAG;EACH,UAAU,YAAY,QAAQ;GAC5B,WAAW,UAAU,YAAY,GAAG;GACpC,MAAM,GAAG;EACX;CACF,CAAC;CAED,MAAM,SAAS,sBAAsB,IAAI;EACvC,GAAG;EACH,eAAe;CACjB,CAAC;CAGD,SAAS,YAAY;EAEnB,OAAO,GAAG,eAAe,GAAG,QAAQ,uBAAuB,UAAU,CAAC;EAEtE,SACE,SAAS,KAAK,SAAS,GACvB,IAAI,UAAU;GACZ,YAAY;GACZ,YAAY,KAAK,WAAW,aAC1B,SAAS,MAAM,WAAW,UAAU,GAAG,CAAC;EAC5C,CAAC,GACD,SACA,QAAQ,MAAM,UAAU,KAAK,GAAG,IAAI,UAAU,OAAO,CACvD;CACF;CAEA,IAAI,GAAG,eAAe,GAAG,YACvB,GAAG,GAAG,cAAc;EAClB,GAAG,OAAO,gBAAgB,UAAU;EACpC,UAAU;CACZ,CAAC;MAED,UAAU;CAIZ,KAAK;EACH,QAAQ;EACR,MAAM;EACN,QAAO,UAAS;GAEd,OAAO,MADM,WAAW,MAAM,MAAM,SAAS,CAC9B,GAAM,UAAU,aAAa;EAC9C;CACF,CAAC;CAED,qBAAqB,IAAI,IAAI,gBAAgB;CAE7C,OAAO;EAAC;EAAW;CAAQ;AAC7B;AASA,SAAgB,KAAQ,EAAC,QAAQ,MAAM,OAAO,kBAAiC;CAC7E,mBAAmB;CACnB,OAAO,kBAAkB,GAAG,qCAAqC;CACjE,MAAM,UAA8B,CAAC;CAErC,SACE,QACA,IAAI,SAAS;EACX,eAAe;EACf,QAAQ,OAAO,WAAW,aAAa;GACrC,IAAI;GACJ,IAAI;IACF,KAAK,MAAM,MAAM,KAAK,OAAO,MAAM;KACjC,SAAS;KACT;IACF;GACF,SAAS,KAAK;IACZ,SAAS,YAAY,GAAG,CAAC;IACzB;GACF;GAMA,MAAM,EAAC,WAAU,KAAK,KAAK,GAAG;GAC9B,QAAQ,KAAK,MAAM;GACnB,OAAY,WAAW,QAAQ,MAAM,CAAC;GAEtC,IAAI,QAAQ,UAAU,gBAEpB,SAAS;QAGT,QAAQ,GAAG,WACH,SAAS,IACf,QAAO,SAAS,YAAY,GAAG,CAAC,CAClC;EAEJ;EACA,UAAU,KAAK,aAAa;GAC1B,IAAI,KACF,KAAK,KAAK,YAAY,GAAG,CAAC;GAG5B,SAAS;EACX;EACA,QAAO,aAAY;GACjB,KAAK,OAAO;GACZ,SAAS;EACX;CACF,CAAC,IACD,QAAQ,MAAM,KAAK,KAAK,GAAG,IAAI,KAAK,OAAO,CAC7C;AACF;AAEA,SAAS,YAAY,KAAc;CACjC,OAAO,eAAe,QAAQ,MAAM,IAAI,MAAM,OAAO,GAAG,CAAC;AAC3D;AAEA,IAAM,YAAY,eAAE,OAAO,EAAC,KAAK,eAAE,OAAO,EAAC,CAAC;AAoB5C,SAAgB,gBAAgB,KAAoC;CAClE,OACE,OAAO,QAAQ,YACf,QAAQ,QACR,aAAa,OACb,OAAO,SAAU,IAAsB,OAAO;AAElD;AAEA,SAAS,cAAc,MAAiB,MAAuB;CAC7D,IAAI,OAAO,SAAS,UAClB,KAAK,KAAK,IAAI;MAEd,KAAqE,KACnE,MACA,EAAC,QAAQ,MAAK,CAChB;AAEJ;AAEA,SAAgB,UACd,IACA,QACA,MACA,SACe;CACf,OAAO,kBAAkB,IAAI,QAAQ,MAAM,WAAW,WAAW,OAAO;AAC1E;;;;AAKA,SAAgB,qBACd,IACA,QACA,MACA,SACe;CACf,OAAO,kBACL,IACA,QACA,OACA,QAAQ,OAAO,QAAQ,WAAW,MAAM,IAAI,QAAQ,SAAS,MAAM,GACnE,OACF;AACF;AAEA,eAAe,kBACb,IACA,QACA,MACA,WACA,SACe;CACf,qBAAqB,IAAI,MAAM,gBAAgB;CAE/C,MAAM,SAAS,gBAAgB,UAAU,IAAI,MAAM,MAAM;CAEzD,MAAM,OAAO,IAAI,MAAW;CAC5B,KAAK,iBAAiB,YAAY,EAAC,WAAU;EAC3C,IAAI;GACF,MAAM,OAAO,OAAO,SAAS,WAAW,OAAO,KAAK,SAAS;GAC7D,KAAK,QAAQ,MAAQ,KAAK,MAAM,IAAI,GAAG,SAAS,CAAC;EACnD,SAAS,GAAG;GACV,GAAG,QAAQ,qBAAqB,CAAC;GACjC,OAAO,MAAM,CAAC;EAChB;CACF,CAAC;CAED,IAAI;EACF,IAAI,SAAS;EACb,MAAM,EAAC,aAAY;EACnB,MAAM,UAAU,SAAS,WAAW;EACpC,MAAM,eAAe,KAAK,IAAI,GAAG,KAAK,MAAM,SAAS,gBAAgB,EAAE,CAAC;EAExE,IAAI,WAAW,OAAO,iBAAiB;GACrC,MAAM,kBAAkB,OAAO,gBAAgB,YAAY;GAC3D,IAAI,iBAAiB;IACnB,GAAG,QACD,iDAAiD,aAAa,EAChE;IACA,WAAW,MAAM,EAAC,QAAQ,cAAa,iBACrC,IAAI,OAAO,WAAW,KAAK,gBAAgB,OAAO,EAAE,GAAG;KACrD,MAAM,KAAK,EAAE;KACb,MAAM,SAAS,OAAO,KAAK,SAAS,IAAI;KAExC,cAAc,MADD,OAAO,OAAO,CAAC,QAAQ,OAAO,GAAG,OAAO,CACjC,CAAI;KAExB,CAAM,YAAY;MAChB,MAAM,EAAC,QAAO,MAAM,KAAK,QAAQ;MACjC,IAAI,QAAQ,IACV,MAAM,IAAI,MAAM,sBAAsB,GAAG,IAAI,KAAK;MAEpD,SAAS;KACX,GAAG,EAAE,OAAM,MAAK,OAAO,MAAM,CAAC,CAAC;IACjC,OAAO,IAAI,OAAO,KAAK,eAAe,GAAG;KACvC,IAAI,YAAY,OAAO;KACvB,MAAM,mBAAmB;MACvB,IAAI,EAAE,cAAc,GAClB,SAAS;KAEb;KACA,KAAK,MAAM,OAAO,QAAQ;MACxB,MAAM,KAAK,EAAE;MACb,IAAI,gBAAgB,GAAG,GAAG;OACxB,MAAM,SAAS,OAAO,KAAK,SAAS,IAAI;OAExC,cAAc,MADD,OAAO,OAAO,CAAC,QAAQ,IAAI,OAAO,CAC3B,CAAI;MAC1B,OAAO;OACL,MAAM,OAAO,SAAS,GAAG,SAAS,UAAU,GAAG,EAAE;OACjD,KAAK,KAAK,IAAI;MAChB;MACA,CAAM,YAAY;OAChB,MAAM,EAAC,QAAO,MAAM,KAAK,QAAQ;OACjC,IAAI,QAAQ,IACV,MAAM,IAAI,MAAM,sBAAsB,GAAG,IAAI,KAAK;OAEpD,WAAW;MACb,GAAG,EAAE,OAAM,MAAK,OAAO,MAAM,CAAC,CAAC;KACjC;IACF,OAAO;KACL,MAAM,KAAK,EAAE;KACb,MAAM,OACJ,OAAO,WAAW,IACd,SAAS,GAAG,SAAS,UAAU,OAAO,EAAE,EAAE,KAC1C,SAAS,GAAG,YAAY,OAAO,IAAI,SAAS,EAAE,KAAK,GAAG,EAAE;KAC9D,KAAK,KAAK,IAAI;KAEd,CAAM,YAAY;MAChB,MAAM,EAAC,QAAO,MAAM,KAAK,QAAQ;MACjC,IAAI,QAAQ,IACV,MAAM,IAAI,MAAM,sBAAsB,GAAG,IAAI,KAAK;MAEpD,SAAS;KACX,GAAG,EAAE,OAAM,MAAK,OAAO,MAAM,CAAC,CAAC;IACjC;IAEF,OAAO,MAAM;IACb;GACF;EACF;EAEA,IAAI,UAAU;GACZ,GAAG,QAAQ,mCAAmC;GAC9C,WAAW,MAAM,EAAC,OAAO,KAAK,cAAa,UAAU;IACnD,MAAM,KAAK,EAAE;IACb,IAAI,gBAAgB,GAAG,GAAG;KACxB,MAAM,SAAS,OAAO,KAAK,SAAS,IAAI;KAExC,cAAc,MADD,OAAO,OAAO,CAAC,QAAQ,IAAI,OAAO,CAC3B,CAAI;IAC1B,OAAO;KACL,MAAM,OAAO,SAAS,GAAG,SAAS,UAAU,GAAG,EAAE;KAGjD,KAAK,KAAK,IAAI;IAChB;IAMA,CAAM,YAAY;KAChB,MAAM,EAAC,QAAO,MAAM,KAAK,QAAQ;KAEjC,IAAI,QAAQ,IACV,MAAM,IAAI,MAAM,sBAAsB,GAAG,IAAI,KAAK;KAEpD,SAAS;IACX,GAAG,EAAE,OAAM,MAAK,OAAO,MAAM,CAAC,CAAC;GACjC;EACF,OAAO;GACL,GAAG,QAAQ,qCAAqC;GAChD,WAAW,MAAM,OAAO,QAAQ;IAC9B,MAAM,KAAK,EAAE;IACb,IAAI,gBAAgB,GAAG,GAAG;KACxB,MAAM,SAAS,OAAO,KAAK,SAAS,IAAI;KAExC,cAAc,MADD,OAAO,OAAO,CAAC,QAAQ,IAAI,OAAO,CAC3B,CAAI;IAC1B,OAAO;KACL,MAAM,OAAO,SAAS,GAAG,SAAS,UAAU,GAAG,EAAE;KAGjD,KAAK,KAAK,IAAI;IAChB;IAEA,MAAM,EAAC,QAAO,MAAM,KAAK,QAAQ;IACjC,IAAI,QAAQ,IACV,MAAM,IAAI,MAAM,sBAAsB,GAAG,IAAI,KAAK;GAEtD;EACF;EACA,OAAO,MAAM;CACf,SAAS,GAAG;EACV,OAAO,MAAM,CAAC;CAChB;AACF;AAEA,SAAgB,SACd,IACA,QACA,QACoB;CACpB,OAAO,iBAAiB,IAAI,QAAQ,SAAQ,SAAQ,IAAI;AAC1D;;;;;AAMA,SAAgB,iBACd,IACA,QACA,QAC2B;CAC3B,OAAO,iBAAiB,IAAI,QAAQ,SAAS,MAAM,QAAQ,KAAK,UAAU;EACxE;EACA;CACF,EAAE;AACJ;AAEA,eAAe,iBACb,IACA,QACA,QACA,WACsB;CACtB,uBAAuB,IAAI,QAAQ,gBAAgB;CAEnD,MAAM,iBAAiB,eAAE,OAAO;EAC9B,IAAI,eAAE,OAAO;EACb,KAAK,OAAO,SAAS;EACrB,OAAO,eAAE,MAAM,MAAM,EAAE,SAAS;CAClC,CAAC;CAOD,MAAM,OAAqC,IAAI,aAC7C;EACE,WAAW,EAAC,eAAc,SAAS;EACnC,eAAe,OAAO,MAAM;CAC9B,IACC,EAAC,WAAU,IACd;CAEA,MAAM,SAAS,gBAAgB,QAAQ,IAAI,QAAQ,MAAM,aAAa;CAEtE,SAAS,cAAc,OAAqB;EAC1C,MAAM,OAAO,MAAM,KAAK,SAAS;EACjC,IAAI,CAAC,KAAK,QAAQ;GAChB,GAAG,OAAO,4CAA4C,IAAI;GAC1D;EACF;EACA,IAAI;GAGF,MAAM,EAAC,IAAI,KAAK,UADD,MADD,WAAW,MAAM,IACR,GAAO,gBAAgB,aACrB;GAEzB,MAAM,gBAAgB;IACpB,IAAI,OAAO,eAAe,OAAO,MAC/B,OAAO,KAAK,KAAK,UAAU,EAAC,KAAK,GAAE,CAAe,CAAC;GAEvD;GAEA,IAAI,UAAU,KAAA,KAAa,QAAQ,KAAA,GACjC,MAAM,IAAI,MAAM,WAAW,GAAG,4BAA4B;GAG5D,IAAI,UAAU,KAAA,GAAW;IACvB,IAAI,YAAY,MAAM;IACtB,IAAI,cAAc,GAAG;KACnB,QAAQ;KACR;IACF;IACA,MAAM,mBAAmB;KACvB,IAAI,EAAE,cAAc,GAClB,QAAQ;IAEZ;IACA,MAAM,WAAW,KAAK,IAAI,GAAG,KAAK,MAAM,KAAK,SAAS,MAAM,MAAM,CAAC;IACnE,KAAK,MAAM,QAAQ,OACjB,KAAK,KAAK;KACR,UAAU;KACV,MAAM,UAAU,MAAM,MAAM,IAAI,QAAQ;IAC1C,CAAC;GAEL,OAAO,IAAI,QAAQ,KAAA,GACjB,KAAK,KAAK;IACR,UAAU;IACV,MAAM,UAAU,KAAK,MAAM,IAAI,KAAK,MAAM;GAC5C,CAAC;QAED,MAAM,IAAI,MAAM,WAAW,GAAG,+BAA+B;EAEjE,SAAS,GAAG;GACV,OAAO,MAAM,CAAC;EAChB;CACF;CAEA,MAAM,OAAO;CACb,OAAO;AACT;AAEA,IAAM,kBAAN,MAAM,gBAAgB;CACpB;CACA;CACA;CACA;CACA,aAAsB,SAAS;CAE/B,IAAI,YAA2B;EAC7B,OAAO,KAAKI,WAAW;CACzB;CAEA,OAAO,UAAa,IAAgB,IAAe,QAAmB;EAGpE,OAAO,IAAI,gBAAgB,IAAI,KAAK,QAClC,OAAO,OAAO,eAAe,QAAQ,MAAM,KAAA,CAAS,CACtD;CACF;CAEA,OAAO,QACL,IACA,IACA,QACA,gBACA;EAIA,OAAO,IAAI,gBACT,IACA,KACC,QAAkB;GACjB,IAAI,KACF,OAAO,KAAK,eAAe,QAAQ,MAAM,IAAI,MAAM,OAAO,GAAG,CAAC,CAAC;QAE/D,OAAO,IAAI;EAEf,GACA,cACF;CACF;CAEA,YACE,IACA,IACA,aACA,gBACA;EACA,KAAKJ,MAAM;EACX,KAAKC,MAAM;EACX,KAAKC,eAAe;EACpB,KAAKC,kBAAkB,kBAAkB;EAEzC,GAAG,iBAAiB,QAAQ,KAAKE,WAAW;EAC5C,GAAG,iBAAiB,SAAS,KAAKC,YAAY;EAC9C,GAAG,iBAAiB,SAAS,KAAKC,YAAY;EAC9C,IAAI,KAAKJ,iBACP,GAAG,iBAAiB,WAAW,KAAKA,eAAe;EAGrD,QAAQ,GAAG,YAAX;GACE,KAAK,GAAG,YACN;GACF,KAAK,GAAG;IACN,KAAKC,WAAW,QAAQ;IACxB;GACF;IACE,KAAKA,WAAW,uBACd,IAAI,MAAM,8BAA8B,GAAG,YAAY,CACzD;IACA;EACJ;CACF;CAEA,IAAII,QAAgB;EAClB,OAAO,gBAAgB,KAAKP,IAAI,MAAM,OAAO,KAAKA,IAAI,QAAQ;CAChE;CAEA,oBAAoB;EAClB,KAAKD,IAAI,OAAO,GAAG,KAAKQ,MAAM,aAAa;EAC3C,KAAKJ,WAAW,QAAQ;CAC1B;CAEA,gBAAgB,MAAkB;EAChC,MAAM,EAAC,MAAM,QAAQ,aAAY;EACjC,KAAKJ,IAAI,OAAO,GAAG,KAAKQ,MAAM,UAAU;GACtC;GACA;GACA;EACF,CAAC;EACD,KAAK,MAAM;EACX,KAAKJ,WAAW,OAAO,GAAG,KAAKI,MAAM,oBAAoB,MAAM;CACjE;CAEA,gBAAgB,EAAC,SAAS,YAAuB;EAC/C,IAAI,KAAKP,IAAI,eAAe,KAAKA,IAAI,MACnC,KAAKD,IAAI,QAAQ,YAAY,KAAKQ,SAAS,SAAS,KAAK;EAE3D,KAAKJ,WAAW,OAAO,KAAK;CAC9B;CAEA,MAAM,KAAe;EACnB,IAAI,KACF,KAAKJ,IAAI,QAAQ,6BAA6B,GAAG;EAEnD,KAAKE,aAAa,GAAG;EACrB,IAAI,CAAC,KAAK,OAAO,GACf,KAAKD,IAAI,MAAM;CAEnB;CAEA,SAAS;EACP,OACE,KAAKA,IAAI,eAAe,KAAKA,IAAI,UACjC,KAAKA,IAAI,eAAe,KAAKA,IAAI;CAErC;AACF"}

package/out/zero-cache/src/types/subscription.d.ts

@@ -121,6 +121,10 @@ export declare class Subscription<T, M = T> implements Source<T>, Sink<M> {
         value: T;
         consumed: () => void;
     }> | undefined;
+    pipelineBatched: (maxBatch?: number) => AsyncIterable<{
+        values: T[];
+        consumed: () => void;
+    }> | undefined;
     [Symbol.asyncIterator](): AsyncIterator<T>;
 }
 export type Options<M> = {

package/out/zero-cache/src/types/subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/subscription.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,cAAc,CAAC;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;;IAC/D;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAC9B,OAAO,GAAE,OAAO,CAAC,CAAC,CAAM,EACxB,OAAO,GAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAU,sBAG9B;IAmBD;;;OAGG;IACH,YAAY,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,YAAK,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAmCzD;IAED;;;;;;;;;;;OAWG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,aAAa,CA2B5B;IAED,iEAAiE;IACjE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,qDAAqD;IACrD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,6DAA6D;IAC7D,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,sCAAsC;IACtC,IAAI,MAAM,gBAET;IAED;;;;;;;;;;;OAWG;IACH,GAAG,SAQF;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,QAEjB;IAED,wEAAwE;IACxE,IAAI,CAAC,GAAG,EAAE,KAAK,QAEd;IAwBD,IAAI,QAAQ,IAAI,aAAa,CAAC;QAAC,KAAK,EAAE,CAAC,CAAC;QAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;KAAC,CAAC,GAAG,SAAS,CAI1E;IAiDD,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAyBzC;CACF;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAE7B;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAEjD;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,yCAAyC;AACzC,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAC,CAAC"}
+{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/subscription.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,cAAc,CAAC;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;;IAC/D;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAC9B,OAAO,GAAE,OAAO,CAAC,CAAC,CAAM,EACxB,OAAO,GAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAU,sBAG9B;IAmBD;;;OAGG;IACH,YAAY,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,YAAK,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAmCzD;IAED;;;;;;;;;;;OAWG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,aAAa,CA2B5B;IAED,iEAAiE;IACjE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,qDAAqD;IACrD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,6DAA6D;IAC7D,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,sCAAsC;IACtC,IAAI,MAAM,gBAET;IAED;;;;;;;;;;;OAWG;IACH,GAAG,SAQF;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,QAEjB;IAED,wEAAwE;IACxE,IAAI,CAAC,GAAG,EAAE,KAAK,QAEd;IAwBD,IAAI,QAAQ,IAAI,aAAa,CAAC;QAAC,KAAK,EAAE,CAAC,CAAC;QAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;KAAC,CAAC,GAAG,SAAS,CAI1E;IAED,eAAe,yBAEZ,aAAa,CAAC;QAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;KAAC,CAAC,GAAG,SAAS,CAQ/D;IAwIF,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAyBzC;CACF;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAE7B;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAEjD;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,yCAAyC;AACzC,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAC,CAAC"}

package/out/zero-cache/src/types/subscription.js

@@ -198,6 +198,77 @@ var Subscription = class Subscription {
 	get pipeline() {
 		return this.#pipelineEnabled ? { [Symbol.asyncIterator]: () => this.#pipeline() } : void 0;
 	}
+	pipelineBatched = (maxBatch = 64) => {
+		assert(Number.isInteger(maxBatch) && maxBatch > 0, () => `maxBatch must be a positive integer, got: ${maxBatch}`);
+		return this.#pipelineEnabled ? { [Symbol.asyncIterator]: () => this.#pipelineBatched(maxBatch) } : void 0;
+	};
+	#pipelineBatched(maxBatch) {
+		return {
+			next: async () => {
+				const entries = [];
+				while (this.#messages.length > 0 && entries.length < maxBatch) {
+					if (this.#messages[0] === "terminus") {
+						if (entries.length > 0) break;
+						this.#messages.shift();
+						this.cancel();
+						return {
+							value: void 0,
+							done: true
+						};
+					}
+					const entry = this.#messages.shift();
+					entries.push(entry);
+				}
+				if (entries.length > 0) {
+					for (const e of entries) this.#consuming.add(e);
+					return {
+						value: {
+							values: entries.map((e) => this.#publish(e.value)),
+							consumed: () => {
+								for (const e of entries) this.#consumed(e);
+							}
+						},
+						done: false
+					};
+				}
+				if (this.#sentinel === "canceled") return {
+					value: void 0,
+					done: true
+				};
+				if (this.#sentinel) return Promise.reject(this.#sentinel);
+				const consumer = resolver();
+				this.#consumers.push(consumer);
+				const result = await consumer.promise;
+				if (result === null) return {
+					value: void 0,
+					done: true
+				};
+				entries.push(result);
+				while (this.#messages.length > 0 && entries.length < maxBatch) {
+					if (this.#messages[0] === "terminus") break;
+					const entry = this.#messages.shift();
+					entries.push(entry);
+				}
+				for (const e of entries) this.#consuming.add(e);
+				return {
+					value: {
+						values: entries.map((e) => this.#publish(e.value)),
+						consumed: () => {
+							for (const e of entries) this.#consumed(e);
+						}
+					},
+					done: false
+				};
+			},
+			return: (value) => {
+				this.cancel();
+				return Promise.resolve({
+					value,
+					done: true
+				});
+			}
+		};
+	}
 	#pipeline() {
 		return {
 			next: async () => {

package/out/zero-cache/src/types/subscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.js","names":["#abortController","#consumers","#messages","#consuming","#pipelineEnabled","#coalesce","#consumed","#cleanup","#publish","#sentinel","#terminate","#pipeline"],"sources":["../../../../../zero-cache/src/types/subscription.ts"],"sourcesContent":["import {resolver, type Resolver} from '@rocicorp/resolver';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {Sink, Source} from './streams.ts';\n\n/**\n * A Subscription abstracts a continuous, logically infinite stream of messages intended\n * for serial processing. Unlike the more general Node `Stream` API, a Subscription has\n * a limited API with specific semantics:\n *\n * * **Serial processing**: Messages must be consumed via the {@link AsyncIterable}\n *   interface, e.g.\n *   ```ts\n *   const subscription = server.subscribe(parameters);\n *\n *   for await (const message of subscription) {\n *     await process(message);  // fully process the message before consuming the next\n *   }\n *   ```\n *\n *   Moreover, the consumer is expected to completely process each message before\n *   requesting the next. This is important for cleanup semantics (explained later).\n *\n * * **cancel()**, not close(): The underlying data in a subscription is logically infinite\n *   and only terminated when the consumer is no longer interested in receiving the messages\n *   (or requires a Subscription with a different configuration). As such, there is no API\n *   for gracefully closing the subscription after pending messages are consumed; rather,\n *   cancellation is immediate, and upon cancellation, pending messages are dropped. A\n *   Subscription can also be terminated with exceptional (i.e. `Error`) circumstances,\n *   for which the behavior is equivalent.\n *\n * * **Coalescing** (optional): A producer can configure pending messages in the Subscription\n *   to be merged together with a {@link Options.coalesce coalesce} function. This is useful\n *   for semantics in which the consumer is not necessarily interested in every incremental\n *   change, but rather the cumulative change since the last processed message. A\n *   Subscription with coalescing is guaranteed to have at most one outstanding message,\n *   regardless of how quickly messages are produced and consumed. This effectively constrains\n *   the amount of outstanding work in the system.\n *\n * ### Resource Tracking and Cleanup\n *\n * Because message consumption is constrained to the async iteration API, standard\n * control flow mechanisms allow the producer to perform bookkeeping without any\n * explicit cleanup actions on the part of the consumer. This includes:\n *\n * * **Per-message cleanup**: Each request for the {@link AsyncIterator.next next}\n *   message, or the termination of the iteration, signals that the consumer has\n *   finished processing the previous message. The producer of a Subscription can\n *   supply a {@link Options.consumed consumed} callback to receive these processed\n *   messages, allowing it to clean up attached resources (e.g. TransactionPools, etc.).\n *\n * * **Per-subscription cleanup**: The producer of a Subscription can supply a\n *   {@link Options.cleanup cleanup} callback that is invoked when the Subscription\n *   is terminated, either explicitly via {@link Subscription.cancel cancel()} /\n *   {@link Subscription.fail fail()}, or implicitly when an iteration is exited via a\n *  `break`, `return`, or `throw` statement. All unconsumed messages are passed to the\n *   call back to facilitate bookkeeping.\n *\n * @param T The external message type, published to the AsyncIterable\n * @param M The internal message type used in the producer-side interfaces\n *          (e.g. {@link push}, {@link Options.consumed}, {@link Options.coalesce},\n *          and {@link Options.cleanup}). This is often the same as the external type\n *          T, but may be diverged to facilitate internal bookkeeping.\n */\nexport class Subscription<T, M = T> implements Source<T>, Sink<M> {\n  /**\n   * Convenience factory method for creating a {@link Subscription} with internal message type\n   * `M` as a subtype of `T`, defaulting to the same type. The default `publish` method publishes\n   * the message of type `M` directly to the AsyncIterable.\n   */\n  static create<T, M extends T = T>(\n    options: Options<M> = {},\n    publish: (m: M) => T = m => m,\n  ) {\n    return new Subscription(options, publish);\n  }\n\n  readonly #abortController = new AbortController();\n  // Consumers waiting to consume messages (i.e. an async iteration awaiting the next message).\n  readonly #consumers: Resolver<Entry<M> | null>[] = [];\n  // Messages waiting to be dequeued.\n  readonly #messages: (Entry<M> | 'terminus')[] = [];\n  // Messages dequeued but not yet consumed.\n  readonly #consuming = new Set<Entry<M>>();\n  readonly #pipelineEnabled: boolean;\n  // Sentinel value signaling that the subscription is \"done\" and no more\n  // messages can be added.\n  #sentinel: 'canceled' | Error | undefined = undefined;\n\n  #coalesce: ((curr: Entry<M>, prev: Entry<M>) => M) | undefined;\n  #consumed: (prev: Entry<M>) => void;\n  #cleanup: (unconsumed: Entry<M>[], err?: Error) => void;\n  #publish: (internal: M) => T;\n\n  /**\n   * @param publish function for converting the internally pushed / coalesced message\n   *        of type `M` to the external type `T` exposed via async iteration.\n   */\n  constructor(options: Options<M> = {}, publish: (m: M) => T) {\n    const {\n      coalesce,\n      consumed = () => {},\n      cleanup = () => {},\n      pipeline = coalesce === undefined,\n    } = options;\n\n    this.#coalesce = !coalesce\n      ? undefined\n      : (curr, prev) => {\n          try {\n            return coalesce(curr.value, prev.value);\n          } finally {\n            prev.resolve('coalesced');\n          }\n        };\n\n    this.#consumed = entry => {\n      consumed(entry.value);\n      this.#consuming.delete(entry);\n      entry.resolve('consumed');\n    };\n\n    this.#cleanup = (entries, err) => {\n      cleanup(\n        entries.map(e => e.value),\n        err,\n      );\n      entries.forEach(e => e.resolve('unconsumed'));\n    };\n\n    this.#publish = publish;\n\n    this.#pipelineEnabled = pipeline;\n  }\n\n  /**\n   * Pushes the next message to be consumed, and returns a `result` that resolves to the\n   * eventual {@link Result} of the `value`.\n   *\n   * If there is an existing unconsumed message and the Subscription has a\n   * {@link Options#coalesce coalesce} function, the specified `value` will be coalesced\n   * with the pending message. In this case, the result of the pending message\n   * is resolved to `coalesced`, regardless of the `coalesce` function implementation.\n   *\n   * If the subscription is in a terminal state, the message is dropped and the\n   * result resolves to `unconsumed`.\n   */\n  push(value: M): PendingResult {\n    const {promise: result, resolve} = resolver<Result>();\n    const entry = {value, resolve};\n\n    if (this.#sentinel) {\n      entry.resolve('unconsumed');\n      return {result};\n    }\n    const consumer = this.#consumers.shift();\n    if (consumer) {\n      consumer.resolve(entry);\n    } else if (\n      this.#coalesce &&\n      this.#messages.length &&\n      this.#messages.at(-1) !== 'terminus'\n    ) {\n      // oxlint-disable-next-line typescript/no-non-null-assertion\n      const prev = this.#messages.at(-1)!;\n      assert(prev !== 'terminus', 'prev should not be terminus after check');\n      this.#messages[this.#messages.length - 1] = {\n        value: this.#coalesce(entry, prev),\n        resolve,\n      };\n    } else {\n      this.#messages.push(entry);\n    }\n    return {result};\n  }\n\n  /** False if the subscription has been canceled or has failed. */\n  get active(): boolean {\n    return this.#sentinel === undefined;\n  }\n\n  /** The number of messages waiting to be dequeued. */\n  get queued(): number {\n    return this.#messages.length;\n  }\n\n  /** The number of messages dequeued but not yet \"consumed\" */\n  get consuming(): number {\n    return this.#consuming.size;\n  }\n\n  /** Satisfies the Source interface. */\n  get signal() {\n    return this.#abortController.signal;\n  }\n\n  /**\n   * Cancels the subscription after any queued messages are consumed. This is\n   * meant for the producer-side code.\n   *\n   * Any messages pushed after calling `end()` will be unconsumed as if\n   * `cancel()` were called (once the first set of pending messages is\n   * consumed). In particular, if a coalesce function is defined, the new\n   * messages will not be coalesced with the messages enqueued before `end()`\n   * was called. However, to effect the intent of memory efficiency, multiple\n   * messages pushed after calling `end()` will be coalesced together.\n   *\n   */\n  end() {\n    if (this.#sentinel) {\n      // already terminated\n    } else if (this.#messages.length === 0) {\n      this.cancel();\n    } else {\n      this.#messages.push('terminus');\n    }\n  }\n\n  /**\n   * Cancels the subscription immediately, cleans up, and terminates any iteration.\n   * This is intended for the consumer to call when it is no longer interested\n   * in the subscription.\n   *\n   * @param err If an `err` is specified, an iteration over the Subscription /\n   *        Sink will throw the `err` (equivalent to the producer calling\n   *        {@link fail()}). If undefined, the iteration will exit gracefully.\n   */\n  cancel(err?: Error) {\n    this.#terminate(err ?? 'canceled');\n  }\n\n  /** Fails the subscription, cleans up, and throws from any iteration. */\n  fail(err: Error) {\n    this.#terminate(err);\n  }\n\n  #terminate(sentinel: 'canceled' | Error) {\n    if (!this.#sentinel) {\n      this.#sentinel = sentinel;\n      this.#cleanup(\n        [...this.#consuming, ...this.#messages.filter(m => m !== 'terminus')],\n        sentinel instanceof Error ? sentinel : undefined,\n      );\n      this.#messages.splice(0);\n\n      for (\n        let consumer = this.#consumers.shift();\n        consumer;\n        consumer = this.#consumers.shift()\n      ) {\n        sentinel === 'canceled'\n          ? consumer.resolve(null)\n          : consumer.reject(sentinel);\n      }\n      this.#abortController.abort(sentinel);\n    }\n  }\n\n  get pipeline(): AsyncIterable<{value: T; consumed: () => void}> | undefined {\n    return this.#pipelineEnabled\n      ? {[Symbol.asyncIterator]: () => this.#pipeline()}\n      : undefined;\n  }\n\n  #pipeline(): AsyncIterator<{value: T; consumed: () => void}> {\n    return {\n      next: async () => {\n        const entry = this.#messages.shift();\n        if (entry === 'terminus') {\n          this.cancel();\n          return {value: undefined, done: true};\n        }\n        if (entry !== undefined) {\n          this.#consuming.add(entry);\n          return {\n            value: {\n              value: this.#publish(entry.value),\n              consumed: () => this.#consumed(entry),\n            },\n          };\n        }\n        if (this.#sentinel === 'canceled') {\n          return {value: undefined, done: true};\n        }\n        if (this.#sentinel) {\n          return Promise.reject(this.#sentinel);\n        }\n        const consumer = resolver<Entry<M> | null>();\n        this.#consumers.push(consumer);\n\n        // Wait for push() (or termination) to resolve the consumer.\n        const result = await consumer.promise;\n        if (result !== null) {\n          this.#consuming.add(result);\n          return {\n            value: {\n              value: this.#publish(result.value),\n              consumed: () => this.#consumed(result),\n            },\n          };\n        }\n        return {value: undefined, done: true};\n      },\n\n      return: value => {\n        this.cancel();\n        return Promise.resolve({value, done: true});\n      },\n    };\n  }\n\n  [Symbol.asyncIterator](): AsyncIterator<T> {\n    const delegate = this.#pipeline();\n\n    let prevConsumed = () => {};\n    return {\n      next: async () => {\n        prevConsumed();\n\n        const entry = await delegate.next();\n        if (entry.done) {\n          return entry;\n        }\n\n        const {value, consumed} = entry.value;\n        prevConsumed = consumed;\n        return {value};\n      },\n\n      return: value => {\n        prevConsumed();\n\n        this.cancel();\n        return Promise.resolve({value, done: true});\n      },\n    };\n  }\n}\n\nexport type Options<M> = {\n  /**\n   * Coalesces messages waiting to be consumed. This is useful for \"watermark\" type\n   * subscriptions in which the consumer is only interested in the cumulative state\n   * change since the last processed message. When a `coalesce` function is specified,\n   * there is guaranteed to be at most one message waiting to be consumed.\n   *\n   * Note that the `curr` argument comes before `prev`. This facilitates a common\n   * scenario in which coalescing just means using the newest value; in such a case,\n   * `coalesce` can simply be the identity function (e.g. `msg => msg`).\n   */\n  coalesce?: (curr: M, prev: M) => M;\n\n  /**\n   * Called on the previous message in an iteration (1) when the next message is requested,\n   * or (2) when the iteration is terminated. This allows the producer to perform\n   * per-message cleanup.\n   *\n   * Note that when a {@link Options.coalesce coalesce} function is defined,\n   * `consumed` is _not_ called on the `prev` message; it is the responsibility of\n   * producers requiring both coalescing and consumption notification to perform any\n   * necessary cleanup of `prev` messages when coalescing.\n   */\n  consumed?: (prev: M) => void;\n\n  /**\n   * `cleanup` is called exactly once when the subscription is terminated via a failure or\n   * cancelation (whichever happens first), which includes implicit cancelation when\n   * the consumer exits an iteration via a `break`, `return`, or `throw` statement.\n   *\n   * Note that the `err` argument will only reflect an explicit cancelation via a call\n   * to {@link Subscription.fail()}. On the other hand, if the iteration is canceled via\n   * a `throw` statement, the thrown reason is not reflected in the `err` parameter, as that\n   * information is not made available to the AsyncIterator implementation.\n   */\n  cleanup?: (unconsumed: M[], err?: Error) => void;\n\n  /**\n   * Enable or disable pipelining when streaming messages over a websocket.\n   *\n   * If unspecified, pipelining is enabled if there is no {@link Options.coalesce coalesce}\n   * method, as pipelining is counter to the semantics of coalescing. However, the\n   * application can explicitly enable pipelining even if there is a coalesce method\n   * by specifying `true` for this option. This assumes that coalescing is either\n   * not important for websocket semantics, or that the receiving end of the websocket\n   * transport performs the desired coalescing.\n   */\n  pipeline?: boolean;\n};\n\n/** Post-queueing results of messages. */\nexport type Result = 'consumed' | 'coalesced' | 'unconsumed';\n\n/**\n * {@link Subscription.subscribe()} wraps the `Promise<Result>` in a `PendingResult`\n * object to avoid forcing all callers to handle the Promise, as most logic does not\n * need to.\n */\nexport type PendingResult = {result: Promise<Result>};\n\ntype Entry<M> = {\n  readonly value: M;\n  readonly resolve: (r: Result) => void;\n};\n"],"mappings":"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"}
+{"version":3,"file":"subscription.js","names":["#abortController","#consumers","#messages","#consuming","#pipelineEnabled","#coalesce","#consumed","#cleanup","#publish","#sentinel","#terminate","#pipeline","#pipelineBatched"],"sources":["../../../../../zero-cache/src/types/subscription.ts"],"sourcesContent":["import {resolver, type Resolver} from '@rocicorp/resolver';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {Sink, Source} from './streams.ts';\n\n/**\n * A Subscription abstracts a continuous, logically infinite stream of messages intended\n * for serial processing. Unlike the more general Node `Stream` API, a Subscription has\n * a limited API with specific semantics:\n *\n * * **Serial processing**: Messages must be consumed via the {@link AsyncIterable}\n *   interface, e.g.\n *   ```ts\n *   const subscription = server.subscribe(parameters);\n *\n *   for await (const message of subscription) {\n *     await process(message);  // fully process the message before consuming the next\n *   }\n *   ```\n *\n *   Moreover, the consumer is expected to completely process each message before\n *   requesting the next. This is important for cleanup semantics (explained later).\n *\n * * **cancel()**, not close(): The underlying data in a subscription is logically infinite\n *   and only terminated when the consumer is no longer interested in receiving the messages\n *   (or requires a Subscription with a different configuration). As such, there is no API\n *   for gracefully closing the subscription after pending messages are consumed; rather,\n *   cancellation is immediate, and upon cancellation, pending messages are dropped. A\n *   Subscription can also be terminated with exceptional (i.e. `Error`) circumstances,\n *   for which the behavior is equivalent.\n *\n * * **Coalescing** (optional): A producer can configure pending messages in the Subscription\n *   to be merged together with a {@link Options.coalesce coalesce} function. This is useful\n *   for semantics in which the consumer is not necessarily interested in every incremental\n *   change, but rather the cumulative change since the last processed message. A\n *   Subscription with coalescing is guaranteed to have at most one outstanding message,\n *   regardless of how quickly messages are produced and consumed. This effectively constrains\n *   the amount of outstanding work in the system.\n *\n * ### Resource Tracking and Cleanup\n *\n * Because message consumption is constrained to the async iteration API, standard\n * control flow mechanisms allow the producer to perform bookkeeping without any\n * explicit cleanup actions on the part of the consumer. This includes:\n *\n * * **Per-message cleanup**: Each request for the {@link AsyncIterator.next next}\n *   message, or the termination of the iteration, signals that the consumer has\n *   finished processing the previous message. The producer of a Subscription can\n *   supply a {@link Options.consumed consumed} callback to receive these processed\n *   messages, allowing it to clean up attached resources (e.g. TransactionPools, etc.).\n *\n * * **Per-subscription cleanup**: The producer of a Subscription can supply a\n *   {@link Options.cleanup cleanup} callback that is invoked when the Subscription\n *   is terminated, either explicitly via {@link Subscription.cancel cancel()} /\n *   {@link Subscription.fail fail()}, or implicitly when an iteration is exited via a\n *  `break`, `return`, or `throw` statement. All unconsumed messages are passed to the\n *   call back to facilitate bookkeeping.\n *\n * @param T The external message type, published to the AsyncIterable\n * @param M The internal message type used in the producer-side interfaces\n *          (e.g. {@link push}, {@link Options.consumed}, {@link Options.coalesce},\n *          and {@link Options.cleanup}). This is often the same as the external type\n *          T, but may be diverged to facilitate internal bookkeeping.\n */\nexport class Subscription<T, M = T> implements Source<T>, Sink<M> {\n  /**\n   * Convenience factory method for creating a {@link Subscription} with internal message type\n   * `M` as a subtype of `T`, defaulting to the same type. The default `publish` method publishes\n   * the message of type `M` directly to the AsyncIterable.\n   */\n  static create<T, M extends T = T>(\n    options: Options<M> = {},\n    publish: (m: M) => T = m => m,\n  ) {\n    return new Subscription(options, publish);\n  }\n\n  readonly #abortController = new AbortController();\n  // Consumers waiting to consume messages (i.e. an async iteration awaiting the next message).\n  readonly #consumers: Resolver<Entry<M> | null>[] = [];\n  // Messages waiting to be dequeued.\n  readonly #messages: (Entry<M> | 'terminus')[] = [];\n  // Messages dequeued but not yet consumed.\n  readonly #consuming = new Set<Entry<M>>();\n  readonly #pipelineEnabled: boolean;\n  // Sentinel value signaling that the subscription is \"done\" and no more\n  // messages can be added.\n  #sentinel: 'canceled' | Error | undefined = undefined;\n\n  #coalesce: ((curr: Entry<M>, prev: Entry<M>) => M) | undefined;\n  #consumed: (prev: Entry<M>) => void;\n  #cleanup: (unconsumed: Entry<M>[], err?: Error) => void;\n  #publish: (internal: M) => T;\n\n  /**\n   * @param publish function for converting the internally pushed / coalesced message\n   *        of type `M` to the external type `T` exposed via async iteration.\n   */\n  constructor(options: Options<M> = {}, publish: (m: M) => T) {\n    const {\n      coalesce,\n      consumed = () => {},\n      cleanup = () => {},\n      pipeline = coalesce === undefined,\n    } = options;\n\n    this.#coalesce = !coalesce\n      ? undefined\n      : (curr, prev) => {\n          try {\n            return coalesce(curr.value, prev.value);\n          } finally {\n            prev.resolve('coalesced');\n          }\n        };\n\n    this.#consumed = entry => {\n      consumed(entry.value);\n      this.#consuming.delete(entry);\n      entry.resolve('consumed');\n    };\n\n    this.#cleanup = (entries, err) => {\n      cleanup(\n        entries.map(e => e.value),\n        err,\n      );\n      entries.forEach(e => e.resolve('unconsumed'));\n    };\n\n    this.#publish = publish;\n\n    this.#pipelineEnabled = pipeline;\n  }\n\n  /**\n   * Pushes the next message to be consumed, and returns a `result` that resolves to the\n   * eventual {@link Result} of the `value`.\n   *\n   * If there is an existing unconsumed message and the Subscription has a\n   * {@link Options#coalesce coalesce} function, the specified `value` will be coalesced\n   * with the pending message. In this case, the result of the pending message\n   * is resolved to `coalesced`, regardless of the `coalesce` function implementation.\n   *\n   * If the subscription is in a terminal state, the message is dropped and the\n   * result resolves to `unconsumed`.\n   */\n  push(value: M): PendingResult {\n    const {promise: result, resolve} = resolver<Result>();\n    const entry = {value, resolve};\n\n    if (this.#sentinel) {\n      entry.resolve('unconsumed');\n      return {result};\n    }\n    const consumer = this.#consumers.shift();\n    if (consumer) {\n      consumer.resolve(entry);\n    } else if (\n      this.#coalesce &&\n      this.#messages.length &&\n      this.#messages.at(-1) !== 'terminus'\n    ) {\n      // oxlint-disable-next-line typescript/no-non-null-assertion\n      const prev = this.#messages.at(-1)!;\n      assert(prev !== 'terminus', 'prev should not be terminus after check');\n      this.#messages[this.#messages.length - 1] = {\n        value: this.#coalesce(entry, prev),\n        resolve,\n      };\n    } else {\n      this.#messages.push(entry);\n    }\n    return {result};\n  }\n\n  /** False if the subscription has been canceled or has failed. */\n  get active(): boolean {\n    return this.#sentinel === undefined;\n  }\n\n  /** The number of messages waiting to be dequeued. */\n  get queued(): number {\n    return this.#messages.length;\n  }\n\n  /** The number of messages dequeued but not yet \"consumed\" */\n  get consuming(): number {\n    return this.#consuming.size;\n  }\n\n  /** Satisfies the Source interface. */\n  get signal() {\n    return this.#abortController.signal;\n  }\n\n  /**\n   * Cancels the subscription after any queued messages are consumed. This is\n   * meant for the producer-side code.\n   *\n   * Any messages pushed after calling `end()` will be unconsumed as if\n   * `cancel()` were called (once the first set of pending messages is\n   * consumed). In particular, if a coalesce function is defined, the new\n   * messages will not be coalesced with the messages enqueued before `end()`\n   * was called. However, to effect the intent of memory efficiency, multiple\n   * messages pushed after calling `end()` will be coalesced together.\n   *\n   */\n  end() {\n    if (this.#sentinel) {\n      // already terminated\n    } else if (this.#messages.length === 0) {\n      this.cancel();\n    } else {\n      this.#messages.push('terminus');\n    }\n  }\n\n  /**\n   * Cancels the subscription immediately, cleans up, and terminates any iteration.\n   * This is intended for the consumer to call when it is no longer interested\n   * in the subscription.\n   *\n   * @param err If an `err` is specified, an iteration over the Subscription /\n   *        Sink will throw the `err` (equivalent to the producer calling\n   *        {@link fail()}). If undefined, the iteration will exit gracefully.\n   */\n  cancel(err?: Error) {\n    this.#terminate(err ?? 'canceled');\n  }\n\n  /** Fails the subscription, cleans up, and throws from any iteration. */\n  fail(err: Error) {\n    this.#terminate(err);\n  }\n\n  #terminate(sentinel: 'canceled' | Error) {\n    if (!this.#sentinel) {\n      this.#sentinel = sentinel;\n      this.#cleanup(\n        [...this.#consuming, ...this.#messages.filter(m => m !== 'terminus')],\n        sentinel instanceof Error ? sentinel : undefined,\n      );\n      this.#messages.splice(0);\n\n      for (\n        let consumer = this.#consumers.shift();\n        consumer;\n        consumer = this.#consumers.shift()\n      ) {\n        sentinel === 'canceled'\n          ? consumer.resolve(null)\n          : consumer.reject(sentinel);\n      }\n      this.#abortController.abort(sentinel);\n    }\n  }\n\n  get pipeline(): AsyncIterable<{value: T; consumed: () => void}> | undefined {\n    return this.#pipelineEnabled\n      ? {[Symbol.asyncIterator]: () => this.#pipeline()}\n      : undefined;\n  }\n\n  pipelineBatched = (\n    maxBatch = 64,\n  ): AsyncIterable<{values: T[]; consumed: () => void}> | undefined => {\n    assert(\n      Number.isInteger(maxBatch) && maxBatch > 0,\n      () => `maxBatch must be a positive integer, got: ${maxBatch}`,\n    );\n    return this.#pipelineEnabled\n      ? {[Symbol.asyncIterator]: () => this.#pipelineBatched(maxBatch)}\n      : undefined;\n  };\n\n  #pipelineBatched(\n    maxBatch: number,\n  ): AsyncIterator<{values: T[]; consumed: () => void}> {\n    return {\n      next: async () => {\n        const entries: Entry<M>[] = [];\n\n        while (this.#messages.length > 0 && entries.length < maxBatch) {\n          const head = this.#messages[0];\n          if (head === 'terminus') {\n            if (entries.length > 0) {\n              break;\n            }\n            this.#messages.shift();\n            this.cancel();\n            return {value: undefined, done: true};\n          }\n          const entry = this.#messages.shift() as Entry<M>;\n          entries.push(entry);\n        }\n\n        if (entries.length > 0) {\n          for (const e of entries) {\n            this.#consuming.add(e);\n          }\n          return {\n            value: {\n              values: entries.map(e => this.#publish(e.value)),\n              consumed: () => {\n                for (const e of entries) {\n                  this.#consumed(e);\n                }\n              },\n            },\n            done: false,\n          };\n        }\n\n        if (this.#sentinel === 'canceled') {\n          return {value: undefined, done: true};\n        }\n        if (this.#sentinel) {\n          return Promise.reject(this.#sentinel);\n        }\n\n        const consumer = resolver<Entry<M> | null>();\n        this.#consumers.push(consumer);\n\n        const result = await consumer.promise;\n        if (result === null) {\n          return {value: undefined, done: true};\n        }\n\n        entries.push(result);\n\n        while (this.#messages.length > 0 && entries.length < maxBatch) {\n          if (this.#messages[0] === 'terminus') {\n            break;\n          }\n          const entry = this.#messages.shift() as Entry<M>;\n          entries.push(entry);\n        }\n\n        for (const e of entries) {\n          this.#consuming.add(e);\n        }\n\n        return {\n          value: {\n            values: entries.map(e => this.#publish(e.value)),\n            consumed: () => {\n              for (const e of entries) {\n                this.#consumed(e);\n              }\n            },\n          },\n          done: false,\n        };\n      },\n\n      return: value => {\n        this.cancel();\n        return Promise.resolve({value, done: true});\n      },\n    };\n  }\n\n  #pipeline(): AsyncIterator<{value: T; consumed: () => void}> {\n    return {\n      next: async () => {\n        const entry = this.#messages.shift();\n        if (entry === 'terminus') {\n          this.cancel();\n          return {value: undefined, done: true};\n        }\n        if (entry !== undefined) {\n          this.#consuming.add(entry);\n          return {\n            value: {\n              value: this.#publish(entry.value),\n              consumed: () => this.#consumed(entry),\n            },\n          };\n        }\n        if (this.#sentinel === 'canceled') {\n          return {value: undefined, done: true};\n        }\n        if (this.#sentinel) {\n          return Promise.reject(this.#sentinel);\n        }\n        const consumer = resolver<Entry<M> | null>();\n        this.#consumers.push(consumer);\n\n        // Wait for push() (or termination) to resolve the consumer.\n        const result = await consumer.promise;\n        if (result !== null) {\n          this.#consuming.add(result);\n          return {\n            value: {\n              value: this.#publish(result.value),\n              consumed: () => this.#consumed(result),\n            },\n          };\n        }\n        return {value: undefined, done: true};\n      },\n\n      return: value => {\n        this.cancel();\n        return Promise.resolve({value, done: true});\n      },\n    };\n  }\n\n  [Symbol.asyncIterator](): AsyncIterator<T> {\n    const delegate = this.#pipeline();\n\n    let prevConsumed = () => {};\n    return {\n      next: async () => {\n        prevConsumed();\n\n        const entry = await delegate.next();\n        if (entry.done) {\n          return entry;\n        }\n\n        const {value, consumed} = entry.value;\n        prevConsumed = consumed;\n        return {value};\n      },\n\n      return: value => {\n        prevConsumed();\n\n        this.cancel();\n        return Promise.resolve({value, done: true});\n      },\n    };\n  }\n}\n\nexport type Options<M> = {\n  /**\n   * Coalesces messages waiting to be consumed. This is useful for \"watermark\" type\n   * subscriptions in which the consumer is only interested in the cumulative state\n   * change since the last processed message. When a `coalesce` function is specified,\n   * there is guaranteed to be at most one message waiting to be consumed.\n   *\n   * Note that the `curr` argument comes before `prev`. This facilitates a common\n   * scenario in which coalescing just means using the newest value; in such a case,\n   * `coalesce` can simply be the identity function (e.g. `msg => msg`).\n   */\n  coalesce?: (curr: M, prev: M) => M;\n\n  /**\n   * Called on the previous message in an iteration (1) when the next message is requested,\n   * or (2) when the iteration is terminated. This allows the producer to perform\n   * per-message cleanup.\n   *\n   * Note that when a {@link Options.coalesce coalesce} function is defined,\n   * `consumed` is _not_ called on the `prev` message; it is the responsibility of\n   * producers requiring both coalescing and consumption notification to perform any\n   * necessary cleanup of `prev` messages when coalescing.\n   */\n  consumed?: (prev: M) => void;\n\n  /**\n   * `cleanup` is called exactly once when the subscription is terminated via a failure or\n   * cancelation (whichever happens first), which includes implicit cancelation when\n   * the consumer exits an iteration via a `break`, `return`, or `throw` statement.\n   *\n   * Note that the `err` argument will only reflect an explicit cancelation via a call\n   * to {@link Subscription.fail()}. On the other hand, if the iteration is canceled via\n   * a `throw` statement, the thrown reason is not reflected in the `err` parameter, as that\n   * information is not made available to the AsyncIterator implementation.\n   */\n  cleanup?: (unconsumed: M[], err?: Error) => void;\n\n  /**\n   * Enable or disable pipelining when streaming messages over a websocket.\n   *\n   * If unspecified, pipelining is enabled if there is no {@link Options.coalesce coalesce}\n   * method, as pipelining is counter to the semantics of coalescing. However, the\n   * application can explicitly enable pipelining even if there is a coalesce method\n   * by specifying `true` for this option. This assumes that coalescing is either\n   * not important for websocket semantics, or that the receiving end of the websocket\n   * transport performs the desired coalescing.\n   */\n  pipeline?: boolean;\n};\n\n/** Post-queueing results of messages. */\nexport type Result = 'consumed' | 'coalesced' | 'unconsumed';\n\n/**\n * {@link Subscription.subscribe()} wraps the `Promise<Result>` in a `PendingResult`\n * object to avoid forcing all callers to handle the Promise, as most logic does not\n * need to.\n */\nexport type PendingResult = {result: Promise<Result>};\n\ntype Entry<M> = {\n  readonly value: M;\n  readonly resolve: (r: Result) => void;\n};\n"],"mappings":"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"}

package/out/zero-cache/src/types/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAIlC,eAAO,MAAM,cAAc,OAAO,CAAC;AACnC,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,MAAM,MAAM,SAAS,GAAG,OAAO,cAAc,GAAG,OAAO,cAAc,CAAC;AAEtE,wBAAgB,cAAc,CAC5B,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,SAA0B,QASjC;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,UAAU,EAAE,MAAM,QAkCnB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,UAAU,EAAE,MAAM,EAClB,eAAe,SAAQ,QAwBxB"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAIlC,eAAO,MAAM,cAAc,OAAO,CAAC;AACnC,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,MAAM,MAAM,SAAS,GAAG,OAAO,cAAc,GAAG,OAAO,cAAc,CAAC;AAEtE,wBAAgB,cAAc,CAC5B,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,SAA0B,QASjC;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,UAAU,EAAE,MAAM,QAkCnB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,UAAU,EAAE,MAAM,EAClB,eAAe,SAAQ,QA+CxB"}

package/out/zero-cache/src/types/ws.js

@@ -30,19 +30,34 @@ function sendPingsForLiveness(lc, ws, intervalMs) {
 	ws.once("close", () => clearInterval(livenessTimer));
 }
 function expectPingsForLiveness(lc, ws, intervalMs, timeoutBufferMs = 3e3) {
+	const timeoutMs = intervalMs + timeoutBufferMs;
 	let gotLivenessSignal = false;
-	const livenessTimer = setInterval(() => {
-		if (!gotLivenessSignal) {
-			lc.warn?.(`socket@${ws.url} did not send heartbeat or messages. Terminating...`);
+	let livenessTimer;
+	function startLivenessChecks() {
+		livenessTimer = setInterval(() => {
+			if (!gotLivenessSignal) {
+				lc.warn?.(`socket@${ws.url} did not send heartbeat or messages. Terminating...`);
+				ws.terminate();
+				return;
+			}
+			gotLivenessSignal = false;
+		}, timeoutMs);
+	}
+	if (ws.readyState === ws.CONNECTING) {
+		const connectTimer = setTimeout(() => {
+			lc.warn?.(`socket@${ws.url} did not connect within ${timeoutMs} ms. Terminating...`);
 			ws.terminate();
-			return;
-		}
-		gotLivenessSignal = false;
-	}, intervalMs + timeoutBufferMs);
+		}, timeoutMs);
+		ws.once("open", () => {
+			clearTimeout(connectTimer);
+			startLivenessChecks();
+		});
+		ws.once("close", () => clearTimeout(connectTimer));
+	} else if (ws.readyState === ws.OPEN) startLivenessChecks();
 	const signalAlive = () => gotLivenessSignal = true;
 	ws.on("ping", signalAlive);
 	ws.on("message", signalAlive);
-	ws.once("close", () => clearTimeout(livenessTimer));
+	ws.once("close", () => clearInterval(livenessTimer));
 }
 //#endregion
 export { PROTOCOL_ERROR, closeWithError, expectPingsForLiveness, sendPingsForLiveness };

package/out/zero-cache/src/types/ws.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws.js","names":[],"sources":["../../../../../zero-cache/src/types/ws.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {WebSocket} from 'ws';\nimport {elide} from './strings.ts';\n\n// https://github.com/Luka967/websocket-close-codes\nexport const PROTOCOL_ERROR = 1002;\nexport const INTERNAL_ERROR = 1011;\n\nexport type ErrorCode = typeof PROTOCOL_ERROR | typeof INTERNAL_ERROR;\n\nexport function closeWithError(\n  lc: LogContext,\n  ws: WebSocket,\n  err: unknown,\n  code: ErrorCode = INTERNAL_ERROR,\n) {\n  const endpoint = ws.url ?? 'client';\n  const errMsg = String(err);\n  lc.warn?.(`closing connection to ${endpoint} with error`, errMsg);\n\n  // close messages must be less than or equal to 123 bytes:\n  // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason\n  ws.close(code, elide(errMsg, 123));\n}\n\nexport function sendPingsForLiveness(\n  lc: LogContext,\n  ws: WebSocket,\n  intervalMs: number,\n) {\n  let gotLivenessSignal = true;\n\n  let livenessTimer: NodeJS.Timeout | undefined;\n  function startHeartBeats() {\n    livenessTimer = setInterval(() => {\n      if (!gotLivenessSignal) {\n        lc.warn?.(\n          `socket@${ws.url} did not respond to heartbeat. Terminating...`,\n        );\n        ws.terminate();\n        return;\n      }\n      // Reset gotLivenessSignal and expect another pong or message to arrive\n      // before the next interval elapses.\n      gotLivenessSignal = false;\n      ws.ping();\n    }, intervalMs);\n  }\n\n  if (ws.readyState === ws.CONNECTING) {\n    ws.once('open', () => startHeartBeats());\n  } else if (ws.readyState === ws.OPEN) {\n    startHeartBeats();\n  }\n\n  // Both pongs and messages are accepted as signs of liveness.\n  // Checking for pongs only risks false positives as pongs may be backed\n  // up behind a large stream of messages.\n  const signalAlive = () => (gotLivenessSignal = true);\n  ws.on('pong', signalAlive);\n  ws.on('message', signalAlive);\n  ws.once('close', () => clearInterval(livenessTimer));\n}\n\nexport function expectPingsForLiveness(\n  lc: LogContext,\n  ws: WebSocket,\n  intervalMs: number,\n  timeoutBufferMs = 3_000,\n) {\n  let gotLivenessSignal = false;\n\n  const livenessTimer = setInterval(() => {\n    if (!gotLivenessSignal) {\n      lc.warn?.(\n        `socket@${ws.url} did not send heartbeat or messages. Terminating...`,\n      );\n      ws.terminate();\n      return;\n    }\n    // Reset gotLivenessSignal and expect another ping or message to arrive\n    // before the next interval elapses.\n    gotLivenessSignal = false;\n  }, intervalMs + timeoutBufferMs);\n\n  // Both pings and messages are accepted as signs of liveness.\n  // Checking for pings only risks false positives as pings may be backed\n  // up behind a large stream of messages.\n  const signalAlive = () => (gotLivenessSignal = true);\n  ws.on('ping', signalAlive);\n  ws.on('message', signalAlive);\n  ws.once('close', () => clearTimeout(livenessTimer));\n}\n"],"mappings":";;AAKA,IAAa,iBAAiB;AAC9B,IAAa,iBAAiB;AAI9B,SAAgB,eACd,IACA,IACA,KACA,OAAkB,gBAClB;CACA,MAAM,WAAW,GAAG,OAAO;CAC3B,MAAM,SAAS,OAAO,GAAG;CACzB,GAAG,OAAO,yBAAyB,SAAS,cAAc,MAAM;CAIhE,GAAG,MAAM,MAAM,MAAM,QAAQ,GAAG,CAAC;AACnC;AAEA,SAAgB,qBACd,IACA,IACA,YACA;CACA,IAAI,oBAAoB;CAExB,IAAI;CACJ,SAAS,kBAAkB;EACzB,gBAAgB,kBAAkB;GAChC,IAAI,CAAC,mBAAmB;IACtB,GAAG,OACD,UAAU,GAAG,IAAI,8CACnB;IACA,GAAG,UAAU;IACb;GACF;GAGA,oBAAoB;GACpB,GAAG,KAAK;EACV,GAAG,UAAU;CACf;CAEA,IAAI,GAAG,eAAe,GAAG,YACvB,GAAG,KAAK,cAAc,gBAAgB,CAAC;MAClC,IAAI,GAAG,eAAe,GAAG,MAC9B,gBAAgB;CAMlB,MAAM,oBAAqB,oBAAoB;CAC/C,GAAG,GAAG,QAAQ,WAAW;CACzB,GAAG,GAAG,WAAW,WAAW;CAC5B,GAAG,KAAK,eAAe,cAAc,aAAa,CAAC;AACrD;AAEA,SAAgB,uBACd,IACA,IACA,YACA,kBAAkB,KAClB;CACA,IAAI,oBAAoB;CAExB,MAAM,gBAAgB,kBAAkB;EACtC,IAAI,CAAC,mBAAmB;GACtB,GAAG,OACD,UAAU,GAAG,IAAI,oDACnB;GACA,GAAG,UAAU;GACb;EACF;EAGA,oBAAoB;CACtB,GAAG,aAAa,eAAe;CAK/B,MAAM,oBAAqB,oBAAoB;CAC/C,GAAG,GAAG,QAAQ,WAAW;CACzB,GAAG,GAAG,WAAW,WAAW;CAC5B,GAAG,KAAK,eAAe,aAAa,aAAa,CAAC;AACpD"}
+{"version":3,"file":"ws.js","names":[],"sources":["../../../../../zero-cache/src/types/ws.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {WebSocket} from 'ws';\nimport {elide} from './strings.ts';\n\n// https://github.com/Luka967/websocket-close-codes\nexport const PROTOCOL_ERROR = 1002;\nexport const INTERNAL_ERROR = 1011;\n\nexport type ErrorCode = typeof PROTOCOL_ERROR | typeof INTERNAL_ERROR;\n\nexport function closeWithError(\n  lc: LogContext,\n  ws: WebSocket,\n  err: unknown,\n  code: ErrorCode = INTERNAL_ERROR,\n) {\n  const endpoint = ws.url ?? 'client';\n  const errMsg = String(err);\n  lc.warn?.(`closing connection to ${endpoint} with error`, errMsg);\n\n  // close messages must be less than or equal to 123 bytes:\n  // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason\n  ws.close(code, elide(errMsg, 123));\n}\n\nexport function sendPingsForLiveness(\n  lc: LogContext,\n  ws: WebSocket,\n  intervalMs: number,\n) {\n  let gotLivenessSignal = true;\n\n  let livenessTimer: NodeJS.Timeout | undefined;\n  function startHeartBeats() {\n    livenessTimer = setInterval(() => {\n      if (!gotLivenessSignal) {\n        lc.warn?.(\n          `socket@${ws.url} did not respond to heartbeat. Terminating...`,\n        );\n        ws.terminate();\n        return;\n      }\n      // Reset gotLivenessSignal and expect another pong or message to arrive\n      // before the next interval elapses.\n      gotLivenessSignal = false;\n      ws.ping();\n    }, intervalMs);\n  }\n\n  if (ws.readyState === ws.CONNECTING) {\n    ws.once('open', () => startHeartBeats());\n  } else if (ws.readyState === ws.OPEN) {\n    startHeartBeats();\n  }\n\n  // Both pongs and messages are accepted as signs of liveness.\n  // Checking for pongs only risks false positives as pongs may be backed\n  // up behind a large stream of messages.\n  const signalAlive = () => (gotLivenessSignal = true);\n  ws.on('pong', signalAlive);\n  ws.on('message', signalAlive);\n  ws.once('close', () => clearInterval(livenessTimer));\n}\n\nexport function expectPingsForLiveness(\n  lc: LogContext,\n  ws: WebSocket,\n  intervalMs: number,\n  timeoutBufferMs = 3_000,\n) {\n  const timeoutMs = intervalMs + timeoutBufferMs;\n  let gotLivenessSignal = false;\n\n  let livenessTimer: NodeJS.Timeout | undefined;\n  function startLivenessChecks() {\n    livenessTimer = setInterval(() => {\n      if (!gotLivenessSignal) {\n        lc.warn?.(\n          `socket@${ws.url} did not send heartbeat or messages. Terminating...`,\n        );\n        ws.terminate();\n        return;\n      }\n      // Reset gotLivenessSignal and expect another ping or message to arrive\n      // before the next interval elapses.\n      gotLivenessSignal = false;\n    }, timeoutMs);\n  }\n\n  if (ws.readyState === ws.CONNECTING) {\n    // Heartbeats only start once the connection is open, so time out the\n    // handshake separately. Otherwise a slow handshake eats into the first\n    // heartbeat interval, and a stuck one is reported as a missed heartbeat.\n    const connectTimer = setTimeout(() => {\n      lc.warn?.(\n        `socket@${ws.url} did not connect within ${timeoutMs} ms. Terminating...`,\n      );\n      ws.terminate();\n    }, timeoutMs);\n    ws.once('open', () => {\n      clearTimeout(connectTimer);\n      startLivenessChecks();\n    });\n    ws.once('close', () => clearTimeout(connectTimer));\n  } else if (ws.readyState === ws.OPEN) {\n    startLivenessChecks();\n  }\n\n  // Both pings and messages are accepted as signs of liveness.\n  // Checking for pings only risks false positives as pings may be backed\n  // up behind a large stream of messages.\n  const signalAlive = () => (gotLivenessSignal = true);\n  ws.on('ping', signalAlive);\n  ws.on('message', signalAlive);\n  ws.once('close', () => clearInterval(livenessTimer));\n}\n"],"mappings":";;AAKA,IAAa,iBAAiB;AAC9B,IAAa,iBAAiB;AAI9B,SAAgB,eACd,IACA,IACA,KACA,OAAkB,gBAClB;CACA,MAAM,WAAW,GAAG,OAAO;CAC3B,MAAM,SAAS,OAAO,GAAG;CACzB,GAAG,OAAO,yBAAyB,SAAS,cAAc,MAAM;CAIhE,GAAG,MAAM,MAAM,MAAM,QAAQ,GAAG,CAAC;AACnC;AAEA,SAAgB,qBACd,IACA,IACA,YACA;CACA,IAAI,oBAAoB;CAExB,IAAI;CACJ,SAAS,kBAAkB;EACzB,gBAAgB,kBAAkB;GAChC,IAAI,CAAC,mBAAmB;IACtB,GAAG,OACD,UAAU,GAAG,IAAI,8CACnB;IACA,GAAG,UAAU;IACb;GACF;GAGA,oBAAoB;GACpB,GAAG,KAAK;EACV,GAAG,UAAU;CACf;CAEA,IAAI,GAAG,eAAe,GAAG,YACvB,GAAG,KAAK,cAAc,gBAAgB,CAAC;MAClC,IAAI,GAAG,eAAe,GAAG,MAC9B,gBAAgB;CAMlB,MAAM,oBAAqB,oBAAoB;CAC/C,GAAG,GAAG,QAAQ,WAAW;CACzB,GAAG,GAAG,WAAW,WAAW;CAC5B,GAAG,KAAK,eAAe,cAAc,aAAa,CAAC;AACrD;AAEA,SAAgB,uBACd,IACA,IACA,YACA,kBAAkB,KAClB;CACA,MAAM,YAAY,aAAa;CAC/B,IAAI,oBAAoB;CAExB,IAAI;CACJ,SAAS,sBAAsB;EAC7B,gBAAgB,kBAAkB;GAChC,IAAI,CAAC,mBAAmB;IACtB,GAAG,OACD,UAAU,GAAG,IAAI,oDACnB;IACA,GAAG,UAAU;IACb;GACF;GAGA,oBAAoB;EACtB,GAAG,SAAS;CACd;CAEA,IAAI,GAAG,eAAe,GAAG,YAAY;EAInC,MAAM,eAAe,iBAAiB;GACpC,GAAG,OACD,UAAU,GAAG,IAAI,0BAA0B,UAAU,oBACvD;GACA,GAAG,UAAU;EACf,GAAG,SAAS;EACZ,GAAG,KAAK,cAAc;GACpB,aAAa,YAAY;GACzB,oBAAoB;EACtB,CAAC;EACD,GAAG,KAAK,eAAe,aAAa,YAAY,CAAC;CACnD,OAAO,IAAI,GAAG,eAAe,GAAG,MAC9B,oBAAoB;CAMtB,MAAM,oBAAqB,oBAAoB;CAC/C,GAAG,GAAG,QAAQ,WAAW;CACzB,GAAG,GAAG,WAAW,WAAW;CAC5B,GAAG,KAAK,eAAe,cAAc,aAAa,CAAC;AACrD"}

package/out/zero-cache/src/workers/connection.js

@@ -78,9 +78,9 @@ var Connection = class {
 	* will only parse messages with schema(s) of supported protocol versions.
 	*/
 	init() {
-		if (this.#protocolVersion > 52 || this.#protocolVersion < 30) this.#closeWithError({
+		if (this.#protocolVersion > 53 || this.#protocolVersion < 30) this.#closeWithError({
 			kind: VersionNotSupported,
-			message: `server is at sync protocol v52 and does not support v${this.#protocolVersion}. The ${this.#protocolVersion > 52 ? "server" : "client"} must be updated to a newer release.`,
+			message: `server is at sync protocol v53 and does not support v${this.#protocolVersion}. The ${this.#protocolVersion > 53 ? "server" : "client"} must be updated to a newer release.`,
 			origin: ZeroCache
 		});
 		else {

package/out/zero-cache/src/workers/replicator.d.ts

@@ -43,6 +43,7 @@ export declare function getPragmaConfig(mode: ReplicaFileMode): PragmaConfig;
 export declare function setupReplica(lc: LogContext, mode: ReplicaFileMode, replicaOptions: ReplicaOptions): Promise<{
     file: string;
     walMode: WalMode;
+    pageSize: number;
 }>;
 export declare function setUpMessageHandlers(lc: LogContext, replicator: Replicator, parent: Worker): void;
 export declare function handleSubscriptionsFrom(lc: LogContext, subscriber: Worker, notifier: ReplicaStateNotifier): void;

package/out/zero-cache/src/workers/replicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAI7D,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACX,MAAM,sCAAsC,CAAC;AAK9C,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,eAAO,MAAM,qBAAqB,+CAIjC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,MAAM,MAAM,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;AAErC,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,UAEzE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAC7C,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAET;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM,GACb,OAAO,CAMT;AA4FD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,YAAY,CAMnE;AAED,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,eAAe,EACrB,cAAc,EAAE,cAAc;UAlGd,MAAM;aAAW,OAAO;GAiIzC;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,QAGf;AAID,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,QA8B/B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,UAAU,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GACvC,QAAQ,CAOV;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAE1D"}
+{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAI7D,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACX,MAAM,sCAAsC,CAAC;AAK9C,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,eAAO,MAAM,qBAAqB,+CAIjC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,MAAM,MAAM,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;AAErC,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,UAEzE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAC7C,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAET;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM,GACb,OAAO,CAMT;AA2FD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,YAAY,CAMnE;AAED,wBAAgB,YAAY,CAC1B,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,eAAe,EACrB,cAAc,EAAE,cAAc;UAjGd,MAAM;aAAW,OAAO;cAAY,MAAM;GAgI3D;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,QAGf;AAID,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,oBAAoB,QA8B/B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,UAAU,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GACvC,QAAQ,CAOV;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAE1D"}

package/out/zero-cache/src/workers/replicator.js

@@ -48,9 +48,10 @@ var MB = 1024 * 1024;
 async function prepare(lc, { file, vacuumIntervalHours }, walMode, mode) {
 	await upgradeReplica(lc, `${mode}-replica`, file);
 	const replica = new Database(lc, file);
+	let pageSize;
 	try {
 		await setJournalMode(lc, replica, "delete");
-		const [{ page_size: pageSize }] = replica.pragma("page_size");
+		[{page_size: pageSize}] = replica.pragma("page_size");
 		const [{ page_count: pageCount }] = replica.pragma("page_count");
 		const [{ freelist_count: freelistCount }] = replica.pragma("freelist_count");
 		const dbSize = (pageCount * pageSize / MB).toFixed(2);
@@ -80,7 +81,8 @@ async function prepare(lc, { file, vacuumIntervalHours }, walMode, mode) {
 	}
 	return {
 		file,
-		walMode
+		walMode,
+		pageSize
 	};
 }
 async function setJournalMode(lc, replica, mode) {

package/out/zero-cache/src/workers/replicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"replicator.js","names":[],"sources":["../../../../../zero-cache/src/workers/replicator.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {sleep} from '../../../shared/src/sleep.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport type {ReplicaOptions} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {upgradeReplica} from '../services/change-source/common/replica-schema.ts';\nimport {deleteChangeLogDB} from '../services/replicator/change-log-db.ts';\nimport {Notifier} from '../services/replicator/notifier.ts';\nimport type {\n  ReplicaState,\n  ReplicaStateNotifier,\n  Replicator,\n} from '../services/replicator/replicator.ts';\nimport {\n  getAscendingEvents,\n  recordEvent,\n} from '../services/replicator/schema/replication-state.ts';\nimport {\n  applyPragmas,\n  type PragmaConfig,\n} from '../services/replicator/write-worker-client.ts';\nimport type {Worker} from '../types/processes.ts';\n\nexport const replicaFileModeSchema = v.literalUnion(\n  'serving',\n  'serving-copy',\n  'backup',\n);\n\nexport type ReplicaFileMode = v.Infer<typeof replicaFileModeSchema>;\n\nexport type WalMode = 'wal' | 'wal2';\n\nexport function replicaFileName(replicaFile: string, mode: ReplicaFileMode) {\n  return mode === 'serving-copy' ? `${replicaFile}-serving-copy` : replicaFile;\n}\n\n/**\n * Whether a replicator worker deletes the change-log file beside its replica at\n * startup.\n *\n * The change log belongs to the change-streamer, so this only ever cleans up a\n * file that nothing is writing. The predicate is deliberately the config flag\n * and nothing else: keying it on anything derived per replica -- a file mode, or\n * the retired `logsChangeStream` -- would make every replicator start unlink the\n * change-streamer's live log, because no replicator writes it any more. Paths\n * coincide whenever `fileMode !== 'serving-copy'`, so that hazard is real in the\n * shipped no-`backupURL` configuration.\n *\n * Deleting is safe when nothing writes the log: it is excluded from the\n * litestream backup, only the writer purges it, and re-enabling the writer\n * reseeds at the resume watermark.\n */\nexport function replicatorDeletesStaleChangeLog(\n  sqliteChangeLogMode: string,\n): boolean {\n  return sqliteChangeLogMode === 'off';\n}\n\n/**\n * The `mode=off` cleanup itself: deletes the change-log file beside `dbPath`\n * when {@link replicatorDeletesStaleChangeLog} says nothing writes it, and\n * reports whether it did. The decision and the delete live in one function so\n * that the guard test covers the call the replicator actually makes, not just\n * the predicate.\n */\nexport function deleteStaleChangeLog(\n  sqliteChangeLogMode: string,\n  dbPath: string,\n): boolean {\n  if (!replicatorDeletesStaleChangeLog(sqliteChangeLogMode)) {\n    return false;\n  }\n  deleteChangeLogDB(dbPath);\n  return true;\n}\n\nconst MILLIS_PER_HOUR = 1000 * 60 * 60;\nconst MB = 1024 * 1024;\n\nasync function prepare(\n  lc: LogContext,\n  {file, vacuumIntervalHours}: ReplicaOptions,\n  walMode: WalMode,\n  mode: ReplicaFileMode,\n): Promise<{file: string; walMode: WalMode}> {\n  // Perform any upgrades to the replica in case the backup is an\n  // earlier version.\n  await upgradeReplica(lc, `${mode}-replica`, file);\n\n  const replica = new Database(lc, file);\n  try {\n    // Start by folding any (e.g. restored) WAL(2) files into the main db.\n    await setJournalMode(lc, replica, 'delete');\n\n    const [{page_size: pageSize}] = replica.pragma<{page_size: number}>(\n      'page_size',\n    );\n    const [{page_count: pageCount}] = replica.pragma<{page_count: number}>(\n      'page_count',\n    );\n    const [{freelist_count: freelistCount}] = replica.pragma<{\n      freelist_count: number;\n    }>('freelist_count');\n\n    const dbSize = ((pageCount * pageSize) / MB).toFixed(2);\n    const freelistSize = ((freelistCount * pageSize) / MB).toFixed(2);\n\n    // TODO: Consider adding a freelist size or ratio based vacuum trigger.\n    lc.info?.(`Size of db ${file}: ${dbSize} MB (${freelistSize} MB freeable)`);\n\n    // Check for the VACUUM threshold.\n    const events = getAscendingEvents(replica);\n    lc.debug?.(`Runtime events for db ${file}`, {events});\n    if (vacuumIntervalHours !== undefined) {\n      const millisSinceLastEvent =\n        Date.now() - (events.at(-1)?.timestamp.getTime() ?? 0);\n      if (millisSinceLastEvent / MILLIS_PER_HOUR > vacuumIntervalHours) {\n        lc.info?.(`Performing maintenance cleanup on ${file}`);\n        const t0 = performance.now();\n        replica.unsafeMode(true);\n        replica.pragma('journal_mode = OFF');\n        replica.exec('VACUUM');\n        recordEvent(replica, 'vacuum');\n        replica.unsafeMode(false);\n        const t1 = performance.now();\n        lc.info?.(`VACUUM completed (${t1 - t0} ms)`);\n      }\n    }\n\n    await setJournalMode(lc, replica, walMode);\n\n    const pragmas = getPragmaConfig(mode);\n    applyPragmas(replica, pragmas);\n\n    replica.pragma('optimize = 0x10002');\n    lc.info?.(`optimized ${file}`);\n  } finally {\n    replica.close();\n  }\n  return {file, walMode};\n}\n\n// Setting the journal_mode requires an exclusive lock on the replica.\n// Add resilience against random replica reads (for stats, etc.) by\n// retrying if the database is locked. Note that the busy_timeout doesn't\n// work here.\nasync function setJournalMode(\n  lc: LogContext,\n  replica: Database,\n  mode: 'delete' | 'wal' | 'wal2',\n) {\n  lc.info?.(`setting ${replica.name} to ${mode} mode`);\n  let err: unknown;\n  for (let i = 0; i < 5; i++) {\n    try {\n      replica.pragma(`journal_mode = ${mode}`);\n      return;\n    } catch (e) {\n      lc.warn?.(`error setting journal_mode to ${mode} (attempt ${i + 1})`, e);\n      err = e;\n    }\n    await sleep(500);\n  }\n  throw err;\n}\n\n/**\n * Returns the PragmaConfig for a given replica file mode.\n * This is used by both the main thread (setupReplica) and\n * the write worker thread to apply the same pragma settings.\n */\nexport function getPragmaConfig(mode: ReplicaFileMode): PragmaConfig {\n  return {\n    busyTimeout: 30000,\n    analysisLimit: 1000,\n    walAutocheckpoint: mode === 'backup' ? 0 : undefined,\n  };\n}\n\nexport function setupReplica(\n  lc: LogContext,\n  mode: ReplicaFileMode,\n  replicaOptions: ReplicaOptions,\n) {\n  lc.info?.(`setting up ${mode} replica`);\n\n  switch (mode) {\n    case 'backup':\n      return prepare(lc, replicaOptions, 'wal', mode);\n\n    case 'serving-copy': {\n      // In 'serving-copy' mode, the original file is being used for 'backup'\n      // mode, so we make a copy for servicing sync requests.\n      const {file} = replicaOptions;\n      const copyLocation = replicaFileName(file, mode);\n      deleteLiteDB(copyLocation);\n\n      const start = Date.now();\n      lc.info?.(`copying ${file} to ${copyLocation}`);\n      const replica = new Database(lc, file);\n      replica.prepare(`VACUUM INTO ?`).run(copyLocation);\n      replica.close();\n      lc.info?.(`finished copy (${Date.now() - start} ms)`);\n\n      return prepare(lc, {...replicaOptions, file: copyLocation}, 'wal2', mode);\n    }\n\n    case 'serving':\n      return prepare(lc, replicaOptions, 'wal2', mode);\n\n    default:\n      throw new Error(`Invalid ReplicaMode ${mode}`);\n  }\n}\n\nexport function setUpMessageHandlers(\n  lc: LogContext,\n  replicator: Replicator,\n  parent: Worker,\n) {\n  handleSubscriptionsFrom(lc, parent, replicator);\n}\n\ntype Notification = ['notify', ReplicaState];\n\nexport function handleSubscriptionsFrom(\n  lc: LogContext,\n  subscriber: Worker,\n  notifier: ReplicaStateNotifier,\n) {\n  subscriber.onMessageType('subscribe', async () => {\n    const subscription = notifier.subscribe();\n\n    subscriber.on('close', () => {\n      lc.debug?.(`closing replication subscription from ${subscriber.pid}`);\n      subscription.cancel();\n    });\n\n    for await (const msg of subscription) {\n      try {\n        subscriber.send<Notification>(['notify', msg]);\n      } catch (e) {\n        const log =\n          e instanceof Error &&\n          'code' in e &&\n          // This can happen in a race condition if the subscribing process\n          // is closed before the 'close' message is processed.\n          e.code === 'ERR_IPC_CHANNEL_CLOSED'\n            ? 'warn'\n            : 'error';\n\n        lc[log]?.(\n          `error sending replicator notification to ${subscriber.pid}: ${String(e)}`,\n          e,\n        );\n      }\n    }\n  });\n}\n\n/**\n * Creates a Notifier to relay notifications the notifier of another Worker.\n * This does not send the initial subscription message. Use {@link subscribeTo}\n * to initiate the subscription.\n */\nexport function createNotifierFrom(\n  _lc: LogContext,\n  source: Worker,\n  onNotify?: (state: ReplicaState) => void,\n): Notifier {\n  const notifier = new Notifier();\n  source.onMessageType<Notification>('notify', msg => {\n    onNotify?.(msg);\n    void notifier.notifySubscribers(msg);\n  });\n  return notifier;\n}\n\nexport function subscribeTo(_lc: LogContext, source: Worker) {\n  source.send(['subscribe', {}]);\n}\n"],"mappings":"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"}
+{"version":3,"file":"replicator.js","names":[],"sources":["../../../../../zero-cache/src/workers/replicator.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {sleep} from '../../../shared/src/sleep.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport type {ReplicaOptions} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {upgradeReplica} from '../services/change-source/common/replica-schema.ts';\nimport {deleteChangeLogDB} from '../services/replicator/change-log-db.ts';\nimport {Notifier} from '../services/replicator/notifier.ts';\nimport type {\n  ReplicaState,\n  ReplicaStateNotifier,\n  Replicator,\n} from '../services/replicator/replicator.ts';\nimport {\n  getAscendingEvents,\n  recordEvent,\n} from '../services/replicator/schema/replication-state.ts';\nimport {\n  applyPragmas,\n  type PragmaConfig,\n} from '../services/replicator/write-worker-client.ts';\nimport type {Worker} from '../types/processes.ts';\n\nexport const replicaFileModeSchema = v.literalUnion(\n  'serving',\n  'serving-copy',\n  'backup',\n);\n\nexport type ReplicaFileMode = v.Infer<typeof replicaFileModeSchema>;\n\nexport type WalMode = 'wal' | 'wal2';\n\nexport function replicaFileName(replicaFile: string, mode: ReplicaFileMode) {\n  return mode === 'serving-copy' ? `${replicaFile}-serving-copy` : replicaFile;\n}\n\n/**\n * Whether a replicator worker deletes the change-log file beside its replica at\n * startup.\n *\n * The change log belongs to the change-streamer, so this only ever cleans up a\n * file that nothing is writing. The predicate is deliberately the config flag\n * and nothing else: keying it on anything derived per replica -- a file mode, or\n * the retired `logsChangeStream` -- would make every replicator start unlink the\n * change-streamer's live log, because no replicator writes it any more. Paths\n * coincide whenever `fileMode !== 'serving-copy'`, so that hazard is real in the\n * shipped no-`backupURL` configuration.\n *\n * Deleting is safe when nothing writes the log: it is excluded from the\n * litestream backup, only the writer purges it, and re-enabling the writer\n * reseeds at the resume watermark.\n */\nexport function replicatorDeletesStaleChangeLog(\n  sqliteChangeLogMode: string,\n): boolean {\n  return sqliteChangeLogMode === 'off';\n}\n\n/**\n * The `mode=off` cleanup itself: deletes the change-log file beside `dbPath`\n * when {@link replicatorDeletesStaleChangeLog} says nothing writes it, and\n * reports whether it did. The decision and the delete live in one function so\n * that the guard test covers the call the replicator actually makes, not just\n * the predicate.\n */\nexport function deleteStaleChangeLog(\n  sqliteChangeLogMode: string,\n  dbPath: string,\n): boolean {\n  if (!replicatorDeletesStaleChangeLog(sqliteChangeLogMode)) {\n    return false;\n  }\n  deleteChangeLogDB(dbPath);\n  return true;\n}\n\nconst MILLIS_PER_HOUR = 1000 * 60 * 60;\nconst MB = 1024 * 1024;\n\nasync function prepare(\n  lc: LogContext,\n  {file, vacuumIntervalHours}: ReplicaOptions,\n  walMode: WalMode,\n  mode: ReplicaFileMode,\n): Promise<{file: string; walMode: WalMode; pageSize: number}> {\n  // Perform any upgrades to the replica in case the backup is an\n  // earlier version.\n  await upgradeReplica(lc, `${mode}-replica`, file);\n\n  const replica = new Database(lc, file);\n  let pageSize: number;\n  try {\n    // Start by folding any (e.g. restored) WAL(2) files into the main db.\n    await setJournalMode(lc, replica, 'delete');\n\n    [{page_size: pageSize}] = replica.pragma<{page_size: number}>('page_size');\n    const [{page_count: pageCount}] = replica.pragma<{page_count: number}>(\n      'page_count',\n    );\n    const [{freelist_count: freelistCount}] = replica.pragma<{\n      freelist_count: number;\n    }>('freelist_count');\n\n    const dbSize = ((pageCount * pageSize) / MB).toFixed(2);\n    const freelistSize = ((freelistCount * pageSize) / MB).toFixed(2);\n\n    // TODO: Consider adding a freelist size or ratio based vacuum trigger.\n    lc.info?.(`Size of db ${file}: ${dbSize} MB (${freelistSize} MB freeable)`);\n\n    // Check for the VACUUM threshold.\n    const events = getAscendingEvents(replica);\n    lc.debug?.(`Runtime events for db ${file}`, {events});\n    if (vacuumIntervalHours !== undefined) {\n      const millisSinceLastEvent =\n        Date.now() - (events.at(-1)?.timestamp.getTime() ?? 0);\n      if (millisSinceLastEvent / MILLIS_PER_HOUR > vacuumIntervalHours) {\n        lc.info?.(`Performing maintenance cleanup on ${file}`);\n        const t0 = performance.now();\n        replica.unsafeMode(true);\n        replica.pragma('journal_mode = OFF');\n        replica.exec('VACUUM');\n        recordEvent(replica, 'vacuum');\n        replica.unsafeMode(false);\n        const t1 = performance.now();\n        lc.info?.(`VACUUM completed (${t1 - t0} ms)`);\n      }\n    }\n\n    await setJournalMode(lc, replica, walMode);\n\n    const pragmas = getPragmaConfig(mode);\n    applyPragmas(replica, pragmas);\n\n    replica.pragma('optimize = 0x10002');\n    lc.info?.(`optimized ${file}`);\n  } finally {\n    replica.close();\n  }\n  return {file, walMode, pageSize};\n}\n\n// Setting the journal_mode requires an exclusive lock on the replica.\n// Add resilience against random replica reads (for stats, etc.) by\n// retrying if the database is locked. Note that the busy_timeout doesn't\n// work here.\nasync function setJournalMode(\n  lc: LogContext,\n  replica: Database,\n  mode: 'delete' | 'wal' | 'wal2',\n) {\n  lc.info?.(`setting ${replica.name} to ${mode} mode`);\n  let err: unknown;\n  for (let i = 0; i < 5; i++) {\n    try {\n      replica.pragma(`journal_mode = ${mode}`);\n      return;\n    } catch (e) {\n      lc.warn?.(`error setting journal_mode to ${mode} (attempt ${i + 1})`, e);\n      err = e;\n    }\n    await sleep(500);\n  }\n  throw err;\n}\n\n/**\n * Returns the PragmaConfig for a given replica file mode.\n * This is used by both the main thread (setupReplica) and\n * the write worker thread to apply the same pragma settings.\n */\nexport function getPragmaConfig(mode: ReplicaFileMode): PragmaConfig {\n  return {\n    busyTimeout: 30000,\n    analysisLimit: 1000,\n    walAutocheckpoint: mode === 'backup' ? 0 : undefined,\n  };\n}\n\nexport function setupReplica(\n  lc: LogContext,\n  mode: ReplicaFileMode,\n  replicaOptions: ReplicaOptions,\n) {\n  lc.info?.(`setting up ${mode} replica`);\n\n  switch (mode) {\n    case 'backup':\n      return prepare(lc, replicaOptions, 'wal', mode);\n\n    case 'serving-copy': {\n      // In 'serving-copy' mode, the original file is being used for 'backup'\n      // mode, so we make a copy for servicing sync requests.\n      const {file} = replicaOptions;\n      const copyLocation = replicaFileName(file, mode);\n      deleteLiteDB(copyLocation);\n\n      const start = Date.now();\n      lc.info?.(`copying ${file} to ${copyLocation}`);\n      const replica = new Database(lc, file);\n      replica.prepare(`VACUUM INTO ?`).run(copyLocation);\n      replica.close();\n      lc.info?.(`finished copy (${Date.now() - start} ms)`);\n\n      return prepare(lc, {...replicaOptions, file: copyLocation}, 'wal2', mode);\n    }\n\n    case 'serving':\n      return prepare(lc, replicaOptions, 'wal2', mode);\n\n    default:\n      throw new Error(`Invalid ReplicaMode ${mode}`);\n  }\n}\n\nexport function setUpMessageHandlers(\n  lc: LogContext,\n  replicator: Replicator,\n  parent: Worker,\n) {\n  handleSubscriptionsFrom(lc, parent, replicator);\n}\n\ntype Notification = ['notify', ReplicaState];\n\nexport function handleSubscriptionsFrom(\n  lc: LogContext,\n  subscriber: Worker,\n  notifier: ReplicaStateNotifier,\n) {\n  subscriber.onMessageType('subscribe', async () => {\n    const subscription = notifier.subscribe();\n\n    subscriber.on('close', () => {\n      lc.debug?.(`closing replication subscription from ${subscriber.pid}`);\n      subscription.cancel();\n    });\n\n    for await (const msg of subscription) {\n      try {\n        subscriber.send<Notification>(['notify', msg]);\n      } catch (e) {\n        const log =\n          e instanceof Error &&\n          'code' in e &&\n          // This can happen in a race condition if the subscribing process\n          // is closed before the 'close' message is processed.\n          e.code === 'ERR_IPC_CHANNEL_CLOSED'\n            ? 'warn'\n            : 'error';\n\n        lc[log]?.(\n          `error sending replicator notification to ${subscriber.pid}: ${String(e)}`,\n          e,\n        );\n      }\n    }\n  });\n}\n\n/**\n * Creates a Notifier to relay notifications the notifier of another Worker.\n * This does not send the initial subscription message. Use {@link subscribeTo}\n * to initiate the subscription.\n */\nexport function createNotifierFrom(\n  _lc: LogContext,\n  source: Worker,\n  onNotify?: (state: ReplicaState) => void,\n): Notifier {\n  const notifier = new Notifier();\n  source.onMessageType<Notification>('notify', msg => {\n    onNotify?.(msg);\n    void notifier.notifySubscribers(msg);\n  });\n  return notifier;\n}\n\nexport function subscribeTo(_lc: LogContext, source: Worker) {\n  source.send(['subscribe', {}]);\n}\n"],"mappings":"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"}

package/out/zero-cache/src/workers/syncer-ws-message-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncer-ws-message-handler.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer-ws-message-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,gCAAgC,EAAC,MAAM,kCAAkC,CAAC;AACvF,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAiBnE,qBAAa,sBAAuB,YAAW,cAAc;;IAU3D,YACE,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,wBAAwB,EAC5C,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GAAG,SAAS,EAkB3B;IAEK,aAAa,CACjB,GAAG,EAAE,gCAAgC,GACpC,OAAO,CAAC,aAAa,EAAE,CAAC,CAkN1B;CACF"}
+{"version":3,"file":"syncer-ws-message-handler.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer-ws-message-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,gCAAgC,EAAC,MAAM,kCAAkC,CAAC;AACvF,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAiBnE,qBAAa,sBAAuB,YAAW,cAAc;;IAU3D,YACE,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,wBAAwB,EAC5C,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GAAG,SAAS,EAkB3B;IAEK,aAAa,CACjB,GAAG,EAAE,gCAAgC,GACpC,OAAO,CAAC,aAAa,EAAE,CAAC,CA6N1B;CACF"}

package/out/zero-cache/src/workers/syncer-ws-message-handler.js

@@ -86,22 +86,27 @@ var SyncerWsMessageHandler = class {
 				}];
 				const auth = this.#connContextManager.mustGetConnectionContext(this.#connectionSelector).auth;
 				assert(auth?.type !== "opaque", "Only JWT auth is supported for CRUD mutations");
-				return [await this.#mutationLock.withLock(async () => {
-					const errors = [];
-					for (const mutation of mutations) {
-						const maybeError = await mutagen.processMutation(mutation, auth?.decoded, this.#pusher !== void 0);
-						if (maybeError !== void 0) errors.push({
-							kind: maybeError[0],
-							message: maybeError[1],
-							origin: ZeroCache
-						});
-					}
-					if (errors.length > 0) return {
-						type: "transient",
-						errors
-					};
-					return { type: "ok" };
-				})];
+				mutagen.ref();
+				try {
+					return [await this.#mutationLock.withLock(async () => {
+						const errors = [];
+						for (const mutation of mutations) {
+							const maybeError = await mutagen.processMutation(mutation, auth?.decoded, this.#pusher !== void 0);
+							if (maybeError !== void 0) errors.push({
+								kind: maybeError[0],
+								message: maybeError[1],
+								origin: ZeroCache
+							});
+						}
+						if (errors.length > 0) return {
+							type: "transient",
+							errors
+						};
+						return { type: "ok" };
+					})];
+				} finally {
+					mutagen.unref();
+				}
 			}));
 			case "changeDesiredQueries":
 				await withTraceparent(msg[1].traceparent, () => startAsyncSpan(tracer, "connection.changeDesiredQueries", () => viewSyncer.changeDesiredQueries(this.#connectionSelector, msg)));