@powersync/service-core-tests 0.7.2 → 0.8.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @powersync/service-core-tests
 
+## 0.8.1
+
+### Patch Changes
+
+- @powersync/service-core@1.10.1
+
+## 0.8.0
+
+### Minor Changes
+
+- 833e8f2: [MongoDB Storage] Stream write checkpoint changes instead of polling, reducing overhead for large numbers of concurrent connections
+- bfece49: Cache parameter queries and buckets to reduce incremental sync overhead
+
+### Patch Changes
+
+- Updated dependencies [833e8f2]
+- Updated dependencies [833e8f2]
+- Updated dependencies [bfece49]
+- Updated dependencies [2cb5252]
+  - @powersync/service-core@1.10.0
+  - @powersync/service-sync-rules@0.25.0
+
 ## 0.7.2
 
 ### Patch Changes

package/dist/test-utils/general-utils.d.ts

@@ -4,7 +4,7 @@ export declare const ZERO_LSN = "0/0";
 export declare const PARSE_OPTIONS: storage.ParseSyncRulesOptions;
 export declare const BATCH_OPTIONS: storage.StartBatchOptions;
 export declare function testRules(content: string): storage.PersistedSyncRulesContent;
-export declare function makeTestTable(name: string, columns?: string[] | undefined): storage.SourceTable;
+export declare function makeTestTable(name: string, replicaIdColumns?: string[] | undefined): storage.SourceTable;
 export declare function getBatchData(batch: utils.SyncBucketData[] | storage.SyncBucketDataBatch[] | storage.SyncBucketDataBatch): {
     op_id: string;
     op: "PUT" | "REMOVE" | "MOVE" | "CLEAR";

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

@@ -27,10 +27,10 @@ export function testRules(content) {
         }
     };
 }
-export function makeTestTable(name, columns) {
-    const relId = utils.hashData('table', name, (columns ?? ['id']).join(','));
+export function makeTestTable(name, replicaIdColumns) {
+    const relId = utils.hashData('table', name, (replicaIdColumns ?? ['id']).join(','));
     const id = new bson.ObjectId('6544e3899293153fa7b38331');
-    return new storage.SourceTable(id, storage.SourceTable.DEFAULT_TAG, relId, 'public', name, (columns ?? ['id']).map((column) => ({ name: column, type: 'VARCHAR', typeId: 25 })), true);
+    return new storage.SourceTable(id, storage.SourceTable.DEFAULT_TAG, relId, 'public', name, (replicaIdColumns ?? ['id']).map((column) => ({ name: column, type: 'VARCHAR', typeId: 25 })), true);
 }
 export function getBatchData(batch) {
     const first = getFirst(batch);

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

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

package/dist/tests/register-data-storage-tests.js

@@ -51,7 +51,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 import { getUuidReplicaIdentityBson, storage } from '@powersync/service-core';
-import { RequestParameters } from '@powersync/service-sync-rules';
+import { ParameterLookup, RequestParameters } from '@powersync/service-sync-rules';
 import { expect, test } from 'vitest';
 import * as test_utils from '../test-utils/test-utils-index.js';
 export const TEST_TABLE = test_utils.makeTestTable('test', ['id']);
@@ -112,7 +112,9 @@ bucket_definitions:
                     afterReplicaId: test_utils.rid('t1')
                 });
             });
-            const parameters = await bucketStorage.getParameterSets(result.flushed_op, [['mybucket', '1', 'user1']]);
+            const parameters = await bucketStorage.getParameterSets(result.flushed_op, [
+                ParameterLookup.normalized('mybucket', '1', ['user1'])
+            ]);
             expect(parameters).toEqual([
                 {
                     group_id: 'group1a'
@@ -163,14 +165,18 @@ bucket_definitions:
                     afterReplicaId: test_utils.rid('user1')
                 });
             });
-            const parameters = await bucketStorage.getParameterSets(result2.flushed_op, [['mybucket', '1', 'user1']]);
+            const parameters = await bucketStorage.getParameterSets(result2.flushed_op, [
+                ParameterLookup.normalized('mybucket', '1', ['user1'])
+            ]);
             expect(parameters).toEqual([
                 {
                     group_id: 'group2'
                 }
             ]);
             // Use the checkpoint to get older data if relevant
