@rocicorp/zero 0.5.2024103100 → 0.6.2024111600

package/out/zero-cache/src/server/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAS/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAkCf"}
+{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAS/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAoCf"}

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

@@ -9,16 +9,17 @@ import { setUpMessageHandlers, setupReplica, } from '../workers/replicator.js';
 import { exitAfter, runUntilKilled } from './life-cycle.js';
 import { createLogContext } from './logging.js';
 export default async function runWorker(parent, ...args) {
-    const config = await getZeroConfig();
     assert(args.length > 0, `replicator mode not specified`);
     const fileMode = args[0];
+    const config = getZeroConfig(args.slice(1));
     const mode = fileMode === 'backup' ? 'backup' : 'serving';
     const workerName = `${mode}-replicator`;
     const lc = createLogContext(config.log, { worker: workerName });
-    const replica = setupReplica(lc, fileMode, config.replicaDBFile);
-    const changeStreamer = config.changeStreamerConnStr
-        ? new ChangeStreamerHttpClient(lc, config.changeStreamerConnStr)
-        : new ChangeStreamerHttpClient(lc);
+    const replica = setupReplica(lc, fileMode, config.replicaFile);
+    const changeStreamerPort = config.changeStreamerPort ?? config.port + 1;
+    const changeStreamer = config.changeStreamerURI
+        ? new ChangeStreamerHttpClient(lc, config.changeStreamerURI)
+        : new ChangeStreamerHttpClient(lc, changeStreamerPort);
     const replicator = new ReplicatorService(lc, `${workerName}-${pid}`, mode, changeStreamer, replica);
     setUpMessageHandlers(lc, replicator, parent);
     const running = runUntilKilled(lc, parent, replicator);

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

@@ -1 +1 @@
-{"version":3,"file":"replicator.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EACL,iBAAiB,GAElB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,oBAAoB,EACpB,YAAY,GAEb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,MAAc,EACd,GAAG,IAAc;IAEjB,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;IACrC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAoB,CAAC;IAC5C,MAAM,IAAI,GAAmB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,MAAM,UAAU,GAAG,GAAG,IAAI,aAAa,CAAC;IACxC,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,UAAU,EAAC,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,cAAc,GAAG,MAAM,CAAC,qBAAqB;QACjD,CAAC,CAAC,IAAI,wBAAwB,CAAC,EAAE,EAAE,MAAM,CAAC,qBAAqB,CAAC;QAChE,CAAC,CAAC,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAErC,MAAM,UAAU,GAAG,IAAI,iBAAiB,CACtC,EAAE,EACF,GAAG,UAAU,IAAI,GAAG,EAAE,EACtB,IAAI,EACJ,cAAc,EACd,OAAO,CACR,CAAC;IAEF,oBAAoB,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAEvD,gFAAgF;IAChF,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACtC,MAAM;IACR,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS;AACT,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC"}
+{"version":3,"file":"replicator.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EACL,iBAAiB,GAElB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,oBAAoB,EACpB,YAAY,GAEb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,MAAc,EACd,GAAG,IAAc;IAEjB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAoB,CAAC;IAE5C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAmB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,MAAM,UAAU,GAAG,GAAG,IAAI,aAAa,CAAC;IACxC,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,UAAU,EAAC,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,MAAM,CAAC,iBAAiB;QAC7C,CAAC,CAAC,IAAI,wBAAwB,CAAC,EAAE,EAAE,MAAM,CAAC,iBAAiB,CAAC;QAC5D,CAAC,CAAC,IAAI,wBAAwB,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;IAEzD,MAAM,UAAU,GAAG,IAAI,iBAAiB,CACtC,EAAE,EACF,GAAG,UAAU,IAAI,GAAG,EAAE,EACtB,IAAI,EACJ,cAAc,EACd,OAAO,CACR,CAAC;IAEF,oBAAoB,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAEvD,gFAAgF;IAChF,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACtC,MAAM;IACR,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS;AACT,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC"}

package/out/zero-cache/src/server/syncer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAcA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAM/B,wBAA8B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiErE"}
+{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAM/B,wBAA8B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyErE"}

package/out/zero-cache/src/server/syncer.js

@@ -1,8 +1,10 @@
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { pid } from 'node:process';
+import { assert } from '../../../shared/src/asserts.js';
 import { must } from '../../../shared/src/must.js';
 import { randInt } from '../../../shared/src/rand.js';
+import { getAuthorizationConfig } from '../auth/load-authorization.js';
 import { getZeroConfig } from '../config/zero-config.js';
 import { MutagenService } from '../services/mutagen/mutagen.js';
 import { DatabaseStorage } from '../services/view-syncer/database-storage.js';
@@ -17,25 +19,27 @@ import { Syncer } from '../workers/syncer.js';
 import { exitAfter, runUntilKilled } from './life-cycle.js';
 import { createLogContext } from './logging.js';
 export default async function runWorker(parent) {
-    const config = await getZeroConfig();
-    // Consider parameterizing these (in main) based on total number of workers.
-    const MAX_CVR_CONNECTIONS = 5;
-    const MAX_MUTAGEN_CONNECTIONS = 5;
+    const config = getZeroConfig();
+    const authorizationConfig = await getAuthorizationConfig();
+    assert(config.cvr.maxConnsPerWorker);
+    assert(config.upstream.maxConnsPerWorker);
     const lc = createLogContext(config.log, { worker: 'syncer' });
-    const cvrDB = pgClient(lc, config.cvrDBConnStr, {
-        max: MAX_CVR_CONNECTIONS,
+    const cvrDB = pgClient(lc, config.cvr.db, {
+        max: config.cvr.maxConnsPerWorker,
+        connection: { ['application_name']: `zero-sync-worker-${pid}-cvr` },
     });
-    const upstreamDB = pgClient(lc, config.upstreamDBConnStr, {
-        max: MAX_MUTAGEN_CONNECTIONS,
+    const upstreamDB = pgClient(lc, config.upstream.db, {
+        max: config.upstream.maxConnsPerWorker,
+        connection: { ['application_name']: `zero-sync-worker-${pid}-upstream` },
     });
     const dbWarmup = Promise.allSettled([
-        ...Array.from({ length: MAX_CVR_CONNECTIONS }, () => cvrDB `SELECT 1`.simple().execute()),
-        ...Array.from({ length: MAX_MUTAGEN_CONNECTIONS }, () => upstreamDB `SELECT 1`.simple().execute()),
+        ...Array.from({ length: config.cvr.maxConnsPerWorker }, () => cvrDB `SELECT 1`.simple().execute()),
+        ...Array.from({ length: config.upstream.maxConnsPerWorker }, () => upstreamDB `SELECT 1`.simple().execute()),
     ]);
     const tmpDir = config.storageDBTmpDir ?? tmpdir();
     const operatorStorage = DatabaseStorage.create(lc, path.join(tmpDir, `sync-worker-${pid}-${randInt(1000000, 9999999)}`));
-    const viewSyncerFactory = (id, sub, drainCoordinator) => new ViewSyncerService(lc, id, config.shard.id, cvrDB, new PipelineDriver(lc, new Snapshotter(lc, config.replicaDBFile), operatorStorage.createClientGroupStorage(id)), sub, drainCoordinator);
-    const mutagenFactory = (id) => new MutagenService(lc, config.shard.id, id, upstreamDB, config);
+    const viewSyncerFactory = (id, sub, drainCoordinator) => new ViewSyncerService(lc, id, config.shard.id, cvrDB, new PipelineDriver(lc, new Snapshotter(lc, config.replicaFile), operatorStorage.createClientGroupStorage(id)), sub, drainCoordinator);
+    const mutagenFactory = (id) => new MutagenService(lc, config.shard.id, id, upstreamDB, config, authorizationConfig);
     const syncer = new Syncer(lc, config, viewSyncerFactory, mutagenFactory, parent);
     void dbWarmup.then(() => parent.send(['ready', { ready: true }]));
     return runUntilKilled(lc, parent, syncer);

package/out/zero-cache/src/server/syncer.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}

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

@@ -3,15 +3,14 @@ import { type Source } from '../../types/streams.js';
 import { HttpService, type Options } from '../http-service.js';
 import { type ChangeStreamer, type Downstream, type SubscriberContext } from './change-streamer.js';
 export declare const CHANGES_URL_PATTERN = "/api/replication/:version/changes";
-export declare const DEFAULT_PORT = 4849;
 export declare class ChangeStreamerHttpServer extends HttpService {
     #private;
     readonly id = "change-streamer-http-server";
-    constructor(lc: LogContext, delegate: ChangeStreamer, opts?: Options);
+    constructor(lc: LogContext, delegate: ChangeStreamer, opts: Options);
 }
 export declare class ChangeStreamerHttpClient implements ChangeStreamer {
     #private;
-    constructor(lc: LogContext, uriOrPort?: string | number);
+    constructor(lc: LogContext, uriOrPort: string | number);
     subscribe(ctx: SubscriberContext): Promise<Source<Downstream>>;
 }
 //# sourceMappingURL=change-streamer-http.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer-http.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAsB,KAAK,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAExE,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,mBAAmB,sCAAsC,CAAC;AAEvE,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,qBAAa,wBAAyB,SAAQ,WAAW;;IACvD,QAAQ,CAAC,EAAE,iCAAiC;gBAI1C,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,cAAc,EACxB,IAAI,GAAE,OAA8B;CA6BvC;AAED,qBAAa,wBAAyB,YAAW,cAAc;;gBAIjD,EAAE,EAAE,UAAU,EAAE,SAAS,GAAE,MAAM,GAAG,MAAqB;IASrE,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CAO/D"}
+{"version":3,"file":"change-streamer-http.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAsB,KAAK,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAExE,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,mBAAmB,sCAAsC,CAAC;AAEvE,qBAAa,wBAAyB,SAAQ,WAAW;;IACvD,QAAQ,CAAC,EAAE,iCAAiC;gBAGhC,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO;CA4BpE;AAED,qBAAa,wBAAyB,YAAW,cAAc;;gBAIjD,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAStD,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CAO/D"}

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

@@ -7,11 +7,10 @@ import { URLParams } from '../../types/url-params.js';
 import { HttpService } from '../http-service.js';
 import { downstreamSchema, } from './change-streamer.js';
 export const CHANGES_URL_PATTERN = '/api/replication/:version/changes';
-export const DEFAULT_PORT = 4849;
 export class ChangeStreamerHttpServer extends HttpService {
     id = 'change-streamer-http-server';
     #delegate;
-    constructor(lc, delegate, opts = { port: DEFAULT_PORT }) {
+    constructor(lc, delegate, opts) {
         super('change-streamer-http-server', lc, opts, async (fastify) => {
             await fastify.register(websocket);
             fastify.get('/', (_req, res) => res.send('OK'));
@@ -42,7 +41,7 @@ export class ChangeStreamerHttpServer extends HttpService {
 export class ChangeStreamerHttpClient {
     #lc;
     #uri;
-    constructor(lc, uriOrPort = DEFAULT_PORT) {
+    constructor(lc, uriOrPort) {
         this.#lc = lc;
         this.#uri =
             (typeof uriOrPort === 'string'

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer-http.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"change-streamer-http.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,5 @@
 import { LogContext } from '@rocicorp/logger';
+import * as v from '../../../../shared/src/valita.js';
 import type { PostgresDB } from '../../types/pg.js';
 import type { Sink, Source } from '../../types/streams.js';
 import { type ChangeStreamerService, type Commit, type DownstreamChange } from './change-streamer.js';
@@ -6,7 +7,156 @@ import { type ReplicationConfig } from './schema/tables.js';
 /**
  * Performs initialization and schema migrations to initialize a ChangeStreamerImpl.
  */
-export declare function initializeStreamer(lc: LogContext, changeDB: PostgresDB, changeSource: ChangeSource, replicationConfig: ReplicationConfig): Promise<ChangeStreamerService>;
+export declare function initializeStreamer(lc: LogContext, changeDB: PostgresDB, changeSource: ChangeSource, replicationConfig: ReplicationConfig, autoReset: boolean, setTimeoutFn?: typeof setTimeout): Promise<ChangeStreamerService>;
+declare const changeStreamMessage: v.UnionType<[v.UnionType<[v.TupleType<[v.Type<"begin">, v.ObjectType<{
+    tag: v.Type<"begin">;
+}, undefined>]>, v.TupleType<[v.Type<"data">, v.UnionType<[v.ObjectType<{
+    tag: v.Type<"insert">;
+    relation: v.ObjectType<{
+        tag: v.Type<"relation">;
+        schema: v.Type<string>;
+        name: v.Type<string>;
+        replicaIdentity: v.UnionType<[v.Type<"default">, v.Type<"nothing">, v.Type<"full">, v.Type<"index">]>;
+        keyColumns: v.ArrayType<v.Type<string>>;
+    }, undefined>;
+    new: v.Type<Record<string, import("../../types/bigint-json.js").JSONValue>>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"update">;
+    relation: v.ObjectType<{
+        tag: v.Type<"relation">;
+        schema: v.Type<string>;
+        name: v.Type<string>;
+        replicaIdentity: v.UnionType<[v.Type<"default">, v.Type<"nothing">, v.Type<"full">, v.Type<"index">]>;
+        keyColumns: v.ArrayType<v.Type<string>>;
+    }, undefined>;
+    key: v.Type<Record<string, import("../../types/bigint-json.js").JSONValue> | null>;
+    old: v.Type<Record<string, import("../../types/bigint-json.js").JSONValue> | null>;
+    new: v.Type<Record<string, import("../../types/bigint-json.js").JSONValue>>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"delete">;
+    relation: v.ObjectType<{
+        tag: v.Type<"relation">;
+        schema: v.Type<string>;
+        name: v.Type<string>;
+        replicaIdentity: v.UnionType<[v.Type<"default">, v.Type<"nothing">, v.Type<"full">, v.Type<"index">]>;
+        keyColumns: v.ArrayType<v.Type<string>>;
+    }, undefined>;
+    key: v.Type<Record<string, import("../../types/bigint-json.js").JSONValue>>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"truncate">;
+    relations: v.ArrayType<v.ObjectType<{
+        tag: v.Type<"relation">;
+        schema: v.Type<string>;
+        name: v.Type<string>;
+        replicaIdentity: v.UnionType<[v.Type<"default">, v.Type<"nothing">, v.Type<"full">, v.Type<"index">]>;
+        keyColumns: v.ArrayType<v.Type<string>>;
+    }, undefined>>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"create-table">;
+    spec: v.ObjectType<Omit<{
+        name: v.Type<string>;
+        columns: v.Type<Record<string, {
+            characterMaximumLength?: number | null | undefined;
+            notNull?: boolean | null | undefined;
+            dflt?: string | null | undefined;
+            pos: number;
+            dataType: string;
+        }>>;
+        primaryKey: v.ArrayType<v.Type<string>>;
+    }, "schema"> & {
+        schema: v.Type<string>;
+    }, undefined>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"rename-table">;
+    old: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+    new: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"add-column">;
+    table: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+    column: v.ObjectType<{
+        name: v.Type<string>;
+        spec: v.ObjectType<{
+            pos: v.Type<number>;
+            dataType: v.Type<string>;
+            characterMaximumLength: v.Optional<number | null>;
+            notNull: v.Optional<boolean | null>;
+            dflt: v.Optional<string | null>;
+        }, undefined>;
+    }, undefined>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"update-column">;
+    table: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+    old: v.ObjectType<{
+        name: v.Type<string>;
+        spec: v.ObjectType<{
+            pos: v.Type<number>;
+            dataType: v.Type<string>;
+            characterMaximumLength: v.Optional<number | null>;
+            notNull: v.Optional<boolean | null>;
+            dflt: v.Optional<string | null>;
+        }, undefined>;
+    }, undefined>;
+    new: v.ObjectType<{
+        name: v.Type<string>;
+        spec: v.ObjectType<{
+            pos: v.Type<number>;
+            dataType: v.Type<string>;
+            characterMaximumLength: v.Optional<number | null>;
+            notNull: v.Optional<boolean | null>;
+            dflt: v.Optional<string | null>;
+        }, undefined>;
+    }, undefined>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"drop-column">;
+    table: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+    column: v.Type<string>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"drop-table">;
+    id: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"create-index">;
+    spec: v.ObjectType<Omit<{
+        name: v.Type<string>;
+        tableName: v.Type<string>;
+        unique: v.Type<boolean>;
+        columns: v.Type<Record<string, "ASC" | "DESC">>;
+    }, "schema"> & {
+        schema: v.Type<string>;
+    }, undefined>;
+}, undefined>, v.ObjectType<{
+    tag: v.Type<"drop-index">;
+    id: v.ObjectType<{
+        schema: v.Type<string>;
+        name: v.Type<string>;
+    }, undefined>;
+}, undefined>]>]>, v.TupleType<[v.Type<"commit">, v.ObjectType<{
+    tag: v.Type<"commit">;
+}, undefined>, v.ObjectType<{
+    watermark: v.Type<string>;
+}, undefined>]>, v.TupleType<[v.Type<"rollback">, v.ObjectType<{
+    tag: v.Type<"rollback">;
+}, undefined>]>]>, v.TupleType<[v.Type<"control">, v.ObjectType<{
+    tag: v.Type<"reset-required">;
+}, undefined>]>]>;
+export type ChangeStreamMessage = v.Infer<typeof changeStreamMessage>;
 /**
  * Internally all Downstream messages (not just commits) are given a watermark.
  * These are used for internal ordering for:
@@ -21,7 +171,7 @@ export type WatermarkedChange = [watermark: string, DownstreamChange];
 export type ChangeStream = {
     /** The watermark at which the ChangeStream begins (i.e. inclusive). */
     initialWatermark: string;
-    changes: Source<DownstreamChange>;
+    changes: Source<ChangeStreamMessage>;
     /**
      * A Sink to push the {@link Commit} messages that have been successfully
      * stored by the {@link Storer}.
@@ -36,4 +186,5 @@ export interface ChangeSource {
      */
     startStream(afterWatermark: string): Promise<ChangeStream>;
 }
+export {};
 //# sourceMappingURL=change-streamer-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer-service.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,MAAM,EAEX,KAAK,gBAAgB,EAGtB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAI5B;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,qBAAqB,CAAC,CAOhC;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAEtE,MAAM,MAAM,YAAY,GAAG;IACzB,uEAAuE;IACvE,gBAAgB,EAAE,MAAM,CAAC;IAEzB,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAElC;;;OAGG;IACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CACpB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC5D"}
+{"version":3,"file":"change-streamer-service.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAOtD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,MAAM,EAEX,KAAK,gBAAgB,EAEtB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAI5B;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,OAAO,EAClB,YAAY,oBAAa,GACxB,OAAO,CAAC,qBAAqB,CAAC,CAchC;AAcD,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA4C,CAAC;AAEtE,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEtE;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAEtE,MAAM,MAAM,YAAY,GAAG;IACzB,uEAAuE;IACvE,gBAAgB,EAAE,MAAM,CAAC;IAEzB,OAAO,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAErC;;;OAGG;IACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CACpB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC5D"}

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

@@ -1,23 +1,35 @@
 import { LogContext } from '@rocicorp/logger';
-import { oneAfter } from '../../types/lexi-version.js';
+import { unreachable } from '../../../../shared/src/asserts.js';
+import * as v from '../../../../shared/src/valita.js';
+import { min, oneAfter, } from '../../types/lexi-version.js';
 import { Subscription } from '../../types/subscription.js';
-import { RunningState } from '../running-state.js';
-import { ErrorType, } from './change-streamer.js';
+import { DEFAULT_MAX_RETRY_DELAY_MS, RunningState } from '../running-state.js';
+import { downstreamChange, ErrorType, } from './change-streamer.js';
 import { Forwarder } from './forwarder.js';
 import { initChangeStreamerSchema } from './schema/init.js';
-import { ensureReplicationConfig, } from './schema/tables.js';
+import { AutoResetSignal, ensureReplicationConfig, markResetRequired, } from './schema/tables.js';
 import { Storer } from './storer.js';
 import { Subscriber } from './subscriber.js';
 /**
  * Performs initialization and schema migrations to initialize a ChangeStreamerImpl.
  */
-export async function initializeStreamer(lc, changeDB, changeSource, replicationConfig) {
+export async function initializeStreamer(lc, changeDB, changeSource, replicationConfig, autoReset, setTimeoutFn = setTimeout) {
     // Make sure the ChangeLog DB is set up.
     await initChangeStreamerSchema(lc, changeDB);
-    await ensureReplicationConfig(lc, changeDB, replicationConfig);
+    await ensureReplicationConfig(lc, changeDB, replicationConfig, autoReset);
     const { replicaVersion } = replicationConfig;
-    return new ChangeStreamerImpl(lc, changeDB, replicaVersion, changeSource);
+    return new ChangeStreamerImpl(lc, changeDB, replicaVersion, changeSource, autoReset, setTimeoutFn);
 }
+// ControlMessages can be sent from the ChangeSource to the ChangeStreamer
+// for non-content signals that initiate action in the ChangeStreamer
+// but otherwise do not constitute a Downstream message.
+//
+// Currently, only one type of message is defined: `reset-required`.
+const controlMessage = v.tuple([
+    v.literal('control'),
+    v.object({ tag: v.literal('reset-required') }),
+]);
+const changeStreamMessage = v.union(downstreamChange, controlMessage);
 /**
  * Upstream-agnostic dispatch of messages in a {@link ChangeStream} to a
  * {@link Forwarder} and {@link Storer} to execute the forward-store-ack
@@ -135,23 +147,49 @@ export async function initializeStreamer(lc, changeDB, changeSource, replication
  * exposed in the `Downstream` `Commit` message. The Subscriber object thus compares
  * the internal watermarks of the incoming messages against the commit watermark of
  * the caller, updating the watermark at every `Commit` message that is forwarded.
+ *
+ * ### Cleanup
+ *
+ * As mentioned in the {@link ChangeStreamer} documentation: "the ChangeStreamer
+ * uses a combination of [the "initial", i.e. backup-derived watermark and] ACK
+ * responses from connected subscribers to determine the watermark up
+ * to which it is safe to purge old change log entries."
+ *
+ * More concretely:
+ *
+ * * The `initial`, backup-derived watermark is the earliest to which cleanup
+ *   should ever happen.
+ *
+ * * However, it is possible for the replica backup to be *ahead* of a connected
+ *   subscriber; and if a network error causes that subscriber to retry from its
+ *   last watermark, the change streamer must support it.
+ *
+ * Thus, before cleaning up to an `initial` backup-derived watermark, the change
+ * streamer first confirms that all connected subscribers have also passed
+ * that watermark.
  */
 class ChangeStreamerImpl {
     id;
     #lc;
+    #changeDB;
     #replicaVersion;
     #source;
     #storer;
     #forwarder;
-    #state = new RunningState('ChangeStreamer');
+    #autoReset;
+    #state;
+    #initialWatermarks = new Set();
     #stream;
-    constructor(lc, changeDB, replicaVersion, source) {
+    constructor(lc, changeDB, replicaVersion, source, autoReset, setTimeoutFn = setTimeout) {
         this.id = `change-streamer`;
         this.#lc = lc.withContext('component', 'change-streamer');
+        this.#changeDB = changeDB;
         this.#replicaVersion = replicaVersion;
         this.#source = source;
-        this.#storer = new Storer(lc, changeDB, commit => this.#stream?.acks.push(commit));
+        this.#storer = new Storer(lc, changeDB, replicaVersion, commit => this.#stream?.acks.push(commit));
         this.#forwarder = new Forwarder();
+        this.#autoReset = autoReset;
+        this.#state = new RunningState(this.id, undefined, setTimeoutFn);
     }
     async run() {
         this.#storer.run().catch(e => this.stop(e));
@@ -165,12 +203,17 @@ class ChangeStreamerImpl {
                 let preCommitWatermark = stream.initialWatermark;
                 for await (const change of stream.changes) {
                     let watermark;
-                    if (change[0] !== 'commit') {
-                        watermark = preCommitWatermark;
-                    }
-                    else {
-                        watermark = change[2].watermark;
-                        preCommitWatermark = oneAfter(watermark); // For the next transaction.
+                    switch (change[0]) {
+                        case 'control':
+                            await this.#handleControlMessage(change[1]);
+                            continue;
+                        case 'commit':
+                            watermark = change[2].watermark;
+                            preCommitWatermark = oneAfter(watermark); // For the next transaction.
+                            break;
+                        default:
+                            watermark = preCommitWatermark;
+                            break;
                     }
                     this.#storer.store([watermark, change]);
                     this.#forwarder.forward([watermark, change]);
@@ -187,26 +230,100 @@ class ChangeStreamerImpl {
         }
         this.#lc.info?.('ChangeStreamer stopped');
     }
+    async #handleControlMessage(msg) {
+        this.#lc.info?.('received control message', msg);
+        const { tag } = msg;
+        switch (tag) {
+            case 'reset-required':
+                await markResetRequired(this.#changeDB);
+                if (this.#autoReset) {
+                    this.#lc.warn?.('shutting down for auto-reset');
+                    await this.stop(new AutoResetSignal());
+                }
+                break;
+            default:
+                unreachable(tag);
+        }
+    }
     subscribe(ctx) {
-        const { id, watermark } = ctx;
+        const { id, replicaVersion, watermark, initial } = ctx;
         const downstream = Subscription.create({
             cleanup: () => this.#forwarder.remove(subscriber),
         });
         const subscriber = new Subscriber(id, watermark, downstream);
-        if (ctx.replicaVersion !== this.#replicaVersion) {
-            subscriber.close(ErrorType.WrongReplicaVersion);
+        if (replicaVersion !== this.#replicaVersion) {
+            this.#lc.warn?.(`rejecting subscriber at replica version ${replicaVersion}`);
+            subscriber.close(ErrorType.WrongReplicaVersion, `current replica version is ${this.#replicaVersion} (requested ${replicaVersion})`);
         }
         else {
             this.#lc.debug?.(`adding subscriber ${subscriber.id}`);
             this.#forwarder.add(subscriber);
             this.#storer.catchup(subscriber);
+            if (initial) {
+                this.#scheduleCleanup(watermark);
+            }
         }
         return Promise.resolve(downstream);
     }
+    #scheduleCleanup(watermark) {
+        const origSize = this.#initialWatermarks.size;
+        this.#initialWatermarks.add(watermark);
+        if (origSize === 0) {
+            this.#state.setTimeout(() => this.#purgeOldChanges(), CLEANUP_DELAY_MS);
+        }
+    }
+    async #purgeOldChanges() {
+        const initial = [...this.#initialWatermarks];
+        if (initial.length === 0) {
+            this.#lc.warn?.('No initial watermarks to check for cleanup'); // Not expected.
+            return;
+        }
+        const current = [...this.#forwarder.getAcks()];
+        if (current.length === 0) {
+            // Also not expected, but possible (e.g. subscriber connects, then disconnects).
+            // Bail to be safe.
+            this.#lc.warn?.('No subscribers to confirm cleanup');
+            return;
+        }
+        try {
+            const earliestInitial = min(...initial);
+            const earliestCurrent = min(...current);
+            if (earliestCurrent < earliestInitial) {
+                this.#lc.info?.(`At least one client is behind backup (${earliestCurrent} < ${earliestInitial})`);
+            }
+            else {
+                const deleted = await this.#storer.purgeRecordsBefore(earliestInitial);
+                this.#lc.info?.(`Purged ${deleted} changes before ${earliestInitial}`);
+                this.#initialWatermarks.delete(earliestInitial);
+            }
+        }
+        finally {
+            if (this.#initialWatermarks.size) {
+                // If there are unpurged watermarks to check, schedule the next purge.
+                this.#state.setTimeout(() => this.#purgeOldChanges(), CLEANUP_DELAY_MS);
+            }
+        }
+    }
     async stop(err) {
         this.#state.stop(this.#lc, err);
         this.#stream?.changes.cancel();
         await this.#storer.stop();
     }
 }
+// The delay between receiving an initial, backup-based watermark
+// and performing a check of whether to purge records before it.
+// This delay should be long enough to handle situations like the following:
+//
+// 1. `litestream restore` downloads a backup for the `replication-manager`
+// 2. `replication-manager` starts up and runs this `change-streamer`
+// 3. `zero-cache`s that are running on a different replica connect to this
+//    `change-streamer` after exponential backoff retries.
+//
+// It is possible for a `zero-cache`[3] to be behind the backup restored [1].
+// This cleanup delay (30 seconds) is thus set to be a value comfortably
+// longer than the max delay for exponential backoff (10 seconds) in
+// `services/running-state.ts`. This allows the `zero-cache` [3] to reconnect
+// so that the `change-streamer` can track its progress and know when it has
+// surpassed the initial watermark of the backup [1].
+const CLEANUP_DELAY_MS = DEFAULT_MAX_RETRY_DELAY_MS * 3;
 //# sourceMappingURL=change-streamer-service.js.map