@powersync/service-module-postgres-storage 0.0.0-dev-20250304151813 → 0.0.0-dev-20250306152715

package/src/storage/batch/PostgresBucketBatch.ts

@@ -9,7 +9,7 @@ import {
   ServiceAssertionError,
   ServiceError
 } from '@powersync/lib-services-framework';
-import { storage, utils } from '@powersync/service-core';
+import { InternalOpId, storage, utils } from '@powersync/service-core';
 import * as sync_rules from '@powersync/service-sync-rules';
 import * as timers from 'timers/promises';
 import * as t from 'ts-codec';
@@ -29,7 +29,7 @@ export interface PostgresBucketBatchOptions {
   last_checkpoint_lsn: string | null;
   no_checkpoint_before_lsn: string;
   store_current_data: boolean;
-  keep_alive_op?: bigint | null;
+  keep_alive_op?: InternalOpId | null;
   /**
    * Set to true for initial replication.
    */
@@ -54,14 +54,14 @@ export class PostgresBucketBatch
   extends BaseObserver<storage.BucketBatchStorageListener>
   implements storage.BucketStorageBatch
 {
-  public last_flushed_op: bigint | null = null;
+  public last_flushed_op: InternalOpId | null = null;
 
   protected db: lib_postgres.DatabaseClient;
   protected group_id: number;
   protected last_checkpoint_lsn: string | null;
   protected no_checkpoint_before_lsn: string;
 
-  protected persisted_op: bigint | null;
+  protected persisted_op: InternalOpId | null;
 
   protected write_checkpoint_batch: storage.CustomWriteCheckpointOptions[];
   protected readonly sync_rules: sync_rules.SqlSyncRules;
@@ -132,18 +132,19 @@ export class PostgresBucketBatch
   async truncate(sourceTables: storage.SourceTable[]): Promise<storage.FlushedResult | null> {
     await this.flush();
 
-    let last_op: bigint | null = null;
+    let last_op: InternalOpId | null = null;
     for (let table of sourceTables) {
       last_op = await this.truncateSingle(table);
     }
 
     if (last_op) {
       this.persisted_op = last_op;
+      return {
+        flushed_op: last_op
+      };
+    } else {
+      return null;
     }
-
-    return {
-      flushed_op: String(last_op!)
-    };
   }
 
   protected async truncateSingle(sourceTable: storage.SourceTable) {
@@ -279,7 +280,7 @@ export class PostgresBucketBatch
 
     this.persisted_op = lastOp;
     this.last_flushed_op = lastOp;
-    return { flushed_op: String(lastOp) };
+    return { flushed_op: lastOp };
   }
 
   async commit(lsn: string, options?: storage.BucketBatchCommitOptions): Promise<boolean> {

package/src/utils/bucket-data.ts

@@ -5,7 +5,7 @@ import { replicaIdToSubkey } from './bson.js';
 export const mapOpEntry = (entry: models.BucketDataDecoded) => {
   if (entry.op == models.OpType.PUT || entry.op == models.OpType.REMOVE) {
     return {
-      op_id: utils.timestampToOpId(entry.op_id),
+      op_id: utils.internalToExternalOpId(entry.op_id),
       op: entry.op,
       object_type: entry.table_name ?? undefined,
       object_id: entry.row_id ?? undefined,
@@ -17,7 +17,7 @@ export const mapOpEntry = (entry: models.BucketDataDecoded) => {
     // MOVE, CLEAR
 
     return {
-      op_id: utils.timestampToOpId(entry.op_id),
+      op_id: utils.internalToExternalOpId(entry.op_id),
       op: entry.op,
       checksum: Number(entry.checksum)
     };

package/test/src/setup.ts

@@ -1,16 +1,10 @@
 import { container } from '@powersync/lib-services-framework';
-import { Metrics } from '@powersync/service-core';
 import { beforeAll } from 'vitest';
+import { METRICS_HELPER } from '@powersync/service-core-tests';
 
 beforeAll(async () => {
   // Executes for every test file
   container.registerDefaults();
 
-  // The metrics need to be initialized before they can be used
-  await Metrics.initialise({
-    disable_telemetry_sharing: true,
-    powersync_instance_id: 'test',
-    internal_metrics_endpoint: 'unused.for.tests.com'
-  });
-  Metrics.getInstance().resetCounters();
+  METRICS_HELPER.resetMetrics();
 });

package/test/src/storage.test.ts

@@ -81,7 +81,7 @@ describe('Postgres Sync Bucket Storage', () => {
     const options: storage.BucketDataBatchOptions = {};
 
     const batch1 = await test_utils.fromAsync(
-      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', '0']]), options)
+      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]]), options)
     );
     expect(test_utils.getBatchData(batch1)).toEqual([
       { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
@@ -93,7 +93,7 @@ describe('Postgres Sync Bucket Storage', () => {
     });
 
     const batch2 = await test_utils.fromAsync(
-      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', batch1[0].batch.next_after]]), options)
+      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch1[0].batch.next_after)]]), options)
     );
     expect(test_utils.getBatchData(batch2)).toEqual([
       { op_id: '2', op: 'PUT', object_id: 'large1', checksum: 1178768505 }
@@ -105,7 +105,7 @@ describe('Postgres Sync Bucket Storage', () => {
     });
 
     const batch3 = await test_utils.fromAsync(
-      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', batch2[0].batch.next_after]]), options)
+      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch2[0].batch.next_after)]]), options)
     );
     expect(test_utils.getBatchData(batch3)).toEqual([
       { op_id: '3', op: 'PUT', object_id: 'large2', checksum: 1607205872 }
@@ -117,7 +117,7 @@ describe('Postgres Sync Bucket Storage', () => {
     });
 
     const batch4 = await test_utils.fromAsync(
-      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', batch3[0].batch.next_after]]), options)
+      bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch3[0].batch.next_after)]]), options)
     );
     expect(test_utils.getBatchData(batch4)).toEqual([
       { op_id: '4', op: 'PUT', object_id: 'test3', checksum: 1359888332 }