@rocicorp/zero 1.11.0-canary.3 → 1.11.0-canary.30

package/out/zero-cache/src/services/change-streamer/backfill-state-tracker.js

@@ -0,0 +1,162 @@
+import { must } from "../../../../shared/src/must.js";
+import { getOrCreateCounter } from "../../observability/metrics.js";
+import { getSuperset, withResumePoint } from "../change-source/protocol/backfill-progress.js";
+import { BackfillState } from "./backfill-state.js";
+//#region ../zero-cache/src/services/change-streamer/backfill-state-tracker.ts
+/**
+* Tracks the pending backfills (and their progress) of the change log, the
+* subscribers, and the current change stream, in order to determine:
+*
+* * the BackfillRequests with which to start a change stream, i.e. the
+*   superset of the pending backfills of the change log and all aligned
+*   subscribers, starting from the earliest progress, and
+* * whether (and why) the change stream must be restarted, i.e. when a
+*   newly aligned subscriber's pending backfills are not covered by the
+*   current stream.
+*
+* The change-streamer calls {@link startStream()} whenever it starts a change
+* stream, {@link track()} for every change that it forwards, and restarts
+* the stream at the next transaction boundary whenever a
+* {@link restartReason} is set.
+*/
+var BackfillStateTracker = class {
+	#lc;
+	/**
+	* The pending backfills of the change log itself, i.e. those of a
+	* (hypothetical) subscriber that has applied every change in the log.
+	* Whenever a stream is started, it is reset from the change log's cookie
+	* jar (which is consistent with the stream's starting watermark), carrying
+	* over the progress tracked in memory (as the cookie jar is
+	* progress-agnostic). It stands in for subscribers that do not report their
+	* pending backfills (i.e. protocol < v8), and ensures that backfills that
+	* are pending in the change log continue to be requested.
+	*/
+	#logBackfills = new BackfillState();
+	/**
+	* The backfill progress of the current change stream (i.e. "session"),
+	* seeded from the BackfillRequests with which the stream was started.
+	* This determines whether a (newly aligned) subscriber's pending backfills
+	* are covered by the stream.
+	*/
+	#sessionBackfills = new BackfillState();
+	/** Subscribers that report their pending backfills (protocol v8+). */
+	#subscribers = /* @__PURE__ */ new Set();
+	/**
+	* Set (to the reason) when the change stream must be restarted with
+	* new BackfillRequests.
+	*/
+	#restartReason = null;
+	#restarts = getOrCreateCounter("replication", "backfill_stream_restarts", "Count of change stream restarts initiated to rewind backfills for subscribers whose pending backfills were not covered by the stream");
+	#unexpectedIgnores = getOrCreateCounter("replication", "backfill_unexpected_ignores", "Count of backfill messages unexpectedly ignored (for some columns) by an aligned subscriber. The expected count is 0.");
+	constructor(lc) {
+		this.#lc = lc;
+	}
+	/**
+	* The reason for which the change stream must be restarted, or `null` if
+	* it need not be. The restart should happen at the next transaction
+	* boundary, i.e. upon the next `commit`, or `status` message outside of a
+	* transaction.
+	*/
+	get restartReason() {
+		return this.#restartReason;
+	}
+	/**
+	* Computes the BackfillRequests with which to start a new change stream:
+	* the superset of the pending backfills of the change log and of all
+	* aligned subscribers, all of which are consistent with the stream's
+	* starting watermark since streams are (re)started at transaction
+	* boundaries.
+	*
+	* @param logBackfillRequests The BackfillRequests from the change log's
+	*        cookie jar, consistent with the stream's starting watermark.
+	*/
+	startStream(logBackfillRequests) {
+		this.#logBackfills = new BackfillState(this.#logBackfills.withProgress(logBackfillRequests));
+		const aligned = [...this.#subscribers].filter((s) => s.aligned);
+		const requests = getSuperset(this.#logBackfills.requests(), ...aligned.map((s) => must(s.backfills).requests())).map(withResumePoint);
+		this.#sessionBackfills = new BackfillState(requests);
+		this.#restartReason = null;
+		if (requests.length) this.#lc.info?.(`starting change stream with ${requests.length} backfill requests (from the change log and ${aligned.length} subscribers)`, { requests });
+		return requests;
+	}
+	/**
+	* Tracks a change that is forwarded to subscribers. This must be called
+	* (synchronously) before the change is forwarded, so that the stream's
+	* state is never ahead of that of aligned subscribers.
+	*/
+	track(change) {
+		this.#sessionBackfills.apply(change);
+		this.#logBackfills.apply(change);
+	}
+	/**
+	* Requests a restart of the change stream (at the next transaction
+	* boundary), e.g. to start it with BackfillRequests that it was not
+	* started with.
+	*/
+	requestRestart(reason) {
+		this.#restartReason ??= reason;
+	}
+	/** Logs and records a (planned) restart for the {@link restartReason}. */
+	recordRestart() {
+		this.#lc.info?.(`restarting change stream: ${this.#restartReason}`);
+		this.#restarts.add(1);
+	}
+	/**
+	* Returns the backfill-related {@link SubscriberOptions} for a new
+	* subscriber, which must subsequently be passed to {@link register()}.
+	*/
+	subscriberOptions(lc, ctx) {
+		const backfills = newBackfillState(lc, ctx);
+		if (!backfills) return {};
+		return {
+			backfills,
+			onAligned: (subscriber) => {
+				if (this.#subscribers.has(subscriber)) this.#checkCoverage(subscriber);
+			},
+			onBackfillIgnored: (columns) => {
+				if (this.#restartReason === null) {
+					lc.warn?.(`aligned subscriber ignored backfill data for ${columns.join(", ")}`);
+					this.#unexpectedIgnores.add(1);
+				}
+			}
+		};
+	}
+	/**
+	* Registers a subscriber (created with {@link subscriberOptions()}) until
+	* its `downstream` is closed. This is a no-op for subscribers that do not
+	* report their pending backfills.
+	*/
+	register(subscriber, downstream) {
+		if (subscriber.backfills) {
+			this.#subscribers.add(subscriber);
+			downstream.addCloseHandler(() => this.#subscribers.delete(subscriber));
+		}
+	}
+	/**
+	* Checks whether the pending backfills of a newly aligned subscriber are
+	* covered by the current stream, requesting a restart of the stream if not.
+	*
+	* This can be checked as soon as the subscriber is aligned (even in the
+	* middle of a transaction), since both the subscriber's and the stream's
+	* BackfillStates compare their committed state, and the stream's state is
+	* never updated with a change before the change is forwarded to (aligned)
+	* subscribers. The restart itself happens at the next transaction boundary.
+	*/
+	#checkCoverage(subscriber) {
+		const uncovered = must(subscriber.backfills).uncovered(this.#sessionBackfills);
+		if (uncovered.length) this.#restartReason ??= `subscriber ${subscriber.id} needs backfills that are not covered by the current stream: ${uncovered.join(", ")}`;
+	}
+};
+function newBackfillState(lc, ctx) {
+	if (ctx.backfills === void 0) return;
+	try {
+		return new BackfillState(ctx.backfills);
+	} catch (e) {
+		lc.warn?.(`invalid backfills from subscriber ${ctx.id}`, e);
+		return;
+	}
+}
+//#endregion
+export { BackfillStateTracker };
+
+//# sourceMappingURL=backfill-state-tracker.js.map

package/out/zero-cache/src/services/change-streamer/backfill-state-tracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backfill-state-tracker.js","names":["#lc","#subscribers","#restarts","#unexpectedIgnores","#restartReason","#logBackfills","#sessionBackfills","#checkCoverage"],"sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state-tracker.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../../shared/src/must.ts';\nimport {getOrCreateCounter} from '../../observability/metrics.ts';\nimport type {Subscription} from '../../types/subscription.ts';\nimport {\n  getSuperset,\n  withResumePoint,\n} from '../change-source/protocol/backfill-progress.ts';\nimport type {ChangeStreamData} from '../change-source/protocol/current/downstream.ts';\nimport type {BackfillRequest} from '../change-source/protocol/current/upstream.ts';\nimport {BackfillState} from './backfill-state.ts';\nimport type {PreSerializedBatch} from './broadcast.ts';\nimport type {SubscriberContext} from './change-streamer.ts';\nimport type {Subscriber, SubscriberOptions} from './subscriber.ts';\n\nexport type SubscriberBackfillOptions = Pick<\n  SubscriberOptions,\n  'backfills' | 'onAligned' | 'onBackfillIgnored'\n>;\n\n/**\n * Tracks the pending backfills (and their progress) of the change log, the\n * subscribers, and the current change stream, in order to determine:\n *\n * * the BackfillRequests with which to start a change stream, i.e. the\n *   superset of the pending backfills of the change log and all aligned\n *   subscribers, starting from the earliest progress, and\n * * whether (and why) the change stream must be restarted, i.e. when a\n *   newly aligned subscriber's pending backfills are not covered by the\n *   current stream.\n *\n * The change-streamer calls {@link startStream()} whenever it starts a change\n * stream, {@link track()} for every change that it forwards, and restarts\n * the stream at the next transaction boundary whenever a\n * {@link restartReason} is set.\n */\nexport class BackfillStateTracker {\n  readonly #lc: LogContext;\n\n  /**\n   * The pending backfills of the change log itself, i.e. those of a\n   * (hypothetical) subscriber that has applied every change in the log.\n   * Whenever a stream is started, it is reset from the change log's cookie\n   * jar (which is consistent with the stream's starting watermark), carrying\n   * over the progress tracked in memory (as the cookie jar is\n   * progress-agnostic). It stands in for subscribers that do not report their\n   * pending backfills (i.e. protocol < v8), and ensures that backfills that\n   * are pending in the change log continue to be requested.\n   */\n  #logBackfills = new BackfillState();\n\n  /**\n   * The backfill progress of the current change stream (i.e. \"session\"),\n   * seeded from the BackfillRequests with which the stream was started.\n   * This determines whether a (newly aligned) subscriber's pending backfills\n   * are covered by the stream.\n   */\n  #sessionBackfills = new BackfillState();\n\n  /** Subscribers that report their pending backfills (protocol v8+). */\n  readonly #subscribers = new Set<Subscriber>();\n\n  /**\n   * Set (to the reason) when the change stream must be restarted with\n   * new BackfillRequests.\n   */\n  #restartReason: string | null = null;\n\n  readonly #restarts = getOrCreateCounter(\n    'replication',\n    'backfill_stream_restarts',\n    'Count of change stream restarts initiated to rewind backfills for ' +\n      'subscribers whose pending backfills were not covered by the stream',\n  );\n  readonly #unexpectedIgnores = getOrCreateCounter(\n    'replication',\n    'backfill_unexpected_ignores',\n    'Count of backfill messages unexpectedly ignored (for some columns) by ' +\n      'an aligned subscriber. The expected count is 0.',\n  );\n\n  constructor(lc: LogContext) {\n    this.#lc = lc;\n  }\n\n  /**\n   * The reason for which the change stream must be restarted, or `null` if\n   * it need not be. The restart should happen at the next transaction\n   * boundary, i.e. upon the next `commit`, or `status` message outside of a\n   * transaction.\n   */\n  get restartReason(): string | null {\n    return this.#restartReason;\n  }\n\n  /**\n   * Computes the BackfillRequests with which to start a new change stream:\n   * the superset of the pending backfills of the change log and of all\n   * aligned subscribers, all of which are consistent with the stream's\n   * starting watermark since streams are (re)started at transaction\n   * boundaries.\n   *\n   * @param logBackfillRequests The BackfillRequests from the change log's\n   *        cookie jar, consistent with the stream's starting watermark.\n   */\n  startStream(logBackfillRequests: BackfillRequest[]): BackfillRequest[] {\n    // The cookie jar can be behind #logBackfills (e.g. if the storer failed\n    // to persist a forwarded commit), in which case the new stream\n    // re-delivers those changes.\n    this.#logBackfills = new BackfillState(\n      this.#logBackfills.withProgress(logBackfillRequests),\n    );\n\n    const aligned = [...this.#subscribers].filter(s => s.aligned);\n    const requests = getSuperset(\n      this.#logBackfills.requests(),\n      ...aligned.map(s => must(s.backfills).requests()),\n    ).map(withResumePoint);\n\n    this.#sessionBackfills = new BackfillState(requests);\n    // Aligned subscribers are accounted for in the requests.\n    this.#restartReason = null;\n    if (requests.length) {\n      this.#lc.info?.(\n        `starting change stream with ${requests.length} backfill requests ` +\n          `(from the change log and ${aligned.length} subscribers)`,\n        {requests},\n      );\n    }\n    return requests;\n  }\n\n  /**\n   * Tracks a change that is forwarded to subscribers. This must be called\n   * (synchronously) before the change is forwarded, so that the stream's\n   * state is never ahead of that of aligned subscribers.\n   */\n  track(change: ChangeStreamData) {\n    this.#sessionBackfills.apply(change);\n    this.#logBackfills.apply(change);\n  }\n\n  /**\n   * Requests a restart of the change stream (at the next transaction\n   * boundary), e.g. to start it with BackfillRequests that it was not\n   * started with.\n   */\n  requestRestart(reason: string) {\n    this.#restartReason ??= reason;\n  }\n\n  /** Logs and records a (planned) restart for the {@link restartReason}. */\n  recordRestart() {\n    this.#lc.info?.(`restarting change stream: ${this.#restartReason}`);\n    this.#restarts.add(1);\n  }\n\n  /**\n   * Returns the backfill-related {@link SubscriberOptions} for a new\n   * subscriber, which must subsequently be passed to {@link register()}.\n   */\n  subscriberOptions(\n    lc: LogContext,\n    ctx: SubscriberContext,\n  ): SubscriberBackfillOptions {\n    const backfills = newBackfillState(lc, ctx);\n    if (!backfills) {\n      return {};\n    }\n    return {\n      backfills,\n      onAligned: subscriber => {\n        if (this.#subscribers.has(subscriber)) {\n          this.#checkCoverage(subscriber);\n        }\n      },\n      onBackfillIgnored: columns => {\n        if (this.#restartReason === null) {\n          lc.warn?.(\n            `aligned subscriber ignored backfill data for ${columns.join(', ')}`,\n          );\n          this.#unexpectedIgnores.add(1);\n        }\n      },\n    };\n  }\n\n  /**\n   * Registers a subscriber (created with {@link subscriberOptions()}) until\n   * its `downstream` is closed. This is a no-op for subscribers that do not\n   * report their pending backfills.\n   */\n  register(\n    subscriber: Subscriber,\n    downstream: Subscription<string | PreSerializedBatch>,\n  ) {\n    if (subscriber.backfills) {\n      this.#subscribers.add(subscriber);\n      downstream.addCloseHandler(() => this.#subscribers.delete(subscriber));\n    }\n  }\n\n  /**\n   * Checks whether the pending backfills of a newly aligned subscriber are\n   * covered by the current stream, requesting a restart of the stream if not.\n   *\n   * This can be checked as soon as the subscriber is aligned (even in the\n   * middle of a transaction), since both the subscriber's and the stream's\n   * BackfillStates compare their committed state, and the stream's state is\n   * never updated with a change before the change is forwarded to (aligned)\n   * subscribers. The restart itself happens at the next transaction boundary.\n   */\n  #checkCoverage(subscriber: Subscriber) {\n    const uncovered = must(subscriber.backfills).uncovered(\n      this.#sessionBackfills,\n    );\n    if (uncovered.length) {\n      this.#restartReason ??=\n        `subscriber ${subscriber.id} needs backfills that are not ` +\n        `covered by the current stream: ${uncovered.join(', ')}`;\n    }\n  }\n}\n\nfunction newBackfillState(\n  lc: LogContext,\n  ctx: SubscriberContext,\n): BackfillState | undefined {\n  if (ctx.backfills === undefined) {\n    return undefined; // protocol < v8\n  }\n  try {\n    return new BackfillState(ctx.backfills);\n  } catch (e) {\n    lc.warn?.(`invalid backfills from subscriber ${ctx.id}`, e);\n    return undefined;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAoCA,IAAa,uBAAb,MAAkC;CAChC;;;;;;;;;;;CAYA,gBAAgB,IAAI,cAAc;;;;;;;CAQlC,oBAAoB,IAAI,cAAc;;CAGtC,+BAAwB,IAAI,IAAgB;;;;;CAM5C,iBAAgC;CAEhC,YAAqB,mBACnB,eACA,4BACA,sIAEF;CACA,qBAA8B,mBAC5B,eACA,+BACA,uHAEF;CAEA,YAAY,IAAgB;EAC1B,KAAKA,MAAM;CACb;;;;;;;CAQA,IAAI,gBAA+B;EACjC,OAAO,KAAKI;CACd;;;;;;;;;;;CAYA,YAAY,qBAA2D;EAIrE,KAAKC,gBAAgB,IAAI,cACvB,KAAKA,cAAc,aAAa,mBAAmB,CACrD;EAEA,MAAM,UAAU,CAAC,GAAG,KAAKJ,YAAY,EAAE,QAAO,MAAK,EAAE,OAAO;EAC5D,MAAM,WAAW,YACf,KAAKI,cAAc,SAAS,GAC5B,GAAG,QAAQ,KAAI,MAAK,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAClD,EAAE,IAAI,eAAe;EAErB,KAAKC,oBAAoB,IAAI,cAAc,QAAQ;EAEnD,KAAKF,iBAAiB;EACtB,IAAI,SAAS,QACX,KAAKJ,IAAI,OACP,+BAA+B,SAAS,OAAO,8CACjB,QAAQ,OAAO,gBAC7C,EAAC,SAAQ,CACX;EAEF,OAAO;CACT;;;;;;CAOA,MAAM,QAA0B;EAC9B,KAAKM,kBAAkB,MAAM,MAAM;EACnC,KAAKD,cAAc,MAAM,MAAM;CACjC;;;;;;CAOA,eAAe,QAAgB;EAC7B,KAAKD,mBAAmB;CAC1B;;CAGA,gBAAgB;EACd,KAAKJ,IAAI,OAAO,6BAA6B,KAAKI,gBAAgB;EAClE,KAAKF,UAAU,IAAI,CAAC;CACtB;;;;;CAMA,kBACE,IACA,KAC2B;EAC3B,MAAM,YAAY,iBAAiB,IAAI,GAAG;EAC1C,IAAI,CAAC,WACH,OAAO,CAAC;EAEV,OAAO;GACL;GACA,YAAW,eAAc;IACvB,IAAI,KAAKD,aAAa,IAAI,UAAU,GAClC,KAAKM,eAAe,UAAU;GAElC;GACA,oBAAmB,YAAW;IAC5B,IAAI,KAAKH,mBAAmB,MAAM;KAChC,GAAG,OACD,gDAAgD,QAAQ,KAAK,IAAI,GACnE;KACA,KAAKD,mBAAmB,IAAI,CAAC;IAC/B;GACF;EACF;CACF;;;;;;CAOA,SACE,YACA,YACA;EACA,IAAI,WAAW,WAAW;GACxB,KAAKF,aAAa,IAAI,UAAU;GAChC,WAAW,sBAAsB,KAAKA,aAAa,OAAO,UAAU,CAAC;EACvE;CACF;;;;;;;;;;;CAYA,eAAe,YAAwB;EACrC,MAAM,YAAY,KAAK,WAAW,SAAS,EAAE,UAC3C,KAAKK,iBACP;EACA,IAAI,UAAU,QACZ,KAAKF,mBACH,cAAc,WAAW,GAAG,+DACM,UAAU,KAAK,IAAI;CAE3D;AACF;AAEA,SAAS,iBACP,IACA,KAC2B;CAC3B,IAAI,IAAI,cAAc,KAAA,GACpB;CAEF,IAAI;EACF,OAAO,IAAI,cAAc,IAAI,SAAS;CACxC,SAAS,GAAG;EACV,GAAG,OAAO,qCAAqC,IAAI,MAAM,CAAC;EAC1D;CACF;AACF"}

package/out/zero-cache/src/services/change-streamer/backfill-state.d.ts

@@ -0,0 +1,50 @@
+import type { BackfillRequest, ChangeStreamData } from '../change-source/protocol/current.ts';
+import type { WatermarkedChange } from './change-streamer.ts';
+/**
+ * Tracks the state of the pending backfills (and their progress) of a party
+ * in the replication stream (e.g. a subscriber, or the change-log itself), by
+ * applying the same policies that a subscriber applies to its replica:
+ * schema changes are folded with the {@link cookieOps} shared by the
+ * cookie jars, and `backfill` / `backfill-completed` messages are accepted
+ * or ignored with the continuity policy of {@link acceptBackfill}.
+ *
+ * Changes are applied transactionally: the changes of a transaction are
+ * discarded if it is rolled back, and {@link requests()} only reflects
+ * committed transactions.
+ */
+export declare class BackfillState {
+    #private;
+    constructor(requests?: readonly BackfillRequest[]);
+    /** The (committed) pending backfills. */
+    requests(): BackfillRequest[];
+    /**
+     * Returns the `requests` with the (committed) progress of this state
+     * applied to the columns that are pending in both, i.e. same table, column,
+     * and backfill ID. Other columns have no progress (i.e. from scratch).
+     */
+    withProgress(requests: readonly BackfillRequest[]): BackfillRequest[];
+    /** Whether there are no (committed) pending backfills. */
+    get empty(): boolean;
+    /**
+     * Returns the columns (as `schema.table.column` strings) with (committed)
+     * pending backfills that are not covered by the (committed) progress of the
+     * `stream`, i.e. columns for which the `stream` will not deliver all of the
+     * necessary data.
+     */
+    uncovered(stream: BackfillState): string[];
+    /**
+     * Applies a serialized change, parsing it only if it is relevant.
+     *
+     * @returns The columns (as `schema.table.column` strings) of a backfill
+     *          message that were ignored due to the continuity policy.
+     */
+    applySerialized([, tag, json]: WatermarkedChange): string[];
+    /**
+     * Applies a change.
+     *
+     * @returns The columns (as `schema.table.column` strings) of a backfill
+     *          message that were ignored due to the continuity policy.
+     */
+    apply(change: ChangeStreamData): string[];
+}
+//# sourceMappingURL=backfill-state.d.ts.map

package/out/zero-cache/src/services/change-streamer/backfill-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"backfill-state.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAIjB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,KAAK,EAAY,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AA8CvE;;;;;;;;;;;GAWG;AACH,qBAAa,aAAa;;IAIxB,YAAY,QAAQ,GAAE,SAAS,eAAe,EAAO,EASpD;IAMD,yCAAyC;IACzC,QAAQ,IAAI,eAAe,EAAE,CAE5B;IAED;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,GAAG,eAAe,EAAE,CAmBpE;IAED,0DAA0D;IAC1D,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,EAAE,CAazC;IAED;;;;;OAKG;IACH,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,MAAM,EAAE,CAgB1D;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE,CA4DxC;CA6HF"}

package/out/zero-cache/src/services/change-streamer/backfill-state.js

@@ -0,0 +1,268 @@
+import { unreachable } from "../../../../shared/src/asserts.js";
+import { deepEqual } from "../../../../shared/src/json.js";
+import { BigIntJSON } from "../../../../shared/src/bigint-json.js";
+import { schemaChangeTags } from "../change-source/protocol/current/schema-change-tags.js";
+import { cookieOps } from "../replicator/change-log-cookies.js";
+import { acceptBackfill, covers } from "../change-source/protocol/backfill-progress.js";
+//#region ../zero-cache/src/services/change-streamer/backfill-state.ts
+function tableKey({ schema, name }) {
+	return JSON.stringify([schema, name]);
+}
+function clone(state) {
+	return new Map(Array.from(state, ([key, { table, columns }]) => [key, {
+		table: { ...table },
+		columns: { ...columns }
+	}]));
+}
+/**
+* Tags of messages that affect the backfill state. Other messages need not be
+* parsed.
+*/
+var RELEVANT_TAGS = new Set(["backfill", ...schemaChangeTags.filter((t) => t !== "create-index" && t !== "drop-index")]);
+var lastParsed;
+function parse(json) {
+	if (lastParsed?.json !== json) lastParsed = {
+		json,
+		change: BigIntJSON.parse(json)
+	};
+	return lastParsed.change;
+}
+/**
+* Tracks the state of the pending backfills (and their progress) of a party
+* in the replication stream (e.g. a subscriber, or the change-log itself), by
+* applying the same policies that a subscriber applies to its replica:
+* schema changes are folded with the {@link cookieOps} shared by the
+* cookie jars, and `backfill` / `backfill-completed` messages are accepted
+* or ignored with the continuity policy of {@link acceptBackfill}.
+*
+* Changes are applied transactionally: the changes of a transaction are
+* discarded if it is rolled back, and {@link requests()} only reflects
+* committed transactions.
+*/
+var BackfillState = class {
+	#state;
+	#beforeTx = null;
+	constructor(requests = []) {
+		this.#state = new Map(requests.filter((req) => Object.keys(req.columns).length > 0).map(({ table, columns }) => [tableKey(table), {
+			table: { ...table },
+			columns: { ...columns }
+		}]));
+	}
+	get #committed() {
+		return this.#beforeTx ?? this.#state;
+	}
+	/** The (committed) pending backfills. */
+	requests() {
+		return [...clone(this.#committed).values()];
+	}
+	/**
+	* Returns the `requests` with the (committed) progress of this state
+	* applied to the columns that are pending in both, i.e. same table, column,
+	* and backfill ID. Other columns have no progress (i.e. from scratch).
+	*/
+	withProgress(requests) {
+		const state = this.#committed;
+		return requests.map(({ table, columns }) => {
+			const tracked = state.get(tableKey(table))?.columns;
+			return {
+				table,
+				columns: Object.fromEntries(Object.entries(columns).map(([name, { id }]) => {
+					const col = tracked?.[name];
+					return [name, col?.progress && deepEqual(col.id, id) ? {
+						id,
+						progress: col.progress
+					} : { id }];
+				}))
+			};
+		});
+	}
+	/** Whether there are no (committed) pending backfills. */
+	get empty() {
+		return this.#committed.size === 0;
+	}
+	/**
+	* Returns the columns (as `schema.table.column` strings) with (committed)
+	* pending backfills that are not covered by the (committed) progress of the
+	* `stream`, i.e. columns for which the `stream` will not deliver all of the
+	* necessary data.
+	*/
+	uncovered(stream) {
+		const uncovered = [];
+		const streamState = stream.#committed;
+		for (const [key, { table, columns }] of this.#committed) {
+			const streamColumns = streamState.get(key)?.columns;
+			for (const [name, { id, progress }] of Object.entries(columns)) {
+				const s = streamColumns?.[name];
+				if (!s || !deepEqual(s.id, id) || !covers(s.progress, progress)) uncovered.push(`${table.schema}.${table.name}.${name}`);
+			}
+		}
+		return uncovered;
+	}
+	/**
+	* Applies a serialized change, parsing it only if it is relevant.
+	*
+	* @returns The columns (as `schema.table.column` strings) of a backfill
+	*          message that were ignored due to the continuity policy.
+	*/
+	applySerialized([, tag, json]) {
+		switch (tag) {
+			case "begin":
+				this.#begin();
+				return [];
+			case "commit":
+				this.#commit();
+				return [];
+			case "rollback":
+				this.#rollback();
+				return [];
+		}
+		if (!RELEVANT_TAGS.has(tag)) return [];
+		return this.apply(parse(json));
+	}
+	/**
+	* Applies a change.
+	*
+	* @returns The columns (as `schema.table.column` strings) of a backfill
+	*          message that were ignored due to the continuity policy.
+	*/
+	apply(change) {
+		switch (change[0]) {
+			case "begin":
+				this.#begin();
+				return [];
+			case "commit":
+				this.#commit();
+				return [];
+			case "rollback":
+				this.#rollback();
+				return [];
+		}
+		const msg = change[1];
+		switch (msg.tag) {
+			case "backfill": {
+				const { relation, columns, progressMarks } = msg;
+				return this.#applyBackfill(relation, columns, (progress, col) => {
+					const result = acceptBackfill(progress, progressMarks);
+					if (result.accept) {
+						col.progress = result.progress;
+						if (col.progress === void 0) delete col.progress;
+					}
+					return result.accept;
+				});
+			}
+			case "backfill-completed": {
+				const { relation, columns, progressMarks } = msg;
+				const backfill = this.#state.get(tableKey(relation));
+				const ignored = this.#applyBackfill(relation, columns, (progress, _, name) => {
+					const { accept } = acceptBackfill(progress, progressMarks && { previous: progressMarks.previous });
+					if (accept && backfill) delete backfill.columns[name];
+					return accept;
+				});
+				if (backfill && Object.keys(backfill.columns).length === 0) this.#state.delete(tableKey(relation));
+				return ignored;
+			}
+			case "create-table":
+			case "rename-table":
+			case "update-table-metadata":
+			case "add-column":
+			case "update-column":
+			case "drop-column":
+			case "drop-table":
+				this.#applySchemaChange(msg);
+				return [];
+		}
+		return [];
+	}
+	#applyBackfill(relation, columns, apply) {
+		const backfill = this.#state.get(tableKey(relation));
+		if (!backfill) return [];
+		const ignored = [];
+		for (const name of [...relation.rowKey.columns, ...columns]) {
+			const col = backfill.columns[name];
+			if (!col) continue;
+			const updated = { ...col };
+			if (apply(col.progress, updated, name)) {
+				if (name in backfill.columns) backfill.columns[name] = updated;
+			} else ignored.push(`${relation.schema}.${relation.name}.${name}`);
+		}
+		return ignored;
+	}
+	#applySchemaChange(change) {
+		const metadata = /* @__PURE__ */ new Map();
+		for (const op of cookieOps(change)) switch (op.op) {
+			case "upsert-metadata": {
+				const key = tableKey(op.table);
+				metadata.set(key, op.metadata);
+				const backfill = this.#state.get(key);
+				if (backfill) backfill.table.metadata = op.metadata;
+				break;
+			}
+			case "upsert-backfill": {
+				const key = tableKey(op.table);
+				let backfill = this.#state.get(key);
+				if (!backfill) {
+					backfill = {
+						table: {
+							schema: op.table.schema,
+							name: op.table.name,
+							metadata: metadata.get(key) ?? null
+						},
+						columns: {}
+					};
+					this.#state.set(key, backfill);
+				}
+				backfill.columns[op.column] = { id: op.backfill };
+				break;
+			}
+			case "rename-table": {
+				const backfill = this.#state.get(tableKey(op.old));
+				if (backfill) {
+					this.#state.delete(tableKey(op.old));
+					backfill.table.schema = op.new.schema;
+					backfill.table.name = op.new.name;
+					this.#state.set(tableKey(op.new), backfill);
+				}
+				break;
+			}
+			case "drop-table":
+				this.#state.delete(tableKey(op.table));
+				break;
+			case "rename-column": {
+				const backfill = this.#state.get(tableKey(op.table));
+				const col = backfill?.columns[op.old];
+				if (backfill && col) {
+					delete backfill.columns[op.old];
+					backfill.columns[op.new] = col;
+				}
+				break;
+			}
+			case "drop-column": {
+				const key = tableKey(op.table);
+				const backfill = this.#state.get(key);
+				if (backfill) {
+					delete backfill.columns[op.column];
+					if (Object.keys(backfill.columns).length === 0) this.#state.delete(key);
+				}
+				break;
+			}
+			case "complete-backfill": throw new Error(`unexpected ${op.op} op`);
+			default: unreachable(op);
+		}
+	}
+	#begin() {
+		this.#beforeTx ??= clone(this.#state);
+	}
+	#commit() {
+		this.#beforeTx = null;
+	}
+	#rollback() {
+		if (this.#beforeTx) {
+			this.#state = this.#beforeTx;
+			this.#beforeTx = null;
+		}
+	}
+};
+//#endregion
+export { BackfillState };
+
+//# sourceMappingURL=backfill-state.js.map

