@powersync/service-module-postgres-storage 0.0.0-dev-20260602073133 → 0.0.0-dev-20260909133214

package/CHANGELOG.md

@@ -1,15 +1,187 @@
 # @powersync/service-module-postgres-storage
 
-## 0.0.0-dev-20260602073133
+## 0.0.0-dev-20260909133214
+
+### Patch Changes
+
+- Updated dependencies [70b00a4]
+  - @powersync/service-sync-rules@0.0.0-dev-20260909133214
+  - @powersync/lib-services-framework@0.0.0-dev-20260909133214
+  - @powersync/service-jpgwire@0.0.0-dev-20260909133214
+  - @powersync/service-core@0.0.0-dev-20260909133214
+  - @powersync/lib-service-postgres@0.0.0-dev-20260909133214
+
+## 0.19.0
+
+### Minor Changes
+
+- 189bd9e: Add storage_version: 4 as a stable storage version.
+- 33a3c23: Add optional version_label for sync configs.
+
+### Patch Changes
+
+- 332d649: [MongoDB Storage] Support incremental parameter compacting jobs.
+- fccdff2: Add object storage metrics, and storage metrics split by sync config.
+- 4e4063b: Optimize runtime type checks, closes https://github.com/powersync-ja/powersync-service/issues/771.
+- 4037e8f: Add storage.default_storage_version config option.
+- a997c88: Restructure MongoDB V3 bucket compacting.
+- Updated dependencies [e11c54b]
+- Updated dependencies [4b6a23e]
+- Updated dependencies [189bd9e]
+- Updated dependencies [bb08068]
+- Updated dependencies [0077a8d]
+- Updated dependencies [332d649]
+- Updated dependencies [33a3c23]
+- Updated dependencies [fccdff2]
+- Updated dependencies [989d9e1]
+- Updated dependencies [646c0de]
+- Updated dependencies [cc121b3]
+- Updated dependencies [4e4063b]
+- Updated dependencies [2407f71]
+- Updated dependencies [10131ca]
+- Updated dependencies [4037e8f]
+- Updated dependencies [3972bac]
+- Updated dependencies [dd7a22f]
+- Updated dependencies [a997c88]
+  - @powersync/service-core@1.26.0
+  - @powersync/service-sync-rules@0.41.0
+  - @powersync/service-types@0.18.0
+  - @powersync/lib-service-postgres@0.5.4
+  - @powersync/lib-services-framework@0.10.1
+  - @powersync/service-jpgwire@0.21.23
+
+## 0.18.0
+
+### Minor Changes
+
+- 798d739: Add source-owned `SourceTable` reconciliation.
+
+  `resolveTables()` now queries all overlapping persisted candidates and passes them to a
+  source-provided reconciler that returns compatible and incompatible tables, can return
+  modified compatible copies, and supplies values used for potential new records. Storage persists allowlisted
+  source metadata differences but never interprets them. MongoDB v1/v3 and PostgreSQL storage were
+  refactored to this candidate-first model (PostgreSQL gains a nullable `source_metadata` JSONB column
+  via migration).
+
+### Patch Changes
+
+- 798d739: Fix hydration of replica id column type ids in Postgres bucket storage.
+
+  `source_tables.replica_id_columns` is persisted with a `type_oid` key, but the decoding codec declared
+  `typeId`, so every `SourceTable` read back from a row lost its column type ids. This affected
+  `getSourceTableStatus()` and the tables returned for dropping, and now also the identity comparison
+  used by source table reconciliation. The codec matches the persisted key - no data migration is
+  needed.
+
+- Updated dependencies [27b56cb]
+- Updated dependencies [798d739]
+  - @powersync/service-core@1.25.0
+
+## 0.17.0
+
+### Minor Changes
+
+- 2189250: Add `/sync/checkpoint-request` for client-supplied checkpoint request ids, previously called write checkpoint ids. The route returns the stored `checkpoint_request_id`, storage now treats managed request ids as monotonic per user/client, custom checkpoint request ids continue to use the existing `checkpoint` field for backwards compatibility, and `checkpoint_requested_at` metadata lets compact jobs remove expired request-derived checkpoint records.
+
+  This release includes storage migrations for the checkpoint request metadata. Self-hosters should run migrations as part of the upgrade.
+
+### Patch Changes
+
+- 294f334: Clear the replication error flag outside the flush transaction. Clearing it inside the REPEATABLE READ replication transaction conflicts with concurrent keepalive updates on the same sync_rules row, causing serialization failures that retry the entire flush when multiple writers are active.
+- 0a511c2: Delete rows in batches when clearing storage for a replication stream. A single DELETE covering the entire group can run for hours on large deployments and never complete once it exceeds statement or socket timeouts; batched deletes make durable progress and can be safely retried or aborted.
+- c4860c9: Improve Postgres sync throughput by reading bucket data with ordered, per-bucket index range scans that stop once the requested batch is full.
+- 63707af: Stability and performance fixes for MongoDB storage V3.
+- 123c801: Reconnect PostgreSQL notification connections and restore `LISTEN` subscriptions when the underlying connection is terminated. Harden connection-slot retries and lease handling, and publish checkpoint notifications atomically with checkpoint updates.
+- Updated dependencies [087b61e]
+- Updated dependencies [2189250]
+- Updated dependencies [922f974]
+- Updated dependencies [c4860c9]
+- Updated dependencies [483415d]
+- Updated dependencies [8daa300]
+- Updated dependencies [aab068b]
+- Updated dependencies [123c801]
+- Updated dependencies [37591e9]
+- Updated dependencies [be42e25]
+- Updated dependencies [cb4c627]
+  - @powersync/service-core@1.24.0
+  - @powersync/lib-services-framework@0.10.0
+  - @powersync/service-types@0.17.0
+  - @powersync/service-sync-rules@0.40.0
+  - @powersync/lib-service-postgres@0.5.3
+  - @powersync/service-jpgwire@0.21.22
+
+## 0.16.3
+
+### Patch Changes
+
+- Updated dependencies [ea71bf3]
+- Updated dependencies [ea31f64]
+- Updated dependencies [edc6ed4]
+  - @powersync/service-sync-rules@0.39.0
+  - @powersync/service-core@1.23.3
+  - @powersync/lib-services-framework@0.9.8
+  - @powersync/service-jpgwire@0.21.21
+  - @powersync/lib-service-postgres@0.5.2
+
+## 0.16.2
+
+### Patch Changes
+
+- e4f683d: [MongoDB Storage] Add experimental option to allow reading data from secondaries.
+- c2edf86: Add `api.parameters.bucket_count_cache_ttl_minutes` configuration option.
+- df9ab1e: Batch concurrent write checkpoint requests and increase request limits to improve throughput.
+- Updated dependencies [71d4a0a]
+- Updated dependencies [e4f683d]
+- Updated dependencies [71d4a0a]
+- Updated dependencies [a6ae678]
+- Updated dependencies [c2edf86]
+- Updated dependencies [df9ab1e]
+  - @powersync/service-core@1.23.2
+  - @powersync/service-sync-rules@0.38.1
+  - @powersync/service-types@0.16.1
+  - @powersync/lib-services-framework@0.9.7
+  - @powersync/lib-service-postgres@0.5.1
+
+## 0.16.1
+
+### Patch Changes
+
+- 7e65360: Restructure replication locks for updated sync config.
+- Updated dependencies [7e65360]
+  - @powersync/service-core@1.23.1
+
+## 0.16.0
+
+### Minor Changes
+
+- a91a08f: [Experimental] Enable incremental reprocessing for MongoDB source + MongoDB storage. This includes significant changes to the v3 storage format.
+
+### Patch Changes
+
+- 101ea67: Include table names in "Cannot mark snapshot done while source tables still require snapshotting" error.
+- Updated dependencies [a91a08f]
+- Updated dependencies [184c39f]
+- Updated dependencies [c3f75df]
+- Updated dependencies [4bd35ea]
+  - @powersync/service-core@1.23.0
+  - @powersync/lib-service-postgres@0.5.0
+  - @powersync/service-types@0.16.0
+  - @powersync/service-sync-rules@0.38.0
+  - @powersync/lib-services-framework@0.9.6
+  - @powersync/service-jpgwire@0.21.20
+
+## 0.15.0
 
 ### Minor Changes
 
 - e2bf1ad: [Internal] rework resolveTables to handle multiple SourceTables.
 - 15e2466: [MongoDB] Support snapshotting concurrently with streaming in storage v3+.
