@powersync/service-core 1.11.2 → 1.12.0

package/test/src/auth.test.ts

@@ -75,21 +75,21 @@ describe('JWT Auth', () => {
         defaultAudiences: ['other'],
         maxAge: '6m'
       })
-    ).rejects.toThrow('unexpected "aud" claim value');
+    ).rejects.toThrow('[PSYNC_S2105] Unexpected "aud" claim value: "tests"');
 
     await expect(
       store.verifyJwt(signedJwt, {
         defaultAudiences: [],
         maxAge: '6m'
       })
-    ).rejects.toThrow('unexpected "aud" claim value');
+    ).rejects.toThrow('[PSYNC_S2105] Unexpected "aud" claim value: "tests"');
 
     await expect(
       store.verifyJwt(signedJwt, {
         defaultAudiences: ['tests'],
         maxAge: '1m'
       })
-    ).rejects.toThrow('Token must expire in a maximum of');
+    ).rejects.toThrow('[PSYNC_S2104] Token must expire in a maximum of 60 seconds, got 300s');
 
     const signedJwt2 = await new jose.SignJWT({})
       .setProtectedHeader({ alg: 'HS256', kid: 'k1' })
@@ -104,7 +104,25 @@ describe('JWT Auth', () => {
         defaultAudiences: ['tests'],
         maxAge: '5m'
       })
-    ).rejects.toThrow('missing required "sub" claim');
+    ).rejects.toThrow('[PSYNC_S2101] JWT payload is missing a required claim "sub"');
+
+    // expired token
+    const d = Math.round(Date.now() / 1000);
+    const signedJwt3 = await new jose.SignJWT({})
+      .setProtectedHeader({ alg: 'HS256', kid: 'k1' })
+      .setSubject('f1')
+      .setIssuedAt(d - 500)
+      .setIssuer('tester')
+      .setAudience('tests')
+      .setExpirationTime(d - 400)
+      .sign(signKey);
+
+    await expect(
+      store.verifyJwt(signedJwt3, {
+        defaultAudiences: ['tests'],
+        maxAge: '5m'
+      })
+    ).rejects.toThrow('[PSYNC_S2103] JWT has expired');
   });
 
   test('Algorithm validation', async () => {
@@ -159,7 +177,7 @@ describe('JWT Auth', () => {
         maxAge: '6m'
       })
     ).rejects.toThrow(
-      'Could not find an appropriate key in the keystore. The key is missing or no key matched the token KID'
+      '[PSYNC_S2101] Could not find an appropriate key in the keystore. The key is missing or no key matched the token KID'
     );
 
     // Wrong kid
@@ -178,7 +196,7 @@ describe('JWT Auth', () => {
         maxAge: '6m'
       })
     ).rejects.toThrow(
-      'Could not find an appropriate key in the keystore. The key is missing or no key matched the token KID'
+      '[PSYNC_S2101] Could not find an appropriate key in the keystore. The key is missing or no key matched the token KID'
     );
 
     // No kid, matches sharedKey2
@@ -255,7 +273,7 @@ describe('JWT Auth', () => {
         defaultAudiences: ['tests'],
         maxAge: '6m'
       })
-    ).rejects.toThrow('unexpected "aud" claim value');
+    ).rejects.toThrow('[PSYNC_S2105] Unexpected "aud" claim value: "tests"');
 
     const signedJwt3 = await new jose.SignJWT({})
       .setProtectedHeader({ alg: 'HS256', kid: 'k1' })
@@ -290,7 +308,7 @@ describe('JWT Auth', () => {
         reject_ip_ranges: ['local']
       }
     });
