@powersync/service-module-mysql 0.0.0-dev-20241128134723 → 0.0.0-dev-20241219110735

package/CHANGELOG.md

@@ -1,12 +1,66 @@
 # @powersync/service-module-mysql
 
-## 0.0.0-dev-20241128134723
+## 0.0.0-dev-20241219110735
 
 ### Patch Changes
 
-- Updated dependencies [74548e4]
-  - @powersync/service-core@0.0.0-dev-20241128134723
-  - @powersync/service-types@0.0.0-dev-20241128134723
+- Updated dependencies [697d44b]
+- Updated dependencies [697d44b]
+- Updated dependencies [a66be3b]
+- Updated dependencies [697d44b]
+  - @powersync/service-core@0.0.0-dev-20241219110735
+  - @powersync/lib-services-framework@0.0.0-dev-20241219110735
+  - @powersync/service-sync-rules@0.0.0-dev-20241219110735
+  - @powersync/service-types@0.0.0-dev-20241219110735
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies [320e646]
+- Updated dependencies [e3a9343]
+  - @powersync/service-core@0.12.2
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies [889ac46]
+  - @powersync/service-core@0.12.1
+
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies [ebc62ff]
+  - @powersync/service-core@0.12.0
+  - @powersync/service-types@0.5.0
+
+## 0.1.3
+
+### Patch Changes
+
+- Updated dependencies [62e97f3]
+- Updated dependencies [a235c9f]
+- Updated dependencies [8c6ce90]
+  - @powersync/service-core@0.11.0
+  - @powersync/service-sync-rules@0.22.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies [2a4f020]
+  - @powersync/service-core@0.10.1
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies [2c18ad2]
+- Updated dependencies [35c267f]
+  - @powersync/service-core@0.10.0
+  - @powersync/service-types@0.4.0
 
 ## 0.1.0
 

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-20241128134723",
+  "version": "0.0.0-dev-20241219110735",
   "license": "FSL-1.1-Apache-2.0",
   "main": "dist/index.js",
   "type": "module",
@@ -26,19 +26,21 @@
     "semver": "^7.5.4",
     "async": "^3.2.4",
     "mysql2": "^3.11.0",
-    "ts-codec": "^1.2.2",
+    "ts-codec": "^1.3.0",
     "uri-js": "^4.4.1",
     "uuid": "^9.0.1",
-    "@powersync/lib-services-framework": "0.2.0",
-    "@powersync/service-core": "0.0.0-dev-20241128134723",
-    "@powersync/service-sync-rules": "0.21.0",
-    "@powersync/service-types": "0.0.0-dev-20241128134723",
-    "@powersync/service-jsonbig": "0.17.10"
+    "@powersync/service-sync-rules": "0.0.0-dev-20241219110735",
+    "@powersync/service-core": "0.0.0-dev-20241219110735",
+    "@powersync/lib-services-framework": "0.0.0-dev-20241219110735",
+    "@powersync/service-jsonbig": "0.17.10",
+    "@powersync/service-types": "0.0.0-dev-20241219110735"
   },
   "devDependencies": {
     "@types/semver": "^7.5.4",
     "@types/async": "^3.2.24",
-    "@types/uuid": "^9.0.4"
+    "@types/uuid": "^9.0.4",
+    "@powersync/service-core-tests": "0.0.0-dev-20241219110735",
+    "@powersync/service-module-mongodb": "0.0.0-dev-20241219110735"
   },
   "scripts": {
     "build": "tsc -b",

package/test/src/BinLogStream.test.ts

@@ -1,9 +1,9 @@
-import { putOp, removeOp } from '@core-tests/stream_utils.js';
-import { MONGO_STORAGE_FACTORY } from '@core-tests/util.js';
 import { BucketStorageFactory, Metrics } from '@powersync/service-core';
+import { test_utils } from '@powersync/service-core-tests';
+import { v4 as uuid } from 'uuid';
 import { describe, expect, test } from 'vitest';
 import { binlogStreamTest } from './BinlogStreamUtils.js';
-import { v4 as uuid } from 'uuid';
+import { INITIALIZED_MONGO_STORAGE_FACTORY } from './util.js';
 
 type StorageFactory = () => Promise<BucketStorageFactory>;
 
@@ -17,7 +17,7 @@ bucket_definitions:
 describe(
   ' Binlog stream - mongodb',
   function () {
-    defineBinlogStreamTests(MONGO_STORAGE_FACTORY);
+    defineBinlogStreamTests(INITIALIZED_MONGO_STORAGE_FACTORY);
   },
   { timeout: 20_000 }
 );
@@ -49,7 +49,7 @@ function defineBinlogStreamTests(factory: StorageFactory) {
       );
       const data = await context.getBucketData('global[]');
 
-      expect(data).toMatchObject([putOp('test_data', { id: testId, description: 'test1', num: 1152921504606846976n })]);
+      expect(data).toMatchObject([test_utils.putOp('test_data', { id: testId, description: 'test1', num: 1152921504606846976n })]);
       const endRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
       const endTxCount =
         (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
@@ -85,7 +85,7 @@ function defineBinlogStreamTests(factory: StorageFactory) {
 
       const data = await context.getBucketData('global[]');
 
-      expect(data).toMatchObject([putOp('test_DATA', { id: testId, description: 'test1' })]);
+      expect(data).toMatchObject([test_utils.putOp('test_DATA', { id: testId, description: 'test1' })]);
       const endRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
       const endTxCount =
         (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
@@ -161,14 +161,14 @@ function defineBinlogStreamTests(factory: StorageFactory) {
       const data = await context.getBucketData('global[]');
       expect(data).toMatchObject([
         // Initial insert
-        putOp('test_data', { id: testId1, description: 'test1' }),
+        test_utils.putOp('test_data', { id: testId1, description: 'test1' }),
         // Update id, then description
-        removeOp('test_data', testId1),
-        putOp('test_data', { id: testId2, description: 'test2a' }),
-        putOp('test_data', { id: testId2, description: 'test2b' }),
+        test_utils.removeOp('test_data', testId1),
+        test_utils.putOp('test_data', { id: testId2, description: 'test2a' }),
+        test_utils.putOp('test_data', { id: testId2, description: 'test2b' }),
         // Re-use old id
-        putOp('test_data', { id: testId1, description: 'test1b' }),
-        putOp('test_data', { id: testId1, description: 'test1c' })
+        test_utils.putOp('test_data', { id: testId1, description: 'test1b' }),
+        test_utils.putOp('test_data', { id: testId1, description: 'test1c' })
       ]);
     })
   );
@@ -187,7 +187,7 @@ function defineBinlogStreamTests(factory: StorageFactory) {
       await context.replicateSnapshot();
 
       const data = await context.getBucketData('global[]');
-      expect(data).toMatchObject([putOp('test_data', { id: testId, description: 'test1' })]);
+      expect(data).toMatchObject([test_utils.putOp('test_data', { id: testId, description: 'test1' })]);
     })
   );
 
