@powersync/service-core 0.0.0-dev-20250116115804 → 0.0.0-dev-20250122110924

package/src/util/config/compound-config-collector.ts

@@ -95,18 +95,16 @@ export class CompoundConfigCollector {
       reject_ip_ranges: []
     };
 
-    const block_local_jwks = baseConfig.client_auth?.block_local_jwks;
-    if (block_local_jwks == true) {
+    if (baseConfig.client_auth?.jwks_reject_ip_ranges != null) {
       jwksLookup = {
-        reject_ip_ranges: ['local'],
-        reject_ipv6: true
-      };
-    } else if (Array.isArray(block_local_jwks)) {
-      jwksLookup = {
-        reject_ip_ranges: block_local_jwks,
-        reject_ipv6: true
+        reject_ip_ranges: baseConfig.client_auth?.jwks_reject_ip_ranges
       };
     }
+    if (baseConfig.client_auth?.block_local_jwks) {
+      // Deprecated - recommend method is to use jwks_reject_ip_ranges
+      jwksLookup.reject_ip_ranges.push('local');
+      jwksLookup.reject_ipv6 = true;
+    }
 
     for (let uri of jwks_uris) {
       collectors.add(new auth.CachedKeyCollector(new auth.RemoteJWKSCollector(uri, { lookupOptions: jwksLookup })));

package/src/util/utils.ts

@@ -7,6 +7,7 @@ import { BucketChecksum, OpId, OplogEntry } from './protocol-types.js';
 import * as storage from '../storage/storage-index.js';
 
 import { PartialChecksum } from '../storage/ChecksumCache.js';
+import { ServiceAssertionError } from '@powersync/lib-services-framework';
 
 export type ChecksumMap = Map<string, BucketChecksum>;
 
@@ -34,7 +35,7 @@ export function timestampToOpId(ts: bigint): OpId {
   // Dynamic values are passed in in some cases, so we make extra sure that the
   // number is a bigint and not number or Long.
   if (typeof ts != 'bigint') {
-    throw new Error(`bigint expected, got: ${ts} (${typeof ts})`);
+    throw new ServiceAssertionError(`bigint expected, got: ${ts} (${typeof ts})`);
   }
   return ts.toString(10);
 }