+- ebeaa3b: [Postgres] Skip storing a redundant copy of replicated rows in `current_data` for tables with `REPLICA IDENTITY FULL`.
 
 ### Patch Changes
 
 - 6e2a57e: Refactor HydratedSyncConfig to support multiple SyncConfigs.
+- Updated dependencies [17fd96b]
 - Updated dependencies [6e2a57e]
 - Updated dependencies [ec6df9f]
 - Updated dependencies [99d33d5]
@@ -22,13 +194,14 @@
 - Updated dependencies [92cc83b]
 - Updated dependencies [0aab0f9]
 - Updated dependencies [15e2466]
+- Updated dependencies [ebeaa3b]
 - Updated dependencies [b116857]
 - Updated dependencies [a94b6c3]
-  - @powersync/service-sync-rules@0.0.0-dev-20260602073133
-  - @powersync/service-core@0.0.0-dev-20260602073133
-  - @powersync/lib-services-framework@0.0.0-dev-20260602073133
-  - @powersync/service-jpgwire@0.0.0-dev-20260602073133
-  - @powersync/lib-service-postgres@0.0.0-dev-20260602073133
+  - @powersync/service-core@1.22.0
+  - @powersync/service-sync-rules@0.37.0
+  - @powersync/lib-services-framework@0.9.5
+  - @powersync/service-jpgwire@0.21.19
+  - @powersync/lib-service-postgres@0.4.28
 
 ## 0.14.0
 

