@powersync/service-module-mongodb-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[`SDK reporting storage > Should create a connection report if its after a day 1`] = `
 [
   {
     "client_id": "client_week",
@@ -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[`SDK reporting 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[`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[`SDK reporting 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[`SDK reporting 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[`SDK reporting storage > Should show connection report data for user over the past week 1`] = `
 {
   "sdks": [
     {
@@ -144,38 +195,17 @@ 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,
-}
-`;
-
-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,
+  "users": 5,
 }
 `;
 
-exports[`SDK reporting storage > Should update a connected sdk event and make it disconnected 1`] = `
+exports[`SDK reporting storage > Should update a connected connection report and make it disconnected 1`] = `
 [
   {
     "client_id": "client_three",
@@ -186,7 +216,7 @@ 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[`SDK reporting storage > Should update a connection report 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 - mongodb > compacting data - invalidate checkpoint 2`] = `
       "bucket": "mybucket[]",
       "data": [
         {
-          "checksum": -93886621n,
+          "checksum": -93886621,
           "op": "CLEAR",
           "op_id": "2",
         },
@@ -74,7 +74,7 @@ exports[`sync - mongodb > 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 - mongodb > compacting data - invalidate checkpoint 2`] = `
           "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
         },
         {
-          "checksum": 3028503153n,
+          "checksum": 3028503153,
           "data": "{"id":"t2","description":"Test 2b"}",
           "object_id": "t2",
           "object_type": "test",
@@ -203,6 +203,7 @@ exports[`sync - mongodb > sends checkpoint complete line for empty checkpoint 1`
       "next_after": "1",
     },
   },
+  null,
   {
     "checkpoint_complete": {
       "last_op_id": "1",
@@ -274,7 +275,7 @@ exports[`sync - mongodb > 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 - mongodb > 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 - mongodb > 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 - mongodb > sync global data 1`] = `
           "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
         },
         {
-          "checksum": 3280762209n,
+          "checksum": 3280762209,
           "data": "{"id":"t2","description":"Test 2"}",
           "object_id": "t2",
           "object_type": "test",
@@ -702,7 +703,7 @@ exports[`sync - mongodb > 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 - mongodb > 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 - mongodb > 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 - mongodb > 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}

@@ -68,6 +68,15 @@ describe('SDK reporting storage', async () => {
     jwt_exp: nowLess5minutes
   };
 
+  const user_old = {
+    user_id: 'user_one',
+    client_id: '',
+    connected_at: now,
+    sdk: 'unknown',
+    user_agent: 'Dart (flutter-web) Chrome/128 android',
+    jwt_exp: nowAdd5minutes
+  };
+
   const user_week = {
     user_id: 'user_week',
     client_id: 'client_week',
@@ -96,19 +105,20 @@ describe('SDK reporting storage', async () => {
   };
 
   async function loadData() {
-    await factory.db.sdk_report_events.insertMany([
+    await factory.db.connection_report_events.insertMany([
       user_one,
       user_two,
       user_three,
       user_four,
       user_week,
       user_month,
-      user_expired
+      user_expired,
+      user_old
     ]);
   }
 
   function deleteData() {
-    return factory.db.sdk_report_events.deleteMany();
+    return factory.db.connection_report_events.deleteMany();
   }
 
   beforeAll(async () => {
@@ -119,49 +129,25 @@ 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()
-      }
-    });
+    const current = await factory.getConnectedClients();
     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()
-      }
-    });
-    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
@@ -169,7 +155,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 report if its within a day', async () => {
     const newConnectAt = new Date(
       now.getFullYear(),
       now.getMonth(),
@@ -187,7 +173,9 @@ describe('SDK reporting storage', async () => {
       user_agent: user_one.user_agent
     });
 
-    const sdk = await factory.db.sdk_report_events.find({ user_id: user_one.user_id }).toArray();
+    const sdk = await factory.db.connection_report_events
+      .find({ user_id: user_one.user_id, client_id: user_one.client_id })
+      .toArray();
     expect(sdk).toHaveLength(1);
     expect(new Date(sdk[0].connected_at)).toEqual(newConnectAt);
     expect(new Date(sdk[0].jwt_exp!)).toEqual(jwtExp);
@@ -196,7 +184,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 connected connection report and make it disconnected', async () => {
     const disconnectAt = new Date(
       now.getFullYear(),
       now.getMonth(),
@@ -215,14 +203,14 @@ describe('SDK reporting storage', async () => {
       connected_at: user_three.connected_at
     });
 
-    const sdk = await factory.db.sdk_report_events.find({ user_id: user_three.user_id }).toArray();
+    const sdk = await factory.db.connection_report_events.find({ user_id: user_three.user_id }).toArray();
     expect(sdk).toHaveLength(1);
     expect(new Date(sdk[0].disconnected_at!)).toEqual(disconnectAt);
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
   });
 
-  it('Should create a sdk event if its after a day', async () => {
+  it('Should create a connection report 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);
 
@@ -235,7 +223,7 @@ describe('SDK reporting storage', async () => {
       user_agent: user_week.user_agent
     });
 
-    const sdk = await factory.db.sdk_report_events.find({ user_id: user_week.user_id }).toArray();
+    const sdk = await factory.db.connection_report_events.find({ user_id: user_week.user_id }).toArray();
     expect(sdk).toHaveLength(2);
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();

package/test/src/util.ts

@@ -1,14 +1,12 @@
 import { env } from './env.js';
+import { mongoTestReportStorageFactoryGenerator, mongoTestStorageFactoryGenerator } from '@module/utils/test-utils.js';
 
-import { MongoTestStorageFactoryGenerator } from '@module/storage/implementation/MongoTestStorageFactoryGenerator.js';
-import { MongoTestReportStorageFactoryGenerator } from '@module/storage/implementation/MongoTestReportStorageFactoryGenerator.js';
-
-export const INITIALIZED_MONGO_STORAGE_FACTORY = MongoTestStorageFactoryGenerator({
+export const INITIALIZED_MONGO_STORAGE_FACTORY = mongoTestStorageFactoryGenerator({
   url: env.MONGO_TEST_URL,
   isCI: env.CI
 });
 
-export const INITIALIZED_MONGO_REPORT_STORAGE_FACTORY = MongoTestReportStorageFactoryGenerator({
+export const INITIALIZED_MONGO_REPORT_STORAGE_FACTORY = mongoTestReportStorageFactoryGenerator({
   url: env.MONGO_TEST_URL,
   isCI: env.CI
 });