[Internal] Improve Lock Error handling

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## Unreleased
 
+* Fix null values in CRUD entries being reported as strings.
 * [Internal] Instantiate Kotlin Kermit logger directly.
+* [Internal] Improved connection context error handling.
 
 ## 1.4.0
 

Package.swift

@@ -2,6 +2,7 @@
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
+
 let packageName = "PowerSync"
 
 // Set this to the absolute path of your Kotlin SDK checkout if you want to use a local Kotlin
@@ -31,8 +32,8 @@ if let kotlinSdkPath = localKotlinSdkOverride {
     // Not using a local build, so download from releases
     conditionalTargets.append(.binaryTarget(
         name: "PowerSyncKotlin",
-        url: "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.4.0/PowersyncKotlinRelease.zip",
-        checksum: "e800db216fc1c9722e66873deb4f925530267db6dbd5e2114dd845cc62c28cd9"
+        url: "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.5.0/PowersyncKotlinRelease.zip",
+        checksum: "cb1d717d28411aff0bfdeeaa837ae01514ebf5d64203dc565a9520a2912bae9d"
     ))
 }
 
@@ -59,7 +60,8 @@ let package = Package(
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: packageName,
-            targets: ["PowerSync"]),
+            targets: ["PowerSync"]
+        )
     ],
     dependencies: conditionalDependencies,
     targets: [
@@ -70,10 +72,11 @@ let package = Package(
             dependencies: [
                 kotlinTargetDependency,
                 .product(name: "PowerSyncSQLiteCore", package: corePackageName)
-            ]),
+            ]
+        ),
         .testTarget(
             name: "PowerSyncTests",
             dependencies: ["PowerSync"]
-        ),
+        )
     ] + conditionalTargets
 )

Sources/PowerSync/Kotlin/KotlinPowerSyncDatabaseImpl.swift

@@ -275,9 +275,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
         return try await wrapPowerSyncException {
             try safeCast(
                 await kotlinDatabase.writeLock(
-                    callback: LockCallback(
-                        callback: callback
-                    )
+                    callback: wrapLockContext(callback: callback)
                 ),
                 to: R.self
             )
@@ -290,9 +288,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
         return try await wrapPowerSyncException {
             try safeCast(
                 await kotlinDatabase.writeTransaction(
-                    callback: TransactionCallback(
-                        callback: callback
-                    )
+                    callback: wrapTransactionContext(callback: callback)
                 ),
                 to: R.self
             )
@@ -307,9 +303,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
         return try await wrapPowerSyncException {
             try safeCast(
                 await kotlinDatabase.readLock(
-                    callback: LockCallback(
-                        callback: callback
-                    )
+                    callback: wrapLockContext(callback: callback)
                 ),
                 to: R.self
             )
@@ -322,9 +316,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
         return try await wrapPowerSyncException {
             try safeCast(
                 await kotlinDatabase.readTransaction(
-                    callback: TransactionCallback(
-                        callback: callback
-                    )
+                    callback: wrapTransactionContext(callback: callback)
                 ),
                 to: R.self
             )
@@ -372,11 +364,11 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
             }
         )
 
-        let rootPages = rows.compactMap { r in
-            if (r.opcode == "OpenRead" || r.opcode == "OpenWrite") &&
-                r.p3 == 0 && r.p2 != 0
+        let rootPages = rows.compactMap { row in
+            if (row.opcode == "OpenRead" || row.opcode == "OpenWrite") &&
+                row.p3 == 0 && row.p2 != 0
             {
-                return r.p2
+                return row.p2
             }
             return nil
         }
@@ -389,7 +381,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
                     message: "Failed to convert pages data to UTF-8 string"
                 )
             }
-            
+
             let tableRows = try await getAll(
                 sql: "SELECT tbl_name FROM sqlite_master WHERE rootpage IN (SELECT json_each.value FROM json_each(?))",
                 parameters: [
@@ -414,3 +406,50 @@ private struct ExplainQueryResult {
     let p2: Int64
     let p3: Int64
 }
+
+extension Error {
+    func toPowerSyncError() -> PowerSyncKotlin.PowerSyncException {
+        return PowerSyncKotlin.PowerSyncException(
+            message: localizedDescription,
+            cause: PowerSyncKotlin.KotlinThrowable(message: localizedDescription)
+        )
+    }
+}
+
+func wrapLockContext(
+    callback: @escaping (any ConnectionContext) throws -> Any
+) throws -> PowerSyncKotlin.ThrowableLockCallback {
+    PowerSyncKotlin.wrapContextHandler { kotlinContext in
+        do {
+            return try PowerSyncKotlin.PowerSyncResult.Success(
+                value: callback(
+                    KotlinConnectionContext(
+                        ctx: kotlinContext
+                    )
+                ))
+        } catch {
+            return PowerSyncKotlin.PowerSyncResult.Failure(
+                exception: error.toPowerSyncError()
+            )
+        }
+    }
+}
+
+func wrapTransactionContext(
+    callback: @escaping (any Transaction) throws -> Any
+) throws -> PowerSyncKotlin.ThrowableTransactionCallback {
+    PowerSyncKotlin.wrapTransactionContextHandler { kotlinContext in
+        do {
+            return try PowerSyncKotlin.PowerSyncResult.Success(
+                value: callback(
+                    KotlinTransactionContext(
+                        ctx: kotlinContext
+                    )
+                ))
+        } catch {
+            return PowerSyncKotlin.PowerSyncResult.Failure(
+                exception: error.toPowerSyncError()
+            )
+        }
+    }
+}