@powersync/service-module-mongodb-storage 0.0.0-dev-20250820110726 → 0.0.0-dev-20250825132649

package/dist/utils/test-utils.js

@@ -0,0 +1,40 @@
+import { mongo } from '@powersync/lib-service-mongodb';
+import { PowerSyncMongo } from '../storage/implementation/db.js';
+import { MongoReportStorage } from '../storage/MongoReportStorage.js';
+import { MongoBucketStorage } from '../storage/MongoBucketStorage.js';
+export function mongoTestStorageFactoryGenerator(factoryOptions) {
+    return async (options) => {
+        const db = connectMongoForTests(factoryOptions.url, factoryOptions.isCI);
+        // None of the tests insert data into this collection, so it was never created
+        if (!(await db.db.listCollections({ name: db.bucket_parameters.collectionName }).hasNext())) {
+            await db.db.createCollection('bucket_parameters');
+        }
+        // Full migrations are not currently run for tests, so we manually create this
+        await db.createCheckpointEventsCollection();
+        if (!options?.doNotClear) {
+            await db.clear();
+        }
+        return new MongoBucketStorage(db, { slot_name_prefix: 'test_' });
+    };
+}
+export function mongoTestReportStorageFactoryGenerator(factoryOptions) {
+    return async (options) => {
+        const db = connectMongoForTests(factoryOptions.url, factoryOptions.isCI);
+        await db.createConnectionReportingCollection();
+        if (!options?.doNotClear) {
+            await db.clear();
+        }
+        return new MongoReportStorage(db);
+    };
+}
+export const connectMongoForTests = (url, isCI) => {
+    // Short timeout for tests, to fail fast when the server is not available.
+    // Slightly longer timeouts for CI, to avoid arbitrary test failures
+    const client = new mongo.MongoClient(url, {
+        connectTimeoutMS: isCI ? 15_000 : 5_000,
+        socketTimeoutMS: isCI ? 15_000 : 5_000,
+        serverSelectionTimeoutMS: isCI ? 15_000 : 2_500
+    });
+    return new PowerSyncMongo(client);
+};
+//# sourceMappingURL=test-utils.js.map

package/dist/utils/test-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../src/utils/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAOtE,MAAM,UAAU,gCAAgC,CAAC,cAAuC;IACtF,OAAO,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC5C,MAAM,EAAE,GAAG,oBAAoB,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;QAEzE,8EAA8E;QAC9E,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC5F,MAAM,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QACpD,CAAC;QAED,8EAA8E;QAC9E,MAAM,EAAE,CAAC,gCAAgC,EAAE,CAAC;QAE5C,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;YACzB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,kBAAkB,CAAC,EAAE,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,cAAuC;IAC5F,OAAO,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC5C,MAAM,EAAE,GAAG,oBAAoB,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;QAEzE,MAAM,EAAE,CAAC,mCAAmC,EAAE,CAAC;QAE/C,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;YACzB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAW,EAAE,IAAa,EAAE,EAAE;IACjE,0EAA0E;IAC1E,oEAAoE;IACpE,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACxC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;QACvC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;QACtC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;KAChD,CAAC,CAAC;IACH,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC"}

package/dist/{storage/implementation → utils}/util.d.ts

@@ -1,8 +1,7 @@
 import * as bson from 'bson';
 import { mongo } from '@powersync/lib-service-mongodb';
 import { storage, utils } from '@powersync/service-core';
-import { PowerSyncMongo } from './db.js';
-import { BucketDataDocument } from './models.js';
+import { BucketDataDocument } from '../storage/implementation/models.js';
 export declare function idPrefixFilter<T>(prefix: Partial<T>, rest: (keyof T)[]): mongo.Condition<T>;
 export declare function generateSlotName(prefix: string, sync_rules_id: number): string;
 /**
@@ -22,8 +21,4 @@ export declare function readSingleBatch<T>(cursor: mongo.FindCursor<T>): Promise
 }>;
 export declare function mapOpEntry(row: BucketDataDocument): utils.OplogEntry;
 export declare function replicaIdToSubkey(table: bson.ObjectId, id: storage.ReplicaId): string;
-/**
- * Helper for unit tests
- */
-export declare const connectMongoForTests: (url: string, isCI: boolean) => PowerSyncMongo;
 export declare function setSessionSnapshotTime(session: mongo.ClientSession, time: bson.Timestamp): void;

