@powersync/service-module-postgres-storage 0.15.0 → 0.16.1

package/dist/storage/sync-rules/PostgresPersistedSyncConfigContent.d.ts

@@ -0,0 +1,17 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
+import { storage } from '@powersync/service-core';
+import { models } from '../../types/types.js';
+export declare class PostgresPersistedSyncConfigContent extends storage.PersistedSyncConfigContent {
+    private db;
+    constructor(db: lib_postgres.DatabaseClient, row: models.SyncRulesDecoded);
+    getSyncConfigStatus(): Promise<storage.PersistedSyncConfigStatus | null>;
+}
+export declare class PostgresPersistedReplicationStream extends storage.PersistedReplicationStream {
+    private db;
+    private readonly row;
+    current_lock: storage.ReplicationLock | null;
+    readonly syncConfigContent: readonly PostgresPersistedSyncConfigContent[];
+    constructor(db: lib_postgres.DatabaseClient, row: models.SyncRulesDecoded);
+    parsed(options: storage.ParseSyncConfigOptions): storage.ParsedSyncConfigSet;
+    lock(): Promise<storage.ReplicationLock>;
+}

package/dist/storage/sync-rules/PostgresPersistedSyncConfigContent.js

@@ -0,0 +1,90 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
+import { ErrorCode, ServiceError } from '@powersync/lib-services-framework';
+import { storage } from '@powersync/service-core';
+import { models } from '../../types/types.js';
+export class PostgresPersistedSyncConfigContent extends storage.PersistedSyncConfigContent {
+    db;
+    constructor(db, row) {
+        super({
+            replicationStreamId: Number(row.id),
+            sync_rules_content: row.content,
+            compiled_plan: row.sync_plan,
+            replicationStreamName: row.slot_name,
+            storageVersion: row.storage_version ?? storage.LEGACY_STORAGE_VERSION,
+            syncConfigState: row.state
+        });
+        this.db = db;
+    }
+    async getSyncConfigStatus() {
+        const row = await this.db.sql `
+      SELECT
+        *
+      FROM
+        sync_rules
+      WHERE
+        id = ${{ value: this.replicationStreamId, type: 'int4' }}
+    `
+            .decoded(models.SyncRules)
+            .first();
+        return row == null ? null : syncConfigStatusFromRow(row);
+    }
+}
+function syncConfigStatusFromRow(row) {
+    return {
+        id: String(row.id),
+        replicationStreamId: Number(row.id),
+        state: row.state,
+        snapshot_done: row.snapshot_done,
+        last_checkpoint_lsn: row.last_checkpoint_lsn,
+        last_fatal_error: row.last_fatal_error,
+        last_keepalive_ts: row.last_keepalive_ts ? new Date(row.last_keepalive_ts) : null,
+        last_checkpoint_ts: row.last_checkpoint_ts ? new Date(row.last_checkpoint_ts) : null
+    };
+}
+export class PostgresPersistedReplicationStream extends storage.PersistedReplicationStream {
+    db;
+    row;
+    current_lock = null;
+    syncConfigContent;
+    constructor(db, row) {
+        super({
+            replicationStreamId: Number(row.id),
+            replicationStreamName: row.slot_name,
+            state: row.state,
+            storageVersion: row.storage_version ?? storage.LEGACY_STORAGE_VERSION
+        });
+        this.db = db;
+        this.row = row;
+        this.syncConfigContent = [new PostgresPersistedSyncConfigContent(this.db, this.row)];
+    }
+    parsed(options) {
+        return this.syncConfigContent[0].parsed(options);
+    }
+    async lock() {
+        const manager = new lib_postgres.PostgresLockManager({
+            db: this.db,
+            name: `sync_rules_${this.replicationStreamId}_${this.replicationStreamName}`
+        });
+        const lockHandle = await manager.acquire();
+        if (!lockHandle) {
+            throw new ServiceError(ErrorCode.PSYNC_S1003, `Replication stream is locked by another process, standing by.`);
+        }
+        const interval = setInterval(async () => {
+            try {
+                await lockHandle.refresh();
+            }
+            catch (e) {
+                this.logger.error('Failed to refresh lock', e);
+                clearInterval(interval);
+            }
+        }, 30_130);
+        return (this.current_lock = {
+            sync_rules_id: this.replicationStreamId,
+            release: async () => {
+                clearInterval(interval);
+                return lockHandle.release();
+            }
+        });
+    }
+}
+//# sourceMappingURL=PostgresPersistedSyncConfigContent.js.map