package/dist/migrations/scripts/1782950400000-checkpoint-requested-at.d.ts

@@ -0,0 +1,3 @@
+import { migrations } from '@powersync/service-core';
+export declare const up: migrations.PowerSyncMigrationFunction;
+export declare const down: migrations.PowerSyncMigrationFunction;

package/dist/migrations/scripts/1782950400000-checkpoint-requested-at.js

@@ -0,0 +1,42 @@
+import { openMigrationDB } from '../migration-utils.js';
+export const up = async (context) => {
+    const { service_context: { configuration } } = context;
+    await using client = openMigrationDB(configuration.storage);
+    await client.transaction(async (db) => {
+        await db.sql `
+      ALTER TABLE write_checkpoints
+      ADD COLUMN checkpoint_requested_at TIMESTAMP WITH TIME ZONE
+    `.execute();
+        await db.sql `
+      ALTER TABLE custom_write_checkpoints
+      ADD COLUMN checkpoint_requested_at TIMESTAMP WITH TIME ZONE
+    `.execute();
+        await db.sql `
+      CREATE INDEX write_checkpoints_checkpoint_requested_at ON write_checkpoints (checkpoint_requested_at)
+      WHERE
+        checkpoint_requested_at IS NOT NULL
+    `.execute();
+        await db.sql `
+      CREATE INDEX custom_write_checkpoints_checkpoint_requested_at ON custom_write_checkpoints (checkpoint_requested_at)
+      WHERE
+        checkpoint_requested_at IS NOT NULL
+    `.execute();
+    });
+};
+export const down = async (context) => {
+    const { service_context: { configuration } } = context;
+    await using client = openMigrationDB(configuration.storage);
+    await client.transaction(async (db) => {
+        // Also drops the write_checkpoints_checkpoint_requested_at index.
+        await db.sql `
+      ALTER TABLE write_checkpoints
+      DROP COLUMN checkpoint_requested_at
+    `.execute();
+        // Also drops the custom_write_checkpoints_checkpoint_requested_at index.
+        await db.sql `
+      ALTER TABLE custom_write_checkpoints
+      DROP COLUMN checkpoint_requested_at
+    `.execute();
+    });
+};
+//# sourceMappingURL=1782950400000-checkpoint-requested-at.js.map

