@powersync/service-module-mongodb-storage 0.1.0 → 0.2.0

package/src/migrations/mongo-migration-store.ts

@@ -1,12 +1,13 @@
+import { mongo } from '@powersync/lib-service-mongodb';
 import { migrations } from '@powersync/lib-services-framework';
-import { Db } from 'mongodb';
+
 import * as path from 'path';
 
 /**
  * A custom store for node-migrate which is used to save and load migrations that have
  * been operated on to mongo.
  */
-export const createMongoMigrationStore = (db: Db): migrations.MigrationStore => {
+export const createMongoMigrationStore = (db: mongo.Db): migrations.MigrationStore => {
   const collection = db.collection<migrations.MigrationState>('migrations');
 
   return {

package/src/storage/MongoBucketStorage.ts

@@ -1,7 +1,6 @@
 import { SqlSyncRules } from '@powersync/service-sync-rules';
 import { wrapWithAbort } from 'ix/asynciterable/operators/withabort.js';
 import { LRUCache } from 'lru-cache/min';
-import * as mongo from 'mongodb';
 import * as timers from 'timers/promises';
 
 import { storage, sync, utils } from '@powersync/service-core';
@@ -10,6 +9,8 @@ import { DisposableObserver, logger } from '@powersync/lib-services-framework';
 import { v4 as uuid } from 'uuid';
 
 import * as lib_mongo from '@powersync/lib-service-mongodb';
+import { mongo } from '@powersync/lib-service-mongodb';
+
 import { PowerSyncMongo } from './implementation/db.js';
 import { SyncRuleDocument } from './implementation/models.js';
 import { MongoPersistedSyncRulesContent } from './implementation/MongoPersistedSyncRulesContent.js';
@@ -285,7 +286,7 @@ export class MongoBucketStorage
 
   async getStorageMetrics(): Promise<storage.StorageMetrics> {
     const ignoreNotExiting = (e: unknown) => {
-      if (e instanceof mongo.MongoServerError && e.codeName == 'NamespaceNotFound') {
+      if (lib_mongo.isMongoServerError(e) && e.codeName == 'NamespaceNotFound') {
         // Collection doesn't exist - return 0
         return [{ storageStats: { size: 0 } }];
       } else {

package/src/storage/implementation/MongoBucketBatch.ts

@@ -1,6 +1,6 @@
+import { mongo } from '@powersync/lib-service-mongodb';
 import { SqlEventDescriptor, SqliteRow, SqlSyncRules } from '@powersync/service-sync-rules';
 import * as bson from 'bson';
-import * as mongo from 'mongodb';
 
 import { container, DisposableObserver, errors, logger } from '@powersync/lib-services-framework';
 import { SaveOperationTag, storage, utils } from '@powersync/service-core';

package/src/storage/implementation/MongoCompactor.ts

@@ -1,6 +1,7 @@
+import { mongo } from '@powersync/lib-service-mongodb';
 import { logger } from '@powersync/lib-services-framework';
 import { storage, utils } from '@powersync/service-core';
-import { AnyBulkWriteOperation, MaxKey, MinKey } from 'mongodb';
+
 import { PowerSyncMongo } from './db.js';
 import { BucketDataDocument, BucketDataKey } from './models.js';
 import { cacheKey } from './OperationBatch.js';
@@ -49,7 +50,7 @@ const DEFAULT_MOVE_BATCH_QUERY_LIMIT = 10_000;
 const DEFAULT_MEMORY_LIMIT_MB = 64;
 
 export class MongoCompactor {
-  private updates: AnyBulkWriteOperation<BucketDataDocument>[] = [];
+  private updates: mongo.AnyBulkWriteOperation<BucketDataDocument>[] = [];
 
   private idLimitBytes: number;
   private moveBatchLimit: number;
@@ -94,12 +95,12 @@ export class MongoCompactor {
 
     let currentState: CurrentBucketState | null = null;
 
-    let bucketLower: string | MinKey;
-    let bucketUpper: string | MaxKey;
+    let bucketLower: string | mongo.MinKey;
+    let bucketUpper: string | mongo.MaxKey;
 
     if (bucket == null) {
-      bucketLower = new MinKey();
-      bucketUpper = new MaxKey();
+      bucketLower = new mongo.MinKey();
+      bucketUpper = new mongo.MaxKey();
     } else if (bucket.includes('[')) {
       // Exact bucket name
       bucketLower = bucket;
@@ -114,14 +115,14 @@ export class MongoCompactor {
     const lowerBound: BucketDataKey = {
       g: this.group_id,
       b: bucketLower as string,
-      o: new MinKey() as any
+      o: new mongo.MinKey() as any
     };
 
     // Upper bound is adjusted for each batch
     let upperBound: BucketDataKey = {
       g: this.group_id,
       b: bucketUpper as string,
-      o: new MaxKey() as any
+      o: new mongo.MaxKey() as any
     };
 
     while (true) {
@@ -287,7 +288,7 @@ export class MongoCompactor {
         $gte: {
           g: this.group_id,
           b: bucket,
-          o: new MinKey() as any
+          o: new mongo.MinKey() as any
         },
         $lte: {
           g: this.group_id,
@@ -349,7 +350,7 @@ export class MongoCompactor {
                   $gte: {
                     g: this.group_id,
                     b: bucket,
-                    o: new MinKey() as any
+                    o: new mongo.MinKey() as any
                   },
                   $lte: lastOpId!
                 }

package/src/storage/implementation/MongoPersistedSyncRulesContent.ts

@@ -1,6 +1,6 @@
+import { mongo } from '@powersync/lib-service-mongodb';
 import { storage } from '@powersync/service-core';
 import { SqlSyncRules } from '@powersync/service-sync-rules';
-import * as mongo from 'mongodb';
 import { MongoPersistedSyncRules } from './MongoPersistedSyncRules.js';
 import { MongoSyncRulesLock } from './MongoSyncRulesLock.js';
 import { PowerSyncMongo } from './db.js';

package/src/storage/implementation/MongoSyncBucketStorage.ts

@@ -1,10 +1,9 @@
-import { SqliteJsonRow, SqliteJsonValue, SqlSyncRules } from '@powersync/service-sync-rules';
-import * as bson from 'bson';
-import * as mongo from 'mongodb';
-
 import * as lib_mongo from '@powersync/lib-service-mongodb';
+import { mongo } from '@powersync/lib-service-mongodb';
 import { DisposableObserver, logger } from '@powersync/lib-services-framework';
 import { storage, utils } from '@powersync/service-core';
+import { SqliteJsonRow, SqliteJsonValue, SqlSyncRules } from '@powersync/service-sync-rules';
+import * as bson from 'bson';
 import * as timers from 'timers/promises';
 import { MongoBucketStorage } from '../MongoBucketStorage.js';
 import { PowerSyncMongo } from './db.js';
@@ -498,7 +497,7 @@ export class MongoSyncBucketStorage
         logger.info(`${this.slot_name} Done clearing data`);
         return;
       } catch (e: unknown) {
-        if (e instanceof mongo.MongoServerError && e.codeName == 'MaxTimeMSExpired') {
+        if (lib_mongo.isMongoServerError(e) && e.codeName == 'MaxTimeMSExpired') {
           logger.info(
             `${this.slot_name} Cleared batch of data in ${lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS}ms, continuing...`
           );

package/src/storage/implementation/PersistedBatch.ts

@@ -1,7 +1,7 @@
+import { mongo } from '@powersync/lib-service-mongodb';
 import { JSONBig } from '@powersync/service-jsonbig';
 import { EvaluatedParameters, EvaluatedRow } from '@powersync/service-sync-rules';
 import * as bson from 'bson';
-import * as mongo from 'mongodb';
 
 import { logger } from '@powersync/lib-services-framework';
 import { storage, utils } from '@powersync/service-core';

package/src/storage/implementation/db.ts

@@ -1,6 +1,6 @@
 import * as lib_mongo from '@powersync/lib-service-mongodb';
+import { mongo } from '@powersync/lib-service-mongodb';
 import { storage } from '@powersync/service-core';
-import * as mongo from 'mongodb';
 
 import { MongoStorageConfig } from '../../types/types.js';
 import {

package/src/storage/implementation/util.ts

@@ -1,8 +1,10 @@
-import { storage, utils } from '@powersync/service-core';
 import * as bson from 'bson';
 import * as crypto from 'crypto';
-import * as mongo from 'mongodb';
 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';