@@ -215,7 +215,7 @@ function defineBinlogStreamTests(factory: StorageFactory) {
 
       const data = await context.getBucketData('global[]');
       expect(data).toMatchObject([
-        putOp('test_data', {
+        test_utils.putOp('test_data', {
           id: testId,
           description: 'testDates',
           date: `2023-03-06`,
@@ -257,7 +257,7 @@ function defineBinlogStreamTests(factory: StorageFactory) {
 
       const data = await context.getBucketData('global[]');
       expect(data).toMatchObject([
-        putOp('test_data', {
+        test_utils.putOp('test_data', {
           id: testId,
           description: 'testDates',
           date: `2023-03-06`,

package/test/src/BinlogStreamUtils.ts

@@ -1,3 +1,7 @@
+import { readExecutedGtid } from '@module/common/read-executed-gtid.js';
+import { BinLogStream, BinLogStreamOptions } from '@module/replication/BinLogStream.js';
+import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
+import { logger } from '@powersync/lib-services-framework';
 import {
   ActiveCheckpoint,
   BucketStorageFactory,
@@ -5,13 +9,9 @@ import {
   OplogEntry,
   SyncRulesBucketStorage
 } from '@powersync/service-core';
-import { TEST_CONNECTION_OPTIONS, clearTestDb } from './util.js';
-import { fromAsync } from '@core-tests/stream_utils.js';
-import { BinLogStream, BinLogStreamOptions } from '@module/replication/BinLogStream.js';
-import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
+import { test_utils } from '@powersync/service-core-tests';
 import mysqlPromise from 'mysql2/promise';
-import { readExecutedGtid } from '@module/common/read-executed-gtid.js';
-import { logger } from '@powersync/lib-services-framework';
+import { TEST_CONNECTION_OPTIONS, clearTestDb } from './util.js';
 
 /**
  * Tests operating on the binlog stream need to configure the stream and manage asynchronous
@@ -113,14 +113,14 @@ export class BinlogStreamTestContext {
   async getBucketsDataBatch(buckets: Record<string, string>, options?: { timeout?: number }) {
     const checkpoint = await this.getCheckpoint(options);
     const map = new Map<string, string>(Object.entries(buckets));
-    return fromAsync(this.storage!.getBucketDataBatch(checkpoint, map));
+    return test_utils.fromAsync(this.storage!.getBucketDataBatch(checkpoint, map));
   }
 
   async getBucketData(bucket: string, start = '0', options?: { timeout?: number }): Promise<OplogEntry[]> {
     const checkpoint = await this.getCheckpoint(options);
     const map = new Map<string, string>([[bucket, start]]);
     const batch = this.storage!.getBucketDataBatch(checkpoint, map);
-    const batches = await fromAsync(batch);
+    const batches = await test_utils.fromAsync(batch);
     return batches[0]?.batch.data ?? [];
   }
 }

package/test/src/env.ts

@@ -2,6 +2,7 @@ import { utils } from '@powersync/lib-services-framework';
 
 export const env = utils.collectEnvironmentVariables({
   MYSQL_TEST_URI: utils.type.string.default('mysql://root:mypassword@localhost:3306/mydatabase'),
+  MONGO_TEST_URL: utils.type.string.default('mongodb://localhost:27017/powersync_test'),
   CI: utils.type.boolean.default('false'),
   SLOW_TESTS: utils.type.boolean.default('false')
 });

package/test/src/util.ts

@@ -1,9 +1,9 @@
 import * as types from '@module/types/types.js';
-import { BucketStorageFactory, Metrics, MongoBucketStorage } from '@powersync/service-core';
-import { env } from './env.js';
-import mysqlPromise from 'mysql2/promise';
-import { connectMongo } from '@core-tests/util.js';
 import { getMySQLVersion, isVersionAtLeast } from '@module/utils/mysql-utils.js';
+import { BucketStorageFactory, Metrics } from '@powersync/service-core';
+import * as mongo_module from '@powersync/service-module-mongodb';
+import mysqlPromise from 'mysql2/promise';
+import { env } from './env.js';
 
 export const TEST_URI = env.MYSQL_TEST_URI;
 
@@ -32,9 +32,20 @@ export const INITIALIZED_MONGO_STORAGE_FACTORY: StorageFactory = async () => {
 
   await db.clear();
 
-  return new MongoBucketStorage(db, { slot_name_prefix: 'test_' });
+  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);
   if (isVersionAtLeast(version, '8.4.0')) {