package/dist/storage/sync-rules/PostgresPersistedSyncConfigContent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgresPersistedSyncConfigContent.js","sourceRoot":"","sources":["../../../src/storage/sync-rules/PostgresPersistedSyncConfigContent.ts"],"names":[],"mappings":"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"}

package/dist/utils/test-utils.js

@@ -54,7 +54,7 @@ export function postgresTestSetup(factoryOptions) {
         await runMigrations({ down: false, up: true });
         await using storageFactory = new PostgresBucketStorageFactory({
             config: TEST_CONNECTION_OPTIONS,
-            slot_name_prefix: 'test_'
+            replicationStreamNamePrefix: 'test_'
         });
         await truncateTables(storageFactory.db);
     };
@@ -81,7 +81,7 @@ export function postgresTestSetup(factoryOptions) {
                 }
                 return new PostgresBucketStorageFactory({
                     config: TEST_CONNECTION_OPTIONS,
-                    slot_name_prefix: 'test_'
+                    replicationStreamNamePrefix: 'test_'
                 });
             }
             catch (ex) {

package/dist/utils/test-utils.js.map

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

package/package.json

@@ -1,44 +1,32 @@
 {
   "name": "@powersync/service-module-postgres-storage",
   "repository": "https://github.com/powersync-ja/powersync-service",
-  "types": "dist/@types/index.d.ts",
-  "version": "0.15.0",
-  "main": "dist/index.js",
+  "version": "0.16.1",
   "license": "FSL-1.1-ALv2",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "exports": {
-    ".": {
-      "types": "./dist/@types/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./types": {
-      "types": "./dist/@types/index.d.ts",
-      "import": "./dist/types/types.js",
-      "require": "./dist/types/types.js",
-      "default": "./dist/types/types.js"
-    }
+    ".": "./dist/index.js",
+    "./types": "./dist/types/types.js"
   },
   "dependencies": {
     "ix": "^5.0.0",
     "lru-cache": "^10.2.2",
     "ts-codec": "^1.3.0",
     "uuid": "^14.0.0",
-    "@powersync/lib-service-postgres": "0.4.28",
-    "@powersync/service-core": "1.22.0",
-    "@powersync/lib-services-framework": "0.9.5",
-    "@powersync/service-types": "0.15.2",
-    "@powersync/service-jpgwire": "0.21.19",
+    "@powersync/lib-service-postgres": "0.5.0",
+    "@powersync/lib-services-framework": "0.9.6",
+    "@powersync/service-core": "1.23.1",
+    "@powersync/service-types": "0.16.0",
+    "@powersync/service-jpgwire": "0.21.20",
     "@powersync/service-jsonbig": "0.17.13",
-    "@powersync/service-sync-rules": "0.37.0"
+    "@powersync/service-sync-rules": "0.38.0"
   },
   "devDependencies": {
     "typescript": "~6.0.3",
-    "@powersync/service-core-tests": "0.16.0"
+    "@powersync/service-core-tests": "0.17.0"
   },
   "scripts": {
     "build": "tsc -b",

package/src/storage/PostgresBucketStorageFactory.ts

@@ -1,4 +1,4 @@
-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 crypto from 'crypto';
 import * as uuid from 'uuid';
@@ -10,17 +10,17 @@ 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 type PostgresBucketStorageOptions = {
   config: NormalizedPostgresStorageConfig;
-  slot_name_prefix: string;
+  replicationStreamNamePrefix: string;
 };
 
 export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
   [framework.DO_NOT_LOG] = true;
   readonly db: lib_postgres.DatabaseClient;
-  public readonly slot_name_prefix: string;
+  public readonly replicationStreamNamePrefix: string;
 
   private activeStorageCache: storage.SyncRulesBucketStorage | undefined;
 
@@ -32,7 +32,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)
@@ -49,31 +49,31 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
   }
 
   getInstance(
-    syncRules: storage.PersistedSyncRulesContent,
+    replicationStream: storage.PersistedReplicationStream,
     options?: GetIntanceOptions
   ): storage.SyncRulesBucketStorage {
-    const storage = new PostgresSyncRulesStorage({
+    const syncRuleStorage = new PostgresSyncRulesStorage({
       factory: this,
       db: this.db,
-      sync_rules: syncRules,
+      replicationStream,
       batchLimits: this.options.config.batch_limits
     });
     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(): Promise<storage.StorageMetrics> {
-    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,
@@ -153,7 +153,7 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     };
   }
 
-  async updateSyncRules(options: storage.UpdateSyncRulesOptions): Promise<PostgresPersistedSyncRulesContent> {
+  async updateSyncRules(options: storage.UpdateSyncRulesOptions): Promise<PostgresPersistedReplicationStream> {
     const storageVersion =
       options.storageVersion ?? options.config.parsed.config.storageVersion ?? storage.CURRENT_STORAGE_VERSION;
     const storageConfig = storage.STORAGE_VERSION_CONFIG[storageVersion];
@@ -200,7 +200,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
@@ -220,7 +220,7 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
 
       await notifySyncRulesUpdate(this.db, newSyncRulesRow!);
 
-      return new PostgresPersistedSyncRulesContent(this.db, newSyncRulesRow!);
+      return new PostgresPersistedReplicationStream(this.db, newSyncRulesRow!);
     });
   }
 
@@ -252,28 +252,28 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     `.execute();
   }
 
-  async restartReplication(sync_rules_group_id: number): Promise<void> {
-    const next = await this.getNextSyncRulesContent();
-    const active = await this.getActiveSyncRulesContent();
+  async restartReplication(replicationStreamId: number): Promise<void> {
+    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`
@@ -281,10 +281,10 @@ 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();
-    } 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
@@ -293,13 +293,13 @@ 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(): Promise<storage.PersistedSyncRulesContent | null> {
+  async getActiveSyncConfig(): Promise<storage.ResolvedSyncConfig | null> {
     const activeRow = await this.db.sql`
       SELECT
         *
@@ -319,11 +319,11 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
       return null;
     }
 
-    return new PostgresPersistedSyncRulesContent(this.db, activeRow);
+    return this.resolvedSyncConfigFromRow(activeRow, { cacheActiveStorage: true });
   }
 
-  async getNextSyncRulesContent(): Promise<storage.PersistedSyncRulesContent | null> {
-    const nextRow = await this.db.sql`
+  async getDeployingSyncConfig(): Promise<storage.ResolvedSyncConfig | null> {
+    const row = await this.db.sql`
       SELECT
         *
       FROM
@@ -337,14 +337,11 @@ 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(): Promise<storage.PersistedSyncRulesContent[]> {
+  async getReplicatingReplicationStreams(): Promise<storage.PersistedReplicationStream[]> {
     const rows = await this.db.sql`
       SELECT
         *
@@ -357,10 +354,10 @@ 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(): Promise<storage.PersistedSyncRulesContent[]> {
+  async getStoppedReplicationStreams(): Promise<storage.PersistedReplicationStream[]> {
     const rows = await this.db.sql`
       SELECT
         *
@@ -372,24 +369,37 @@ 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(): Promise<SyncRulesBucketStorage | null> {
-    const content = await this.getActiveSyncRulesContent();
-    if (content == null) {
-      return null;
-    }
+  private resolvedSyncConfigFromRow(
+    row: models.SyncRulesDecoded,
+    options: { cacheActiveStorage?: boolean } = {}
+  ): storage.ResolvedSyncConfig {
+    const stream = new PostgresPersistedReplicationStream(this.db, row);
+    const content = stream.syncConfigContent[0];
+    const thisFactory = this;
 
-    // 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;
-    }
+    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;
+      }
+    };
   }
 }

package/src/storage/PostgresReportStorage.ts

@@ -3,7 +3,6 @@ import { logger } from '@powersync/lib-services-framework';
 import { storage } from '@powersync/service-core';
 import * as pg_wire from '@powersync/service-jpgwire';
 import { event_types } from '@powersync/service-types';
-import { ClientConnectionResponse } from '@powersync/service-types/dist/reports.js';
 import { toInteger } from 'ix/util/tointeger.js';
 import { v4 } from 'uuid';
 import { SdkReporting, SdkReportingDecoded } from '../types/models/SdkReporting.js';
@@ -295,7 +294,7 @@ export class PostgresReportStorage implements storage.ReportStorage {
     const limit = data.limit || 100;
     const statement = this.clientsConnectionPagination(data);
 
-    const result = await this.db.queryRows<ClientConnectionResponse>(statement.mainQuery);
+    const result = await this.db.queryRows<event_types.ClientConnectionResponse>(statement.mainQuery);
     const items = result.map((item) => ({
       ...item,
       /** JS Date conversion to match document schema used for Mongo storage */

package/src/storage/PostgresStorageProvider.ts

@@ -27,7 +27,7 @@ export class PostgresStorageProvider implements storage.StorageProvider {
     const normalizedConfig = normalizePostgresStorageConfig(decodedConfig);
     const storageFactory = new PostgresBucketStorageFactory({
       config: normalizedConfig,
-      slot_name_prefix: options.resolvedConfig.slot_name_prefix
+      replicationStreamNamePrefix: options.resolvedConfig.slot_name_prefix
     });
 
     const reportStorageFactory = new PostgresReportStorage({