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

package/test/src/__snapshots__/{sdk-report-storage.test.ts.snap → connection-report-storage.test.ts.snap}

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`SDK reporting storage > Should create a sdk event if its after a day 1`] = `
+exports[`Connection report storage > Should create a connection event if its after a day 1`] = `
 [
   {
     "client_id": "client_week",
@@ -17,7 +17,7 @@ exports[`SDK reporting storage > Should create a sdk event if its after a day 1`
 ]
 `;
 
-exports[`SDK reporting storage > Should delete rows older than specified range 1`] = `
+exports[`Connection report storage > Should delete rows older than specified range 1`] = `
 {
   "sdks": [
     {
@@ -45,12 +45,53 @@ exports[`SDK reporting storage > Should delete rows older than specified range 1
       "sdk": "powersync-js/1.24.5",
       "users": 1,
     },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
   ],
   "users": 5,
 }
 `;
 
-exports[`SDK reporting storage > Should show SDK scrape data for user over the past day 1`] = `
+exports[`Connection report storage > Should show connected users with start range 1`] = `
+{
+  "sdks": [
+    {
+      "clients": 1,
+      "sdk": "powersync-dart/1.6.4",
+      "users": 1,
+    },
+    {
+      "clients": 1,
+      "sdk": "powersync-js/1.21.1",
+      "users": 1,
+    },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
+  ],
+  "users": 2,
+}
+`;
+
+exports[`Connection report storage > Should show connected users with start range and end range 1`] = `
+{
+  "sdks": [
+    {
+      "clients": 1,
+      "sdk": "powersync-js/1.21.1",
+      "users": 1,
+    },
+  ],
+  "users": 1,
+}
+`;
+
+exports[`Connection report storage > Should show connection report data for user over the past day 1`] = `
 {
   "sdks": [
     {
@@ -68,12 +109,17 @@ exports[`SDK reporting storage > Should show SDK scrape data for user over the p
       "sdk": "powersync-js/1.21.4",
       "users": 1,
     },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
   ],
   "users": 3,
 }
 `;
 
-exports[`SDK reporting storage > Should show SDK scrape data for user over the past month 1`] = `
+exports[`Connection report storage > Should show connection report data for user over the past month 1`] = `
 {
   "sdks": [
     {
@@ -111,12 +157,17 @@ exports[`SDK reporting storage > Should show SDK scrape data for user over the p
       "sdk": "powersync-js/1.24.5",
       "users": 1,
     },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
   ],
   "users": 7,
 }
 `;
 
-exports[`SDK reporting storage > Should show SDK scrape data for user over the past week 1`] = `
+exports[`Connection report storage > Should show connection report data for user over the past week 1`] = `
 {
   "sdks": [
     {
@@ -144,38 +195,28 @@ exports[`SDK reporting storage > Should show SDK scrape data for user over the p
       "sdk": "powersync-js/1.24.5",
       "users": 1,
     },
-  ],
-  "users": 5,
-}
-`;
-
-exports[`SDK reporting storage > Should show connected users with start range 1`] = `
-{
-  "sdks": [
     {
       "clients": 1,
-      "sdk": "powersync-dart/1.6.4",
+      "sdk": "unknown",
       "users": 1,
     },
   ],
-  "users": 1,
+  "users": 5,
 }
 `;
 
-exports[`SDK reporting storage > Should show connected users with start range and end range 1`] = `
-{
-  "sdks": [
-    {
-      "clients": 1,
-      "sdk": "powersync-js/1.21.1",
-      "users": 1,
-    },
-  ],
-  "users": 1,
-}
+exports[`Connection report storage > Should update a connected sdk event and make it disconnected 1`] = `
+[
+  {
+    "client_id": "client_three",
+    "sdk": "powersync-js/1.21.2",
+    "user_agent": "powersync-js/1.21.0 powersync-web Firefox/141 linux",
+    "user_id": "user_three",
+  },
+]
 `;
 
