Cleanup example demo

Author: stevensJourney

Demo/PowerSyncExample/PowerSync/SystemManager.swift

@@ -13,8 +13,8 @@ func getAttachmentsDirectoryPath() throws -> String {
 
 let logTag = "SystemManager"
 
-@Observable
 @MainActor
+@Observable
 class SystemManager {
     let connector = SupabaseConnector()
     let schema = AppSchema
@@ -34,7 +34,7 @@ class SystemManager {
     }
 
     /// Creates an AttachmentQueue if a Supabase Storage bucket has been specified in the config
-    @MainActor private static func createAttachmentQueue(
+    private static func createAttachmentQueue(
         db: PowerSyncDatabaseProtocol,
         connector: SupabaseConnector
     ) -> AttachmentQueue? {
@@ -226,25 +226,23 @@ class SystemManager {
         if let attachments, let photoId = todo.photoId {
             try await attachments.deleteFile(
                 attachmentId: photoId
-            ) { _, _ in
-                // TODO:
-//                try self.deleteTodoInTX(
-//                    id: todo.id,
-//                    tx: tx
-//                )
+            ) { transaction, _ in
+                try self.deleteTodoInTX(
+                    id: todo.id,
+                    tx: transaction
+                )
             }
         } else {
-            try await db.writeTransaction { _ in
-                // TODO:
-//                try self.deleteTodoInTX(
-//                    id: todo.id,
-//                    tx: tx
-//                )
+            try await db.writeTransaction { transaction in
+                try self.deleteTodoInTX(
+                    id: todo.id,
+                    tx: transaction
+                )
             }
         }
     }
 
-    private func deleteTodoInTX(id: String, tx: ConnectionContext) throws {
+    private nonisolated func deleteTodoInTX(id: String, tx: ConnectionContext) throws {
         _ = try tx.execute(
             sql: "DELETE FROM \(TODOS_TABLE) WHERE id = ?",
             parameters: [id]

Sources/PowerSync/Kotlin/KotlinPowerSyncDatabaseImpl.swift

@@ -1,8 +1,6 @@
 import Foundation
 import PowerSyncKotlin
 
-class Test: AnyObject {}
-
 final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol, @unchecked Sendable {
     let logger: any LoggerProtocol
 

Sources/PowerSync/Logger.swift

@@ -85,27 +85,27 @@ public final class DefaultLogger: LoggerProtocol,
         }
     }
 
-    public nonisolated func debug(_ message: String, tag: String? = nil) {
+    public func debug(_ message: String, tag: String? = nil) {
         writeLog(message, severity: LogSeverity.debug, tag: tag)
     }
 
-    public nonisolated func error(_ message: String, tag: String? = nil) {
+    public func error(_ message: String, tag: String? = nil) {
         writeLog(message, severity: LogSeverity.error, tag: tag)
     }
 
-    public nonisolated func info(_ message: String, tag: String? = nil) {
+    public func info(_ message: String, tag: String? = nil) {
         writeLog(message, severity: LogSeverity.info, tag: tag)
     }
 
-    public nonisolated func warning(_ message: String, tag: String? = nil) {
+    public func warning(_ message: String, tag: String? = nil) {
         writeLog(message, severity: LogSeverity.warning, tag: tag)
     }
 
-    public nonisolated func fault(_ message: String, tag: String? = nil) {
+    public func fault(_ message: String, tag: String? = nil) {
         writeLog(message, severity: LogSeverity.fault, tag: tag)
     }
 
-    private nonisolated func writeLog(_ message: String, severity: LogSeverity, tag: String?) {
+    private func writeLog(_ message: String, severity: LogSeverity, tag: String?) {
         let currentSeverity = queue.sync { minSeverity }
 
         if severity.rawValue < currentSeverity.rawValue {

Sources/PowerSync/attachments/SyncingService.swift

@@ -110,7 +110,7 @@ actor SyncingServiceImpl: SyncingService {
         try guardClosed()
 
         try await _stopSync()
-        _setClosed()
+        closed = true
     }
 
     /// Triggers a sync operation. Can be called manually.
@@ -287,11 +287,6 @@ actor SyncingServiceImpl: SyncingService {
         syncTriggerSubject.send(())
     }
 
-    /// Small actor isolated method to mark as closed
-    private func _setClosed() {
-        closed = true
-    }
-
     /// Deletes an attachment from remote and local storage.
     ///
     /// - Parameter attachment: The attachment to delete.

Tests/PowerSyncTests/AttachmentTests.swift

@@ -34,7 +34,7 @@ final class AttachmentTests: XCTestCase {
     }
 
     func testAttachmentDownload() async throws {
-        let queue = await AttachmentQueue(
+        let queue = AttachmentQueue(
             db: database,
             remoteStorage: {
                 struct MockRemoteStorage: RemoteStorageAdapter {
@@ -80,27 +80,26 @@ final class AttachmentTests: XCTestCase {
             parameters: []
         )
 
-         let attachmentRecord = try await waitForMatch(
-             iteratorGenerator: { [database] in try database!.watch(
-                 options: WatchOptions(
-                     sql: "SELECT * FROM attachments",
-                     mapper: { cursor in try Attachment.fromCursor(cursor) }
-                 )) },
-             where: { results in results.first?.state == AttachmentState.synced },
-             timeout: 5
-         ).first
+        let attachmentRecord = try await waitForMatch(
+            iteratorGenerator: { [database] in try database!.watch(
+                options: WatchOptions(
+                    sql: "SELECT * FROM attachments",
+                    mapper: { cursor in try Attachment.fromCursor(cursor) }
+                )) },
+            where: { results in results.first?.state == AttachmentState.synced },
+            timeout: 5
+        ).first
 
 //         The file should exist
-         let localData = try await queue.localStorage.readFile(filePath: attachmentRecord!.localUri!)
-         XCTAssertEqual(localData.count, 3)
+        let localData = try await queue.localStorage.readFile(filePath: attachmentRecord!.localUri!)
+        XCTAssertEqual(localData.count, 3)
 
         try await queue.clearQueue()
         try await queue.close()
     }
 
     func testAttachmentUpload() async throws {
-        @MainActor
-        final class MockRemoteStorage: RemoteStorageAdapter {
+        actor MockRemoteStorage: RemoteStorageAdapter {
             public var uploadCalled = false
 
             func wasUploadCalled() -> Bool {
@@ -129,7 +128,7 @@ final class AttachmentTests: XCTestCase {
 
         let mockedRemote = MockRemoteStorage()
 
-        let queue = await AttachmentQueue(
+        let queue = AttachmentQueue(
             db: database,
             remoteStorage: mockedRemote,
             attachmentsDirectory: getAttachmentDirectory(),