Add logger

Author: stevensJourney

Sources/PowerSync/Kotlin/KotlinPowerSyncDatabaseImpl.swift

@@ -1,27 +1,27 @@
 import Foundation
 import PowerSyncKotlin
 
-final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
+internal final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
+    let logger: any LoggerProtocol
+    
     private let kotlinDatabase: PowerSyncKotlin.PowerSyncDatabase
 
     var currentStatus: SyncStatus { kotlinDatabase.currentStatus }
+    
 
     init(
         schema: Schema,
         dbFilename: String,
-        logger: DatabaseLogger? = nil
+        logger: DatabaseLogger
     ) {
         let factory = PowerSyncKotlin.DatabaseDriverFactory()
         kotlinDatabase = PowerSyncDatabase(
             factory: factory,
             schema: KotlinAdapter.Schema.toKotlin(schema),
             dbFilename: dbFilename,
-            logger: logger?.kLogger
+            logger: logger.kLogger
         )
-    }
-
-    init(kotlinDatabase: KotlinPowerSyncDatabase) {
-        self.kotlinDatabase = kotlinDatabase
+        self.logger = logger
     }
 
     func waitForFirstSync() async throws {
@@ -42,7 +42,10 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
         retryDelayMs: Int64 = 5000,
         params: [String: JsonParam?] = [:]
     ) async throws {
-        let connectorAdapter = PowerSyncBackendConnectorAdapter(swiftBackendConnector: connector)
+        let connectorAdapter = PowerSyncBackendConnectorAdapter(
+            swiftBackendConnector: connector,
+            db: self
+        )
 
         try await kotlinDatabase.connect(
             connector: connectorAdapter,

Sources/PowerSync/PowerSyncBackendConnectorAdapter.swift

@@ -1,38 +1,34 @@
 import OSLog
 
-class PowerSyncBackendConnectorAdapter: KotlinPowerSyncBackendConnector {
+internal class PowerSyncBackendConnectorAdapter: KotlinPowerSyncBackendConnector {
     let swiftBackendConnector: PowerSyncBackendConnector
-
+    let db: any PowerSyncDatabaseProtocol
+    let logTag = "PowerSyncBackendConnector"
+    
     init(
-        swiftBackendConnector: PowerSyncBackendConnector
+        swiftBackendConnector: PowerSyncBackendConnector,
+        db: any PowerSyncDatabaseProtocol
     ) {
         self.swiftBackendConnector = swiftBackendConnector
+        self.db = db
     }
 
     override func __fetchCredentials() async throws -> KotlinPowerSyncCredentials? {
         do {
             let result = try await swiftBackendConnector.fetchCredentials()
             return result?.kotlinCredentials
         } catch {
-            if #available(iOS 14.0, *) {
-                Logger().error("🔴 Failed to fetch credentials: \(error.localizedDescription)")
-            } else {
-                print("🔴 Failed to fetch credentials: \(error.localizedDescription)")
-            }
+            db.logger.error("Error while fetching credentials", tag: logTag)
             return nil
         }
     }
 
     override func __uploadData(database: KotlinPowerSyncDatabase) async throws {
-        let swiftDatabase = KotlinPowerSyncDatabaseImpl(kotlinDatabase: database)
         do {
-            return  try await swiftBackendConnector.uploadData(database: swiftDatabase)
+            // Pass the Swift DB protocal to the connector
+            return  try await swiftBackendConnector.uploadData(database: db)
         } catch {
-            if #available(iOS 14.0, *) {
-                Logger().error("🔴 Failed to upload data: \(error)")
-            } else {
-                print("🔴 Failed to upload data: \(error)")
-            }
+            db.logger.error("Error while uploading data: \(error)", tag: logTag)
         }
     }
 }

Sources/PowerSync/PowerSyncDatabaseProtocol.swift

@@ -11,6 +11,9 @@ public protocol PowerSyncDatabaseProtocol: Queries {
     /// The current sync status.
     var currentStatus: SyncStatus { get }
 
+    /// Logger used for PowerSync operations
+    var logger: any LoggerProtocol { get }
+    
     /// Wait for the first sync to occur
     func waitForFirstSync() async throws
 

Sources/PowerSync/attachments/AttachmentQueue.swift

@@ -46,6 +46,8 @@ public struct WatchedAttachmentItem {
 public actor AttachmentQueue {
     /// Default name of the attachments table
     public static let DEFAULT_TABLE_NAME = "attachments"
+    
+    let logTag = "AttachmentQueue"
 
     /// PowerSync database client
     public let db: PowerSyncDatabaseProtocol
@@ -86,7 +88,7 @@ public actor AttachmentQueue {
     /**
      * Logging interface used for all log operations
      */
-//    public let logger: Logger
+    public let logger: any LoggerProtocol
 
     /// Attachment service for interacting with attachment records
     public let attachmentsService: AttachmentService
@@ -102,12 +104,13 @@ public actor AttachmentQueue {
         remoteStorage: self.remoteStorage,
         localStorage: self.localStorage,
         attachmentsService: self.attachmentsService,
+        logger: self.logger,
         getLocalUri: { [weak self] filename in
             guard let self = self else { return filename }
             return await self.getLocalUri(filename)
         },
         errorHandler: self.errorHandler,
-        syncThrottle: self.syncThrottleDuration
+        syncThrottle: self.syncThrottleDuration,
     )
 
     /// Initializes the attachment queue
@@ -125,7 +128,7 @@ public actor AttachmentQueue {
         syncThrottleDuration: TimeInterval = 1.0,
         subdirectories: [String]? = nil,
         downloadAttachments: Bool = true,
-//        logger: Logger = Logger(subsystem: "com.powersync.attachments", category: "AttachmentQueue")
+        logger: (any LoggerProtocol)? = nil
     ) {
         self.db = db
         self.remoteStorage = remoteStorage
@@ -139,12 +142,12 @@ public actor AttachmentQueue {
         self.syncThrottleDuration = syncThrottleDuration
         self.subdirectories = subdirectories
         self.downloadAttachments = downloadAttachments
-//        self.logger = logger
+        self.logger = logger ?? db.logger
 
         attachmentsService = AttachmentService(
             db: db,
             tableName: attachmentsQueueTableName,
-//            logger: logger,
+            logger: self.logger,
             maxArchivedCount: archivedCacheLimit
         )
     }
@@ -193,7 +196,7 @@ public actor AttachmentQueue {
                 try await watchTask.value
             } catch {
                 if !(error is CancellationError) {
-//                    logger.error("Error in sync job: \(error.localizedDescription)")
+                    logger.error("Error in sync job: \(error.localizedDescription)", tag: logTag)
                 }
             }
         }

Sources/PowerSync/attachments/AttachmentsService.swift

@@ -9,7 +9,8 @@ import PowerSyncKotlin
 public class AttachmentService {
     private let db: any PowerSyncDatabaseProtocol
     private let tableName: String
-//    private let logger: Logger
+    private let logger: any LoggerProtocol
+    private let logTag = "AttachmentService"
     private let maxArchivedCount: Int64
 
     /**
@@ -22,12 +23,12 @@ public class AttachmentService {
     public init(
         db: PowerSyncDatabaseProtocol,
         tableName: String,
-//        logger: Logger,
+        logger: any LoggerProtocol,
         maxArchivedCount: Int64
     ) {
         self.db = db
         self.tableName = tableName
-//        self.logger = logger
+        self.logger = logger
         self.maxArchivedCount = maxArchivedCount
     }
 
@@ -145,7 +146,7 @@ public class AttachmentService {
      * Once a change is detected it will initiate a sync of the attachments
      */
     public func watchActiveAttachments() throws -> AsyncThrowingStream<[String], Error> {
-//        logger.i("Watching attachments...")
+        logger.info("Watching attachments...", tag: logTag)
 
         return try db.watch(
             sql: """

Sources/PowerSync/attachments/SyncingService.swift

@@ -17,6 +17,9 @@ actor SyncingService {
     private let syncTriggerSubject = PassthroughSubject<Void, Never>()
     private var periodicSyncTimer: Timer?
     private var syncTask: Task<Void, Never>?
+    let logger: any LoggerProtocol
+    
+    let logTag = "AttachmentSync"
 
     /// Initializes a new instance of `SyncingService`.
     ///
@@ -31,16 +34,18 @@ actor SyncingService {
         remoteStorage: RemoteStorageAdapter,
         localStorage: LocalStorageAdapter,
         attachmentsService: AttachmentService,
+        logger: any LoggerProtocol,
         getLocalUri: @escaping (String) async -> String,
         errorHandler: SyncErrorHandler? = nil,
-        syncThrottle: TimeInterval = 5.0
+        syncThrottle: TimeInterval = 5.0,
     ) {
         self.remoteStorage = remoteStorage
         self.localStorage = localStorage
         self.attachmentsService = attachmentsService
         self.getLocalUri = getLocalUri
         self.errorHandler = errorHandler
         self.syncThrottle = syncThrottle
+        self.logger = logger
 
         Task { await self.setupSyncFlow() }
     }
@@ -74,7 +79,7 @@ actor SyncingService {
                     _ = try await deleteArchivedAttachments()
                 } catch {
                     if error is CancellationError { break }
-                    // logger.error("Sync failure: \(error)")
+                     logger.error("Sync error: \(error)", tag: logTag)
                 }
             }
 
@@ -167,6 +172,7 @@ actor SyncingService {
     /// - Parameter attachment: The attachment to upload.
     /// - Returns: The updated attachment with new sync state.
     private func uploadAttachment(attachment: Attachment) async throws -> Attachment {
+        logger.info("Uploading attachment \(attachment.filename)", tag: logTag)
         do {
             guard let localUri = attachment.localUri else {
                 throw PowerSyncError.attachmentError("No localUri for attachment \(attachment.id)")
@@ -192,6 +198,7 @@ actor SyncingService {
     /// - Parameter attachment: The attachment to download.
     /// - Returns: The updated attachment with new sync state.
     private func downloadAttachment(attachment: Attachment) async throws -> Attachment {
+        logger.info("Downloading attachment \(attachment.filename)", tag: logTag)
         do {
             let attachmentPath = await getLocalUri(attachment.filename)
             let fileData = try await remoteStorage.downloadFile(attachment: attachment)
@@ -218,6 +225,7 @@ actor SyncingService {
     /// - Parameter attachment: The attachment to delete.
     /// - Returns: The updated attachment with archived state.
     private func deleteAttachment(attachment: Attachment) async throws -> Attachment {
+        logger.info("Deleting attachment \(attachment.filename)", tag: logTag)
         do {
             try await remoteStorage.deleteFile(attachment: attachment)