-exports[`SDK reporting storage > Should update a connected sdk event and make it disconnected 1`] = `
+exports[`Connection report storage > Should update a connection event and make it disconnected 1`] = `
 [
   {
     "client_id": "client_three",
@@ -186,7 +227,18 @@ exports[`SDK reporting storage > Should update a connected sdk event and make it
 ]
 `;
 
-exports[`SDK reporting storage > Should update a sdk event if its within a day 1`] = `
+exports[`Connection report storage > Should update a connection event if its within a day 1`] = `
+[
+  {
+    "client_id": "client_one",
+    "sdk": "powersync-dart/1.6.4",
+    "user_agent": "powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android",
+    "user_id": "user_one",
+  },
+]
+`;
+
+exports[`Connection report storage > Should update a sdk event if its within a day 1`] = `
 [
   {
     "client_id": "client_one",

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

@@ -39,7 +39,7 @@ exports[`sync - postgres > compacting data - invalidate checkpoint 2`] = `
       "bucket": "mybucket[]",
       "data": [
         {
-          "checksum": -93886621n,
+          "checksum": -93886621,
           "op": "CLEAR",
           "op_id": "2",
         },
@@ -74,7 +74,7 @@ exports[`sync - postgres > compacting data - invalidate checkpoint 2`] = `
       "bucket": "mybucket[]",
       "data": [
         {
-          "checksum": 1859363232n,
+          "checksum": 1859363232,
           "data": "{"id":"t1","description":"Test 1b"}",
           "object_id": "t1",
           "object_type": "test",
@@ -83,7 +83,7 @@ exports[`sync - postgres > compacting data - invalidate checkpoint 2`] = `
           "subkey": "02d285ac-4f96-5124-8fba-c6d1df992dd1",
         },
         {
-          "checksum": 3028503153n,
+          "checksum": 3028503153,
           "data": "{"id":"t2","description":"Test 2b"}",
           "object_id": "t2",
           "object_type": "test",
@@ -203,6 +203,7 @@ exports[`sync - postgres > sends checkpoint complete line for empty checkpoint 1
       "next_after": "1",
     },
   },
+  null,
   {
     "checkpoint_complete": {
       "last_op_id": "1",
@@ -274,7 +275,7 @@ exports[`sync - postgres > sync buckets in order 1`] = `
       "bucket": "b1[]",
       "data": [
         {
-          "checksum": 2912868539n,
+          "checksum": 2912868539,
           "data": "{"id":"earlier","description":"Test 2"}",
           "object_id": "earlier",
           "object_type": "test",
@@ -299,7 +300,7 @@ exports[`sync - postgres > sync buckets in order 1`] = `
       "bucket": "b0[]",
       "data": [
         {
-          "checksum": 920318466n,
+          "checksum": 920318466,
           "data": "{"id":"t1","description":"Test 1"}",
           "object_id": "t1",
           "object_type": "test",
@@ -354,7 +355,7 @@ exports[`sync - postgres > sync global data 1`] = `
       "bucket": "mybucket[]",
       "data": [
         {
-          "checksum": 920318466n,
+          "checksum": 920318466,
           "data": "{"id":"t1","description":"Test 1"}",
           "object_id": "t1",
           "object_type": "test",
@@ -363,7 +364,7 @@ exports[`sync - postgres > sync global data 1`] = `
           "subkey": "02d285ac-4f96-5124-8fba-c6d1df992dd1",
         },
         {
-          "checksum": 3280762209n,
+          "checksum": 3280762209,
           "data": "{"id":"t2","description":"Test 2"}",
           "object_id": "t2",
           "object_type": "test",
@@ -702,7 +703,7 @@ exports[`sync - postgres > sync updates to data query only 2`] = `
       "bucket": "by_user["user1"]",
       "data": [
         {
-          "checksum": 1418351250n,
+          "checksum": 1418351250,
           "data": "{"id":"list1","user_id":"user1","name":"User 1"}",
           "object_id": "list1",
           "object_type": "lists",
@@ -787,7 +788,7 @@ exports[`sync - postgres > sync updates to global data 2`] = `
       "bucket": "mybucket[]",
       "data": [
         {
-          "checksum": 920318466n,
+          "checksum": 920318466,
           "data": "{"id":"t1","description":"Test 1"}",
           "object_id": "t1",
           "object_type": "test",
@@ -836,7 +837,7 @@ exports[`sync - postgres > sync updates to global data 3`] = `
       "bucket": "mybucket[]",
       "data": [
         {
-          "checksum": 3280762209n,
+          "checksum": 3280762209,
           "data": "{"id":"t2","description":"Test 2"}",
           "object_id": "t2",
           "object_type": "test",
@@ -909,7 +910,7 @@ exports[`sync - postgres > sync updates to parameter query + data 2`] = `
       "bucket": "by_user["user1"]",
       "data": [
         {
-          "checksum": 1418351250n,
+          "checksum": 1418351250,
           "data": "{"id":"list1","user_id":"user1","name":"User 1"}",
           "object_id": "list1",
           "object_type": "lists",

package/test/src/{sdk-report-storage.test.ts → connection-report-storage.test.ts}

@@ -11,7 +11,7 @@ function removeVolatileFields(sdks: event_types.ClientConnection[]): Partial<eve
   });
 }
 
-describe('SDK reporting storage', async () => {
+describe('Connection report storage', async () => {
   const factory = await POSTGRES_REPORT_STORAGE_FACTORY();
   const now = new Date();
   const nowAdd5minutes = new Date(
@@ -70,6 +70,16 @@ describe('SDK reporting storage', async () => {
     id: '4'
   };
 
+  const user_old = {
+    user_id: 'user_one',
+    client_id: '',
+    connected_at: now.toISOString(),
+    sdk: 'unknown',
+    user_agent: 'powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android',
+    jwt_exp: nowAdd5minutes.toISOString(),
+    id: '5'
+  };
+
   const user_week = {
     user_id: 'user_week',
     client_id: 'client_week',
@@ -103,7 +113,7 @@ describe('SDK reporting storage', async () => {
   async function loadData() {
     await factory.db.sql`
       INSERT INTO
-        sdk_report_events (
+        connection_report_events (
           user_id,
           client_id,
           connected_at,
@@ -144,6 +154,16 @@ describe('SDK reporting storage', async () => {
           ${{ type: 'varchar', value: user_four.id }},
           NULL
         ),
+        (
+          ${{ type: 'varchar', value: user_old.user_id }},
+          ${{ type: 'varchar', value: user_old.client_id }},
+          ${{ type: 1184, value: user_old.connected_at }},
+          ${{ type: 'varchar', value: user_old.sdk }},
+          ${{ type: 'varchar', value: user_old.user_agent }},
+          ${{ type: 1184, value: user_old.jwt_exp }},
+          ${{ type: 'varchar', value: user_old.id }},
+          NULL
+        ),
         (
           ${{ type: 'varchar', value: user_three.user_id }},
           ${{ type: 'varchar', value: user_three.client_id }},
@@ -188,7 +208,7 @@ describe('SDK reporting storage', async () => {
   }
 
   function deleteData() {
-    return factory.db.sql`TRUNCATE TABLE sdk_report_events`.execute();
+    return factory.db.sql`TRUNCATE TABLE connection_report_events`.execute();
   }
 
   beforeAll(async () => {
@@ -199,49 +219,24 @@ describe('SDK reporting storage', async () => {
     await deleteData();
   });
   it('Should show connected users with start range', async () => {
-    const current = await factory.getConnectedClients({
-      range: {
-        start: new Date(
-          now.getFullYear(),
-          now.getMonth(),
-          now.getDate(),
-          now.getHours(),
-          now.getMinutes() - 1
-        ).toISOString()
-      }
-    });
-    expect(current).toMatchSnapshot();
-  });
-  it('Should show connected users with start range and end range', async () => {
-    const current = await factory.getConnectedClients({
-      range: {
-        end: nowLess5minutes.toISOString(),
-        start: new Date(
-          now.getFullYear(),
-          now.getMonth(),
-          now.getDate(),
-          now.getHours(),
-          now.getMinutes() - 6
-        ).toISOString()
-      }
-    });
+    const current = await factory.getConnectedClients();
     expect(current).toMatchSnapshot();
   });
-  it('Should show SDK scrape data for user over the past month', async () => {
+  it('Should show connection report data for user over the past month', async () => {
     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 () => {
+  it('Should show connection report data for user over the past week', async () => {
     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 () => {
+  it('Should show connection report data for user over the past day', async () => {
     const sdk = await factory.getClientConnectionReports({
       start: dayAgo,
       end: now
@@ -249,7 +244,7 @@ describe('SDK reporting storage', async () => {
     expect(sdk).toMatchSnapshot();
   });
 
-  it('Should update a sdk event if its within a day', async () => {
+  it('Should update a connection event if its within a day', async () => {
     const newConnectAt = new Date(
       now.getFullYear(),
       now.getMonth(),
@@ -268,7 +263,7 @@ 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.ClientConnection>();
+      .sql`SELECT * FROM connection_report_events WHERE user_id = ${{ type: 'varchar', value: user_one.user_id }} AND client_id = ${{ type: 'varchar', value: user_one.client_id }}`.rows<event_types.ClientConnection>();
     expect(sdk).toHaveLength(1);
     expect(new Date(sdk[0].connected_at).toISOString()).toEqual(newConnectAt.toISOString());
     expect(new Date(sdk[0].jwt_exp!).toISOString()).toEqual(jwtExp.toISOString());
@@ -277,7 +272,7 @@ describe('SDK reporting storage', async () => {
     expect(cleaned).toMatchSnapshot();
   });
 
-  it('Should update a connected sdk event and make it disconnected', async () => {
+  it('Should update a connection event and make it disconnected', async () => {
     const disconnectAt = new Date(
       now.getFullYear(),
       now.getMonth(),
@@ -297,14 +292,14 @@ describe('SDK reporting storage', async () => {
     });
 
     const sdk = await factory.db
-      .sql`SELECT * FROM sdk_report_events WHERE user_id = ${{ type: 'varchar', value: user_three.user_id }}`.rows<event_types.ClientConnection>();
+      .sql`SELECT * FROM connection_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].disconnected_at!).toISOString()).toEqual(disconnectAt.toISOString());
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
   });
 
-  it('Should create a sdk event if its after a day', async () => {
+  it('Should create a connection event if its after a day', 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);
 
@@ -318,7 +313,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.ClientConnection>();
+      .sql`SELECT * FROM connection_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();

package/test/src/util.ts

@@ -1,7 +1,8 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { normalizePostgresStorageConfig, PostgresMigrationAgent, postgresTestSetup } from '../../src/index.js';
+import { normalizePostgresStorageConfig, PostgresMigrationAgent } from '../../src/index.js';
 import { env } from './env.js';
+import { postgresTestSetup } from '../../src/utils/test-utils.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

package/dist/storage/PostgresTestStorageFactoryGenerator.js.map

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