@powersync/service-module-mysql 0.0.0-dev-20250102111825 → 0.0.0-dev-20250108073049

package/CHANGELOG.md

@@ -1,16 +1,17 @@
 # @powersync/service-module-mysql
 
-## 0.0.0-dev-20250102111825
+## 0.0.0-dev-20250108073049
 
 ### Patch Changes
 
 - 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-core@0.0.0-dev-20250108073049
+  - @powersync/lib-services-framework@0.0.0-dev-20250108073049
+  - @powersync/service-sync-rules@0.0.0-dev-20250108073049
+  - @powersync/service-types@0.0.0-dev-20250108073049
 
 ## 0.1.7
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@powersync/service-module-mysql",
   "repository": "https://github.com/powersync-ja/powersync-service",
   "types": "dist/index.d.ts",
-  "version": "0.0.0-dev-20250102111825",
+  "version": "0.0.0-dev-20250108073049",
   "license": "FSL-1.1-Apache-2.0",
   "main": "dist/index.js",
   "type": "module",
@@ -29,18 +29,18 @@
     "ts-codec": "^1.3.0",
     "uri-js": "^4.4.1",
     "uuid": "^9.0.1",
-    "@powersync/lib-services-framework": "0.0.0-dev-20250102111825",
-    "@powersync/service-core": "0.0.0-dev-20250102111825",
-    "@powersync/service-sync-rules": "0.0.0-dev-20250102111825",
-    "@powersync/service-types": "0.0.0-dev-20250102111825",
+    "@powersync/lib-services-framework": "0.0.0-dev-20250108073049",
+    "@powersync/service-core": "0.0.0-dev-20250108073049",
+    "@powersync/service-sync-rules": "0.0.0-dev-20250108073049",
+    "@powersync/service-types": "0.0.0-dev-20250108073049",
     "@powersync/service-jsonbig": "0.17.10"
   },
   "devDependencies": {
     "@types/semver": "^7.5.4",
     "@types/async": "^3.2.24",
     "@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-20250108073049",
+    "@powersync/service-module-mongodb-storage": "0.0.0-dev-20250108073049"
   },
   "scripts": {
     "build": "tsc -b",

package/test/src/BinLogStream.test.ts

@@ -1,5 +1,5 @@
-import { Metrics } from '@powersync/service-core';
-import { putOp, removeOp, StorageFactory } from '@powersync/service-core-tests';
+import { Metrics, storage } from '@powersync/service-core';
+import { putOp, removeOp } from '@powersync/service-core-tests';
 import { v4 as uuid } from 'uuid';
 import { describe, expect, test } from 'vitest';
 import { BinlogStreamTestContext } from './BinlogStreamUtils.js';
@@ -20,7 +20,7 @@ describe(
   { timeout: 20_000 }
 );
 
-function defineBinlogStreamTests(factory: StorageFactory) {
+function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
   test('Replicate basic values', async () => {
     await using context = await BinlogStreamTestContext.open(factory);
     const { connectionManager } = context;

package/test/src/BinlogStreamUtils.ts

@@ -7,9 +7,10 @@ import {
   BucketStorageFactory,
   OpId,
   OplogEntry,
+  storage,
   SyncRulesBucketStorage
 } from '@powersync/service-core';
-import { StorageFactory, test_utils } from '@powersync/service-core-tests';
+import { test_utils } from '@powersync/service-core-tests';
 import mysqlPromise from 'mysql2/promise';
 import { clearTestDb, TEST_CONNECTION_OPTIONS } from './util.js';
 
@@ -27,7 +28,7 @@ export class BinlogStreamTestContext {
   public storage?: SyncRulesBucketStorage;
   private replicationDone = false;
 
-  static async open(factory: StorageFactory, options?: { doNotClear?: boolean }) {
+  static async open(factory: storage.TestStorageFactory, options?: { doNotClear?: boolean }) {
     const f = await factory({ doNotClear: options?.doNotClear });
     const connectionManager = new MySQLConnectionManager(TEST_CONNECTION_OPTIONS, {});
 

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/util.ts

@@ -1,8 +1,6 @@
 import * as types from '@module/types/types.js';
 import { getMySQLVersion, isVersionAtLeast } from '@module/utils/mysql-utils.js';
-import { BucketStorageFactory, Metrics } 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 mysqlPromise from 'mysql2/promise';
 import { env } from './env.js';
 
@@ -13,41 +11,10 @@ export const TEST_CONNECTION_OPTIONS = types.normalizeConnectionConfig({
   uri: TEST_URI
 });
 
-// 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'
+export const INITIALIZED_MONGO_STORAGE_FACTORY = mongo_storage.MongoTestStorageFactoryGenerator({
+  url: env.MONGO_TEST_URL,
+  isCI: env.CI
 });
-Metrics.getInstance().resetCounters();
-
-export type StorageFactory = () => Promise<BucketStorageFactory>;
-
-export const INITIALIZED_MONGO_STORAGE_FACTORY: StorageFactory = async (options?: test_utils.StorageOptions) => {
-  const db = await connectMongo();
-
-  // None of the 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(connection: mysqlPromise.Connection) {
   const version = await getMySQLVersion(connection);