package/dist/{storage/implementation → utils}/util.js

@@ -1,9 +1,7 @@
 import * as bson from 'bson';
 import * as crypto from 'crypto';
 import * as uuid from 'uuid';
-import { mongo } from '@powersync/lib-service-mongodb';
 import { storage, utils } from '@powersync/service-core';
-import { PowerSyncMongo } from './db.js';
 import { ServiceAssertionError } from '@powersync/lib-services-framework';
 export function idPrefixFilter(prefix, rest) {
     let filter = {
@@ -96,19 +94,6 @@ export function replicaIdToSubkey(table, id) {
         return uuid.v5(repr, utils.ID_NAMESPACE);
     }
 }
-/**
- * Helper for unit tests
- */
-export const connectMongoForTests = (url, isCI) => {
-    // Short timeout for tests, to fail fast when the server is not available.
-    // Slightly longer timeouts for CI, to avoid arbitrary test failures
-    const client = new mongo.MongoClient(url, {
-        connectTimeoutMS: isCI ? 15_000 : 5_000,
-        socketTimeoutMS: isCI ? 15_000 : 5_000,
-        serverSelectionTimeoutMS: isCI ? 15_000 : 2_500
-    });
-    return new PowerSyncMongo(client);
-};
 export function setSessionSnapshotTime(session, time) {
     // This is a workaround for the lack of direct support for snapshot reads in the MongoDB driver.
     if (!session.snapshotEnabled) {

package/dist/utils/util.js.map

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

package/dist/utils/utils-index.d.ts

@@ -0,0 +1,2 @@
+export * as test_utils from './test-utils.js';
+export * from './util.js';

package/dist/utils/utils-index.js

@@ -0,0 +1,3 @@
+export * as test_utils from './test-utils.js';
+export * from './util.js';
+//# sourceMappingURL=utils-index.js.map

package/dist/utils/utils-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils-index.js","sourceRoot":"","sources":["../../src/utils/utils-index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,cAAc,WAAW,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@powersync/service-module-mongodb-storage",
   "repository": "https://github.com/powersync-ja/powersync-service",
   "types": "dist/index.d.ts",
-  "version": "0.0.0-dev-20250820110726",
+  "version": "0.0.0-dev-20250825132649",
   "main": "dist/index.js",
   "license": "FSL-1.1-ALv2",
   "type": "module",
@@ -27,15 +27,15 @@
     "lru-cache": "^10.2.2",
     "ts-codec": "^1.3.0",
     "uuid": "^11.1.0",
-    "@powersync/lib-service-mongodb": "0.0.0-dev-20250820110726",
-    "@powersync/lib-services-framework": "0.0.0-dev-20250820110726",
-    "@powersync/service-core": "0.0.0-dev-20250820110726",
-    "@powersync/service-types": "0.0.0-dev-20250820110726",
-    "@powersync/service-jsonbig": "0.0.0-dev-20250820110726",
-    "@powersync/service-sync-rules": "0.0.0-dev-20250820110726"
+    "@powersync/lib-service-mongodb": "0.0.0-dev-20250825132649",
+    "@powersync/lib-services-framework": "0.0.0-dev-20250825132649",
+    "@powersync/service-core": "0.0.0-dev-20250825132649",
+    "@powersync/service-types": "0.0.0-dev-20250825132649",
+    "@powersync/service-jsonbig": "0.0.0-dev-20250825132649",
+    "@powersync/service-sync-rules": "0.0.0-dev-20250825132649"
   },
   "devDependencies": {
-    "@powersync/service-core-tests": "0.0.0-dev-20250820110726"
+    "@powersync/service-core-tests": "0.0.0-dev-20250825132649"
   },
   "scripts": {
     "build": "tsc -b",

package/src/index.ts

@@ -5,3 +5,4 @@ export * as storage from './storage/storage-index.js';
 
 export * from './types/types.js';
 export * as types from './types/types.js';
+export * as utils from './utils/utils-index.js';

package/src/migrations/db/migrations/1752661449910-connection-reporting.ts

@@ -51,18 +51,6 @@ export const down: migrations.PowerSyncMigrationFunction = async (context) => {
   const db = storage.createPowerSyncMongo(configuration.storage as MongoStorageConfig);
 
   try {
-    if (await db.connection_report_events.indexExists('connection_list_index')) {
-      await db.connection_report_events.dropIndex('connection_list_index');
-    }
-    if (await db.connection_report_events.indexExists('connection_user_id_index')) {
-      await db.connection_report_events.dropIndex('connection_user_id_index');
-    }
-    if (await db.connection_report_events.indexExists('connection_client_id_index')) {
-      await db.connection_report_events.dropIndex('connection_client_id_index');
-    }
-    if (await db.connection_report_events.indexExists('connection_index')) {
-      await db.connection_report_events.dropIndex('connection_index');
-    }
     await db.db.dropCollection('connection_report_events');
   } finally {
     await db.client.close();

package/src/storage/MongoBucketStorage.ts

@@ -12,7 +12,7 @@ import { PowerSyncMongo } from './implementation/db.js';
 import { SyncRuleDocument } from './implementation/models.js';
 import { MongoPersistedSyncRulesContent } from './implementation/MongoPersistedSyncRulesContent.js';
 import { MongoSyncBucketStorage } from './implementation/MongoSyncBucketStorage.js';
-import { generateSlotName } from './implementation/util.js';
+import { generateSlotName } from '../utils/util.js';
 
 export class MongoBucketStorage
   extends BaseObserver<storage.BucketStorageFactoryListener>

package/src/storage/MongoReportStorage.ts

@@ -30,10 +30,10 @@ export class MongoReportStorage implements storage.ReportStorage {
 
   async getClientConnectionReports(
     data: event_types.ClientConnectionReportRequest
-  ): Promise<event_types.ClientConnectionReport> {
+  ): Promise<event_types.ClientConnectionReportResponse> {
     const { start, end } = data;
     const result = await this.db.connection_report_events
-      .aggregate<event_types.ClientConnectionReport>([
+      .aggregate<event_types.ClientConnectionReportResponse>([
         {
           $match: {
             connected_at: { $lte: end, $gte: start }
@@ -79,15 +79,13 @@ export class MongoReportStorage implements storage.ReportStorage {
       }
     );
   }
-  async getConnectedClients(data: event_types.ClientConnectionsRequest): Promise<event_types.ClientConnectionReport> {
-    const timeframeFilter = this.listConnectionsDateRange(data);
+  async getConnectedClients(): Promise<event_types.ClientConnectionReportResponse> {
     const result = await this.db.connection_report_events
-      .aggregate<event_types.ClientConnectionReport>([
+      .aggregate<event_types.ClientConnectionReportResponse>([
         {
           $match: {
             disconnected_at: { $exists: false },
-            jwt_exp: { $gt: new Date() },
-            ...timeframeFilter
+            jwt_exp: { $gt: new Date() }
           }
         },
         this.connectionsFacetPipeline(),
@@ -177,19 +175,4 @@ export class MongoReportStorage implements storage.ReportStorage {
       }
     };
   }
-
-  private listConnectionsDateRange(data: event_types.ClientConnectionsRequest) {
-    const { range } = data;
-    if (!range) {
-      return undefined;
-    }
-    const endDate = data.range?.end ? new Date(data.range.end) : new Date();
-    const startDate = new Date(range.start);
-    return {
-      connected_at: {
-        $lte: endDate,
-        $gte: startDate
-      }
-    };
-  }
 }

package/src/storage/implementation/MongoBucketBatch.ts

@@ -28,7 +28,7 @@ import { MongoIdSequence } from './MongoIdSequence.js';
 import { batchCreateCustomWriteCheckpoints } from './MongoWriteCheckpointAPI.js';
 import { cacheKey, OperationBatch, RecordOperation } from './OperationBatch.js';
 import { PersistedBatch } from './PersistedBatch.js';
-import { idPrefixFilter } from './util.js';
+import { idPrefixFilter } from '../../utils/util.js';
 
 /**
  * 15MB

package/src/storage/implementation/MongoSyncBucketStorage.ts

@@ -32,7 +32,7 @@ import { BucketDataDocument, BucketDataKey, BucketStateDocument, SourceKey, Sour
 import { MongoBucketBatch } from './MongoBucketBatch.js';
 import { MongoCompactor } from './MongoCompactor.js';
 import { MongoWriteCheckpointAPI } from './MongoWriteCheckpointAPI.js';
-import { idPrefixFilter, mapOpEntry, readSingleBatch, setSessionSnapshotTime } from './util.js';
+import { idPrefixFilter, mapOpEntry, readSingleBatch, setSessionSnapshotTime } from '../../utils/util.js';
 import { MongoParameterCompactor } from './MongoParameterCompactor.js';
 
 export class MongoSyncBucketStorage

package/src/storage/implementation/PersistedBatch.ts

@@ -16,7 +16,7 @@ import {
   CurrentDataDocument,
   SourceKey
 } from './models.js';
-import { replicaIdToSubkey } from './util.js';
+import { replicaIdToSubkey } from '../../utils/util.js';
 
 /**
  * Maximum size of operations we write in a single transaction.

package/src/storage/storage-index.ts

@@ -7,9 +7,9 @@ export * from './implementation/MongoPersistedSyncRulesContent.js';
 export * from './implementation/MongoStorageProvider.js';
 export * from './implementation/MongoSyncBucketStorage.js';
 export * from './implementation/MongoSyncRulesLock.js';
-export * from './implementation/MongoTestStorageFactoryGenerator.js';
 export * from './implementation/OperationBatch.js';
 export * from './implementation/PersistedBatch.js';
-export * from './implementation/util.js';
+export * from '../utils/util.js';
 export * from './MongoBucketStorage.js';
 export * from './MongoReportStorage.js';
+export * as test_utils from '../utils/test-utils.js';

package/src/utils/test-utils.ts

@@ -0,0 +1,55 @@
+import { mongo } from '@powersync/lib-service-mongodb';
+import { PowerSyncMongo } from '../storage/implementation/db.js';
+import { TestStorageOptions } from '@powersync/service-core';
+import { MongoReportStorage } from '../storage/MongoReportStorage.js';
+import { MongoBucketStorage } from '../storage/MongoBucketStorage.js';
+
+export type MongoTestStorageOptions = {
+  url: string;
+  isCI: boolean;
+};
+
+export function mongoTestStorageFactoryGenerator(factoryOptions: MongoTestStorageOptions) {
+  return async (options?: TestStorageOptions) => {
+    const db = connectMongoForTests(factoryOptions.url, factoryOptions.isCI);
+
+    // None of the tests insert data into this collection, so it was never created
+    if (!(await db.db.listCollections({ name: db.bucket_parameters.collectionName }).hasNext())) {
+      await db.db.createCollection('bucket_parameters');
+    }
+
+    // Full migrations are not currently run for tests, so we manually create this
+    await db.createCheckpointEventsCollection();
+
+    if (!options?.doNotClear) {
+      await db.clear();
+    }
+
+    return new MongoBucketStorage(db, { slot_name_prefix: 'test_' });
+  };
+}
+
+export function mongoTestReportStorageFactoryGenerator(factoryOptions: MongoTestStorageOptions) {
+  return async (options?: TestStorageOptions) => {
+    const db = connectMongoForTests(factoryOptions.url, factoryOptions.isCI);
+
+    await db.createConnectionReportingCollection();
+
+    if (!options?.doNotClear) {
+      await db.clear();
+    }
+
+    return new MongoReportStorage(db);
+  };
+}
+
+export const connectMongoForTests = (url: string, isCI: boolean) => {
+  // Short timeout for tests, to fail fast when the server is not available.
+  // Slightly longer timeouts for CI, to avoid arbitrary test failures
+  const client = new mongo.MongoClient(url, {
+    connectTimeoutMS: isCI ? 15_000 : 5_000,
+    socketTimeoutMS: isCI ? 15_000 : 5_000,
+    serverSelectionTimeoutMS: isCI ? 15_000 : 2_500
+  });
+  return new PowerSyncMongo(client);
+};

package/src/{storage/implementation → utils}/util.ts

@@ -3,9 +3,7 @@ import * as crypto from 'crypto';
 import * as uuid from 'uuid';
 import { mongo } from '@powersync/lib-service-mongodb';
 import { storage, utils } from '@powersync/service-core';
-
-import { PowerSyncMongo } from './db.js';
-import { BucketDataDocument } from './models.js';
+import { BucketDataDocument } from '../storage/implementation/models.js';
 import { ServiceAssertionError } from '@powersync/lib-services-framework';
 
 export function idPrefixFilter<T>(prefix: Partial<T>, rest: (keyof T)[]): mongo.Condition<T> {
@@ -104,20 +102,6 @@ export function replicaIdToSubkey(table: bson.ObjectId, id: storage.ReplicaId):
   }
 }
 
-/**
- * Helper for unit tests
- */
-export const connectMongoForTests = (url: string, isCI: boolean) => {
-  // Short timeout for tests, to fail fast when the server is not available.
-  // Slightly longer timeouts for CI, to avoid arbitrary test failures
-  const client = new mongo.MongoClient(url, {
-    connectTimeoutMS: isCI ? 15_000 : 5_000,
-    socketTimeoutMS: isCI ? 15_000 : 5_000,
-    serverSelectionTimeoutMS: isCI ? 15_000 : 2_500
-  });
-  return new PowerSyncMongo(client);
-};
-
 export function setSessionSnapshotTime(session: mongo.ClientSession, time: bson.Timestamp) {
   // This is a workaround for the lack of direct support for snapshot reads in the MongoDB driver.
   if (!session.snapshotEnabled) {

package/src/utils/utils-index.ts

@@ -0,0 +1,2 @@
+export * as test_utils from './test-utils.js';
+export * from './util.js';

package/test/src/__snapshots__/connection-report-storage.test.ts.snap

@@ -45,6 +45,11 @@ 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,
 }
@@ -58,8 +63,18 @@ exports[`SDK reporting storage > Should show connected users with start range 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": 1,
+  "users": 2,
 }
 `;
 
@@ -94,6 +109,11 @@ exports[`SDK reporting storage > Should show connection report data for user ove
       "sdk": "powersync-js/1.21.4",
       "users": 1,
     },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
   ],
   "users": 3,
 }
@@ -137,6 +157,11 @@ exports[`SDK reporting storage > Should show connection report data for user ove
       "sdk": "powersync-js/1.24.5",
       "users": 1,
     },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
   ],
   "users": 7,
 }
@@ -170,6 +195,11 @@ exports[`SDK reporting storage > Should show connection report data for user ove
       "sdk": "powersync-js/1.24.5",
       "users": 1,
     },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
   ],
   "users": 5,
 }

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/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',
@@ -103,7 +112,8 @@ describe('SDK reporting storage', async () => {
       user_four,
       user_week,
       user_month,
-      user_expired
+      user_expired,
+      user_old
     ]);
   }
 
@@ -119,34 +129,10 @@ 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 connection report data for user over the past month', async () => {
     const sdk = await factory.getClientConnectionReports({
       start: monthAgo,
@@ -187,7 +173,9 @@ describe('SDK reporting storage', async () => {
       user_agent: user_one.user_agent
     });
 
-    const sdk = await factory.db.connection_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);

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
 });