Merge branch 'main' into feat/api-catchup-effort-2

Author: Chriztiaan

.github/workflows/dev-packages.yml

@@ -1,40 +1,63 @@
 # The version is pulled from the CHANGELOG.md file of the package.
-# Add a `-dev.xxx` suffix to the version.
+# Add a `-dev.xxx` suffix to the version. Example: `0.0.1-dev.1`
 name: Create Dev Release
 
 on: workflow_dispatch
 
 jobs:
   dev-release:
     name: Publish Dev Packages
-    runs-on: windows-latest
+    runs-on: macos-latest
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
 
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0' 
+          dotnet-version: '8.0'
+
+      - name: Install MAUI Workloads
+        run: dotnet workload restore
 
       - name: Download PowerSync extension
         run: dotnet run --project Tools/Setup    
 
       - name: Restore dependencies
         run: dotnet restore
 
-      - name: Extract Version from CHANGELOG.md
+      - name: Extract Common Package Version from CHANGELOG.md
         id: extract_version
         shell: bash
         run: |
-          VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+-dev(\.[0-9]+)?$/ {print $2; exit}' PowerSync/PowerSync.Common/CHANGELOG.md)
-          echo "Detected Version: $VERSION"
-          echo "VERSION=$VERSION" >> $GITHUB_ENV 
+          COMMON_VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+-dev(\.[0-9]+)?$/ {print $2; exit}' PowerSync/PowerSync.Common/CHANGELOG.md)
+          echo "Detected Version: $COMMON_VERSION"
+          echo "VERSION=$COMMON_VERSION" >> $GITHUB_ENV 
+
+      - name: Run Pack For Common
+        run: dotnet pack PowerSync/PowerSync.Common -c Release -o ${{ github.workspace }}/output
+
+      - name: Run Push For Common
+        continue-on-error: true
+        run: dotnet nuget push ${{ github.workspace }}/output/PowerSync.Common*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
+
+      - name: Extract MAUI Package Version from CHANGELOG.md
+        id: extract_maui_version
+        shell: bash
+        run: |
+          MAUI_VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+-dev(\.[0-9]+)?$/ {print $2; exit}' PowerSync/PowerSync.Maui/CHANGELOG.md)
+          echo "Detected Version: $MAUI_VERSION"
+          echo "VERSION=$MAUI_VERSION" >> $GITHUB_ENV 
+        
+      - name: Build MAUI Project
+        run: dotnet build PowerSync/PowerSync.Maui -c Release
 
-      - name: Run Pack
-        run: dotnet pack -c Release -o ${{ github.workspace }}/output
+      - name: Run Pack For MAUI
+        run: dotnet pack PowerSync/PowerSync.Maui -c Release -o ${{ github.workspace }}/output
 
-      - name: Run Push
-        run: dotnet nuget push ${{ github.workspace }}\output\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
-       
+      - name: Run Push For MAUI
+        continue-on-error: true
+        run: dotnet nuget push ${{ github.workspace }}/output/PowerSync.Maui*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}

.github/workflows/release.yml

@@ -6,35 +6,58 @@ on: workflow_dispatch
 jobs:
   release:
     name: Release
-    runs-on: windows-latest
+    runs-on: macos-latest
     if: github.ref == 'refs/heads/main'
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
 
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0' 
+          dotnet-version: '8.0'
+
+      - name: Install MAUI Workloads
+        run: dotnet workload restore
 
       - name: Download PowerSync extension
         run: dotnet run --project Tools/Setup    
 
       - name: Restore dependencies
         run: dotnet restore
 
-      - name: Extract Version from CHANGELOG.md
+      - name: Extract Common Package Version from CHANGELOG.md
         id: extract_version
         shell: bash
         run: |
           VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+/ {print $2; exit}' PowerSync/PowerSync.Common/CHANGELOG.md)
           echo "Detected Version: $VERSION"
           echo "VERSION=$VERSION" >> $GITHUB_ENV 
 
