Review feedback

Author: simolus3

packages/common/src/client/AbstractPowerSyncDatabase.ts

@@ -146,6 +146,11 @@ export const isPowerSyncDatabaseOptionsWithSettings = (test: any): test is Power
   return typeof test == 'object' && isSQLOpenOptions(test.database);
 };
 
+/**
+ * The priority used by the core extension to indicate that a full sync was completed.
+ */
+const fullSyncPriority = 2147483647;
+
 export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDBListener> {
   /**
    * Transactions should be queued in the DBAdapter, but we also want to prevent
@@ -347,27 +352,30 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
       'SELECT priority, last_synced_at FROM ps_sync_state ORDER BY priority DESC'
     );
     let lastCompleteSync: Date | undefined;
-    const priorityStatus: SyncPriorityStatus[] = [];
+    const prioritStatuses: SyncPriorityStatus[] = [];
 
     for (const { priority, last_synced_at } of result) {
       const parsedDate = new Date(last_synced_at + 'Z');
 
-      if (priority === 2147483647) {
+      if (priority == fullSyncPriority) {
         // This lowest-possible priority represents a complete sync.
         lastCompleteSync = parsedDate;
       } else {
-        priorityStatus.push({ priority, hasSynced: true, lastSyncedAt: parsedDate });
+        prioritStatuses.push({ priority, hasSynced: true, lastSyncedAt: parsedDate });
       }
     }
+    
 
     const hasSynced = lastCompleteSync != null;
-    if (hasSynced != this.currentStatus.hasSynced || priorityStatus != this.currentStatus.statusInPriority) {
-      this.currentStatus = new SyncStatus({
-        ...this.currentStatus.toJSON(),
-        hasSynced,
-        lastSyncedAt: lastCompleteSync,
-        statusInPriority: priorityStatus
-      });
+    const updatedStatus = new SyncStatus({
+      ...this.currentStatus.toJSON(),
+      hasSynced,
+      prioritStatuses,
+      lastSyncedAt: lastCompleteSync,
+    });
+
+    if (!updatedStatus.isEqual(this.currentStatus)) {
+      this.currentStatus = updatedStatus;
       this.iterateListeners((l) => l.statusChanged?.(this.currentStatus));
     }
   }

packages/common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts

@@ -468,7 +468,7 @@ The next upload iteration will be delayed.`);
 
   private async collectLocalBucketState(): Promise<[BucketRequest[], Map<string, BucketDescription | null>]> {
     const bucketEntries = await this.options.adapter.getBucketStates();
-    const req: BucketRequest[] = Array.from(bucketEntries).map((entry) => ({
+    const req: BucketRequest[] = bucketEntries.map((entry) => ({
       name: entry.bucket,
       after: entry.op_id
     }));
@@ -601,7 +601,7 @@ The next upload iteration will be delayed.`);
               this.logger.debug('partial checkpoint validation succeeded');
 
               // All states with a higher priority can be deleted since this partial sync includes them.
-              const priorityStates = this.syncStatus.statusInPriority.filter((s) => s.priority <= priority);
+              const priorityStates = this.syncStatus.prioritStatuses.filter((s) => s.priority <= priority);
               priorityStates.push({
                 priority,
                 lastSyncedAt: new Date(),
@@ -610,7 +610,7 @@ The next upload iteration will be delayed.`);
 
               this.updateSyncStatus({
                 connected: true,
-                statusInPriority: priorityStates
+                prioritStatuses: priorityStates
               });
             }
           } else if (isStreamingSyncCheckpointDiff(line)) {
@@ -679,7 +679,7 @@ The next upload iteration will be delayed.`);
               this.updateSyncStatus({
                 connected: true,
                 lastSyncedAt: new Date(),
-                statusInPriority: []
+                prioritStatuses: []
               });
             } else if (validatedCheckpoint === targetCheckpoint) {
               const result = await this.options.adapter.syncLocalDatabase(targetCheckpoint!);
@@ -696,7 +696,7 @@ The next upload iteration will be delayed.`);
                 this.updateSyncStatus({
                   connected: true,
                   lastSyncedAt: new Date(),
-                  statusInPriority: [],
+                  prioritStatuses: [],
                   dataFlow: {
                     downloading: false
                   }
@@ -721,7 +721,7 @@ The next upload iteration will be delayed.`);
         ...this.syncStatus.dataFlowStatus,
         ...options.dataFlow
       },
-      statusInPriority: options.statusInPriority ?? this.syncStatus.statusInPriority
+      prioritStatuses: options.prioritStatuses ?? this.syncStatus.prioritStatuses
     });
 
     if (!this.syncStatus.isEqual(updatedStatus)) {

packages/common/src/db/crud/SyncStatus.ts

@@ -15,7 +15,7 @@ export type SyncStatusOptions = {
   dataFlow?: SyncDataFlowStatus;
   lastSyncedAt?: Date;
   hasSynced?: boolean;
-  statusInPriority?: SyncPriorityStatus[];
+  prioritStatuses?: SyncPriorityStatus[];
 };
 
 export class SyncStatus {
@@ -70,8 +70,8 @@ export class SyncStatus {
   /**
    * Partial sync status for involved bucket priorities.
    */
-  get statusInPriority() {
-    return (this.options.statusInPriority ?? []).toSorted(SyncStatus.comparePriorities);
+  get prioritStatuses() {
+    return (this.options.prioritStatuses ?? []).toSorted(SyncStatus.comparePriorities);
   }
 
   /**
@@ -90,8 +90,8 @@ export class SyncStatus {
    * @param priority The bucket priority for which the status should be reported.
    */
   statusForPriority(priority: number): SyncPriorityStatus {
-    // statusInPriority is sorted by ascending priorities (so higher numbers to lower numbers).
-    for (const known of this.statusInPriority) {
+    // prioritStatuses are sorted by ascending priorities (so higher numbers to lower numbers).
+    for (const known of this.prioritStatuses) {
       // We look for the first entry that doesn't have a higher priority.
       if (known.priority >= priority) {
         return known;
@@ -122,7 +122,7 @@ export class SyncStatus {
       dataFlow: this.dataFlowStatus,
       lastSyncedAt: this.lastSyncedAt,
       hasSynced: this.hasSynced,
-      statusInPriority: this.statusInPriority
+      prioritStatuses: this.prioritStatuses
     };
   }
 

packages/web/tests/stream.test.ts

@@ -247,7 +247,7 @@ describe(
       });
       await another.init();
 
-      expect(another.currentStatus.statusInPriority).toHaveLength(1);
+      expect(another.currentStatus.prioritStatuses).toHaveLength(1);
       expect(another.currentStatus.statusForPriority(0).hasSynced).toBeTruthy();
       await another.waitForFirstSync({priority: 0});
     });