package/out/zero-cache/src/services/change-streamer/backfill-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backfill-state.js","names":["#state","#committed","#beforeTx","#begin","#commit","#rollback","#applyBackfill","#applySchemaChange"],"sources":["../../../../../../zero-cache/src/services/change-streamer/backfill-state.ts"],"sourcesContent":["import {unreachable} from '../../../../shared/src/asserts.ts';\nimport {BigIntJSON} from '../../../../shared/src/bigint-json.ts';\nimport {deepEqual} from '../../../../shared/src/json.ts';\nimport {\n  acceptBackfill,\n  covers,\n} from '../change-source/protocol/backfill-progress.ts';\nimport type {\n  BackfillRequest,\n  ChangeStreamData,\n  Identifier,\n  SchemaChange,\n  TableMetadata,\n} from '../change-source/protocol/current.ts';\nimport {schemaChangeTags} from '../change-source/protocol/current/schema-change-tags.ts';\nimport {cookieOps} from '../replicator/change-log-cookies.ts';\nimport type {ChangeTag, WatermarkedChange} from './change-streamer.ts';\n\nfunction tableKey({schema, name}: Identifier) {\n  return JSON.stringify([schema, name]);\n}\n\ntype Column = BackfillRequest['columns'][string];\n\n/** A mutable BackfillRequest. */\ntype Backfill = {\n  table: {schema: string; name: string; metadata: TableMetadata | null};\n  columns: Record<string, Column>;\n};\n\ntype State = Map<string, Backfill>;\n\nfunction clone(state: State): State {\n  return new Map(\n    Array.from(state, ([key, {table, columns}]) => [\n      key,\n      {table: {...table}, columns: {...columns}},\n    ]),\n  );\n}\n\n/**\n * Tags of messages that affect the backfill state. Other messages need not be\n * parsed.\n */\nconst RELEVANT_TAGS = new Set<ChangeTag>([\n  'backfill',\n  ...schemaChangeTags.filter(t => t !== 'create-index' && t !== 'drop-index'),\n]);\n\n// Serialized changes are typically forwarded (as the same string) to every\n// subscriber, so a single entry cache avoids re-parsing the same message for\n// each subscriber.\nlet lastParsed: {json: string; change: ChangeStreamData} | undefined;\n\nfunction parse(json: string): ChangeStreamData {\n  if (lastParsed?.json !== json) {\n    lastParsed = {json, change: BigIntJSON.parse(json) as ChangeStreamData};\n  }\n  return lastParsed.change;\n}\n\n/**\n * Tracks the state of the pending backfills (and their progress) of a party\n * in the replication stream (e.g. a subscriber, or the change-log itself), by\n * applying the same policies that a subscriber applies to its replica:\n * schema changes are folded with the {@link cookieOps} shared by the\n * cookie jars, and `backfill` / `backfill-completed` messages are accepted\n * or ignored with the continuity policy of {@link acceptBackfill}.\n *\n * Changes are applied transactionally: the changes of a transaction are\n * discarded if it is rolled back, and {@link requests()} only reflects\n * committed transactions.\n */\nexport class BackfillState {\n  #state: State;\n  #beforeTx: State | null = null;\n\n  constructor(requests: readonly BackfillRequest[] = []) {\n    this.#state = new Map(\n      requests\n        .filter(req => Object.keys(req.columns).length > 0)\n        .map(({table, columns}) => [\n          tableKey(table),\n          {table: {...table}, columns: {...columns}},\n        ]),\n    );\n  }\n\n  get #committed(): State {\n    return this.#beforeTx ?? this.#state;\n  }\n\n  /** The (committed) pending backfills. */\n  requests(): BackfillRequest[] {\n    return [...clone(this.#committed).values()];\n  }\n\n  /**\n   * Returns the `requests` with the (committed) progress of this state\n   * applied to the columns that are pending in both, i.e. same table, column,\n   * and backfill ID. Other columns have no progress (i.e. from scratch).\n   */\n  withProgress(requests: readonly BackfillRequest[]): BackfillRequest[] {\n    const state = this.#committed;\n    return requests.map(({table, columns}) => {\n      const tracked = state.get(tableKey(table))?.columns;\n      return {\n        table,\n        columns: Object.fromEntries(\n          Object.entries(columns).map(([name, {id}]) => {\n            const col = tracked?.[name];\n            return [\n              name,\n              col?.progress && deepEqual(col.id, id)\n                ? {id, progress: col.progress}\n                : {id},\n            ];\n          }),\n        ),\n      };\n    });\n  }\n\n  /** Whether there are no (committed) pending backfills. */\n  get empty(): boolean {\n    return this.#committed.size === 0;\n  }\n\n  /**\n   * Returns the columns (as `schema.table.column` strings) with (committed)\n   * pending backfills that are not covered by the (committed) progress of the\n   * `stream`, i.e. columns for which the `stream` will not deliver all of the\n   * necessary data.\n   */\n  uncovered(stream: BackfillState): string[] {\n    const uncovered: string[] = [];\n    const streamState = stream.#committed;\n    for (const [key, {table, columns}] of this.#committed) {\n      const streamColumns = streamState.get(key)?.columns;\n      for (const [name, {id, progress}] of Object.entries(columns)) {\n        const s = streamColumns?.[name];\n        if (!s || !deepEqual(s.id, id) || !covers(s.progress, progress)) {\n          uncovered.push(`${table.schema}.${table.name}.${name}`);\n        }\n      }\n    }\n    return uncovered;\n  }\n\n  /**\n   * Applies a serialized change, parsing it only if it is relevant.\n   *\n   * @returns The columns (as `schema.table.column` strings) of a backfill\n   *          message that were ignored due to the continuity policy.\n   */\n  applySerialized([, tag, json]: WatermarkedChange): string[] {\n    switch (tag) {\n      case 'begin':\n        this.#begin();\n        return [];\n      case 'commit':\n        this.#commit();\n        return [];\n      case 'rollback':\n        this.#rollback();\n        return [];\n    }\n    if (!RELEVANT_TAGS.has(tag)) {\n      return [];\n    }\n    return this.apply(parse(json));\n  }\n\n  /**\n   * Applies a change.\n   *\n   * @returns The columns (as `schema.table.column` strings) of a backfill\n   *          message that were ignored due to the continuity policy.\n   */\n  apply(change: ChangeStreamData): string[] {\n    switch (change[0]) {\n      case 'begin':\n        this.#begin();\n        return [];\n      case 'commit':\n        this.#commit();\n        return [];\n      case 'rollback':\n        this.#rollback();\n        return [];\n    }\n    const msg = change[1];\n    switch (msg.tag) {\n      case 'backfill': {\n        const {relation, columns, progressMarks} = msg;\n        return this.#applyBackfill(relation, columns, (progress, col) => {\n          const result = acceptBackfill(progress, progressMarks);\n          if (result.accept) {\n            col.progress = result.progress;\n            if (col.progress === undefined) {\n              delete col.progress;\n            }\n          }\n          return result.accept;\n        });\n      }\n      case 'backfill-completed': {\n        const {relation, columns, progressMarks} = msg;\n        const backfill = this.#state.get(tableKey(relation));\n        const ignored = this.#applyBackfill(\n          relation,\n          columns,\n          (progress, _, name) => {\n            const {accept} = acceptBackfill(\n              progress,\n              progressMarks && {previous: progressMarks.previous},\n            );\n            if (accept && backfill) {\n              delete backfill.columns[name];\n            }\n            return accept;\n          },\n        );\n        if (backfill && Object.keys(backfill.columns).length === 0) {\n          this.#state.delete(tableKey(relation));\n        }\n        return ignored;\n      }\n      case 'create-table':\n      case 'rename-table':\n      case 'update-table-metadata':\n      case 'add-column':\n      case 'update-column':\n      case 'drop-column':\n      case 'drop-table':\n        this.#applySchemaChange(msg);\n        return [];\n    }\n    return [];\n  }\n\n  #applyBackfill(\n    relation: {schema: string; name: string; rowKey: {columns: string[]}},\n    columns: readonly string[],\n    apply: (progress: Column['progress'], col: Column, name: string) => boolean,\n  ): string[] {\n    const backfill = this.#state.get(tableKey(relation));\n    if (!backfill) {\n      return [];\n    }\n    const ignored: string[] = [];\n    // rowKey columns are excluded from `columns` but are backfilled with them\n    // (e.g. for a new table).\n    for (const name of [...relation.rowKey.columns, ...columns]) {\n      const col = backfill.columns[name];\n      if (!col) {\n        continue;\n      }\n      // Copy-on-write, since the column object may be shared with the\n      // pre-transaction state.\n      const updated = {...col};\n      if (apply(col.progress, updated, name)) {\n        if (name in backfill.columns) {\n          backfill.columns[name] = updated;\n        }\n      } else {\n        ignored.push(`${relation.schema}.${relation.name}.${name}`);\n      }\n    }\n    return ignored;\n  }\n\n  #applySchemaChange(change: SchemaChange) {\n    // Table metadata specified in the same change (e.g. a `create-table` or\n    // `add-column`), for backfills of tables that are not yet tracked.\n    const metadata = new Map<string, TableMetadata>();\n\n    for (const op of cookieOps(change)) {\n      switch (op.op) {\n        case 'upsert-metadata': {\n          const key = tableKey(op.table);\n          metadata.set(key, op.metadata);\n          const backfill = this.#state.get(key);\n          if (backfill) {\n            backfill.table.metadata = op.metadata;\n          }\n          break;\n        }\n        case 'upsert-backfill': {\n          const key = tableKey(op.table);\n          let backfill = this.#state.get(key);\n          if (!backfill) {\n            backfill = {\n              table: {\n                schema: op.table.schema,\n                name: op.table.name,\n                metadata: metadata.get(key) ?? null,\n              },\n              columns: {},\n            };\n            this.#state.set(key, backfill);\n          }\n          // A new backfill always starts from scratch.\n          backfill.columns[op.column] = {id: op.backfill};\n          break;\n        }\n        case 'rename-table': {\n          const backfill = this.#state.get(tableKey(op.old));\n          if (backfill) {\n            this.#state.delete(tableKey(op.old));\n            backfill.table.schema = op.new.schema;\n            backfill.table.name = op.new.name;\n            this.#state.set(tableKey(op.new), backfill);\n          }\n          break;\n        }\n        case 'drop-table':\n          this.#state.delete(tableKey(op.table));\n          break;\n        case 'rename-column': {\n          const backfill = this.#state.get(tableKey(op.table));\n          const col = backfill?.columns[op.old];\n          if (backfill && col) {\n            delete backfill.columns[op.old];\n            backfill.columns[op.new] = col;\n          }\n          break;\n        }\n        case 'drop-column': {\n          const key = tableKey(op.table);\n          const backfill = this.#state.get(key);\n          if (backfill) {\n            delete backfill.columns[op.column];\n            if (Object.keys(backfill.columns).length === 0) {\n              this.#state.delete(key);\n            }\n          }\n          break;\n        }\n        case 'complete-backfill':\n          // Only produced for `backfill-completed`, which is handled\n          // separately (with the continuity policy).\n          throw new Error(`unexpected ${op.op} op`);\n        default:\n          unreachable(op);\n      }\n    }\n  }\n\n  #begin() {\n    // Tolerate a missing commit/rollback, e.g. from an interrupted stream.\n    this.#beforeTx ??= clone(this.#state);\n  }\n\n  #commit() {\n    this.#beforeTx = null;\n  }\n\n  #rollback() {\n    if (this.#beforeTx) {\n      this.#state = this.#beforeTx;\n      this.#beforeTx = null;\n    }\n  }\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-cleanup-monitor-factory.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAyB,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAC1E,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,oCAAoC,CAAC;AAI5C,MAAM,MAAM,kCAAkC,GAAG;IAC/C,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,qBAAqB,CAAC;IACtC,iBAAiB,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACrD,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,EACzC,EAAE,EACF,MAAM,EACN,WAAW,EACX,cAAc,EACd,iBAAiB,GAClB,EAAE,kCAAkC,GAAG,aAAa,CAyCpD"}
+{"version":3,"file":"backup-cleanup-monitor-factory.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAMpE,OAAO,EAAyB,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAC1E,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,oCAAoC,CAAC;AAG5C,MAAM,MAAM,kCAAkC,GAAG;IAC/C,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,qBAAqB,CAAC;IACtC,iBAAiB,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACrD,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,EACzC,EAAE,EACF,MAAM,EACN,WAAW,EACX,cAAc,EACd,iBAAiB,GAClB,EAAE,kCAAkC,GAAG,aAAa,CAyBpD"}