-      - name: Run Pack
-        run: dotnet pack -c Release -o ${{ github.workspace }}/output
+      - name: Run Pack for Common
+        run: dotnet pack PowerSync/PowerSync.Common -c Release -o ${{ github.workspace }}/output
+
+      - name: Run Push for Common
+        continue-on-error: true
+        run: dotnet nuget push ${{ github.workspace }}/output/PowerSync.Common*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
 
-      - name: Run Push
-        run: dotnet nuget push ${{ github.workspace }}\output\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
-       
+      - name: Extract MAUI Package Version from CHANGELOG.md
+        id: extract_maui_version
+        shell: bash
+        run: |
+          MAUI_VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+/ {print $2; exit}' PowerSync/PowerSync.Maui/CHANGELOG.md)
+          echo "Detected Version: $MAUI_VERSION"
+          echo "VERSION=$MAUI_VERSION" >> $GITHUB_ENV
+          
+      - name: Build MAUI Project
+        run: dotnet build PowerSync/PowerSync.Maui -c Release
+
+      - name: Run Pack For MAUI
+        run: dotnet pack PowerSync/PowerSync.Maui -c Release -o ${{ github.workspace }}/output
+
+      - name: Run Push For MAUI
+        continue-on-error: true
+        run: dotnet nuget push ${{ github.workspace }}/output/PowerSync.Maui*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}

.gitignore

@@ -14,6 +14,7 @@ obj/
 *.log
 *.tlog
 *.dmp
+*.tmp
 
 # Visual Studio specific
 .vscode/
@@ -61,3 +62,9 @@ TestResults/
 *.dylib
 *.dll
 *.so
+*.xcframework
+.env
+*NativeLibs
+
+# Ignore user id file
+user_id.txt

PowerSync/PowerSync.Common/CHANGELOG.md

@@ -1,3 +1,11 @@
+# PowerSync.Common Changelog
+
+## 0.0.4-alpha.1
+- Fixed MAUI issues related to extension loading when installing package outside of the monorepo. 
+
+## 0.0.3-alpha.1
+- Minor changes to accommodate PowerSync.MAUI package extension.
+
 ## 0.0.2-alpha.2
 
 - Updated core extension to v0.3.14

PowerSync/PowerSync.Common/Client/PowerSyncDatabase.cs

@@ -35,11 +35,6 @@ public class DBAdapterSource(IDBAdapter Adapter) : IDatabaseSource
     public IDBAdapter Adapter { get; init; } = Adapter;
 }
 