-    await expect(invalid.getKeys()).rejects.toThrow('IPs in this range are not supported');
+    await expect(invalid.getKeys()).rejects.toThrow('[PSYNC_S2204] JWKS request failed');
 
     // IPs throw an error immediately
     expect(
@@ -345,7 +363,7 @@ describe('JWT Auth', () => {
     expect(key.kid).toEqual(publicKeyRSA.kid!);
 
     cached.addTimeForTests(301_000);
-    currentResponse = Promise.reject('refresh failed');
+    currentResponse = Promise.reject(new Error('refresh failed'));
 
     // Uses the promise, refreshes in the background
     let response = await cached.getKeys();
@@ -357,14 +375,14 @@ describe('JWT Auth', () => {
     response = await cached.getKeys();
     // Still have the cached key, but also have the error
     expect(response.keys[0].kid).toEqual(publicKeyRSA.kid!);
-    expect(response.errors[0].message).toMatch('Failed to fetch');
+    expect(response.errors[0].message).toMatch('[PSYNC_S2201] refresh failed');
 
     await cached.addTimeForTests(3601_000);
     response = await cached.getKeys();
 
     // Now the keys have expired, and the request still fails
     expect(response.keys).toEqual([]);
-    expect(response.errors[0].message).toMatch('Failed to fetch');
+    expect(response.errors[0].message).toMatch('[PSYNC_S2201] refresh failed');
 
     currentResponse = Promise.resolve({
       errors: [],

package/test/src/config.test.ts

@@ -0,0 +1,72 @@
+// Vitest Unit Tests
+import { CompoundConfigCollector } from '@/index.js';
+import { describe, expect, it, vi } from 'vitest';
+
+describe('Config', () => {
+  it('should substitute env variables in YAML config', {}, async () => {
+    const type = 'mongodb';
+    vi.stubEnv('PS_MONGO_TYPE', type);
+
+    const yamlConfig = /* yaml */ `
+      # PowerSync config
+      replication:
+        connections: []
+      storage:
+        type: !env PS_MONGO_TYPE
+    `;
+
+    const collector = new CompoundConfigCollector();
+
+    const config = await collector.collectConfig({
+      config_base64: Buffer.from(yamlConfig, 'utf-8').toString('base64')
+    });
+
+    expect(config.storage.type).toBe(type);
+  });
+
+  it('should substitute boolean env variables in YAML config', {}, async () => {
+    vi.stubEnv('PS_MONGO_HEALTHCHECK', 'true');
+
+    const yamlConfig = /* yaml */ `
+      # PowerSync config
+      replication:
+        connections: []
+      storage:
+        type: mongodb
+      healthcheck:
+        probes:
+          use_http: !env PS_MONGO_HEALTHCHECK::boolean
+    `;
+
+    const collector = new CompoundConfigCollector();
+
+    const config = await collector.collectConfig({
+      config_base64: Buffer.from(yamlConfig, 'utf-8').toString('base64')
+    });
+
+    expect(config.healthcheck.probes.use_http).toBe(true);
+  });
+
+  it('should substitute number env variables in YAML config', {}, async () => {
+    vi.stubEnv('PS_MAX_BUCKETS', '1');
+
+    const yamlConfig = /* yaml */ `
+      # PowerSync config
+      replication:
+        connections: []
+      storage:
+        type: mongodb
+      api:
+        parameters:
+          max_buckets_per_connection: !env PS_MAX_BUCKETS::number
+    `;
+
+    const collector = new CompoundConfigCollector();
+
+    const config = await collector.collectConfig({
+      config_base64: Buffer.from(yamlConfig, 'utf-8').toString('base64')
+    });
+
+    expect(config.api_parameters.max_buckets_per_connection).toBe(1);
+  });
+});

package/test/src/sync/BucketChecksumState.test.ts

@@ -71,6 +71,7 @@ bucket_definitions:
       writeCheckpoint: null,
       update: CHECKPOINT_INVALIDATE_ALL
     }))!;
+    line.advance();
     expect(line.checkpointLine).toEqual({
       checkpoint: {
         buckets: [{ bucket: 'global[]', checksum: 1, count: 1, priority: 3 }],
@@ -85,10 +86,11 @@ bucket_definitions:
       }
     ]);
     // This is the bucket data to be fetched
-    expect(state.getFilteredBucketPositions(line.bucketsToFetch)).toEqual(new Map([['global[]', 0n]]));
+    expect(line.getFilteredBucketPositions()).toEqual(new Map([['global[]', 0n]]));
 
     // This similuates the bucket data being sent
-    state.updateBucketPosition({ bucket: 'global[]', nextAfter: 1n, hasMore: false });
+    line.advance();
+    line.updateBucketPosition({ bucket: 'global[]', nextAfter: 1n, hasMore: false });
 
     // Update bucket storage state
     storage.updateTestChecksum({ bucket: 'global[]', checksum: 2, count: 2 });
@@ -104,6 +106,7 @@ bucket_definitions:
         invalidateParameterBuckets: false
       }
     }))!;