package/dist/migrations/scripts/1782950400000-checkpoint-requested-at.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1782950400000-checkpoint-requested-at.js","sourceRoot":"","sources":["../../../src/migrations/scripts/1782950400000-checkpoint-requested-at.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,MAAM,EAAE,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;IACzE,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;IACZ,YAAY,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE5D,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpC,MAAM,EAAE,CAAC,GAAG,CAAA;;;KAGX,CAAC,OAAO,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC,GAAG,CAAA;;;KAGX,CAAC,OAAO,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC,GAAG,CAAA;;;;KAIX,CAAC,OAAO,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC,GAAG,CAAA;;;;KAIX,CAAC,OAAO,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;IAC3E,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;IACZ,YAAY,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE5D,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpC,kEAAkE;QAClE,MAAM,EAAE,CAAC,GAAG,CAAA;;;KAGX,CAAC,OAAO,EAAE,CAAC;QACZ,yEAAyE;QACzE,MAAM,EAAE,CAAC,GAAG,CAAA;;;KAGX,CAAC,OAAO,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/migrations/scripts/1784900000000-source-metadata.d.ts

@@ -0,0 +1,3 @@
+import { migrations } from '@powersync/service-core';
+export declare const up: migrations.PowerSyncMigrationFunction;
+export declare const down: migrations.PowerSyncMigrationFunction;

package/dist/migrations/scripts/1784900000000-source-metadata.js

@@ -0,0 +1,22 @@
+import { openMigrationDB } from '../migration-utils.js';
+export const up = async (context) => {
+    const { service_context: { configuration } } = context;
+    await using client = openMigrationDB(configuration.storage);
+    await client.transaction(async (db) => {
+        await db.sql `
+      ALTER TABLE source_tables
+      ADD COLUMN source_metadata JSONB
+    `.execute();
+    });
+};
+export const down = async (context) => {
+    const { service_context: { configuration } } = context;
+    await using client = openMigrationDB(configuration.storage);
+    await client.transaction(async (db) => {
+        await db.sql `
+      ALTER TABLE source_tables
+      DROP COLUMN source_metadata
+    `.execute();
+    });
+};
+//# sourceMappingURL=1784900000000-source-metadata.js.map

package/dist/migrations/scripts/1784900000000-source-metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1784900000000-source-metadata.js","sourceRoot":"","sources":["../../../src/migrations/scripts/1784900000000-source-metadata.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,MAAM,EAAE,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;IACzE,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;IACZ,YAAY,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE5D,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpC,MAAM,EAAE,CAAC,GAAG,CAAA;;;KAGX,CAAC,OAAO,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;IAC3E,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;IACZ,YAAY,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE5D,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpC,MAAM,EAAE,CAAC,GAAG,CAAA;;;KAGX,CAAC,OAAO,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/migrations/scripts/1788000000000-sync-config-version-label.d.ts

@@ -0,0 +1,3 @@
+import { migrations } from '@powersync/service-core';
+export declare const up: migrations.PowerSyncMigrationFunction;
+export declare const down: migrations.PowerSyncMigrationFunction;

package/dist/migrations/scripts/1788000000000-sync-config-version-label.js

@@ -0,0 +1,12 @@
+import { openMigrationDB } from '../migration-utils.js';
+export const up = async (context) => {
+    const { service_context: { configuration } } = context;
+    await using client = openMigrationDB(configuration.storage);
+    await client.sql `ALTER TABLE sync_rules ADD COLUMN version_label TEXT`.execute();
+};
+export const down = async (context) => {
+    const { service_context: { configuration } } = context;
+    await using client = openMigrationDB(configuration.storage);
+    await client.sql `ALTER TABLE sync_rules DROP COLUMN version_label`.execute();
+};
+//# sourceMappingURL=1788000000000-sync-config-version-label.js.map