-public class OpenFactorySource(ISQLOpenFactory Factory) : IDatabaseSource
-{
-    public ISQLOpenFactory Factory { get; init; } = Factory;
-}
-
 public class PowerSyncDatabaseOptions() : BasePowerSyncDatabaseOptions()
 {
     /// <summary> 
@@ -113,9 +108,9 @@ public PowerSyncDatabase(PowerSyncDatabaseOptions options)
         {
             Database = adapterSource.Adapter;
         }
-        else if (options.Database is OpenFactorySource factorySource)
+        else if (options.Database is ISQLOpenFactory factorySource)
         {
-            Database = factorySource.Factory.OpenDatabase();
+            Database = factorySource.OpenDatabase();
         }
         else if (options.Database is SQLOpenOptions openOptions)
         {
@@ -158,7 +153,7 @@ public async Task WaitForReady()
 
         await isReadyTask;
     }
-    
+
     public class PrioritySyncRequest
     {
         public CancellationToken? Token { get; set; }
@@ -176,7 +171,7 @@ public class PrioritySyncRequest
     /// <returns>A task which will complete once the first full sync has completed.</returns>
     public async Task WaitForFirstSync(PrioritySyncRequest? request = null)
     {
-        var priority =  request?.Priority ?? null;
+        var priority = request?.Priority ?? null;
         var cancellationToken = request?.Token ?? null;
 
         bool StatusMatches(SyncStatus status)
@@ -200,7 +195,7 @@ bool StatusMatches(SyncStatus status)
         {
             foreach (var update in Listen(cts.Token))
             {
-                if  (update.StatusChanged != null && StatusMatches(update.StatusChanged!))
+                if (update.StatusChanged != null && StatusMatches(update.StatusChanged!))
                 {
                     cts.Cancel();
                     tcs.SetResult(true);
@@ -295,7 +290,7 @@ protected async Task UpdateHasSynced()
             PriorityStatusEntries = priorityStatuses.ToArray(),
             LastSyncedAt = lastCompleteSync,
         });
-        
+
         if (!updatedStatus.IsEqual(CurrentStatus))
         {
             CurrentStatus = updatedStatus;

PowerSync/PowerSync.Common/Client/SQLOpenFactory.cs

@@ -15,7 +15,7 @@ public class SQLOpenOptions : IDatabaseSource
     public string? DbLocation { get; set; }
 }
 
-public interface ISQLOpenFactory
+public interface ISQLOpenFactory: IDatabaseSource
 {
     /// <summary>
     /// Opens a connection adapter to a SQLite Database.

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

@@ -14,7 +14,7 @@ namespace PowerSync.Common.Client.Sync.Stream;
 public class SyncStreamOptions
 {
     public string Path { get; set; } = "";
-    
+
     public StreamingSyncRequest Data { get; set; } = new();
     public Dictionary<string, string> Headers { get; set; } = new();
 
@@ -23,6 +23,9 @@ public class SyncStreamOptions
 
 public class Remote
 {
+
+    private const int STREAMING_POST_TIMEOUT_MS = 30_000;
+
     private readonly HttpClient httpClient;
     protected IPowerSyncBackendConnector connector;
 
@@ -113,34 +116,37 @@ public async Task<T> Get<T>(string path, Dictionary<string, string>? headers = n
         var responseData = await response.Content.ReadAsStringAsync();
         return JsonConvert.DeserializeObject<T>(responseData)!;
     }
-    
-     /// <summary>
-    /// Posts to the stream endpoint and returns a raw NDJSON stream that can be read line by line.
-    /// </summary>
-    public async Task<Stream> PostStreamRaw(SyncStreamOptions options)
-    {
-         var requestMessage = await BuildRequest(HttpMethod.Post, options.Path, options.Data, options.Headers);
-         var response = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, options.CancellationToken);
 
-        if (response.Content == null)
+    public static StreamingSyncLine? ParseStreamingSyncLine(JObject json)
+    {
+        // Determine the type based on available keys
+        if (json.ContainsKey("checkpoint"))
         {
-            throw new HttpRequestException($"HTTP {response.StatusCode}: No content");
+            return json.ToObject<StreamingSyncCheckpoint>();
         }
-        
-        if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized) {
-            InvalidateCredentials();
+        else if (json.ContainsKey("checkpoint_diff"))
+        {
+            return json.ToObject<StreamingSyncCheckpointDiff>();
         }
-
-        if (!response.IsSuccessStatusCode)
+        else if (json.ContainsKey("checkpoint_complete"))
         {
-            var errorText = await response.Content.ReadAsStringAsync();
-            throw new HttpRequestException($"HTTP {response.StatusCode}: {errorText}");
+            return json.ToObject<StreamingSyncCheckpointComplete>();
+        }
+        else if (json.ContainsKey("data"))
+        {
+            return json.ToObject<StreamingSyncDataJSON>();
+        }
+        else if (json.ContainsKey("token_expires_in"))
+        {
+            return json.ToObject<StreamingSyncKeepalive>();
+        }
+        else
+        {
+            return null;
         }
-
-        return await response.Content.ReadAsStreamAsync();
     }
 
-  
+
     private async Task<HttpRequestMessage> BuildRequest(HttpMethod method, string path, object? data = null, Dictionary<string, string>? additionalHeaders = null)
     {
         var credentials = await GetCredentials();