@powersync/service-module-postgres 0.13.0 → 0.14.0

package/dist/replication/WalStream.js

@@ -1,12 +1,13 @@
 import * as lib_postgres from '@powersync/lib-service-postgres';
-import { container, DatabaseConnectionError, ErrorCode, errors, logger, ReplicationAbortedError, ReplicationAssertionError } from '@powersync/lib-services-framework';
-import { getUuidReplicaIdentityBson, storage } from '@powersync/service-core';
+import { container, DatabaseConnectionError, ErrorCode, errors, logger as defaultLogger, ReplicationAssertionError, ReplicationAbortedError } from '@powersync/lib-services-framework';
+import { getUuidReplicaIdentityBson, RelationCache, storage } from '@powersync/service-core';
 import * as pgwire from '@powersync/service-jpgwire';
 import { toSyncRulesRow } from '@powersync/service-sync-rules';
 import * as pg_utils from '../utils/pgwire_utils.js';
 import { getPgOutputRelation, getRelId } from './PgRelation.js';
-import { checkSourceConfiguration, getReplicationIdentityColumns } from './replication-utils.js';
+import { checkSourceConfiguration, checkTableRls, getReplicationIdentityColumns } from './replication-utils.js';
 import { ReplicationMetric } from '@powersync/service-types';
+import { ChunkedSnapshotQuery, IdSnapshotQuery, SimpleSnapshotQuery } from './SnapshotQuery.js';
 export const ZERO_LSN = '00000000/00000000';
 export const PUBLICATION_NAME = 'powersync';
 export const POSTGRES_DEFAULT_SCHEMA = 'public';
