@powersync/service-module-postgres-storage 0.0.0-dev-20250813080357 → 0.0.0-dev-20250819134004

package/test/src/__snapshots__/storage_sync.test.ts.snap

@@ -10,9 +10,21 @@ exports[`sync - postgres > compacting data - invalidate checkpoint 1`] = `
           "checksum": -93886621,
           "count": 2,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "2",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -46,6 +58,11 @@ exports[`sync - postgres > compacting data - invalidate checkpoint 2`] = `
           "checksum": 499012468,
           "count": 4,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,
@@ -105,9 +122,21 @@ exports[`sync - postgres > expiring token 1`] = `
           "checksum": 0,
           "count": 0,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "0",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -137,9 +166,21 @@ exports[`sync - postgres > sends checkpoint complete line for empty checkpoint 1
           "checksum": -1221282404,
           "count": 1,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "1",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -193,15 +234,37 @@ exports[`sync - postgres > sync buckets in order 1`] = `
           "checksum": 920318466,
           "count": 1,
           "priority": 2,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
         {
           "bucket": "b1[]",
           "checksum": -1382098757,
           "count": 1,
           "priority": 1,
+          "subscriptions": [
+            {
+              "default": 1,
+            },
+          ],
         },
       ],
       "last_op_id": "2",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "b0",
+        },
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "b1",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -267,9 +330,21 @@ exports[`sync - postgres > sync global data 1`] = `
           "checksum": -93886621,
           "count": 2,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "2",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -319,21 +394,53 @@ exports[`sync - postgres > sync interrupts low-priority buckets on new checkpoin
           "checksum": -659831575,
           "count": 2000,
           "priority": 2,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
         {
           "bucket": "b0b[]",
           "checksum": -659831575,
           "count": 2000,
           "priority": 2,
+          "subscriptions": [
+            {
+              "default": 1,
+            },
+          ],
         },
         {
           "bucket": "b1[]",
           "checksum": -1096116670,
           "count": 1,
           "priority": 1,
+          "subscriptions": [
+            {
+              "default": 2,
+            },
+          ],
         },
       ],
       "last_op_id": "4001",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "b0a",
+        },
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "b0b",
+        },
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "b1",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -380,18 +487,33 @@ exports[`sync - postgres > sync interrupts low-priority buckets on new checkpoin
           "checksum": 883076828,
           "count": 2001,
           "priority": 2,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
         {
           "bucket": "b0b[]",
           "checksum": 883076828,
           "count": 2001,
           "priority": 2,
+          "subscriptions": [
+            {
+              "default": 1,
+            },
+          ],
         },
         {
           "bucket": "b1[]",
           "checksum": 1841937527,
           "count": 2,
           "priority": 1,
+          "subscriptions": [
+            {
+              "default": 2,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,
@@ -466,9 +588,21 @@ exports[`sync - postgres > sync legacy non-raw data 1`] = `
           "checksum": -852817836,
           "count": 1,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "1",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -514,9 +648,21 @@ exports[`sync - postgres > sync updates to data query only 1`] = `
           "checksum": 0,
           "count": 0,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "1",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "by_user",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -540,6 +686,11 @@ exports[`sync - postgres > sync updates to data query only 2`] = `
           "checksum": 1418351250,
           "count": 1,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,
@@ -582,9 +733,21 @@ exports[`sync - postgres > sync updates to global data 1`] = `
           "checksum": 0,
           "count": 0,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "last_op_id": "0",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "mybucket",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -608,6 +771,11 @@ exports[`sync - postgres > sync updates to global data 2`] = `
           "checksum": 920318466,
           "count": 1,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,
@@ -652,6 +820,11 @@ exports[`sync - postgres > sync updates to global data 3`] = `
           "checksum": -93886621,
           "count": 2,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,
@@ -690,6 +863,13 @@ exports[`sync - postgres > sync updates to parameter query + data 1`] = `
     "checkpoint": {
       "buckets": [],
       "last_op_id": "0",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "by_user",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -713,6 +893,11 @@ exports[`sync - postgres > sync updates to parameter query + data 2`] = `
           "checksum": 1418351250,
           "count": 1,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,
@@ -751,6 +936,13 @@ exports[`sync - postgres > sync updates to parameter query only 1`] = `
     "checkpoint": {
       "buckets": [],
       "last_op_id": "0",
+      "streams": [
+        {
+          "errors": [],
+          "is_default": true,
+          "name": "by_user",
+        },
+      ],
       "write_checkpoint": undefined,
     },
   },
@@ -774,6 +966,11 @@ exports[`sync - postgres > sync updates to parameter query only 2`] = `
           "checksum": 0,
           "count": 0,
           "priority": 3,
+          "subscriptions": [
+            {
+              "default": 0,
+            },
+          ],
         },
       ],
       "write_checkpoint": undefined,

package/test/src/sdk-report-storage.test.ts

@@ -2,9 +2,9 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { POSTGRES_REPORT_STORAGE_FACTORY } from './util.js';
 import { event_types } from '@powersync/service-types';
 
-function removeVolatileFields(sdks: event_types.SdkConnectDocument[]): Partial<event_types.SdkConnectDocument>[] {
+function removeVolatileFields(sdks: event_types.ClientConnection[]): Partial<event_types.ClientConnection>[] {
   return sdks.map((sdk) => {
-    const { id, disconnect_at, connect_at, jwt_exp, ...rest } = sdk;
+    const { id, disconnected_at, connected_at, jwt_exp, ...rest } = sdk;
     return {
       ...rest
     };
@@ -35,7 +35,7 @@ describe('SDK reporting storage', async () => {
   const user_one = {
     user_id: 'user_one',
     client_id: 'client_one',
-    connect_at: now.toISOString(),
+    connected_at: now.toISOString(),
     sdk: 'powersync-dart/1.6.4',
     user_agent: 'powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android',
     jwt_exp: nowAdd5minutes.toISOString(),
@@ -44,7 +44,7 @@ describe('SDK reporting storage', async () => {
   const user_two = {
     user_id: 'user_two',
     client_id: 'client_two',
-    connect_at: nowLess5minutes.toISOString(),
+    connected_at: nowLess5minutes.toISOString(),
     sdk: 'powersync-js/1.21.1',
     user_agent: 'powersync-js/1.21.0 powersync-web Chromium/138 linux',
     jwt_exp: nowAdd5minutes.toISOString(),
@@ -53,17 +53,17 @@ describe('SDK reporting storage', async () => {
   const user_three = {
     user_id: 'user_three',
     client_id: 'client_three',
-    connect_at: yesterday.toISOString(),
+    connected_at: yesterday.toISOString(),
     sdk: 'powersync-js/1.21.2',
     user_agent: 'powersync-js/1.21.0 powersync-web Firefox/141 linux',
-    disconnect_at: yesterday.toISOString(),
+    disconnected_at: yesterday.toISOString(),
     id: '3'
   };
 
   const user_four = {
     user_id: 'user_four',
     client_id: 'client_four',
-    connect_at: now.toISOString(),
+    connected_at: now.toISOString(),
     sdk: 'powersync-js/1.21.4',
     user_agent: 'powersync-js/1.21.0 powersync-web Firefox/141 linux',
     jwt_exp: nowLess5minutes.toISOString(),
@@ -73,27 +73,27 @@ describe('SDK reporting storage', async () => {
   const user_week = {
     user_id: 'user_week',
     client_id: 'client_week',
-    connect_at: weekAgo.toISOString(),
+    connected_at: weekAgo.toISOString(),
     sdk: 'powersync-js/1.24.5',
     user_agent: 'powersync-js/1.21.0 powersync-web Firefox/141 linux',
-    disconnect_at: weekAgo.toISOString(),
+    disconnected_at: weekAgo.toISOString(),
     id: 'week'
   };
 
   const user_month = {
     user_id: 'user_month',
     client_id: 'client_month',
-    connect_at: monthAgo.toISOString(),
+    connected_at: monthAgo.toISOString(),
     sdk: 'powersync-js/1.23.6',
     user_agent: 'powersync-js/1.23.0 powersync-web Firefox/141 linux',
-    disconnect_at: monthAgo.toISOString(),
+    disconnected_at: monthAgo.toISOString(),
     id: 'month'
   };
 
   const user_expired = {
     user_id: 'user_expired',
     client_id: 'client_expired',
-    connect_at: monthAgo.toISOString(),
+    connected_at: monthAgo.toISOString(),
     sdk: 'powersync-js/1.23.7',
     user_agent: 'powersync-js/1.23.0 powersync-web Firefox/141 linux',
     jwt_exp: monthAgo.toISOString(),
@@ -106,18 +106,18 @@ describe('SDK reporting storage', async () => {
         sdk_report_events (
           user_id,
           client_id,
-          connect_at,
+          connected_at,
           sdk,
           user_agent,
           jwt_exp,
           id,
-          disconnect_at
+          disconnected_at
         )
       VALUES
         (
           ${{ type: 'varchar', value: user_one.user_id }},
           ${{ type: 'varchar', value: user_one.client_id }},
-          ${{ type: 1184, value: user_one.connect_at }},
+          ${{ type: 1184, value: user_one.connected_at }},
           ${{ type: 'varchar', value: user_one.sdk }},
           ${{ type: 'varchar', value: user_one.user_agent }},
           ${{ type: 1184, value: user_one.jwt_exp }},
@@ -127,7 +127,7 @@ describe('SDK reporting storage', async () => {
         (
           ${{ type: 'varchar', value: user_two.user_id }},
           ${{ type: 'varchar', value: user_two.client_id }},
-          ${{ type: 1184, value: user_two.connect_at }},
+          ${{ type: 1184, value: user_two.connected_at }},
           ${{ type: 'varchar', value: user_two.sdk }},
           ${{ type: 'varchar', value: user_two.user_agent }},
           ${{ type: 1184, value: user_two.jwt_exp }},
@@ -137,7 +137,7 @@ describe('SDK reporting storage', async () => {
         (
           ${{ type: 'varchar', value: user_four.user_id }},
           ${{ type: 'varchar', value: user_four.client_id }},
-          ${{ type: 1184, value: user_four.connect_at }},
+          ${{ type: 1184, value: user_four.connected_at }},
           ${{ type: 'varchar', value: user_four.sdk }},
           ${{ type: 'varchar', value: user_four.user_agent }},
           ${{ type: 1184, value: user_four.jwt_exp }},
@@ -147,37 +147,37 @@ describe('SDK reporting storage', async () => {
         (
           ${{ type: 'varchar', value: user_three.user_id }},
           ${{ type: 'varchar', value: user_three.client_id }},
-          ${{ type: 1184, value: user_three.connect_at }},
+          ${{ type: 1184, value: user_three.connected_at }},
           ${{ type: 'varchar', value: user_three.sdk }},
           ${{ type: 'varchar', value: user_three.user_agent }},
           NULL,
           ${{ type: 'varchar', value: user_three.id }},
-          ${{ type: 1184, value: user_three.disconnect_at }}
+          ${{ type: 1184, value: user_three.disconnected_at }}
         ),
         (
           ${{ type: 'varchar', value: user_week.user_id }},
           ${{ type: 'varchar', value: user_week.client_id }},
-          ${{ type: 1184, value: user_week.connect_at }},
+          ${{ type: 1184, value: user_week.connected_at }},
           ${{ type: 'varchar', value: user_week.sdk }},
           ${{ type: 'varchar', value: user_week.user_agent }},
           NULL,
           ${{ type: 'varchar', value: user_week.id }},
-          ${{ type: 1184, value: user_week.disconnect_at }}
+          ${{ type: 1184, value: user_week.disconnected_at }}
         ),
         (
           ${{ type: 'varchar', value: user_month.user_id }},
           ${{ type: 'varchar', value: user_month.client_id }},
-          ${{ type: 1184, value: user_month.connect_at }},
+          ${{ type: 1184, value: user_month.connected_at }},
           ${{ type: 'varchar', value: user_month.sdk }},
           ${{ type: 'varchar', value: user_month.user_agent }},
           NULL,
           ${{ type: 'varchar', value: user_month.id }},
-          ${{ type: 1184, value: user_month.disconnect_at }}
+          ${{ type: 1184, value: user_month.disconnected_at }}
         ),
         (
           ${{ type: 'varchar', value: user_expired.user_id }},
           ${{ type: 'varchar', value: user_expired.client_id }},
-          ${{ type: 1184, value: user_expired.connect_at }},
+          ${{ type: 1184, value: user_expired.connected_at }},
           ${{ type: 'varchar', value: user_expired.sdk }},
           ${{ type: 'varchar', value: user_expired.user_agent }},
           ${{ type: 1184, value: user_expired.jwt_exp }},
@@ -199,7 +199,7 @@ describe('SDK reporting storage', async () => {
     await deleteData();
   });
   it('Should show connected users with start range', async () => {
-    const current = await factory.listCurrentConnections({
+    const current = await factory.getConnectedClients({
       range: {
         start: new Date(
           now.getFullYear(),
@@ -213,7 +213,7 @@ describe('SDK reporting storage', async () => {
     expect(current).toMatchSnapshot();
   });
   it('Should show connected users with start range and end range', async () => {
-    const current = await factory.listCurrentConnections({
+    const current = await factory.getConnectedClients({
       range: {
         end: nowLess5minutes.toISOString(),
         start: new Date(
@@ -228,21 +228,21 @@ describe('SDK reporting storage', async () => {
     expect(current).toMatchSnapshot();
   });
   it('Should show SDK scrape data for user over the past month', async () => {
-    const sdk = await factory.scrapeSdkData({
+    const sdk = await factory.getClientConnectionReports({
       start: monthAgo,
       end: now
     });
     expect(sdk).toMatchSnapshot();
   });
   it('Should show SDK scrape data for user over the past week', async () => {
-    const sdk = await factory.scrapeSdkData({
+    const sdk = await factory.getClientConnectionReports({
       start: weekAgo,
       end: now
     });
     expect(sdk).toMatchSnapshot();
   });
   it('Should show SDK scrape data for user over the past day', async () => {
-    const sdk = await factory.scrapeSdkData({
+    const sdk = await factory.getClientConnectionReports({
       start: dayAgo,
       end: now
     });
@@ -258,9 +258,9 @@ describe('SDK reporting storage', async () => {
       now.getMinutes() + 20
     );
     const jwtExp = new Date(newConnectAt.getFullYear(), newConnectAt.getMonth(), newConnectAt.getDate() + 1);
-    await factory.reportSdkConnect({
+    await factory.reportClientConnection({
       sdk: user_one.sdk,
-      connect_at: newConnectAt,
+      connected_at: newConnectAt,
       jwt_exp: jwtExp,
       client_id: user_one.client_id,
       user_id: user_one.user_id,
@@ -268,11 +268,11 @@ describe('SDK reporting storage', async () => {
     });
 
     const sdk = await factory.db
-      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_one.user_id }}`.rows<event_types.SdkConnectDocument>();
+      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_one.user_id }}`.rows<event_types.ClientConnection>();
     expect(sdk).toHaveLength(1);
-    expect(new Date(sdk[0].connect_at).toISOString()).toEqual(newConnectAt.toISOString());
+    expect(new Date(sdk[0].connected_at).toISOString()).toEqual(newConnectAt.toISOString());
     expect(new Date(sdk[0].jwt_exp!).toISOString()).toEqual(jwtExp.toISOString());
-    expect(sdk[0].disconnect_at).toBeNull();
+    expect(sdk[0].disconnected_at).toBeNull();
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
   });
@@ -287,19 +287,19 @@ describe('SDK reporting storage', async () => {
     );
     const jwtExp = new Date(disconnectAt.getFullYear(), disconnectAt.getMonth(), disconnectAt.getDate() + 1);
 
-    await factory.reportSdkDisconnect({
-      disconnect_at: disconnectAt,
+    await factory.reportClientDisconnection({
+      disconnected_at: disconnectAt,
       jwt_exp: jwtExp,
       client_id: user_three.client_id,
       user_id: user_three.user_id,
       user_agent: user_three.user_agent,
-      connect_at: yesterday
+      connected_at: yesterday
     });
 
     const sdk = await factory.db
-      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_three.user_id }}`.rows<event_types.SdkConnectDocument>();
+      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_three.user_id }}`.rows<event_types.ClientConnection>();
     expect(sdk).toHaveLength(1);
-    expect(new Date(sdk[0].disconnect_at!).toISOString()).toEqual(disconnectAt.toISOString());
+    expect(new Date(sdk[0].disconnected_at!).toISOString()).toEqual(disconnectAt.toISOString());
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
   });
@@ -308,9 +308,9 @@ describe('SDK reporting storage', async () => {
     const newConnectAt = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1, now.getHours());
     const jwtExp = new Date(newConnectAt.getFullYear(), newConnectAt.getMonth(), newConnectAt.getDate() + 1);
 
-    await factory.reportSdkConnect({
+    await factory.reportClientConnection({
       sdk: user_week.sdk,
-      connect_at: newConnectAt,
+      connected_at: newConnectAt,
       jwt_exp: jwtExp,
       client_id: user_week.client_id,
       user_id: user_week.user_id,
@@ -318,7 +318,7 @@ describe('SDK reporting storage', async () => {
     });
 
     const sdk = await factory.db
-      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_week.user_id }}`.rows<event_types.SdkConnectDocument>();
+      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_week.user_id }}`.rows<event_types.ClientConnection>();
     expect(sdk).toHaveLength(2);
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
@@ -327,10 +327,10 @@ describe('SDK reporting storage', async () => {
   it('Should delete rows older than specified range', async () => {
     await deleteData();
     await loadData();
-    await factory.deleteOldSdkData({
+    await factory.deleteOldConnectionData({
       date: weekAgo
     });
-    const sdk = await factory.scrapeSdkData({
+    const sdk = await factory.getClientConnectionReports({
       start: monthAgo,
       end: now
     });