package/out/zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.js

@@ -1,27 +1,16 @@
-import { must } from "../../../../shared/src/must.js";
-import { getLastBackupTime } from "../litestream/commands.js";
+import { backupDestinationURL, getLastBackupTime } from "../litestream/commands.js";
 import { BackupMonitor } from "./backup-monitor.js";
+import { LitestreamSyncRequester } from "./litestream-sync-requester.js";
 import { Litestream3PrometheusPoller } from "./litestream3-prometheus-poller.js";
 import { ReplicaPoller } from "./replica-poller.js";
-import { VfsWatermarkPoller } from "./vfs-watermark-poller.js";
 //#region ../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts
 function createBackupCleanupMonitor({ lc, config, replicaFile, changeStreamer, verifyBackupState }) {
-	const { log, litestream, replica } = config;
-	const { backupURL } = litestream;
+	const { litestream, replica } = config;
+	const backupURL = backupDestinationURL(litestream);
 	let stream;
 	if (!backupURL) stream = new ReplicaPoller(lc, replicaFile).start();
-	else if (config.litestream.backupUsingV5) {
-		const { logLevel, endpoint, region, vfsQueryExecutable, vfsPollIntervalMs: remotePollIntervalMs } = litestream;
-		stream = new VfsWatermarkPoller(lc, replicaFile, {
-			executable: must(vfsQueryExecutable, `litestream-vfs-query-executable must be defined`),
-			remotePollIntervalMs,
-			backupURL,
-			region,
-			endpoint,
-			logLevel,
-			logFormat: log.format
-		}).start();
-	} else {
+	else if (config.litestream.backupUsingV5) stream = new LitestreamSyncRequester(lc, replicaFile, { intervalMs: litestream.incrementalBackupIntervalSeconds * 1e3 }).start();
+	else {
 		const { port: metricsPort } = litestream;
 		stream = new Litestream3PrometheusPoller(lc, replicaFile, backupURL, `http://localhost:${metricsPort}/metrics`, verifyBackupState ?? (() => getLastBackupTime(lc, litestream, replica.file))).start();
 	}

package/out/zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup-cleanup-monitor-factory.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {must} from '../../../../shared/src/must.ts';\nimport type {NormalizedZeroConfig} from '../../config/normalize.ts';\nimport type {Source} from '../../types/streams.ts';\nimport {getLastBackupTime} from '../litestream/commands.ts';\nimport {type BackedUpWatermark, BackupMonitor} from './backup-monitor.ts';\nimport type {ChangeStreamerService} from './change-streamer.ts';\nimport {\n  type BackupStateVerifier,\n  Litestream3PrometheusPoller,\n} from './litestream3-prometheus-poller.ts';\nimport {ReplicaPoller} from './replica-poller.ts';\nimport {VfsWatermarkPoller} from './vfs-watermark-poller.ts';\n\nexport type BackupCleanupMonitorFactoryOptions = {\n  lc: LogContext;\n  config: NormalizedZeroConfig;\n  replicaFile: string;\n  changeStreamer: ChangeStreamerService;\n  verifyBackupState?: BackupStateVerifier | undefined;\n};\n\nexport function createBackupCleanupMonitor({\n  lc,\n  config,\n  replicaFile,\n  changeStreamer,\n  verifyBackupState,\n}: BackupCleanupMonitorFactoryOptions): BackupMonitor {\n  const {log, litestream, replica} = config;\n  const {backupURL} = litestream;\n\n  let stream: Source<BackedUpWatermark>;\n\n  if (!backupURL) {\n    stream = new ReplicaPoller(lc, replicaFile).start();\n  } else if (config.litestream.backupUsingV5) {\n    const {\n      logLevel,\n      endpoint,\n      region,\n      vfsQueryExecutable,\n      vfsPollIntervalMs: remotePollIntervalMs,\n    } = litestream;\n    stream = new VfsWatermarkPoller(lc, replicaFile, {\n      executable: must(\n        vfsQueryExecutable,\n        `litestream-vfs-query-executable must be defined`,\n      ),\n      remotePollIntervalMs,\n      backupURL,\n      region,\n      endpoint,\n      logLevel,\n      logFormat: log.format,\n    }).start();\n  } else {\n    const {port: metricsPort} = litestream;\n    stream = new Litestream3PrometheusPoller(\n      lc,\n      replicaFile,\n      backupURL,\n      `http://localhost:${metricsPort}/metrics`,\n      verifyBackupState ??\n        (() => getLastBackupTime(lc, litestream, replica.file)),\n    ).start();\n  }\n\n  return new BackupMonitor(lc, stream, changeStreamer, replicaFile);\n}\n"],"mappings":";;;;;;;AAsBA,SAAgB,2BAA2B,EACzC,IACA,QACA,aACA,gBACA,qBACoD;CACpD,MAAM,EAAC,KAAK,YAAY,YAAW;CACnC,MAAM,EAAC,cAAa;CAEpB,IAAI;CAEJ,IAAI,CAAC,WACH,SAAS,IAAI,cAAc,IAAI,WAAW,EAAE,MAAM;MAC7C,IAAI,OAAO,WAAW,eAAe;EAC1C,MAAM,EACJ,UACA,UACA,QACA,oBACA,mBAAmB,yBACjB;EACJ,SAAS,IAAI,mBAAmB,IAAI,aAAa;GAC/C,YAAY,KACV,oBACA,iDACF;GACA;GACA;GACA;GACA;GACA;GACA,WAAW,IAAI;EACjB,CAAC,EAAE,MAAM;CACX,OAAO;EACL,MAAM,EAAC,MAAM,gBAAe;EAC5B,SAAS,IAAI,4BACX,IACA,aACA,WACA,oBAAoB,YAAY,WAChC,4BACS,kBAAkB,IAAI,YAAY,QAAQ,IAAI,EACzD,EAAE,MAAM;CACV;CAEA,OAAO,IAAI,cAAc,IAAI,QAAQ,gBAAgB,WAAW;AAClE"}
+{"version":3,"file":"backup-cleanup-monitor-factory.js","names":[],"sources":["../../../../../../zero-cache/src/services/change-streamer/backup-cleanup-monitor-factory.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {NormalizedZeroConfig} from '../../config/normalize.ts';\nimport type {Source} from '../../types/streams.ts';\nimport {\n  backupDestinationURL,\n  getLastBackupTime,\n} from '../litestream/commands.ts';\nimport {type BackedUpWatermark, BackupMonitor} from './backup-monitor.ts';\nimport type {ChangeStreamerService} from './change-streamer.ts';\nimport {LitestreamSyncRequester} from './litestream-sync-requester.ts';\nimport {\n  type BackupStateVerifier,\n  Litestream3PrometheusPoller,\n} from './litestream3-prometheus-poller.ts';\nimport {ReplicaPoller} from './replica-poller.ts';\n\nexport type BackupCleanupMonitorFactoryOptions = {\n  lc: LogContext;\n  config: NormalizedZeroConfig;\n  replicaFile: string;\n  changeStreamer: ChangeStreamerService;\n  verifyBackupState?: BackupStateVerifier | undefined;\n};\n\nexport function createBackupCleanupMonitor({\n  lc,\n  config,\n  replicaFile,\n  changeStreamer,\n  verifyBackupState,\n}: BackupCleanupMonitorFactoryOptions): BackupMonitor {\n  const {litestream, replica} = config;\n  const backupURL = backupDestinationURL(litestream);\n\n  let stream: Source<BackedUpWatermark>;\n\n  if (!backupURL) {\n    stream = new ReplicaPoller(lc, replicaFile).start();\n  } else if (config.litestream.backupUsingV5) {\n    stream = new LitestreamSyncRequester(lc, replicaFile, {\n      intervalMs: litestream.incrementalBackupIntervalSeconds * 1000,\n    }).start();\n  } else {\n    const {port: metricsPort} = litestream;\n    stream = new Litestream3PrometheusPoller(\n      lc,\n      replicaFile,\n      backupURL,\n      `http://localhost:${metricsPort}/metrics`,\n      verifyBackupState ??\n        (() => getLastBackupTime(lc, litestream, replica.file)),\n    ).start();\n  }\n\n  return new BackupMonitor(lc, stream, changeStreamer, replicaFile);\n}\n"],"mappings":";;;;;;AAwBA,SAAgB,2BAA2B,EACzC,IACA,QACA,aACA,gBACA,qBACoD;CACpD,MAAM,EAAC,YAAY,YAAW;CAC9B,MAAM,YAAY,qBAAqB,UAAU;CAEjD,IAAI;CAEJ,IAAI,CAAC,WACH,SAAS,IAAI,cAAc,IAAI,WAAW,EAAE,MAAM;MAC7C,IAAI,OAAO,WAAW,eAC3B,SAAS,IAAI,wBAAwB,IAAI,aAAa,EACpD,YAAY,WAAW,mCAAmC,IAC5D,CAAC,EAAE,MAAM;MACJ;EACL,MAAM,EAAC,MAAM,gBAAe;EAC5B,SAAS,IAAI,4BACX,IACA,aACA,WACA,oBAAoB,YAAY,WAChC,4BACS,kBAAkB,IAAI,YAAY,QAAQ,IAAI,EACzD,EAAE,MAAM;CACV;CAEA,OAAO,IAAI,cAAc,IAAI,QAAQ,gBAAgB,WAAW;AAClE"}

package/out/zero-cache/src/services/change-streamer/backup-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-monitor.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/backup-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAKjD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,aAAc,YAAW,gBAAgB;;IACpD,QAAQ,CAAC,EAAE,oBAAoB;IAS/B,YACE,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,EACrC,cAAc,EAAE,qBAAqB,EACrC,WAAW,EAAE,MAAM,EAMpB;IAED,mBAAmB,kBAElB;IAEK,GAAG,kBAmBR;IAED,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpB;CA+BF"}
+{"version":3,"file":"backup-monitor.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/backup-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAKjD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,aAAc,YAAW,gBAAgB;;IACpD,QAAQ,CAAC,EAAE,oBAAoB;IAiB/B,YACE,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,EACrC,cAAc,EAAE,qBAAqB,EACrC,WAAW,EAAE,MAAM,EAMpB;IAED,mBAAmB,kBAElB;IAEK,GAAG,kBA8BR;IAqDD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpB;CA+BF"}