package/dist/migrations/scripts/1788000000000-sync-config-version-label.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1788000000000-sync-config-version-label.js","sourceRoot":"","sources":["../../../src/migrations/scripts/1788000000000-sync-config-version-label.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,MAAM,EAAE,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;IACzE,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;IACZ,YAAY,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,MAAM,CAAC,GAAG,CAAA,sDAAsD,CAAC,OAAO,EAAE,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;IAC3E,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;IACZ,YAAY,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,MAAM,CAAC,GAAG,CAAA,kDAAkD,CAAC,OAAO,EAAE,CAAC;AAC/E,CAAC,CAAC"}

package/dist/{@types/storage → storage}/PostgresBucketStorageFactory.d.ts

@@ -1,34 +1,36 @@
-import { framework, GetIntanceOptions, storage, SyncRulesBucketStorage } from '@powersync/service-core';
+import { framework, GetIntanceOptions, storage } from '@powersync/service-core';
 import * as pg_wire from '@powersync/service-jpgwire';
 import * as lib_postgres from '@powersync/lib-service-postgres';
 import { NormalizedPostgresStorageConfig } from '../types/types.js';
-import { PostgresPersistedSyncRulesContent } from './sync-rules/PostgresPersistedSyncRulesContent.js';
+import { PostgresPersistedReplicationStream } from './sync-rules/PostgresPersistedSyncConfigContent.js';
 export type PostgresBucketStorageOptions = {
     config: NormalizedPostgresStorageConfig;
-    slot_name_prefix: string;
+    replicationStreamNamePrefix: string;
+    checksumCacheTtlMs?: number;
+    defaultStorageVersion?: number;
 };
 export declare class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     protected options: PostgresBucketStorageOptions;
     [framework.DO_NOT_LOG]: boolean;
     readonly db: lib_postgres.DatabaseClient;
-    readonly slot_name_prefix: string;
+    readonly replicationStreamNamePrefix: string;
     private activeStorageCache;
     constructor(options: PostgresBucketStorageOptions);
     [Symbol.asyncDispose](): Promise<void>;
     prepareStatements(connection: pg_wire.PgConnection): Promise<void>;
-    getInstance(syncRules: storage.PersistedSyncRulesContent, options?: GetIntanceOptions): storage.SyncRulesBucketStorage;
+    getInstance(replicationStream: storage.PersistedReplicationStream, options?: GetIntanceOptions): storage.SyncRulesBucketStorage;
     getStorageMetrics(): Promise<storage.StorageMetrics>;
     getPowerSyncInstanceId(): Promise<string>;
     getSystemIdentifier(): Promise<storage.BucketStorageSystemIdentifier>;
-    updateSyncRules(options: storage.UpdateSyncRulesOptions): Promise<PostgresPersistedSyncRulesContent>;
+    updateSyncRules(options: storage.UpdateSyncRulesOptions): Promise<PostgresPersistedReplicationStream>;
     /**
      * Lazy-initializes storage-version-specific structures, if needed.
      */
     private initializeStorageVersion;
-    restartReplication(sync_rules_group_id: number): Promise<void>;
-    getActiveSyncRulesContent(): Promise<storage.PersistedSyncRulesContent | null>;
-    getNextSyncRulesContent(): Promise<storage.PersistedSyncRulesContent | null>;
-    getReplicatingSyncRules(): Promise<storage.PersistedSyncRulesContent[]>;
-    getStoppedSyncRules(): Promise<storage.PersistedSyncRulesContent[]>;
-    getActiveStorage(): Promise<SyncRulesBucketStorage | null>;
+    restartReplication(replicationStreamId: number): Promise<void>;
+    getActiveSyncConfig(): Promise<storage.ResolvedSyncConfig | null>;
+    getDeployingSyncConfig(): Promise<storage.ResolvedSyncConfig | null>;
+    getReplicatingReplicationStreams(): Promise<storage.PersistedReplicationStream[]>;
+    getStoppedReplicationStreams(): Promise<storage.PersistedReplicationStream[]>;
+    private resolvedSyncConfigFromRow;
 }

