Updated SyncStatus update handling from core instructions.

Author: Chriztiaan

PowerSync/PowerSync.Common/Client/Sync/Stream/CoreInstructions.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
+using PowerSync.Common.DB.Crud;
 
 namespace PowerSync.Common.Client.Sync.Stream;
 
@@ -83,6 +84,7 @@ public class CoreSyncStatus
 
     [JsonProperty("downloading")]
     public DownloadProgress? Downloading { get; set; }
+
 }
 
 public class SyncPriorityStatus
@@ -126,4 +128,40 @@ public class FetchCredentials : Instruction
 
 public class CloseSyncStream : Instruction { }
 public class FlushFileSystem : Instruction { }
-public class DidCompleteSync : Instruction { }
+public class DidCompleteSync : Instruction { }
+
+public class CoreInstructionHelpers
+{
+    public static DB.Crud.SyncPriorityStatus PriorityToStatus(SyncPriorityStatus status)
+    {
+        return new DB.Crud.SyncPriorityStatus
+        {
+            Priority = status.Priority,
+            HasSynced = status.HasSynced ?? null,
+            LastSyncedAt = status?.LastSyncedAt != null ? new DateTime(status!.LastSyncedAt) : null
+        };
+    }
+
+    public static DB.Crud.SyncStatusOptions CoreStatusToSyncStatus(CoreSyncStatus status)
+    {
+        var coreCompleteSync =
+            status.PriorityStatus.FirstOrDefault(s => s.Priority == SyncProgress.FULL_SYNC_PRIORITY);
+        var completeSync = coreCompleteSync != null ? PriorityToStatus(coreCompleteSync) : null;
+
+        return new DB.Crud.SyncStatusOptions
+        {
+            Connected = status.Connected,
+            Connecting = status.Connecting,
+            DataFlow = new DB.Crud.SyncDataFlowStatus
+            {
+                // We expose downloading as a boolean field, the core extension reports download information as a nullable
+                // download status. When that status is non-null, a download is in progress.
+                Downloading = status.Downloading != null,
+                DownloadProgress = status.Downloading?.Buckets
+            },
+            LastSyncedAt = completeSync?.LastSyncedAt,
+            HasSynced = completeSync?.HasSynced,
+            PriorityStatusEntries = status.PriorityStatus.Select(PriorityToStatus).ToArray()
+        };
+    }
+}

PowerSync/PowerSync.Common/Client/Sync/Stream/StreamingSyncImplementation.cs

@@ -537,29 +537,7 @@ async Task HandleInstruction(Instruction instruction)
                     }
                     break;
                 case UpdateSyncStatus syncStatus:
-                    var info = syncStatus.Status;
-                    var coreCompleteSync =
-                        info.PriorityStatus.FirstOrDefault(s => s.Priority == SyncProgress.FULL_SYNC_PRIORITY);
-                    var completeSync = coreCompleteSync != null ? CoreStatusToSyncStatus(coreCompleteSync) : null;
-
-                    UpdateSyncStatus(new SyncStatusOptions
-                    {
-                        Connected = info.Connected,
-                        Connecting = info.Connecting,
-                        LastSyncedAt = completeSync?.LastSyncedAt,
-                        HasSynced = completeSync?.HasSynced,
-                        PriorityStatusEntries = info.PriorityStatus.Select(CoreStatusToSyncStatus).ToArray(),
-                        DataFlow = new SyncDataFlowStatus
-                        {
-                            Downloading = info.Downloading != null,
-                            DownloadProgress = info.Downloading?.Buckets
-                        }
-                    },
-                        new UpdateSyncStatusOptions
-                        {
-                            ClearDownloadError = true,
-                        }
-                    );
+                    UpdateSyncStatus(CoreInstructionHelpers.CoreStatusToSyncStatus(syncStatus.Status));
                     break;
                 case EstablishSyncStream establishSyncStream:
                     if (receivingLines != null)
@@ -1048,7 +1026,7 @@ protected void UpdateSyncStatus(SyncStatusOptions options, UpdateSyncStatusOptio
                 {
                     Uploading = options.DataFlow?.Uploading ?? SyncStatus.DataFlowStatus.Uploading,
                     Downloading = options.DataFlow?.Downloading ?? SyncStatus.DataFlowStatus.Downloading,
-                    DownloadProgress = options.DataFlow?.DownloadProgress ?? SyncStatus.DataFlowStatus.DownloadProgress
+                    DownloadProgress = options.DataFlow?.DownloadProgress ?? SyncStatus.DataFlowStatus.DownloadProgress,
                     DownloadError = updateOptions?.ClearDownloadError == true ? null : options.DataFlow?.DownloadError ?? SyncStatus.DataFlowStatus.DownloadError,
                     UploadError = updateOptions?.ClearUploadError == true ? null : options.DataFlow?.UploadError ?? SyncStatus.DataFlowStatus.UploadError,
                 }
@@ -1071,16 +1049,6 @@ protected void UpdateSyncStatus(SyncStatusOptions options, UpdateSyncStatusOptio
         }
     }
 
-    private static DB.Crud.SyncPriorityStatus CoreStatusToSyncStatus(SyncPriorityStatus status)
-    {
-        return new DB.Crud.SyncPriorityStatus
-        {
-            Priority = status.Priority,
-            HasSynced = status.HasSynced ?? null,
-            LastSyncedAt = status?.LastSyncedAt != null ? new DateTime(status!.LastSyncedAt) : null
-        };
-    }
-
     private async Task DelayRetry()
     {
         if (Options.RetryDelayMs.HasValue)

PowerSync/PowerSync.Common/DB/Schema/Table.cs

@@ -15,9 +15,9 @@ public class TableOptions(
 {
     public Dictionary<string, List<string>> Indexes { get; set; } = indexes ?? [];
 
-    public bool LocalOnly { get; } = localOnly ?? false;
+    public bool LocalOnly { get; set; } = localOnly ?? false;
 
-    public bool InsertOnly { get; } = insertOnly ?? false;
+    public bool InsertOnly { get; set; } = insertOnly ?? false;
 
     public string? ViewName { get; } = viewName;