@powersync/service-module-mongodb-storage 0.0.0-dev-20250813080357 → 0.0.0-dev-20250818104041

package/src/storage/MongoReportStorage.ts

@@ -4,7 +4,7 @@ import { event_types } from '@powersync/service-types';
 import { PowerSyncMongo } from './implementation/db.js';
 import { logger } from '@powersync/lib-services-framework';
 
-export class MongoReportStorage implements storage.ReportStorageFactory {
+export class MongoReportStorage implements storage.ReportStorage {
   private readonly client: mongo.MongoClient;
   public readonly db: PowerSyncMongo;
 
@@ -12,6 +12,92 @@ export class MongoReportStorage implements storage.ReportStorageFactory {
     this.client = db.client;
     this.db = db;
   }
+  async deleteOldSdkData(data: event_types.DeleteOldSdkData): Promise<void> {
+    const { date } = data;
+    const result = await this.db.sdk_report_events.deleteMany({
+      connected_at: { $lt: date },
+      $or: [
+        { disconnected_at: { $exists: true } },
+        { jwt_exp: { $lt: new Date() }, disconnected_at: { $exists: false } }
+      ]
+    });
+    if (result.deletedCount > 0) {
+      logger.info(
+        `TTL from ${date.toISOString()}: ${result.deletedCount} MongoDB documents have been removed from sdk_report_events.`
+      );
+    }
+  }
+
+  async scrapeSdkData(data: event_types.ScrapeSdkDataRequest): Promise<event_types.SdkConnections> {
+    const { start, end } = data;
+    const result = await this.db.sdk_report_events
+      .aggregate<event_types.SdkConnections>([
+        {
+          $match: {
+            connected_at: { $lte: end, $gte: start }
+          }
+        },
+        this.sdkFacetPipeline(),
+        this.sdkProjectPipeline()
+      ])
+      .toArray();
+    return result[0];
+  }
+
+  async reportSdkConnect(data: event_types.SdkConnectBucketData): Promise<void> {
+    const updateFilter = this.updateDocFilter(data.user_id, data.client_id!);
+    await this.db.sdk_report_events.findOneAndUpdate(
+      updateFilter,
+      {
+        $set: data,
+        $unset: {
+          disconnected_at: ''
+        }
+      },
+      {
+        upsert: true
+      }
+    );
+  }
+  async reportSdkDisconnect(data: event_types.SdkDisconnectEventData): Promise<void> {
+    const { connected_at, user_id, client_id } = data;
+    await this.db.sdk_report_events.findOneAndUpdate(
+      {
+        client_id,
+        user_id,
+        connected_at
+      },
+      {
+        $set: {
+          disconnected_at: data.disconnected_at
+        },
+        $unset: {
+          jwt_exp: ''
+        }
+      }
+    );
+  }
+  async listCurrentConnections(data: event_types.ListCurrentConnectionsRequest): Promise<event_types.SdkConnections> {
+    const timeframeFilter = this.listConnectionsDateRange(data);
+    const result = await this.db.sdk_report_events
+      .aggregate<event_types.SdkConnections>([
+        {
+          $match: {
+            disconnected_at: { $exists: false },
+            jwt_exp: { $gt: new Date() },
+            ...timeframeFilter
+          }
+        },
+        this.sdkFacetPipeline(),
+        this.sdkProjectPipeline()
+      ])
+      .toArray();
+    return result[0];
+  }
+
+  async [Symbol.asyncDispose]() {
+    // No-op
+  }
 
   private parseJsDate(date: Date) {
     const year = date.getFullYear();
@@ -82,7 +168,7 @@ export class MongoReportStorage implements storage.ReportStorageFactory {
     return {
       user_id: userId,
       client_id: clientId,
-      connect_at: {
+      connected_at: {
         // Need to create a new date here to sett the time to 00:00:00
         $gte: new Date(year, month, today),
         $lt: new Date(year, month, nextDay)
@@ -98,96 +184,10 @@ export class MongoReportStorage implements storage.ReportStorageFactory {
     const endDate = data.range?.end ? new Date(data.range.end) : new Date();
     const startDate = new Date(range.start);
     return {
-      connect_at: {
+      connected_at: {
         $lte: endDate,
         $gte: startDate
       }
     };
   }
-
-  async deleteOldSdkData(data: event_types.DeleteOldSdkData): Promise<void> {
-    const { date } = data;
-    const result = await this.db.sdk_report_events.deleteMany({
-      connect_at: { $lt: date },
-      $or: [{ disconnect_at: { $exists: true } }, { jwt_exp: { $lt: new Date() }, disconnect_at: { $exists: false } }]
-    });
-    if (result.deletedCount > 0) {
-      logger.info(
-        `TTL from ${date.toISOString()}: ${result.deletedCount} MongoDB documents have been removed from sdk_report_events.`
-      );
-    }
-  }
-
-  async scrapeSdkData(data: event_types.ScrapeSdkDataRequest): Promise<event_types.ListCurrentConnections> {
-    const { start, end } = data;
-    const result = await this.db.sdk_report_events
-      .aggregate<event_types.ListCurrentConnections>([
-        {
-          $match: {
-            connect_at: { $lte: end, $gte: start }
-          }
-        },
-        this.sdkFacetPipeline(),
-        this.sdkProjectPipeline()
-      ])
-      .toArray();
-    return result[0];
-  }
-
-  async reportSdkConnect(data: event_types.SdkConnectBucketData): Promise<void> {
-    const updateFilter = this.updateDocFilter(data.user_id, data.client_id!);
-    await this.db.sdk_report_events.findOneAndUpdate(
-      updateFilter,
-      {
-        $set: data,
-        $unset: {
-          disconnect_at: ''
-        }
-      },
-      {
-        upsert: true
-      }
-    );
-  }
-  async reportSdkDisconnect(data: event_types.SdkDisconnectEventData): Promise<void> {
-    const { connect_at, user_id, client_id } = data;
-    await this.db.sdk_report_events.findOneAndUpdate(
-      {
-        client_id,
-        user_id,
-        connect_at
-      },
-      {
-        $set: {
-          disconnect_at: data.disconnect_at
-        },
-        $unset: {
-          jwt_exp: ''
-        }
-      }
-    );
-  }
-  async listCurrentConnections(
-    data: event_types.ListCurrentConnectionsRequest
-  ): Promise<event_types.ListCurrentConnections> {
-    const timeframeFilter = this.listConnectionsDateRange(data);
-    const result = await this.db.sdk_report_events
-      .aggregate<event_types.ListCurrentConnections>([
-        {
-          $match: {
-            disconnect_at: { $exists: false },
-            jwt_exp: { $gt: new Date() },
-            ...timeframeFilter
-          }
-        },
-        this.sdkFacetPipeline(),
-        this.sdkProjectPipeline()
-      ])
-      .toArray();
-    return result[0];
-  }
-
-  async [Symbol.asyncDispose]() {
-    // No-op
-  }
 }

package/src/storage/implementation/MongoBucketBatch.ts

@@ -807,7 +807,7 @@ export class MongoBucketBatch
   }
 
   async keepalive(lsn: string): Promise<boolean> {
-    if (this.last_checkpoint_lsn != null && lsn <= this.last_checkpoint_lsn) {
+    if (this.last_checkpoint_lsn != null && lsn < this.last_checkpoint_lsn) {
       // No-op
       return false;
     }

package/src/storage/implementation/MongoStorageProvider.ts

@@ -6,7 +6,7 @@ import { MongoBucketStorage } from '../MongoBucketStorage.js';
 import { PowerSyncMongo } from './db.js';
 import { MongoReportStorage } from '../MongoReportStorage.js';
 
-export class MongoStorageProvider implements storage.BucketStorageProvider {
+export class MongoStorageProvider implements storage.StorageProvider {
   get type() {
     return lib_mongo.MONGO_CONNECTION_TYPE;
   }

package/src/storage/implementation/db.ts

@@ -12,7 +12,7 @@ import {
   CustomWriteCheckpointDocument,
   IdSequenceDocument,
   InstanceDocument,
-  SdkConnectDocument,
+  SdkConnectEventDocument,
   SourceTableDocument,
   SyncRuleDocument,
   WriteCheckpointDocument
@@ -38,7 +38,7 @@ export class PowerSyncMongo {
   readonly locks: mongo.Collection<lib_mongo.locks.Lock>;
   readonly bucket_state: mongo.Collection<BucketStateDocument>;
   readonly checkpoint_events: mongo.Collection<CheckpointEventDocument>;
-  readonly sdk_report_events: mongo.Collection<SdkConnectDocument>;
+  readonly sdk_report_events: mongo.Collection<SdkConnectEventDocument>;
 
   readonly client: mongo.MongoClient;
   readonly db: mongo.Db;

package/src/storage/implementation/models.ts

@@ -221,4 +221,4 @@ export interface InstanceDocument {
   _id: string;
 }
 
-export interface SdkConnectDocument extends event_types.SdkConnectDocument {}
+export interface SdkConnectEventDocument extends event_types.SdkConnection {}

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

@@ -3,10 +3,10 @@ import { INITIALIZED_MONGO_REPORT_STORAGE_FACTORY } from './util.js';
 import { event_types } from '@powersync/service-types';
 
 function removeVolatileFields(
-  sdks: event_types.SdkConnectDocument[]
-): Partial<event_types.SdkConnectDocument & { _id: string }>[] {
-  return sdks.map((sdk: Partial<event_types.SdkConnectDocument & { _id: string }>) => {
-    const { _id, disconnect_at, connect_at, jwt_exp, ...rest } = sdk;
+  sdks: event_types.SdkConnection[]
+): Partial<event_types.SdkConnection & { _id: string }>[] {
+  return sdks.map((sdk: Partial<event_types.SdkConnection & { _id: string }>) => {
+    const { _id, disconnected_at, connected_at, jwt_exp, ...rest } = sdk;
     return {
       ...rest
     };
@@ -37,7 +37,7 @@ describe('SDK reporting storage', async () => {
   const user_one = {
     user_id: 'user_one',
     client_id: 'client_one',
-    connect_at: now,
+    connected_at: now,
     sdk: 'powersync-dart/1.6.4',
     user_agent: 'powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android',
     jwt_exp: nowAdd5minutes
@@ -45,7 +45,7 @@ describe('SDK reporting storage', async () => {
   const user_two = {
     user_id: 'user_two',
     client_id: 'client_two',
-    connect_at: nowLess5minutes,
+    connected_at: nowLess5minutes,
     sdk: 'powersync-js/1.21.1',
     user_agent: 'powersync-js/1.21.0 powersync-web Chromium/138 linux',
     jwt_exp: nowAdd5minutes
@@ -53,16 +53,16 @@ describe('SDK reporting storage', async () => {
   const user_three = {
     user_id: 'user_three',
     client_id: 'client_three',
-    connect_at: yesterday,
+    connected_at: yesterday,
     sdk: 'powersync-js/1.21.2',
     user_agent: 'powersync-js/1.21.0 powersync-web Firefox/141 linux',
-    disconnect_at: yesterday
+    disconnected_at: yesterday
   };
 
   const user_four = {
     user_id: 'user_four',
     client_id: 'client_four',
-    connect_at: now,
+    connected_at: now,
     sdk: 'powersync-js/1.21.4',
     user_agent: 'powersync-js/1.21.0 powersync-web Firefox/141 linux',
     jwt_exp: nowLess5minutes
@@ -71,25 +71,25 @@ describe('SDK reporting storage', async () => {
   const user_week = {
     user_id: 'user_week',
     client_id: 'client_week',
-    connect_at: weekAgo,
+    connected_at: weekAgo,
     sdk: 'powersync-js/1.24.5',
     user_agent: 'powersync-js/1.21.0 powersync-web Firefox/141 linux',
-    disconnect_at: weekAgo
+    disconnected_at: weekAgo
   };
 
   const user_month = {
     user_id: 'user_month',
     client_id: 'client_month',
-    connect_at: monthAgo,
+    connected_at: monthAgo,
     sdk: 'powersync-js/1.23.6',
     user_agent: 'powersync-js/1.23.0 powersync-web Firefox/141 linux',
-    disconnect_at: monthAgo
+    disconnected_at: monthAgo
   };
 
   const user_expired = {
     user_id: 'user_expired',
     client_id: 'client_expired',
-    connect_at: monthAgo,
+    connected_at: monthAgo,
     sdk: 'powersync-js/1.23.7',
     user_agent: 'powersync-js/1.23.0 powersync-web Firefox/141 linux',
     jwt_exp: monthAgo
@@ -180,7 +180,7 @@ describe('SDK reporting storage', async () => {
     const jwtExp = new Date(newConnectAt.getFullYear(), newConnectAt.getMonth(), newConnectAt.getDate() + 1);
     await factory.reportSdkConnect({
       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,
@@ -189,9 +189,9 @@ describe('SDK reporting storage', async () => {
 
     const sdk = await factory.db.sdk_report_events.find({ user_id: user_one.user_id }).toArray();
     expect(sdk).toHaveLength(1);
-    expect(new Date(sdk[0].connect_at)).toEqual(newConnectAt);
+    expect(new Date(sdk[0].connected_at)).toEqual(newConnectAt);
     expect(new Date(sdk[0].jwt_exp!)).toEqual(jwtExp);
-    expect(sdk[0].disconnect_at).toBeUndefined();
+    expect(sdk[0].disconnected_at).toBeUndefined();
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
   });
@@ -207,17 +207,17 @@ describe('SDK reporting storage', async () => {
     const jwtExp = new Date(disconnectAt.getFullYear(), disconnectAt.getMonth(), disconnectAt.getDate() + 1);
 
     await factory.reportSdkDisconnect({
-      disconnect_at: disconnectAt,
+      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: user_three.connect_at
+      connected_at: user_three.connected_at
     });
 
     const sdk = await factory.db.sdk_report_events.find({ user_id: user_three.user_id }).toArray();
     expect(sdk).toHaveLength(1);
-    expect(new Date(sdk[0].disconnect_at!)).toEqual(disconnectAt);
+    expect(new Date(sdk[0].disconnected_at!)).toEqual(disconnectAt);
     const cleaned = removeVolatileFields(sdk);
     expect(cleaned).toMatchSnapshot();
   });
@@ -228,7 +228,7 @@ describe('SDK reporting storage', async () => {
 
     await factory.reportSdkConnect({
       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,