@powersync/service-module-postgres 0.0.0-dev-20250102111825 → 0.0.0-dev-20250108084515

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @powersync/service-module-postgres
 
-## 0.0.0-dev-20250102111825
+## 0.0.0-dev-20250108084515
 
 ### Minor Changes
 
@@ -10,12 +10,13 @@
 
 - Updated dependencies [697d44b]
 - Updated dependencies [697d44b]
+- Updated dependencies [48320b5]
 - Updated dependencies [697d44b]
-  - @powersync/service-core@0.0.0-dev-20250102111825
-  - @powersync/lib-services-framework@0.0.0-dev-20250102111825
-  - @powersync/service-sync-rules@0.0.0-dev-20250102111825
-  - @powersync/service-types@0.0.0-dev-20250102111825
-  - @powersync/service-jpgwire@0.0.0-dev-20250102111825
+  - @powersync/service-core@0.0.0-dev-20250108084515
+  - @powersync/lib-services-framework@0.0.0-dev-20250108084515
+  - @powersync/service-sync-rules@0.0.0-dev-20250108084515
+  - @powersync/service-types@0.0.0-dev-20250108084515
+  - @powersync/service-jpgwire@0.0.0-dev-20250108084515
 
 ## 0.2.4
 

package/package.json

@@ -5,7 +5,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.0-dev-20250102111825",
+  "version": "0.0.0-dev-20250108084515",
   "main": "dist/index.js",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",
@@ -27,17 +27,17 @@
     "ts-codec": "^1.3.0",
     "uuid": "^9.0.1",
     "uri-js": "^4.4.1",
-    "@powersync/lib-services-framework": "0.0.0-dev-20250102111825",
-    "@powersync/service-core": "0.0.0-dev-20250102111825",
-    "@powersync/service-jpgwire": "0.0.0-dev-20250102111825",
+    "@powersync/lib-services-framework": "0.0.0-dev-20250108084515",
+    "@powersync/service-core": "0.0.0-dev-20250108084515",
+    "@powersync/service-jpgwire": "0.0.0-dev-20250108084515",
     "@powersync/service-jsonbig": "0.17.10",