@@ -39,20 +40,39 @@ export class WalStream {
     sync_rules;
     group_id;
     connection_id = 1;
+    logger;
     storage;
     metrics;
     slot_name;
     connections;
     abort_signal;
-    relation_cache = new Map();
+    relationCache = new RelationCache((relation) => {
+        if (typeof relation == 'number') {
+            return relation;
+        }
+        return relation.objectId;
+    });
     startedStreaming = false;
+    snapshotChunkLength;
+    /**
+     * Time of the oldest uncommitted change, according to the source db.
+     * This is used to determine the replication lag.
+     */
+    oldestUncommittedChange = null;
+    /**
+     * Keep track of whether we have done a commit or keepalive yet.
+     * We can only compute replication lag if isStartingReplication == false, or oldestUncommittedChange is present.
+     */
+    isStartingReplication = true;
     constructor(options) {
+        this.logger = options.logger ?? defaultLogger;
         this.storage = options.storage;
         this.metrics = options.metrics;
         this.sync_rules = options.storage.getParsedSyncRules({ defaultSchema: POSTGRES_DEFAULT_SCHEMA });
         this.group_id = options.storage.group_id;
         this.slot_name = options.storage.slot_name;
         this.connections = options.connections;
+        this.snapshotChunkLength = options.snapshotChunkLength ?? 10_000;
         this.abort_signal = options.abort_signal;
         this.abort_signal.addEventListener('abort', () => {
             if (this.startedStreaming) {
@@ -62,7 +82,7 @@ export class WalStream {
                 const promise = sendKeepAlive(this.connections.pool);
                 promise.catch((e) => {
                     // Failures here are okay - this only speeds up stopping the process.
-                    logger.warn('Failed to ping connection', e);
+                    this.logger.warn('Failed to ping connection', e);
                 });
             }
             else {
@@ -130,9 +150,20 @@ export class WalStream {
                 ]
             });
             if (rs.rows.length == 0) {
-                logger.info(`Skipping ${tablePattern.schema}.${name} - not part of ${PUBLICATION_NAME} publication`);
+                this.logger.info(`Skipping ${tablePattern.schema}.${name} - not part of ${PUBLICATION_NAME} publication`);
                 continue;
             }
+            try {
+                const result = await checkTableRls(db, relid);
+                if (!result.canRead) {
+                    // We log the message, then continue anyway, since the check does not cover all cases.
+                    this.logger.warn(result.message);
+                }
+            }
+            catch (e) {
+                // It's possible that we just don't have permission to access pg_roles - log the error and continue.
+                this.logger.warn(`Could not check RLS access for ${tablePattern.schema}.${name}`, e);
+            }
             const cresult = await getReplicationIdentityColumns(db, relid);
             const table = await this.handleRelation(batch, {
                 name,
@@ -152,7 +183,7 @@ export class WalStream {
         const snapshotDone = status.snapshot_done && status.checkpoint_lsn != null;
         if (snapshotDone) {
             // Snapshot is done, but we still need to check the replication slot status
-            logger.info(`${slotName} Initial replication already done`);
+            this.logger.info(`Initial replication already done`);
         }
         // Check if replication slot exists
         const rs = await this.connections.pool.query({
@@ -208,7 +239,7 @@ export class WalStream {
                 // We peek a large number of changes here, to make it more likely to pick up replication slot errors.
                 // For example, "publication does not exist" only occurs here if the peek actually includes changes related
                 // to the slot.
-                logger.info(`Checking ${slotName}`);
+                this.logger.info(`Checking ${slotName}`);
                 // The actual results can be quite large, so we don't actually return everything
                 // due to memory and processing overhead that would create.
                 const cursor = await this.connections.pool.stream({
@@ -222,12 +253,12 @@ export class WalStream {
                     // No-op, just exhaust the cursor
                 }
                 // Success
-                logger.info(`Slot ${slotName} appears healthy`);
+                this.logger.info(`Slot ${slotName} appears healthy`);
                 return { needsNewSlot: false };
             }
             catch (e) {
                 last_error = e;
-                logger.warn(`${slotName} Replication slot error`, e);
+                this.logger.warn(`Replication slot error`, e);
                 if (this.stopped) {
                     throw e;
                 }
@@ -249,7 +280,7 @@ export class WalStream {
                     // Sample: publication "powersync" does not exist
                     //   Happens when publication deleted or never created.
                     //   Slot must be re-created in this case.
-                    logger.info(`${slotName} is not valid anymore`);
+                    this.logger.info(`${slotName} is not valid anymore`);
                     return { needsNewSlot: true };
                 }
                 // Try again after a pause
@@ -258,7 +289,7 @@ export class WalStream {
         }
         throw new ReplicationAssertionError('Unreachable');
     }
-    async estimatedCount(db, table) {
+    async estimatedCountNumber(db, table) {
         const results = await db.query({
             statement: `SELECT reltuples::bigint AS estimate
 FROM   pg_class
@@ -267,10 +298,10 @@ WHERE  oid = $1::regclass`,
         });
         const row = results.rows[0];
         if ((row?.[0] ?? -1n) == -1n) {
-            return '?';
+            return -1;
         }
         else {
-            return `~${row[0]}`;
+            return Number(row[0]);
         }
     }
     /**
@@ -290,7 +321,7 @@ WHERE  oid = $1::regclass`,
             // In those cases, we have to start replication from scratch.
             // If there is an existing healthy slot, we can skip this and continue
             // initial replication where we left off.
-            await this.storage.clear();
+            await this.storage.clear({ signal: this.abort_signal });
             await db.query({
                 statement: 'SELECT pg_drop_replication_slot(slot_name) FROM pg_replication_slots WHERE slot_name = $1',
                 params: [{ type: 'varchar', value: slotName }]
@@ -298,27 +329,39 @@ WHERE  oid = $1::regclass`,
             // We use the replication connection here, not a pool.
             // The replication slot must be created before we start snapshotting tables.
             await replicationConnection.query(`CREATE_REPLICATION_SLOT ${slotName} LOGICAL pgoutput`);
-            logger.info(`Created replication slot ${slotName}`);
+            this.logger.info(`Created replication slot ${slotName}`);
         }
         await this.initialReplication(db);
     }
     async initialReplication(db) {
         const sourceTables = this.sync_rules.getSourceTables();
-        await this.storage.startBatch({ zeroLSN: ZERO_LSN, defaultSchema: POSTGRES_DEFAULT_SCHEMA, storeCurrentData: true, skipExistingRows: true }, async (batch) => {
+        await this.storage.startBatch({
+            logger: this.logger,
+            zeroLSN: ZERO_LSN,
+            defaultSchema: POSTGRES_DEFAULT_SCHEMA,
+            storeCurrentData: true,
+            skipExistingRows: true
+        }, async (batch) => {
+            let tablesWithStatus = [];
             for (let tablePattern of sourceTables) {
                 const tables = await this.getQualifiedTableNames(batch, db, tablePattern);
+                // Pre-get counts
                 for (let table of tables) {
                     if (table.snapshotComplete) {
-                        logger.info(`${this.slot_name} Skipping ${table.qualifiedName} - snapshot already done`);
+                        this.logger.info(`Skipping ${table.qualifiedName} - snapshot already done`);
                         continue;
                     }
-                    await this.snapshotTable(batch, db, table);
-                    const rs = await db.query(`select pg_current_wal_lsn() as lsn`);
-                    const tableLsnNotBefore = rs.rows[0][0];
-                    await batch.markSnapshotDone([table], tableLsnNotBefore);
-                    await touch();
+                    const count = await this.estimatedCountNumber(db, table);
+                    table = await batch.updateTableProgress(table, { totalEstimatedCount: count });
+                    this.relationCache.update(table);
+                    tablesWithStatus.push(table);
+                    this.logger.info(`To replicate: ${table.qualifiedName} ${table.formatSnapshotProgress()}`);
                 }
             }
+            for (let table of tablesWithStatus) {
+                await this.snapshotTableInTx(batch, db, table);
+                await touch();
+            }
             // Always commit the initial snapshot at zero.
             // This makes sure we don't skip any changes applied before starting this snapshot,
             // in the case of snapshot retries.
@@ -340,53 +383,147 @@ WHERE  oid = $1::regclass`,
             yield toSyncRulesRow(row);
         }
     }
-    async snapshotTable(batch, db, table) {
-        logger.info(`${this.slot_name} Replicating ${table.qualifiedName}`);
-        const estimatedCount = await this.estimatedCount(db, table);
-        let at = 0;
-        let lastLogIndex = 0;
-        const cursor = db.stream({ statement: `SELECT * FROM ${table.escapedIdentifier}` });
+    async snapshotTableInTx(batch, db, table, limited) {
+        // Note: We use the default "Read Committed" isolation level here, not snapshot isolation.
+        // The data may change during the transaction, but that is compensated for in the streaming
+        // replication afterwards.
+        await db.query('BEGIN');
+        try {
+            let tableLsnNotBefore;
+            await this.snapshotTable(batch, db, table, limited);
+            // Get the current LSN.
+            // The data will only be consistent once incremental replication has passed that point.
+            // We have to get this LSN _after_ we have finished the table snapshot.
+            //
+            // There are basically two relevant LSNs here:
+            // A: The LSN before the snapshot starts. We don't explicitly record this on the PowerSync side,
+            //    but it is implicitly recorded in the replication slot.
+            // B: The LSN after the table snapshot is complete, which is what we get here.
+            // When we do the snapshot queries, the data that we get back for each chunk could match the state
+            // anywhere between A and B. To actually have a consistent state on our side, we need to:
+            // 1. Complete the snapshot.
+            // 2. Wait until logical replication has caught up with all the change between A and B.
+            // Calling `markSnapshotDone(LSN B)` covers that.
+            const rs = await db.query(`select pg_current_wal_lsn() as lsn`);
+            tableLsnNotBefore = rs.rows[0][0];
+            // Side note: A ROLLBACK would probably also be fine here, since we only read in this transaction.
+            await db.query('COMMIT');
+            const [resultTable] = await batch.markSnapshotDone([table], tableLsnNotBefore);
+            this.relationCache.update(resultTable);
+            return resultTable;
+        }
+        catch (e) {
+            await db.query('ROLLBACK');
+            throw e;
+        }
+    }
+    async snapshotTable(batch, db, table, limited) {
+        let totalEstimatedCount = table.snapshotStatus?.totalEstimatedCount;
+        let at = table.snapshotStatus?.replicatedCount ?? 0;
+        let lastCountTime = 0;
+        let q;
+        // We do streaming on two levels:
+        // 1. Coarse level: DELCARE CURSOR, FETCH 10000 at a time.
+        // 2. Fine level: Stream chunks from each fetch call.
+        if (limited) {
+            q = new IdSnapshotQuery(db, table, limited);
+        }
+        else if (ChunkedSnapshotQuery.supports(table)) {
+            // Single primary key - we can use the primary key for chunking
+            const orderByKey = table.replicaIdColumns[0];
+            q = new ChunkedSnapshotQuery(db, table, this.snapshotChunkLength, table.snapshotStatus?.lastKey ?? null);
+            if (table.snapshotStatus?.lastKey != null) {
+                this.logger.info(`Replicating ${table.qualifiedName} ${table.formatSnapshotProgress()} - resuming from ${orderByKey.name} > ${q.lastKey}`);
+            }
+            else {
+                this.logger.info(`Replicating ${table.qualifiedName} ${table.formatSnapshotProgress()} - resumable`);
+            }
+        }
+        else {
+            // Fallback case - query the entire table
+            this.logger.info(`Replicating ${table.qualifiedName} ${table.formatSnapshotProgress()} - not resumable`);
+            q = new SimpleSnapshotQuery(db, table, this.snapshotChunkLength);
+            at = 0;
+        }
+        await q.initialize();
         let columns = [];
-        // pgwire streams rows in chunks.
-        // These chunks can be quite small (as little as 16KB), so we don't flush chunks automatically.
-        for await (let chunk of cursor) {
-            if (chunk.tag == 'RowDescription') {
-                let i = 0;
-                columns = chunk.payload.map((c) => {
-                    return { i: i++, name: c.name };
+        let hasRemainingData = true;
+        while (hasRemainingData) {
+            // Fetch 10k at a time.
+            // The balance here is between latency overhead per FETCH call,
+            // and not spending too much time on each FETCH call.
+            // We aim for a couple of seconds on each FETCH call.
+            const cursor = q.nextChunk();
+            hasRemainingData = false;
+            // pgwire streams rows in chunks.
+            // These chunks can be quite small (as little as 16KB), so we don't flush chunks automatically.
+            // There are typically 100-200 rows per chunk.
+            for await (let chunk of cursor) {
+                if (chunk.tag == 'RowDescription') {
+                    // We get a RowDescription for each FETCH call, but they should
+                    // all be the same.
+                    let i = 0;
+                    columns = chunk.payload.map((c) => {
+                        return { i: i++, name: c.name };
+                    });
+                    continue;
+                }
+                const rows = chunk.rows.map((row) => {
+                    let q = {};
+                    for (let c of columns) {
+                        q[c.name] = row[c.i];
+                    }
+                    return q;
                 });
-                continue;
+                if (rows.length > 0) {
+                    hasRemainingData = true;
+                }
+                for (const record of WalStream.getQueryData(rows)) {
+                    // This auto-flushes when the batch reaches its size limit
+                    await batch.save({
+                        tag: storage.SaveOperationTag.INSERT,
+                        sourceTable: table,
+                        before: undefined,
+                        beforeReplicaId: undefined,
+                        after: record,
+                        afterReplicaId: getUuidReplicaIdentityBson(record, table.replicaIdColumns)
+                    });
+                }
+                at += rows.length;
+                this.metrics.getCounter(ReplicationMetric.ROWS_REPLICATED).add(rows.length);
+                await touch();
             }
-            const rows = chunk.rows.map((row) => {
-                let q = {};
-                for (let c of columns) {
-                    q[c.name] = row[c.i];
+            // Important: flush before marking progress
+            await batch.flush();
+            if (limited == null) {
+                let lastKey;
+                if (q instanceof ChunkedSnapshotQuery) {
+                    lastKey = q.getLastKeySerialized();
                 }
-                return q;
-            });
-            if (rows.length > 0 && at - lastLogIndex >= 5000) {
-                logger.info(`${this.slot_name} Replicating ${table.qualifiedName} ${at}/${estimatedCount}`);
-                lastLogIndex = at;
+                if (lastCountTime < performance.now() - 10 * 60 * 1000) {
+                    // Even though we're doing the snapshot inside a transaction, the transaction uses
+                    // the default "Read Committed" isolation level. This means we can get new data
+                    // within the transaction, so we re-estimate the count every 10 minutes when replicating
+                    // large tables.
+                    totalEstimatedCount = await this.estimatedCountNumber(db, table);
+                    lastCountTime = performance.now();
+                }
+                table = await batch.updateTableProgress(table, {
+                    lastKey: lastKey,
+                    replicatedCount: at,
+                    totalEstimatedCount: totalEstimatedCount
+                });
+                this.relationCache.update(table);
+                this.logger.info(`Replicating ${table.qualifiedName} ${table.formatSnapshotProgress()}`);
             }
-            if (this.abort_signal.aborted) {
-                throw new ReplicationAbortedError(`Aborted initial replication of ${this.slot_name}`);
+            else {
+                this.logger.info(`Replicating ${table.qualifiedName} ${at}/${limited.length} for resnapshot`);
             }
-            for (const record of WalStream.getQueryData(rows)) {
-                // This auto-flushes when the batch reaches its size limit
-                await batch.save({
-                    tag: storage.SaveOperationTag.INSERT,
-                    sourceTable: table,
-                    before: undefined,
-                    beforeReplicaId: undefined,
-                    after: record,
-                    afterReplicaId: getUuidReplicaIdentityBson(record, table.replicaIdColumns)
-                });
+            if (this.abort_signal.aborted) {
+                // We only abort after flushing
+                throw new ReplicationAbortedError(`Initial replication interrupted`);
             }
-            at += rows.length;
-            this.metrics.getCounter(ReplicationMetric.ROWS_REPLICATED).add(rows.length);
-            await touch();
         }
-        await batch.flush();
     }
     async handleRelation(batch, descriptor, snapshot) {
         if (!descriptor.objectId && typeof descriptor.objectId != 'number') {
@@ -399,7 +536,7 @@ WHERE  oid = $1::regclass`,
             entity_descriptor: descriptor,
             sync_rules: this.sync_rules
         });
-        this.relation_cache.set(descriptor.objectId, result.table);
+        this.relationCache.update(result.table);
         // Drop conflicting tables. This includes for example renamed tables.
         await batch.drop(result.dropTables);
         // Snapshot if:
@@ -410,38 +547,53 @@ WHERE  oid = $1::regclass`,
         if (shouldSnapshot) {
             // Truncate this table, in case a previous snapshot was interrupted.
             await batch.truncate([result.table]);
-            let lsn = ZERO_LSN;
             // Start the snapshot inside a transaction.
             // We use a dedicated connection for this.
             const db = await this.connections.snapshotConnection();
             try {
-                await db.query('BEGIN');
-                try {
-                    await this.snapshotTable(batch, db, result.table);
-                    // Get the current LSN.
-                    // The data will only be consistent once incremental replication
-                    // has passed that point.
-                    // We have to get this LSN _after_ we have started the snapshot query.
-                    const rs = await db.query(`select pg_current_wal_lsn() as lsn`);
-                    lsn = rs.rows[0][0];
-                    await db.query('COMMIT');
-                }
-                catch (e) {
-                    await db.query('ROLLBACK');
-                    // TODO: Wrap with custom error type
-                    throw e;
-                }
+                const table = await this.snapshotTableInTx(batch, db, result.table);
+                // After the table snapshot, we wait for replication to catch up.
+                // To make sure there is actually something to replicate, we send a keepalive
+                // message.
+                await sendKeepAlive(db);
+                return table;
             }
             finally {
                 await db.end();
             }
-            const [table] = await batch.markSnapshotDone([result.table], lsn);
-            return table;
         }
         return result.table;
     }
+    /**
+     * Process rows that have missing TOAST values.
+     *
+     * This can happen during edge cases in the chunked intial snapshot process.
+     *
+     * We handle this similar to an inline table snapshot, but limited to the specific
+     * set of rows.
+     */
+    async resnapshot(batch, rows) {
+        const byTable = new Map();
+        for (let row of rows) {
+            const relId = row.table.objectId; // always a number for postgres
+            if (!byTable.has(relId)) {
+                byTable.set(relId, []);
+            }
+            byTable.get(relId).push(row);
+        }
+        const db = await this.connections.snapshotConnection();
+        try {
+            for (let rows of byTable.values()) {
+                const table = rows[0].table;
+                await this.snapshotTableInTx(batch, db, table, rows.map((r) => r.key));
+            }
+        }
+        finally {
+            await db.end();
+        }
+    }
     getTable(relationId) {
-        const table = this.relation_cache.get(relationId);
+        const table = this.relationCache.get(relationId);
         if (table == null) {
             // We should always receive a replication message before the relation is used.
             // If we can't find it, it's a bug.
@@ -456,7 +608,7 @@ WHERE  oid = $1::regclass`,
         if (msg.tag == 'insert' || msg.tag == 'update' || msg.tag == 'delete') {
             const table = this.getTable(getRelId(msg.relation));
             if (!table.syncAny) {
-                logger.debug(`Table ${table.qualifiedName} not used in sync rules - skipping`);
+                this.logger.debug(`Table ${table.qualifiedName} not used in sync rules - skipping`);
                 return null;
             }
             if (msg.tag == 'insert') {
@@ -556,7 +708,36 @@ WHERE  oid = $1::regclass`,
         this.startedStreaming = true;
         // Auto-activate as soon as initial replication is done
         await this.storage.autoActivate();
-        await this.storage.startBatch({ zeroLSN: ZERO_LSN, defaultSchema: POSTGRES_DEFAULT_SCHEMA, storeCurrentData: true, skipExistingRows: false }, async (batch) => {
+        let resnapshot = [];
+        const markRecordUnavailable = (record) => {
+            if (!IdSnapshotQuery.supports(record.sourceTable)) {
+                // If it's not supported, it's also safe to ignore
+                return;
+            }
+            let key = {};
+            for (let column of record.sourceTable.replicaIdColumns) {
+                const name = column.name;
+                const value = record.after[name];
+                if (value == null) {
+                    // We don't expect this to actually happen.
+                    // The key should always be present in the "after" record.
+                    return;
+                }
+                key[name] = value;
+            }
+            resnapshot.push({
+                table: record.sourceTable,
+                key: key
+            });
+        };
+        await this.storage.startBatch({
+            logger: this.logger,
+            zeroLSN: ZERO_LSN,
+            defaultSchema: POSTGRES_DEFAULT_SCHEMA,
+            storeCurrentData: true,
+            skipExistingRows: false,
+            markRecordUnavailable
+        }, async (batch) => {
             // We don't handle any plain keepalive messages while we have transactions.
             // While we have transactions, we use that to advance the position.
             // Replication never starts in the middle of a transaction, so this starts as false.
@@ -585,6 +766,9 @@ WHERE  oid = $1::regclass`,
                     else if (msg.tag == 'begin') {
                         // This may span multiple transactions in the same chunk, or even across chunks.
                         skipKeepalive = true;
+                        if (this.oldestUncommittedChange == null) {
+                            this.oldestUncommittedChange = new Date(Number(msg.commitTime / 1000n));
+                        }
                     }
                     else if (msg.tag == 'commit') {
                         this.metrics.getCounter(ReplicationMetric.TRANSACTIONS_REPLICATED).add(1);
@@ -593,13 +777,30 @@ WHERE  oid = $1::regclass`,
                             // This effectively lets us batch multiple transactions within the same chunk
                             // into a single flush, increasing throughput for many small transactions.
                             skipKeepalive = false;
-                            await batch.commit(msg.lsn, { createEmptyCheckpoints });
+                            // flush() must be before the resnapshot check - that is
+                            // typically what reports the resnapshot records.
+                            await batch.flush({ oldestUncommittedChange: this.oldestUncommittedChange });
+                            // This _must_ be checked after the flush(), and before
+                            // commit() or ack(). We never persist the resnapshot list,
+                            // so we have to process it before marking our progress.
+                            if (resnapshot.length > 0) {
+                                await this.resnapshot(batch, resnapshot);
+                                resnapshot = [];
+                            }
+                            const didCommit = await batch.commit(msg.lsn, {
+                                createEmptyCheckpoints,
+                                oldestUncommittedChange: this.oldestUncommittedChange
+                            });
                             await this.ack(msg.lsn, replicationStream);
+                            if (didCommit) {
+                                this.oldestUncommittedChange = null;
+                                this.isStartingReplication = false;
+                            }
                         }
                     }
                     else {
                         if (count % 100 == 0) {
-                            logger.info(`${this.slot_name} replicating op ${count} ${msg.lsn}`);
+                            this.logger.info(`Replicating op ${count} ${msg.lsn}`);
                         }
                         /**
                          * If we can see the contents of logical messages, then we can check if a keepalive
@@ -611,7 +812,14 @@ WHERE  oid = $1::regclass`,
                             keepAliveDetected = true;
                         }
                         count += 1;
-                        await this.writeChange(batch, msg);
+                        const flushResult = await this.writeChange(batch, msg);
+                        if (flushResult != null && resnapshot.length > 0) {
+                            // If we have large transactions, we also need to flush the resnapshot list
+                            // periodically.
+                            // TODO: make sure this bit is actually triggered
+                            await this.resnapshot(batch, resnapshot);
+                            resnapshot = [];
+                        }
                     }
                 }
                 if (!skipKeepalive) {
@@ -623,7 +831,11 @@ WHERE  oid = $1::regclass`,
                         // Big caveat: This _must not_ be used to skip individual messages, since this LSN
                         // may be in the middle of the next transaction.
                         // It must only be used to associate checkpoints with LSNs.
-                        await batch.keepalive(chunkLastLsn);
+                        const didCommit = await batch.keepalive(chunkLastLsn);
+                        if (didCommit) {
+                            this.oldestUncommittedChange = null;
+                        }
+                        this.isStartingReplication = false;
                     }
                     // We receive chunks with empty messages often (about each second).
                     // Acknowledging here progresses the slot past these and frees up resources.
@@ -649,7 +861,8 @@ WHERE  oid = $1::regclass`,
         if (storageIdentifier.type != lib_postgres.POSTGRES_CONNECTION_TYPE) {
             return {
                 // Keep the same behaviour as before allowing Postgres storage.
-                createEmptyCheckpoints: true
+                createEmptyCheckpoints: true,
+                oldestUncommittedChange: null
             };
         }
         const parsedStorageIdentifier = lib_postgres.utils.decodePostgresSystemIdentifier(storageIdentifier.id);
@@ -665,7 +878,8 @@ WHERE  oid = $1::regclass`,
              * Don't create empty checkpoints if the same Postgres database is used for the data source
              * and sync bucket storage. Creating empty checkpoints will cause WAL feedback loops.
              */
-            createEmptyCheckpoints: replicationIdentifier.database_name != parsedStorageIdentifier.database_name
+            createEmptyCheckpoints: replicationIdentifier.database_name != parsedStorageIdentifier.database_name,
+            oldestUncommittedChange: null
         };
     }
     /**
@@ -676,6 +890,19 @@ WHERE  oid = $1::regclass`,
         const version = await this.connections.getServerVersion();
         return version ? version.compareMain('14.0.0') >= 0 : false;
     }
+    async getReplicationLagMillis() {
+        if (this.oldestUncommittedChange == null) {
+            if (this.isStartingReplication) {
+                // We don't have anything to compute replication lag with yet.
+                return undefined;
+            }
+            else {
+                // We don't have any uncommitted changes, so replication is up-to-date.
+                return 0;
+            }
+        }
+        return Date.now() - this.oldestUncommittedChange.getTime();
+    }
 }
 async function touch() {
     // FIXME: The hosted Kubernetes probe does not actually check the timestamp on this.