+    line2.advance();
     expect(line2.checkpointLine).toEqual({
       checkpoint_diff: {
         removed_buckets: [],
@@ -112,7 +115,7 @@ bucket_definitions:
         write_checkpoint: undefined
       }
     });
-    expect(state.getFilteredBucketPositions(line2.bucketsToFetch)).toEqual(new Map([['global[]', 1n]]));
+    expect(line2.getFilteredBucketPositions()).toEqual(new Map([['global[]', 1n]]));
   });
 
   test('global bucket with initial state', async () => {
@@ -137,6 +140,7 @@ bucket_definitions:
       writeCheckpoint: null,
       update: CHECKPOINT_INVALIDATE_ALL
     }))!;
+    line.advance();
     expect(line.checkpointLine).toEqual({
       checkpoint: {
         buckets: [{ bucket: 'global[]', checksum: 1, count: 1, priority: 3 }],
@@ -151,7 +155,7 @@ bucket_definitions:
       }
     ]);
     // This is the main difference between this and the previous test
-    expect(state.getFilteredBucketPositions(line.bucketsToFetch)).toEqual(new Map([['global[]', 1n]]));
+    expect(line.getFilteredBucketPositions()).toEqual(new Map([['global[]', 1n]]));
   });
 
   test('multiple static buckets', async () => {
@@ -192,6 +196,7 @@ bucket_definitions:
         priority: 3
       }
     ]);
+    line.advance();
 
     storage.updateTestChecksum({ bucket: 'global[1]', checksum: 2, count: 2 });
     storage.updateTestChecksum({ bucket: 'global[2]', checksum: 2, count: 2 });
@@ -240,6 +245,7 @@ bucket_definitions:
       writeCheckpoint: null,
       update: CHECKPOINT_INVALIDATE_ALL
     }))!;
+    line.advance();
     expect(line.checkpointLine).toEqual({
       checkpoint: {
         buckets: [{ bucket: 'global[]', checksum: 1, count: 1, priority: 3 }],
@@ -253,7 +259,7 @@ bucket_definitions:
         priority: 3
       }
     ]);
