Merge remote-tracking branch 'origin/main' into swift-sync-client

Author: simolus3

.github/workflows/build_and_test.yaml

@@ -8,6 +8,7 @@ jobs:
   build:
     name: Build and test
     runs-on: macos-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - name: Set up XCode

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.14.0 (unreleased)
 
 * Add `opDataTyped` and `previousValuesTyped` to `CrudEntry`, providing typed values instead of strings.
+* Make `CrudBatch`, `CrudEntry` and `CrudTransaction` a concrete struct. Note that these can no longer be created in user code.
 
 ## 1.13.1
 

Sources/PowerSync/Protocol/Schema/RawTable.swift

@@ -69,7 +69,7 @@ public struct RawTable: BaseTableProtocol, Encodable {
             // That could also throw an exception (which would crash the process), but that
             // was overlooked due to a missing @Throws annotation.
             // Now, we can't mark this as throws without breaking backwards compatibility.
-            // We should conver this to be throwing in a future major release.
+            // We should convert this to be throwing in a future major release.
             fatalError("Serializing a raw table failed: \(error)")
         }
     }

Sources/PowerSync/Protocol/db/CrudBatch.swift

@@ -19,16 +19,9 @@ public struct CrudBatch: Sendable {
     /// Call to remove the changes from the local queue, once successfully uploaded.
     ///
     /// `writeCheckpoint` is optional.
-    public func complete(writeCheckpoint: String?) async throws {
+    public func complete(writeCheckpoint: String? = nil) async throws {
         let lastId = crud.last!.clientId
-        try await completeCrudItems(self.db, lastId)
-    }
-
-    /// Call to remove the changes from the local queue, once successfully uploaded.
-    public func complete() async throws {
-        try await self.complete(
-            writeCheckpoint: nil
-        )
+        try await completeCrudItems(self.db, lastId, writeCheckpoint: writeCheckpoint)
     }
 }
 
@@ -42,6 +35,6 @@ internal func completeCrudItems(_ db: any PowerSyncDatabaseProtocol, _ lastItemI
                 return
             }
         }
-        try tx.execute(sql: "UPDATE ps_buckets SET target_op = ? WHERE name = '$local'", parameters: [KotlinPowerSyncDatabaseImpl.maxOpId])
+        try tx.execute(sql: "UPDATE ps_buckets SET target_op = 9223372036854775807 WHERE name = '$local'", parameters: nil)
     }
 }

Sources/PowerSync/Protocol/db/CrudEntry.swift

@@ -112,7 +112,10 @@ public struct CrudEntry: Sendable {
         }
 
         let decoder = JSONDecoder()
-        let entry = try decoder.decode(CrudJsonEntry.self, from: data.data(using: .utf8)!)
+        guard let jsonData = data.data(using: .utf8) else {
+            throw PowerSyncError.operationFailed(message: "Invalid UTF-8 in CRUD entry")
+        }
+        let entry = try decoder.decode(CrudJsonEntry.self, from: jsonData)
 
         return CrudEntry(
             id: entry.id,
@@ -128,7 +131,9 @@ public struct CrudEntry: Sendable {
     }
 
     private static func jsonValueToString(_ value: JsonValue?) throws -> String? {
-        try value.map { value in
+        // Older versions of the SDK were only able to export these values as strings, so we convert for
+        // backwards compatibility.
+        try value.flatMap { value in
             switch (value) {
             case .string(let value):
                 return value
@@ -139,7 +144,7 @@ public struct CrudEntry: Sendable {
             case .bool(let value):
                 return String(value)
             case .null:
-                return "null"
+                return nil
             case .array(_), .object(_):
                 throw PowerSyncError.operationFailed(message: "Invalid array/object in CRUD data, should be string")
             }

Tests/PowerSyncTests/CrudTests.swift

@@ -318,4 +318,30 @@ final class CrudTests: XCTestCase {
         XCTAssertEqual(write.opData?["name"], "updated_name")
         XCTAssertEqual(write.previousValues?["name"], "user")
     }
+
+    func testCustomWriteCheckpoints() async throws {
+        try await database.execute(
+            sql: "INSERT INTO users (id, name) VALUES (uuid(), 'a')",
+            parameters: []
+        )
+
+        let tx = try await database.getNextCrudTransaction()!
+        try await tx.complete(writeCheckpoint: "123")
+
+        let targetOp = try await database.get("SELECT target_op FROM ps_buckets WHERE name = '$local'") {
+            try $0.getInt(index: 0)
+        }
+        XCTAssertEqual(targetOp, 123)
+
+        try await database.execute(
+            sql: "INSERT INTO users (id, name) VALUES (uuid(), 'a')",
+            parameters: []
+        )
+        let batch = try await database.getCrudBatch()!
+        try await batch.complete(writeCheckpoint: "124")
+        let newTargetOp = try await database.get("SELECT target_op FROM ps_buckets WHERE name = '$local'") {
+            try $0.getInt(index: 0)
+        }
+        XCTAssertEqual(newTargetOp, 124)
+    }
 }