-    "@powersync/service-sync-rules": "0.0.0-dev-20250102111825",
-    "@powersync/service-types": "0.0.0-dev-20250102111825"
+    "@powersync/service-sync-rules": "0.0.0-dev-20250108084515",
+    "@powersync/service-types": "0.0.0-dev-20250108084515"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.4",
-    "@powersync/service-core-tests": "0.0.0-dev-20250102111825",
-    "@powersync/service-module-mongodb": "0.0.0-dev-20250102111825"
+    "@powersync/service-core-tests": "0.0.0-dev-20250108084515",
+    "@powersync/service-module-mongodb-storage": "0.0.0-dev-20250108084515"
   },
   "scripts": {
     "build": "tsc -b",

package/test/src/large_batch.test.ts

@@ -1,5 +1,4 @@
-import { Metrics } from '@powersync/service-core';
-import { test_utils } from '@powersync/service-core-tests';
+import { Metrics, storage } from '@powersync/service-core';
 import * as timers from 'timers/promises';
 import { describe, expect, test } from 'vitest';
 import { populateData } from '../../dist/utils/populate_test_data.js';
@@ -23,7 +22,7 @@ const BASIC_SYNC_RULES = `bucket_definitions:
     data:
       - SELECT id, description, other FROM "test_data"`;
 
-function defineBatchTests(factory: test_utils.StorageFactory) {
+function defineBatchTests(factory: storage.TestStorageFactory) {
   test('update large record', async () => {
     await using context = await WalStreamTestContext.open(factory);
     // This test generates a large transaction in MongoDB, despite the replicated data

package/test/src/schema_changes.test.ts

@@ -1,8 +1,11 @@
 import { compareIds, putOp, reduceBucket, removeOp, test_utils } from '@powersync/service-core-tests';
 import * as timers from 'timers/promises';
 import { describe, expect, test } from 'vitest';
-import { INITIALIZED_MONGO_STORAGE_FACTORY, StorageFactory } from './util.js';
+
+import { storage } from '@powersync/service-core';
+import { INITIALIZED_MONGO_STORAGE_FACTORY } from './util.js';
 import { WalStreamTestContext } from './wal_stream_utils.js';
+
 describe('schema changes', { timeout: 20_000 }, function () {
   defineTests(INITIALIZED_MONGO_STORAGE_FACTORY);
 });
@@ -21,7 +24,7 @@ const PUT_T3 = test_utils.putOp('test_data', { id: 't3', description: 'test3' })
 const REMOVE_T1 = test_utils.removeOp('test_data', 't1');
 const REMOVE_T2 = test_utils.removeOp('test_data', 't2');
 
-function defineTests(factory: StorageFactory) {
+function defineTests(factory: storage.TestStorageFactory) {
   test('re-create table', async () => {
     await using context = await WalStreamTestContext.open(factory);
 

package/test/src/setup.ts

@@ -1,7 +1,9 @@
 import { container } from '@powersync/lib-services-framework';
+import { test_utils } from '@powersync/service-core-tests';
 import { beforeAll } from 'vitest';
 
-beforeAll(() => {
+beforeAll(async () => {
   // Executes for every test file
   container.registerDefaults();
+  await test_utils.initMetrics();
 });

package/test/src/slow_tests.test.ts

@@ -2,16 +2,22 @@ import * as bson from 'bson';
 import { afterEach, describe, expect, test } from 'vitest';
 import { WalStream, WalStreamOptions } from '../../src/replication/WalStream.js';
 import { env } from './env.js';
-import { clearTestDb, connectPgPool, getClientCheckpoint, INITIALIZED_MONGO_STORAGE_FACTORY, TEST_CONNECTION_OPTIONS } from './util.js';
+import {
+  clearTestDb,
+  connectPgPool,
+  getClientCheckpoint,
+  INITIALIZED_MONGO_STORAGE_FACTORY,
+  TEST_CONNECTION_OPTIONS
+} from './util.js';
 
 import * as pgwire from '@powersync/service-jpgwire';
 import { SqliteRow } from '@powersync/service-sync-rules';
 
 import { PgManager } from '@module/replication/PgManager.js';
+import { storage } from '@powersync/service-core';
 import { test_utils } from '@powersync/service-core-tests';
-import * as mongo_module from '@powersync/service-module-mongodb';
+import * as mongo_storage from '@powersync/service-module-mongodb-storage';
 import * as timers from 'node:timers/promises';
-import { reduceBucket } from '@powersync/service-core';
 
 describe('slow tests - mongodb', function () {
   // These are slow, inconsistent tests.
@@ -24,7 +30,7 @@ describe('slow tests - mongodb', function () {
   }
 });
 
-function defineSlowTests(factory: test_utils.StorageFactory) {
+function defineSlowTests(factory: storage.TestStorageFactory) {
   let walStream: WalStream | undefined;
   let connections: PgManager | undefined;
   let abortController: AbortController | undefined;
@@ -73,7 +79,7 @@ function defineSlowTests(factory: test_utils.StorageFactory) {
     const replicationConnection = await connections.replicationConnection();
     const pool = connections.pool;
     await clearTestDb(pool);
-    const f = (await factory()) as mongo_module.storage.MongoBucketStorage;
+    const f = (await factory()) as mongo_storage.storage.MongoBucketStorage;
 
     const syncRuleContent = `
 bucket_definitions:
@@ -170,11 +176,11 @@ bucket_definitions:
           const checkpoint = BigInt((await storage.getCheckpoint()).checkpoint);
           const opsBefore = (await f.db.bucket_data.find().sort({ _id: 1 }).toArray())
             .filter((row) => row._id.o <= checkpoint)
-            .map(mongo_module.storage.mapOpEntry);
+            .map(mongo_storage.storage.mapOpEntry);
           await storage.compact({ maxOpId: checkpoint });
           const opsAfter = (await f.db.bucket_data.find().sort({ _id: 1 }).toArray())
             .filter((row) => row._id.o <= checkpoint)
-            .map(mongo_module.storage.mapOpEntry);
+            .map(mongo_storage.storage.mapOpEntry);
 
           test_utils.validateCompactedBucket(opsBefore, opsAfter);
         }
@@ -201,7 +207,7 @@ bucket_definitions:
       const ops = await f.db.bucket_data.find().sort({ _id: 1 }).toArray();
 
       // All a single bucket in this test
-      const bucket = ops.map((op) => mongo_module.storage.mapOpEntry(op));
+      const bucket = ops.map((op) => mongo_storage.storage.mapOpEntry(op));
       const reduced = test_utils.reduceBucket(bucket);
       expect(reduced).toMatchObject([
         {

package/test/src/util.ts

@@ -2,58 +2,24 @@ import { PostgresRouteAPIAdapter } from '@module/api/PostgresRouteAPIAdapter.js'
 import * as types from '@module/types/types.js';
 import * as pg_utils from '@module/utils/pgwire_utils.js';
 import { logger } from '@powersync/lib-services-framework';
-import { BucketStorageFactory, Metrics, OpId } from '@powersync/service-core';
-import { test_utils } from '@powersync/service-core-tests';
+import { BucketStorageFactory, OpId } from '@powersync/service-core';
 import * as pgwire from '@powersync/service-jpgwire';
-import * as mongo_module from '@powersync/service-module-mongodb';
+import * as mongo_storage from '@powersync/service-module-mongodb-storage';
 import { env } from './env.js';
 
-// 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();
-
 export const TEST_URI = env.PG_TEST_URL;
 
+export const INITIALIZED_MONGO_STORAGE_FACTORY = mongo_storage.MongoTestStorageFactoryGenerator({
+  url: env.MONGO_TEST_URL,
+  isCI: env.CI
+});
+
 export const TEST_CONNECTION_OPTIONS = types.normalizeConnectionConfig({
   type: 'postgresql',
   uri: TEST_URI,
   sslmode: 'disable'
 });
 
-export type StorageFactory = () => Promise<BucketStorageFactory>;
-
-export const INITIALIZED_MONGO_STORAGE_FACTORY: StorageFactory = async (options?: test_utils.StorageOptions) => {
-  const db = await connectMongo();
-
-  // None of the PG tests insert data into this collection, so it was never created
-  if (!(await db.db.listCollections({ name: db.bucket_parameters.collectionName }).hasNext())) {
-    await db.db.createCollection('bucket_parameters');
-  }
-
-  if (!options?.doNotClear) {
-    await db.clear();
-  }
-
-  return new mongo_module.storage.MongoBucketStorage(db, {
-    slot_name_prefix: 'test_'
-  });
-};
-
-export async function connectMongo() {
-  // Short timeout for tests, to fail fast when the server is not available.
-  // Slightly longer timeouts for CI, to avoid arbitrary test failures
-  const client = mongo_module.storage.createMongoClient(env.MONGO_TEST_URL, {
-    connectTimeoutMS: env.CI ? 15_000 : 5_000,
-    socketTimeoutMS: env.CI ? 15_000 : 5_000,
-    serverSelectionTimeoutMS: env.CI ? 15_000 : 2_500
-  });
-  return new mongo_module.storage.PowerSyncMongo(client);
-}
-
 export async function clearTestDb(db: pgwire.PgClient) {
   await db.query(
     "select pg_drop_replication_slot(slot_name) from pg_replication_slots where active = false and slot_name like 'test_%'"

package/test/src/wal_stream.test.ts

@@ -1,13 +1,11 @@
-import { BucketStorageFactory, Metrics } from '@powersync/service-core';
+import { MissingReplicationSlotError } from '@module/replication/WalStream.js';
+import { Metrics, storage } from '@powersync/service-core';
 import { putOp, removeOp } from '@powersync/service-core-tests';
 import { pgwireRows } from '@powersync/service-jpgwire';
 import * as crypto from 'crypto';
 import { describe, expect, test } from 'vitest';
 import { INITIALIZED_MONGO_STORAGE_FACTORY } from './util.js';
 import { WalStreamTestContext } from './wal_stream_utils.js';
-import { MissingReplicationSlotError } from '@module/replication/WalStream.js';
-
-type StorageFactory = () => Promise<BucketStorageFactory>;
 
 const BASIC_SYNC_RULES = `
 bucket_definitions:
@@ -20,7 +18,7 @@ describe('wal stream - mongodb', { timeout: 20_000 }, function () {
   defineWalStreamTests(INITIALIZED_MONGO_STORAGE_FACTORY);
 });
 
-function defineWalStreamTests(factory: StorageFactory) {
+function defineWalStreamTests(factory: storage.TestStorageFactory) {
   test('replicating basic values', async () => {
     await using context = await WalStreamTestContext.open(factory);
     const { pool } = context;

package/test/src/wal_stream_utils.ts

@@ -1,7 +1,7 @@
 import { PgManager } from '@module/replication/PgManager.js';
 import { PUBLICATION_NAME, WalStream, WalStreamOptions } from '@module/replication/WalStream.js';
-import { BucketStorageFactory, OplogEntry, SyncRulesBucketStorage } from '@powersync/service-core';
-import { StorageOptions, test_utils } from '@powersync/service-core-tests';
+import { BucketStorageFactory, OplogEntry, storage, SyncRulesBucketStorage } from '@powersync/service-core';
+import { test_utils } from '@powersync/service-core-tests';
 import * as pgwire from '@powersync/service-jpgwire';
 import { clearTestDb, getClientCheckpoint, TEST_CONNECTION_OPTIONS } from './util.js';
 
@@ -19,7 +19,7 @@ export class WalStreamTestContext implements AsyncDisposable {
    * This configures all the context, and tears it down afterwards.
    */
   static async open(
-    factory: (options: StorageOptions) => Promise<BucketStorageFactory>,
+    factory: (options: storage.TestStorageOptions) => Promise<BucketStorageFactory>,
     options?: { doNotClear?: boolean }
   ) {
     const f = await factory({ doNotClear: options?.doNotClear });