-    expect(state.getFilteredBucketPositions(line.bucketsToFetch)).toEqual(new Map([['global[]', 0n]]));
+    expect(line.getFilteredBucketPositions()).toEqual(new Map([['global[]', 0n]]));
   });
 
   test('invalidating individual bucket', async () => {
@@ -274,14 +280,14 @@ bucket_definitions:
     // We specifically do not set this here, so that we have manual control over the events.
     // storage.filter = state.checkpointFilter;
 
-    await state.buildNextCheckpointLine({
+    const line = await state.buildNextCheckpointLine({
       base: { checkpoint: 1n, lsn: '1' },
       writeCheckpoint: null,
       update: CHECKPOINT_INVALIDATE_ALL
     });
-
-    state.updateBucketPosition({ bucket: 'global[1]', nextAfter: 1n, hasMore: false });
-    state.updateBucketPosition({ bucket: 'global[2]', nextAfter: 1n, hasMore: false });
+    line!.advance();
+    line!.updateBucketPosition({ bucket: 'global[1]', nextAfter: 1n, hasMore: false });
+    line!.updateBucketPosition({ bucket: 'global[2]', nextAfter: 1n, hasMore: false });
 
     storage.updateTestChecksum({ bucket: 'global[1]', checksum: 2, count: 2 });
     storage.updateTestChecksum({ bucket: 'global[2]', checksum: 2, count: 2 });
@@ -330,12 +336,14 @@ bucket_definitions:
     storage.updateTestChecksum({ bucket: 'global[1]', checksum: 1, count: 1 });
     storage.updateTestChecksum({ bucket: 'global[2]', checksum: 1, count: 1 });
 
-    await state.buildNextCheckpointLine({
+    const line = await state.buildNextCheckpointLine({
       base: { checkpoint: 1n, lsn: '1' },
       writeCheckpoint: null,
       update: CHECKPOINT_INVALIDATE_ALL
     });
 
+    line!.advance();
+
     storage.updateTestChecksum({ bucket: 'global[1]', checksum: 2, count: 2 });
     storage.updateTestChecksum({ bucket: 'global[2]', checksum: 2, count: 2 });
 
@@ -380,6 +388,7 @@ bucket_definitions:
       writeCheckpoint: null,
       update: CHECKPOINT_INVALIDATE_ALL
     }))!;
+    line.advance();
     expect(line.checkpointLine).toEqual({
       checkpoint: {
         buckets: [
@@ -402,7 +411,7 @@ bucket_definitions:
     ]);
 
     // This is the bucket data to be fetched
-    expect(state.getFilteredBucketPositions(line.bucketsToFetch)).toEqual(
+    expect(line.getFilteredBucketPositions()).toEqual(
       new Map([
         ['global[1]', 0n],
         ['global[2]', 0n]
@@ -411,8 +420,9 @@ bucket_definitions:
 
     // No data changes here.
     // We simulate partial data sent, before a checkpoint is interrupted.
-    state.updateBucketPosition({ bucket: 'global[1]', nextAfter: 3n, hasMore: false });
-    state.updateBucketPosition({ bucket: 'global[2]', nextAfter: 1n, hasMore: true });
+    line.advance();
+    line.updateBucketPosition({ bucket: 'global[1]', nextAfter: 3n, hasMore: false });
+    line.updateBucketPosition({ bucket: 'global[2]', nextAfter: 1n, hasMore: true });
     storage.updateTestChecksum({ bucket: 'global[1]', checksum: 4, count: 4 });
 
     const line2 = (await state.buildNextCheckpointLine({
@@ -424,6 +434,7 @@ bucket_definitions:
         updatedDataBuckets: new Set(['global[1]'])
       }
     }))!;
+    line2.advance();
     expect(line2.checkpointLine).toEqual({
       checkpoint_diff: {
         removed_buckets: [],
@@ -451,7 +462,7 @@ bucket_definitions:
       }
     ]);
 
-    expect(state.getFilteredBucketPositions(line2.bucketsToFetch)).toEqual(
+    expect(line2.getFilteredBucketPositions()).toEqual(
       new Map([
         ['global[1]', 3n],
         ['global[2]', 1n]
@@ -507,16 +518,18 @@ bucket_definitions:
         priority: 3
       }
     ]);
+    line.advance();
     // This is the bucket data to be fetched
-    expect(state.getFilteredBucketPositions(line.bucketsToFetch)).toEqual(
+    expect(line.getFilteredBucketPositions()).toEqual(
       new Map([
         ['by_project[1]', 0n],
         ['by_project[2]', 0n]
       ])
     );
 
-    state.updateBucketPosition({ bucket: 'by_project[1]', nextAfter: 1n, hasMore: false });
-    state.updateBucketPosition({ bucket: 'by_project[2]', nextAfter: 1n, hasMore: false });
+    line.advance();
+    line.updateBucketPosition({ bucket: 'by_project[1]', nextAfter: 1n, hasMore: false });
+    line.updateBucketPosition({ bucket: 'by_project[2]', nextAfter: 1n, hasMore: false });
 
     storage.getParameterSets = async (
       checkpoint: InternalOpId,
@@ -538,6 +551,7 @@ bucket_definitions:
         invalidateParameterBuckets: false
       }
     }))!;
+    line2.advance();
     expect(line2.checkpointLine).toEqual({
       checkpoint_diff: {
         removed_buckets: [],
@@ -546,7 +560,7 @@ bucket_definitions:
         write_checkpoint: undefined
       }
     });
-    expect(state.getFilteredBucketPositions(line2.bucketsToFetch)).toEqual(new Map([['by_project[3]', 0n]]));
+    expect(line2.getFilteredBucketPositions()).toEqual(new Map([['by_project[3]', 0n]]));
   });
 });