@powersync/service-core 1.7.0 → 1.7.2

package/src/storage/bson.ts

@@ -14,11 +14,10 @@ export const BSON_DESERIALIZE_INTERNAL_OPTIONS: bson.DeserializeOptions = {
 };
 
 /**
- * Use for data from external sources.
+ * Use for data from external sources, which could contain arbitrary fields.
  */
 export const BSON_DESERIALIZE_DATA_OPTIONS: bson.DeserializeOptions = {
-  // Temporarily disable due to https://jira.mongodb.org/browse/NODE-6764
-  useBigInt64: false
+  useBigInt64: true
 };
 
 /**
@@ -67,16 +66,11 @@ export const deserializeReplicaId = (id: Buffer): ReplicaId => {
   return deserialized.id;
 };
 
+/**
+ * Deserialize BSON - can be used for BSON containing arbitrary user data.
+ */
 export const deserializeBson = (buffer: Uint8Array): bson.Document => {
-  const doc = bson.deserialize(buffer, BSON_DESERIALIZE_DATA_OPTIONS);
-  // Temporary workaround due to https://jira.mongodb.org/browse/NODE-6764
-  for (let key in doc) {
-    const value = doc[key];
-    if (value instanceof bson.Long) {
-      doc[key] = value.toBigInt();
-    }
-  }
-  return doc;
+  return bson.deserialize(buffer, BSON_DESERIALIZE_DATA_OPTIONS);
 };
 
 export const serializeBson = (document: any): NodeBuffer => {

package/src/sync/sync.ts

@@ -155,6 +155,15 @@ async function* streamResponseInner(
       bucketsByPriority.sort((a, b) => a[0] - b[0]); // Sort from high to lower priorities
       const lowestPriority = bucketsByPriority.at(-1)?.[0];
 
+      // Ensure that we have at least one priority batch: After sending the checkpoint line, clients expect to
+      // receive a sync complete message after the synchronization is done (which happens in the last
+      // bucketDataInBatches iteration). Without any batch, the line is missing and clients might not complete their
+      // sync properly.
+      const priorityBatches: [BucketPriority | null, BucketDescription[]][] = bucketsByPriority;
+      if (priorityBatches.length == 0) {
+        priorityBatches.push([null, []]);
+      }
+
       function maybeRaceForNewCheckpoint() {
         if (syncedOperations >= 1000 && nextCheckpointPromise === undefined) {
           nextCheckpointPromise = (async () => {
@@ -179,7 +188,7 @@ async function* streamResponseInner(
 
       // This incrementally updates dataBuckets with each individual bucket position.
       // At the end of this, we can be sure that all buckets have data up to the checkpoint.
-      for (const [priority, buckets] of bucketsByPriority) {
+      for (const [priority, buckets] of priorityBatches) {
         const isLast = priority === lowestPriority;
         if (abortCheckpointSignal.aborted) {
           break;
@@ -196,9 +205,9 @@ async function* streamResponseInner(
           abort_connection: signal,
           abort_batch: abortCheckpointSignal,
           user_id: syncParams.user_id,
-          // Passing undefined will emit a full sync complete message at the end. If we pass a priority, we'll emit a partial
-          // sync complete message.
-          forPriority: !isLast ? priority : undefined
+          // Passing null here will emit a full sync complete message at the end. If we pass a priority, we'll emit a partial
+          // sync complete message instead.
+          forPriority: !isLast ? priority : null
         });
       }
 
@@ -227,7 +236,7 @@ interface BucketDataRequest {
    */
   abort_batch: AbortSignal;
   user_id?: string;
-  forPriority?: BucketPriority;
+  forPriority: BucketPriority | null;
   onRowsSent: (amount: number) => void;
 }
 
@@ -372,7 +381,7 @@ async function* bucketDataBatch(request: BucketDataRequest): AsyncGenerator<Buck
         // More data should be available immediately for a new checkpoint.
         yield { data: null, done: true };
       } else {
-        if (request.forPriority !== undefined) {
+        if (request.forPriority != null) {
           const line: util.StreamingSyncCheckpointPartiallyComplete = {
             partial_checkpoint_complete: {
               last_op_id: checkpoint,