Added ResolveOfflineSyncStatus, bumped sqlite extension and minimum version.

Author: Chriztiaan

PowerSync/PowerSync.Common/Client/PowerSyncDatabase.cs

@@ -219,7 +219,7 @@ protected async Task Initialize()
         await BucketStorageAdapter.Init();
         await LoadVersion();
         await UpdateSchema(schema);
-        await UpdateHasSynced();
+        await ResolveOfflineSyncStatus();
         await Database.Execute("PRAGMA RECURSIVE_TRIGGERS=TRUE");
         Ready = true;
         Emit(new PowerSyncDBEvent { Initialized = true });
@@ -243,70 +243,33 @@ private async Task LoadVersion()
         catch (Exception e)
         {
             throw new Exception(
-                $"Unsupported PowerSync extension version. Need >=0.2.0 <1.0.0, got: {sdkVersion}. Details: {e.Message}"
+                $"Unsupported PowerSync extension version. Need >=0.4.10 <1.0.0, got: {sdkVersion}. Details: {e.Message}"
             );
         }
 
-        // Validate version is >= 0.2.0 and < 1.0.0
-        if (versionInts[0] != 0 || versionInts[1] < 2 || versionInts[2] < 0)
+        // Validate version is >= 0.4.10 and < 1.0.0
+        if (versionInts[0] != 0 || versionInts[1] < 4 || (versionInts[1] == 4 && versionInts[2] < 10))
         {
-            throw new Exception($"Unsupported PowerSync extension version. Need >=0.2.0 <1.0.0, got: {sdkVersion}");
+            throw new Exception($"Unsupported PowerSync extension version. Need >=0.4.10 <1.0.0, got: {sdkVersion}");
         }
     }
 
-    //   protected async resolveOfflineSyncStatus() {
-    //     const result = await this.database.get<{ r: string }>('SELECT powersync_offline_sync_status() as r');
-    //     const parsed = JSON.parse(result.r) as CoreSyncStatus;
-
-    //     const updatedStatus = new SyncStatus({
-    //       ...this.currentStatus.toJSON(),
-    //       ...coreStatusToJs(parsed)
-    //     });
-
-    //     if (!updatedStatus.isEqual(this.currentStatus)) {
-    //       this.currentStatus = updatedStatus;
-    //       this.iterateListeners((l) => l.statusChanged?.(this.currentStatus));
-    //     }
-    //   }
-    // TODO DELETE
-    private record LastSyncedResult(int priority, string? last_synced_at);
-
-    protected async Task UpdateHasSynced()
+    private record OfflineSyncStatusResult(string r);
+    protected async Task ResolveOfflineSyncStatus()
     {
-        var results = await Database.GetAll<LastSyncedResult>(
-            "SELECT priority, last_synced_at FROM ps_sync_state ORDER BY priority DESC"
-        );
-
-        DateTime? lastCompleteSync = null;
-        List<DB.Crud.SyncPriorityStatus> priorityStatuses = [];
+        var result = await Database.Get<OfflineSyncStatusResult>("SELECT powersync_offline_sync_status() as r");
+        var parsed = JsonConvert.DeserializeObject<CoreSyncStatus>(result.r);
 
-        // TODO: Will be altered/extended when reporting individual sync priority statuses is supported 
-        foreach (var result in results)
-        {
-            var parsedDate = DateTime.Parse(result.last_synced_at + "Z");
-
-            if (result.priority == FULL_SYNC_PRIORITY)
-            {
-                // This lowest-possible priority represents a complete sync.
-                lastCompleteSync = parsedDate;
-            }
-        }
+        var parsedSyncStatus = CoreInstructionHelpers.CoreStatusToSyncStatus(parsed!);
+        var updatedStatus = CurrentStatus.CreateUpdatedStatus(parsedSyncStatus);
 
-        var hasSynced = lastCompleteSync != null;
-        if (hasSynced != CurrentStatus.HasSynced)
+        if (!updatedStatus.IsEqual(CurrentStatus))
         {
-            CurrentStatus = new SyncStatus(new SyncStatusOptions(CurrentStatus.Options)
-            {
-                HasSynced = hasSynced,
-                LastSyncedAt = lastCompleteSync,
-            });
-
+            CurrentStatus = updatedStatus;
             Emit(new PowerSyncDBEvent { StatusChanged = CurrentStatus });
         }
     }
 