package/dist/storage/PostgresBucketStorageFactory.js

@@ -5,14 +5,13 @@ import * as lib_postgres from '@powersync/lib-service-postgres';
 import { models } from '../types/types.js';
 import { getStorageApplicationName } from '../utils/application-name.js';
 import { NOTIFICATION_CHANNEL, STORAGE_SCHEMA_NAME } from '../utils/db.js';
-import { notifySyncRulesUpdate } from './batch/PostgresBucketBatch.js';
 import { PostgresSyncRulesStorage } from './PostgresSyncRulesStorage.js';
-import { PostgresPersistedSyncRulesContent } from './sync-rules/PostgresPersistedSyncRulesContent.js';
+import { PostgresPersistedReplicationStream } from './sync-rules/PostgresPersistedSyncConfigContent.js';
 export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     options;
     [framework.DO_NOT_LOG] = true;
     db;
-    slot_name_prefix;
+    replicationStreamNamePrefix;
     activeStorageCache;
     constructor(options) {
         super();
@@ -23,7 +22,7 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
             notificationChannels: [NOTIFICATION_CHANNEL],
             applicationName: getStorageApplicationName()
         });
-        this.slot_name_prefix = options.slot_name_prefix;
+        this.replicationStreamNamePrefix = options.replicationStreamNamePrefix;
         this.db.registerListener({
             connectionCreated: async (connection) => this.prepareStatements(connection)
         });
@@ -35,32 +34,34 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
         // It should be possible to prepare statements for some common operations here.
         // This has not been implemented yet.
     }
