From 44f1f7a8264ef247b31eb9d50c77d19cf32c088e Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 19 Feb 2025 14:31:17 +0200 Subject: [PATCH 1/4] Fix versions of the docker image and service-core. --- .changeset/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/config.json b/.changeset/config.json index f3ad05a21..ef96d5d77 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -2,7 +2,7 @@ "$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json", "changelog": "@changesets/cli/changelog", "commit": false, - "fixed": [], + "fixed": [["@powersync/service-core", "@powersync/service-image"]], "linked": [], "access": "restricted", "baseBranch": "origin/main", From eaffe0795204921dc677a123fb6310827e04f682 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 19 Feb 2025 14:32:13 +0200 Subject: [PATCH 2/4] Prepare version for 1.7.0 bump. --- packages/service-core/package.json | 2 +- service/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/service-core/package.json b/packages/service-core/package.json index 9f2ed28e6..8c1629cf7 100644 --- a/packages/service-core/package.json +++ b/packages/service-core/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "version": "0.18.1", + "version": "1.6.999", "main": "dist/index.js", "license": "FSL-1.1-Apache-2.0", "type": "module", diff --git a/service/package.json b/service/package.json index 1d2f3b74e..6c70c5be0 100644 --- a/service/package.json +++ b/service/package.json @@ -1,6 +1,6 @@ { "name": "@powersync/service-image", - "version": "1.4.1", + "version": "1.6.999", "private": true, "license": "FSL-1.1-Apache-2.0", "type": "module", From d7cab98a23dd749e307f5ff08780171cd3b58369 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 19 Feb 2025 15:02:50 +0200 Subject: [PATCH 3/4] Fix warning on tests. --- packages/service-core/test/src/auth.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/service-core/test/src/auth.test.ts b/packages/service-core/test/src/auth.test.ts index 8f45d428d..853a9d8d8 100644 --- a/packages/service-core/test/src/auth.test.ts +++ b/packages/service-core/test/src/auth.test.ts @@ -290,9 +290,9 @@ describe('JWT Auth', () => { reject_ip_ranges: ['local'] } }); - expect(invalid.getKeys()).rejects.toThrow('IPs in this range are not supported'); + await expect(invalid.getKeys()).rejects.toThrow('IPs in this range are not supported'); - // IPS throw an error immediately + // IPs throw an error immediately expect( () => new RemoteJWKSCollector('https://127.0.0.1/.well-known/jwks.json', { @@ -315,11 +315,11 @@ describe('JWT Auth', () => { const invalid = new RemoteJWKSCollector('https://127.0.0.1/.well-known/jwks.json'); // Should try and fetch - expect(invalid.getKeys()).rejects.toThrow(); + await expect(invalid.getKeys()).rejects.toThrow(); const invalid2 = new RemoteJWKSCollector('https://localhost/.well-known/jwks.json'); // Should try and fetch - expect(invalid2.getKeys()).rejects.toThrow(); + await expect(invalid2.getKeys()).rejects.toThrow(); }); test('caching', async () => { From 749e23c14d59e7eb269a5facb47c23088151ab7f Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 19 Feb 2025 15:03:40 +0200 Subject: [PATCH 4/4] Increase timeout for http auth test. --- packages/service-core/test/src/auth.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/service-core/test/src/auth.test.ts b/packages/service-core/test/src/auth.test.ts index 853a9d8d8..cba439aa5 100644 --- a/packages/service-core/test/src/auth.test.ts +++ b/packages/service-core/test/src/auth.test.ts @@ -274,7 +274,7 @@ describe('JWT Auth', () => { ).rejects.toThrow('Token must expire in a maximum of'); }); - test('http', async () => { + test('http', { timeout: 20_000 }, async () => { // Not ideal to rely on an external endpoint for tests, but it is good to test that this // one actually works. const remote = new RemoteJWKSCollector(