-
-
     /// <summary> 
     /// Replace the schema with a new version. This is for advanced use cases - typically the schema should just be specified once in the constructor.
     /// Cannot be used while connected - this should only be called before <see cref="Connect"/>.

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

@@ -142,7 +142,12 @@ public static DB.Crud.SyncPriorityStatus PriorityToStatus(SyncPriorityStatus sta
         };
     }
 
-    public static DB.Crud.SyncStatusOptions CoreStatusToSyncStatus(CoreSyncStatus status)
+    public static DB.Crud.SyncStatus CoreStatusToSyncStatus(CoreSyncStatus status)
+    {
+        return new DB.Crud.SyncStatus(CoreStatusToSyncStatusOptions(status));
+    }
+
+    public static DB.Crud.SyncStatusOptions CoreStatusToSyncStatusOptions(CoreSyncStatus status)
     {
         var coreCompleteSync =
             status.PriorityStatus.FirstOrDefault(s => s.Priority == SyncProgress.FULL_SYNC_PRIORITY);

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

@@ -537,7 +537,7 @@ async Task HandleInstruction(Instruction instruction)
                     }
                     break;
                 case UpdateSyncStatus syncStatus:
-                    UpdateSyncStatus(CoreInstructionHelpers.CoreStatusToSyncStatus(syncStatus.Status));
+                    UpdateSyncStatus(CoreInstructionHelpers.CoreStatusToSyncStatusOptions(syncStatus.Status));
                     break;
                 case EstablishSyncStream establishSyncStream:
                     if (receivingLines != null)

PowerSync/PowerSync.Common/DB/Crud/SyncStatus.cs

@@ -152,6 +152,27 @@ public SyncPriorityStatus StatusForPriority(int priority)
         };
     }
 
+    /// <summary>
+    /// Creates an updated SyncStatus by merging the current status with the provided updated status.
+    /// </summary>
+    public SyncStatus CreateUpdatedStatus(SyncStatus updatedStatus)
+    {
+        var updatedOptions = updatedStatus.Options;
+        var currentOptions = Options;
+
+        var parsedOptions = new SyncStatusOptions
+        {
+            Connected = updatedOptions.Connected ?? currentOptions.Connected,
+            Connecting = updatedOptions.Connecting ?? currentOptions.Connecting,
+            LastSyncedAt = updatedOptions.LastSyncedAt ?? currentOptions.LastSyncedAt,
+            HasSynced = updatedOptions.HasSynced ?? currentOptions.HasSynced,
+            PriorityStatusEntries = updatedOptions.PriorityStatusEntries ?? currentOptions.PriorityStatusEntries,
+            DataFlow = updatedOptions.DataFlow ?? currentOptions.DataFlow,
+        };
+
+        return new SyncStatus(parsedOptions);
+    }
+
     private string SerializeObject()
     {
         return JsonConvert.SerializeObject(new { Options, UploadErrorMessage = Options.DataFlow?.UploadError?.Message, DownloadErrorMessage = DataFlowStatus.DownloadError?.Message });

Tests/PowerSync/PowerSync.Common.IntegrationTests/SyncIntegrationTests.cs

@@ -42,8 +42,6 @@ public async Task InitializeAsync()
         await db.Init();
         var connector = new NodeConnector(userId);
 
-        await ClearAllData();
-
         Console.WriteLine($"Using User ID: {userId}");
         try
         {

Tools/Setup/Setup.cs

@@ -5,9 +5,12 @@
 using System.Collections.Generic;
 using System.IO.Compression;
 
+/// <summary>
+/// Execute with `dotnet run --project Tools/Setup`
+/// </summary>
 public class PowerSyncSetup
 {
-    private const string VERSION = "0.4.9";
+    private const string VERSION = "0.4.10";
 
     private const string GITHUB_BASE_URL = $"https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v{VERSION}";
     private const string MAVEN_BASE_URL = $"https://repo1.maven.org/maven2/com/powersync/powersync-sqlite-core/{VERSION}";