-    getInstance(syncRules, options) {
-        const storage = new PostgresSyncRulesStorage({
+    getInstance(replicationStream, options) {
+        const syncRuleStorage = new PostgresSyncRulesStorage({
             factory: this,
             db: this.db,
-            sync_rules: syncRules,
-            batchLimits: this.options.config.batch_limits
+            replicationStream,
+            batchLimits: this.options.config.batch_limits,
+            checksumCacheTtlMs: this.options.checksumCacheTtlMs
         });
         if (!options?.skipLifecycleHooks) {
-            this.iterateListeners((cb) => cb.syncStorageCreated?.(storage));
+            this.iterateListeners((cb) => cb.syncStorageCreated?.(syncRuleStorage));
         }
-        storage.registerListener({
+        syncRuleStorage.registerListener({
             batchStarted: (batch) => {
                 batch.registerListener({
                     replicationEvent: (payload) => this.iterateListeners((cb) => cb.replicationEvent?.(payload))
                 });
             }
         });
-        return storage;
+        return syncRuleStorage;
     }
     async getStorageMetrics() {
-        const active_sync_rules = await this.getActiveSyncRules({ defaultSchema: 'public' });
-        if (active_sync_rules == null) {
+        const activeSyncConfig = await this.getActiveSyncConfig();
+        if (activeSyncConfig == null) {
             return {
                 operations_size_bytes: 0,
                 parameters_size_bytes: 0,
-                replication_size_bytes: 0
+                replication_size_bytes: 0,
+                object_storage_size_bytes: 0
             };
         }
         const sizes = await this.db.sql `
@@ -79,7 +80,8 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
         return {
             operations_size_bytes: Number(sizes.operations_size_bytes),
             parameters_size_bytes: Number(sizes.parameter_size_bytes),
-            replication_size_bytes: Number(sizes.v1_current_size_bytes) + Number(sizes.v3_current_size_bytes)
+            replication_size_bytes: Number(sizes.v1_current_size_bytes) + Number(sizes.v3_current_size_bytes),
+            object_storage_size_bytes: 0
         };
     }
     async getPowerSyncInstanceId() {
@@ -124,10 +126,13 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
         };
     }
     async updateSyncRules(options) {
-        const storageVersion = options.storageVersion ?? options.config.parsed.config.storageVersion ?? storage.CURRENT_STORAGE_VERSION;
+        const storageVersion = options.storageVersion ??
+            options.config.parsed.config.storageVersion ??
+            this.options.defaultStorageVersion ??
+            storage.CURRENT_STORAGE_VERSION;
         const storageConfig = storage.STORAGE_VERSION_CONFIG[storageVersion];
-        if (storageConfig == null) {
-            throw new framework.ServiceError(framework.ErrorCode.PSYNC_S1005, `Unsupported storage version ${storageVersion}`);
+        if (storageConfig == null || storageVersion >= storage.STORAGE_VERSION_4) {
+            throw new framework.ServiceError(framework.ErrorCode.PSYNC_S1005, `Unsupported storage version ${storageVersion} for PostgreSQL storage`);
         }
         await this.initializeStorageVersion(storageConfig);
         return this.db.transaction(async (db) => {
@@ -151,7 +156,8 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
             sync_plan,
             state,
             slot_name,
-            storage_version
+            storage_version,
+            version_label
           )
         VALUES
           (
@@ -165,7 +171,7 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
             ${{ type: 'json', value: options.config.plan }},
             ${{ type: 'varchar', value: storage.SyncRuleState.PROCESSING }},
             CONCAT(
-              ${{ type: 'varchar', value: this.slot_name_prefix }},
+              ${{ type: 'varchar', value: this.replicationStreamNamePrefix }},
               (
                 SELECT
                   id
@@ -175,15 +181,15 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
               '_',
               ${{ type: 'varchar', value: crypto.randomBytes(2).toString('hex') }}
             ),
-            ${{ type: 'int4', value: storageVersion }}
+            ${{ type: 'int4', value: storageVersion }},
+            ${{ type: 'varchar', value: options.version_label ?? null }}
           )
         RETURNING
           *
       `
                 .decoded(models.SyncRules)
                 .first();
-            await notifySyncRulesUpdate(this.db, newSyncRulesRow);
-            return new PostgresPersistedSyncRulesContent(this.db, newSyncRulesRow);
+            return new PostgresPersistedReplicationStream(this.db, newSyncRulesRow);
         });
     }
     /**
@@ -211,38 +217,38 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
         pending_delete IS NOT NULL
     `.execute();
     }
-    async restartReplication(sync_rules_group_id) {
-        const next = await this.getNextSyncRulesContent();
-        const active = await this.getActiveSyncRulesContent();
+    async restartReplication(replicationStreamId) {
+        const next = await this.getDeployingSyncConfig();
+        const active = await this.getActiveSyncConfig();
         // In both the below cases, we create a new replication stream.
         // The current one will continue serving sync requests until the next one has finished processing.
-        if (next != null && next.id == sync_rules_group_id) {
+        if (next != null && next.content.replicationStreamId == replicationStreamId) {
             // We need to redo the "next" replication stream
-            await this.updateSyncRules(next.asUpdateOptions());
+            await this.updateSyncRules(next.content.asUpdateOptions());
             // Pro-actively stop replicating
             await this.db.sql `
         UPDATE sync_rules
         SET
           state = ${{ value: storage.SyncRuleState.STOP, type: 'varchar' }}
         WHERE
-          id = ${{ value: next.id, type: 'int4' }}
+          id = ${{ value: next.content.replicationStreamId, type: 'int4' }}
           AND state = ${{ value: storage.SyncRuleState.PROCESSING, type: 'varchar' }}
       `.execute();
         }
-        else if (next == null && active?.id == sync_rules_group_id) {
+        else if (next == null && active?.content.replicationStreamId == replicationStreamId) {
             // Slot removed for "active" replication stream, while there is no "next" one.
-            await this.updateSyncRules(active.asUpdateOptions());
+            await this.updateSyncRules(active.content.asUpdateOptions());
             // Pro-actively stop replicating, but still serve clients with existing data
             await this.db.sql `
         UPDATE sync_rules
         SET
           state = ${{ value: storage.SyncRuleState.ERRORED, type: 'varchar' }}
         WHERE
-          id = ${{ value: active.id, type: 'int4' }}
+          id = ${{ value: active.content.replicationStreamId, type: 'int4' }}
           AND state = ${{ value: storage.SyncRuleState.ACTIVE, type: 'varchar' }}
       `.execute();
         }
-        else if (next != null && active?.id == sync_rules_group_id) {
+        else if (next != null && active?.content.replicationStreamId == replicationStreamId) {
             // Already have "next" replication stream - don't update any.
             // Pro-actively stop replicating, but still serve clients with existing data
             await this.db.sql `
@@ -250,12 +256,12 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
         SET
           state = ${{ value: storage.SyncRuleState.ERRORED, type: 'varchar' }}
         WHERE
-          id = ${{ value: active.id, type: 'int4' }}
+          id = ${{ value: active.content.replicationStreamId, type: 'int4' }}
           AND state = ${{ value: storage.SyncRuleState.ACTIVE, type: 'varchar' }}
       `.execute();
         }
     }
-    async getActiveSyncRulesContent() {
+    async getActiveSyncConfig() {
         const activeRow = await this.db.sql `
       SELECT
         *
@@ -274,10 +280,10 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
         if (!activeRow) {
             return null;
         }
-        return new PostgresPersistedSyncRulesContent(this.db, activeRow);
+        return this.resolvedSyncConfigFromRow(activeRow, { cacheActiveStorage: true });
     }
-    async getNextSyncRulesContent() {
-        const nextRow = await this.db.sql `
+    async getDeployingSyncConfig() {
+        const row = await this.db.sql `
       SELECT
         *
       FROM
@@ -291,12 +297,9 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     `
             .decoded(models.SyncRules)
             .first();
-        if (!nextRow) {
-            return null;
-        }
-        return new PostgresPersistedSyncRulesContent(this.db, nextRow);
+        return row == null ? null : this.resolvedSyncConfigFromRow(row);
     }
-    async getReplicatingSyncRules() {
+    async getReplicatingReplicationStreams() {
         const rows = await this.db.sql `
       SELECT
         *
@@ -308,9 +311,9 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     `
             .decoded(models.SyncRules)
             .rows();
-        return rows.map((row) => new PostgresPersistedSyncRulesContent(this.db, row));
+        return rows.map((row) => new PostgresPersistedReplicationStream(this.db, row));
     }
-    async getStoppedSyncRules() {
+    async getStoppedReplicationStreams() {
         const rows = await this.db.sql `
       SELECT
         *
@@ -321,24 +324,32 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     `
             .decoded(models.SyncRules)
             .rows();
-        return rows.map((row) => new PostgresPersistedSyncRulesContent(this.db, row));
+        return rows.map((row) => new PostgresPersistedReplicationStream(this.db, row));
     }
-    async getActiveStorage() {
-        const content = await this.getActiveSyncRulesContent();
-        if (content == null) {
-            return null;
-        }
-        // It is important that this instance is cached.
-        // Not for the instance construction itself, but to ensure that internal caches on the instance
-        // are re-used properly.
-        if (this.activeStorageCache?.group_id == content.id) {
-            return this.activeStorageCache;
-        }
-        else {
-            const instance = this.getInstance(content);
-            this.activeStorageCache = instance;
-            return instance;
-        }
+    resolvedSyncConfigFromRow(row, options = {}) {
+        const stream = new PostgresPersistedReplicationStream(this.db, row);
+        const content = stream.syncConfigContent[0];
+        const thisFactory = this;
+        return {
+            content,
+            replicationStream: stream,
+            get storage() {
+                // It is important that this instance is cached.
+                // Not for the instance construction itself, but to ensure that internal caches on the instance
+                // are re-used properly.
+                if (options.cacheActiveStorage) {
+                    const activeStorageCache = thisFactory.activeStorageCache;
+                    if (activeStorageCache?.replicationStreamId == stream.replicationStreamId) {
+                        return activeStorageCache;
+                    }
+                }
+                const instance = thisFactory.getInstance(stream);
+                if (options.cacheActiveStorage) {
+                    thisFactory.activeStorageCache = instance;
+                }
+                return instance;
+            }
+        };
     }
 }
 //# sourceMappingURL=PostgresBucketStorageFactory.js.map