-            const parameters2 = await bucketStorage.getParameterSets(result1.flushed_op, [['mybucket', '1', 'user1']]);
+            const parameters2 = await bucketStorage.getParameterSets(result1.flushed_op, [
+                ParameterLookup.normalized('mybucket', '1', ['user1'])
+            ]);
             expect(parameters2).toEqual([
                 {
                     group_id: 'group1'
@@ -239,8 +245,8 @@ bucket_definitions:
             // There removal operation for the association of `list2`::`todo2` should not interfere with the new
             // association of `list1`::`todo2`
             const parameters = await bucketStorage.getParameterSets(result2.flushed_op, [
-                ['mybucket', '1', 'list1'],
-                ['mybucket', '1', 'list2']
+                ParameterLookup.normalized('mybucket', '1', ['list1']),
+                ParameterLookup.normalized('mybucket', '1', ['list2'])
             ]);
             expect(parameters.sort((a, b) => a.todo_id.localeCompare(b.todo_id))).toEqual([
                 {
@@ -289,11 +295,17 @@ bucket_definitions:
             });
             const TEST_PARAMS = { group_id: 'group1' };
             const checkpoint = result.flushed_op;
-            const parameters1 = await bucketStorage.getParameterSets(checkpoint, [['mybucket', '1', 314n, 314, 3.14]]);
+            const parameters1 = await bucketStorage.getParameterSets(checkpoint, [
+                ParameterLookup.normalized('mybucket', '1', [314n, 314, 3.14])
+            ]);
             expect(parameters1).toEqual([TEST_PARAMS]);
-            const parameters2 = await bucketStorage.getParameterSets(checkpoint, [['mybucket', '1', 314, 314n, 3.14]]);
+            const parameters2 = await bucketStorage.getParameterSets(checkpoint, [
+                ParameterLookup.normalized('mybucket', '1', [314, 314n, 3.14])
+            ]);
             expect(parameters2).toEqual([TEST_PARAMS]);
-            const parameters3 = await bucketStorage.getParameterSets(checkpoint, [['mybucket', '1', 314n, 314, 3]]);
+            const parameters3 = await bucketStorage.getParameterSets(checkpoint, [
+                ParameterLookup.normalized('mybucket', '1', [314n, 314, 3])
+            ]);
             expect(parameters3).toEqual([]);
         }
         catch (e_4) {
@@ -347,7 +359,9 @@ bucket_definitions:
             });
             const TEST_PARAMS = { group_id: 'group1' };
             const checkpoint = result.flushed_op;
-            const parameters1 = await bucketStorage.getParameterSets(checkpoint, [['mybucket', '1', 1152921504606846976n]]);
+            const parameters1 = await bucketStorage.getParameterSets(checkpoint, [
+                ParameterLookup.normalized('mybucket', '1', [1152921504606846976n])
+            ]);
             expect(parameters1).toEqual([TEST_PARAMS]);
         }
         catch (e_5) {
@@ -452,7 +466,7 @@ bucket_definitions:
             const parameters = new RequestParameters({ sub: 'u1' }, {});
             const q1 = sync_rules.bucket_descriptors[0].parameter_queries[0];
             const lookups = q1.getLookups(parameters);
-            expect(lookups).toEqual([['by_workspace', '1', 'u1']]);
+            expect(lookups).toEqual([ParameterLookup.normalized('by_workspace', '1', ['u1'])]);
             const parameter_sets = await bucketStorage.getParameterSets(checkpoint, lookups);
             expect(parameter_sets).toEqual([{ workspace_id: 'workspace1' }]);
             const buckets = await sync_rules.getBucketParameterQuerier(parameters).queryDynamicBucketDescriptions({
@@ -520,7 +534,7 @@ bucket_definitions:
             const parameters = new RequestParameters({ sub: 'unknown' }, {});
             const q1 = sync_rules.bucket_descriptors[0].parameter_queries[0];
             const lookups = q1.getLookups(parameters);
-            expect(lookups).toEqual([['by_public_workspace', '1']]);
+            expect(lookups).toEqual([ParameterLookup.normalized('by_public_workspace', '1', [])]);
             const parameter_sets = await bucketStorage.getParameterSets(checkpoint, lookups);
             parameter_sets.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
             expect(parameter_sets).toEqual([{ workspace_id: 'workspace1' }, { workspace_id: 'workspace3' }]);
@@ -607,13 +621,13 @@ bucket_definitions:
             // Test intermediate values - could be moved to sync_rules.test.ts
             const q1 = sync_rules.bucket_descriptors[0].parameter_queries[0];
             const lookups1 = q1.getLookups(parameters);
-            expect(lookups1).toEqual([['by_workspace', '1']]);
+            expect(lookups1).toEqual([ParameterLookup.normalized('by_workspace', '1', [])]);
             const parameter_sets1 = await bucketStorage.getParameterSets(checkpoint, lookups1);
             parameter_sets1.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
             expect(parameter_sets1).toEqual([{ workspace_id: 'workspace1' }]);
             const q2 = sync_rules.bucket_descriptors[0].parameter_queries[1];
             const lookups2 = q2.getLookups(parameters);
-            expect(lookups2).toEqual([['by_workspace', '2', 'u1']]);
+            expect(lookups2).toEqual([ParameterLookup.normalized('by_workspace', '2', ['u1'])]);
             const parameter_sets2 = await bucketStorage.getParameterSets(checkpoint, lookups2);
             parameter_sets2.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
             expect(parameter_sets2).toEqual([{ workspace_id: 'workspace3' }]);
@@ -916,7 +930,9 @@ bucket_definitions:
                 await batch.truncate([TEST_TABLE]);
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const parameters = await bucketStorage.getParameterSets(checkpoint, [['mybucket', '1', 'user1']]);
+            const parameters = await bucketStorage.getParameterSets(checkpoint, [
+                ParameterLookup.normalized('mybucket', '1', ['user1'])
+            ]);
             expect(parameters).toEqual([]);
         }
         catch (e_13) {
@@ -1509,5 +1525,259 @@ bucket_definitions:
                 await result_20;
         }
     });
+    test('managed write checkpoints - checkpoint after write', async (context) => {
+        const env_21 = { stack: [], error: void 0, hasError: false };
+        try {
+            const factory = __addDisposableResource(env_21, await generateStorageFactory(), true);
+            const r = await factory.configureSyncRules({
+                content: `
+bucket_definitions:
+  mybucket:
+    data: [] 
+    `,
+                validate: false
+            });
+            const bucketStorage = factory.getInstance(r.persisted_sync_rules);
+            await bucketStorage.autoActivate();
+            const abortController = new AbortController();
+            context.onTestFinished(() => abortController.abort());
+            const iter = bucketStorage
+                .watchCheckpointChanges({ user_id: 'user1', signal: abortController.signal })[Symbol.asyncIterator]();
+            const writeCheckpoint = await bucketStorage.createManagedWriteCheckpoint({
+                heads: { '1': '5/0' },
+                user_id: 'user1'
+            });
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('5/0');
+            });
+            const result = await iter.next();
+            expect(result).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n,
+                        lsn: '5/0'
+                    },
+                    writeCheckpoint: writeCheckpoint
+                }
+            });
+        }
+        catch (e_21) {
+            env_21.error = e_21;
+            env_21.hasError = true;
+        }
+        finally {
+            const result_21 = __disposeResources(env_21);
+            if (result_21)
+                await result_21;
+        }
+    });
+    test('managed write checkpoints - write after checkpoint', async (context) => {
+        const env_22 = { stack: [], error: void 0, hasError: false };
+        try {
+            const factory = __addDisposableResource(env_22, await generateStorageFactory(), true);
+            const r = await factory.configureSyncRules({
+                content: `
+bucket_definitions:
+  mybucket:
+    data: []
+    `,
+                validate: false
+            });
+            const bucketStorage = factory.getInstance(r.persisted_sync_rules);
+            await bucketStorage.autoActivate();
+            const abortController = new AbortController();
+            context.onTestFinished(() => abortController.abort());
+            const iter = bucketStorage
+                .watchCheckpointChanges({ user_id: 'user1', signal: abortController.signal })[Symbol.asyncIterator]();
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('5/0');
+            });
+            const result = await iter.next();
+            expect(result).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n,
+                        lsn: '5/0'
+                    },
+                    writeCheckpoint: null
+                }
+            });
+            const writeCheckpoint = await bucketStorage.createManagedWriteCheckpoint({
+                heads: { '1': '6/0' },
+                user_id: 'user1'
+            });
+            // We have to trigger a new keepalive after the checkpoint, at least to cover postgres storage.
+            // This is what is effetively triggered with RouteAPI.createReplicationHead().
+            // MongoDB storage doesn't explicitly need this anymore.
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('6/0');
+            });
+            let result2 = await iter.next();
+            if (result2.value?.base?.lsn == '5/0') {
+                // Events could arrive in a different order in some cases - this caters for it
+                result2 = await iter.next();
+            }
+            expect(result2).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n,
+                        lsn: '6/0'
+                    },
+                    writeCheckpoint: writeCheckpoint
+                }
+            });
+        }
+        catch (e_22) {
+            env_22.error = e_22;
+            env_22.hasError = true;
+        }
+        finally {
+            const result_22 = __disposeResources(env_22);
+            if (result_22)
+                await result_22;
+        }
+    });
+    test('custom write checkpoints - checkpoint after write', async (context) => {
+        const env_23 = { stack: [], error: void 0, hasError: false };
+        try {
+            const factory = __addDisposableResource(env_23, await generateStorageFactory(), true);
+            const r = await factory.configureSyncRules({
+                content: `
+bucket_definitions:
+  mybucket:
+    data: []
+    `,
+                validate: false
+            });
+            const bucketStorage = factory.getInstance(r.persisted_sync_rules);
+            await bucketStorage.autoActivate();
+            bucketStorage.setWriteCheckpointMode(storage.WriteCheckpointMode.CUSTOM);
+            const abortController = new AbortController();
+            context.onTestFinished(() => abortController.abort());
+            const iter = bucketStorage
+                .watchCheckpointChanges({ user_id: 'user1', signal: abortController.signal })[Symbol.asyncIterator]();
+            await bucketStorage.batchCreateCustomWriteCheckpoints([
+                {
+                    checkpoint: 5n,
+                    user_id: 'user1'
+                }
+            ]);
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('5/0');
+            });
+            const result = await iter.next();
+            expect(result).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n,
+                        lsn: '5/0'
+                    },
+                    writeCheckpoint: 5n
+                }
+            });
+        }
+        catch (e_23) {
+            env_23.error = e_23;
+            env_23.hasError = true;
+        }
+        finally {
+            const result_23 = __disposeResources(env_23);
+            if (result_23)
+                await result_23;
+        }
+    });
+    test('custom write checkpoints - write after checkpoint', async (context) => {
+        const env_24 = { stack: [], error: void 0, hasError: false };
+        try {
+            const factory = __addDisposableResource(env_24, await generateStorageFactory(), true);
+            const r = await factory.configureSyncRules({
+                content: `
+bucket_definitions:
+  mybucket:
+    data: []
+    `,
+                validate: false
+            });
+            const bucketStorage = factory.getInstance(r.persisted_sync_rules);
+            await bucketStorage.autoActivate();
+            bucketStorage.setWriteCheckpointMode(storage.WriteCheckpointMode.CUSTOM);
+            const abortController = new AbortController();
+            context.onTestFinished(() => abortController.abort());
+            const iter = bucketStorage
+                .watchCheckpointChanges({ user_id: 'user1', signal: abortController.signal })[Symbol.asyncIterator]();
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('5/0');
+            });
+            const result = await iter.next();
+            expect(result).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n,
+                        lsn: '5/0'
+                    },
+                    writeCheckpoint: null
+                }
+            });
+            await bucketStorage.batchCreateCustomWriteCheckpoints([
+                {
+                    checkpoint: 6n,
+                    user_id: 'user1'
+                }
+            ]);
+            // We have to trigger a new keepalive after the checkpoint, at least to cover postgres storage.
+            // This is what is effetively triggered with RouteAPI.createReplicationHead().
+            // MongoDB storage doesn't explicitly need this anymore.
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('6/0');
+            });
+            let result2 = await iter.next();
+            expect(result2).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n
+                        // can be 5/0 or 6/0 - actual value not relevant for custom write checkpoints
+                        // lsn: '6/0'
+                    },
+                    writeCheckpoint: 6n
+                }
+            });
+            await bucketStorage.batchCreateCustomWriteCheckpoints([
+                {
+                    checkpoint: 7n,
+                    user_id: 'user1'
+                }
+            ]);
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.keepalive('7/0');
+            });
+            let result3 = await iter.next();
+            expect(result3).toMatchObject({
+                done: false,
+                value: {
+                    base: {
+                        checkpoint: 0n
+                        // can be 5/0, 6/0 or 7/0 - actual value not relevant for custom write checkpoints
+                        // lsn: '7/0'
+                    },
+                    writeCheckpoint: 7n
+                }
+            });
+        }
+        catch (e_24) {
+            env_24.error = e_24;
+            env_24.hasError = true;
+        }
+        finally {
+            const result_24 = __disposeResources(env_24);
+            if (result_24)
+                await result_24;
+        }
+    });
 }
 //# sourceMappingURL=register-data-storage-tests.js.map