Add init which accepts LoggerProtocol. Generally cleanup logger config.

Author: stevensJourney

CHANGELOG.md

@@ -5,23 +5,19 @@
 * Added the ability to log PowerSync sync network requests.
 
 ```swift
-struct InlineLogger: SyncRequestLogger {
-    func log(_ message: String) {
-        print("Network: \(message)")
-    }
-}
-
-try await db.connect(
-                connector: connector,
-                options: ConnectOptions(
-                    clientConfiguration: SyncClientConfiguration(
-                        requestLogger: SyncRequestLoggerConfiguration(
-                            logLevel: .headers,
-                            logger: InlineLogger()
-                        )
-                    )
-                )
-            )
+try await database.connect(
+    connector: Connector(),
+    options: ConnectOptions(
+        clientConfiguration: SyncClientConfiguration(
+            requestLogger: SyncRequestLoggerConfiguration(
+                requestLevel: .headers
+            ) { message in
+                // Handle Network request logs here
+                print(message)
+            }
+        )
+    )
+)
 ```
 ## 1.3.1
 

Demo/PowerSyncExample/PowerSync/SystemManager.swift

@@ -13,12 +13,6 @@ func getAttachmentsDirectoryPath() throws -> String {
 
 let logTag = "SystemManager"
 
-struct InlineLogger: SyncRequestLogger {
-    func log(_ message: String) {
-        print("Network: \(message)")
-    }
-}
-
 @Observable
 class SystemManager {
     let connector = SupabaseConnector()
@@ -81,9 +75,10 @@ class SystemManager {
                 options: ConnectOptions(
                     clientConfiguration: SyncClientConfiguration(
                         requestLogger: SyncRequestLoggerConfiguration(
-                            logLevel: .headers,
-                            logger: InlineLogger()
-                        )
+                            requestLevel: .headers
+                        ) { message in
+                            self.db.logger.debug(message, tag: "SyncRequest")
+                        }
                     )
                 )
             )

Sources/PowerSync/Kotlin/KotlinNetworkLogger.swift

@@ -20,9 +20,9 @@ extension SyncRequestLogLevel {
 extension SyncRequestLoggerConfiguration {
     func toKotlinConfig() -> SwiftRequestLoggerConfig {
         return SwiftRequestLoggerConfig(
-            logLevel: self.logLevel.toKotlin(),
-            log: { [logger] message in
-                logger.log(message)
+            logLevel: self.requestLevel.toKotlin(),
+            log: { [log] message in
+                log(message)
             }
         )
     }

Sources/PowerSync/Protocol/PowerSyncDatabaseProtocol.swift

@@ -8,10 +8,7 @@ public struct SyncClientConfiguration {
     /// Optional configuration for logging PowerSync HTTP requests.
     ///
     /// When provided, network requests will be logged according to the
-    /// specified `SyncRequestLogLevel`. The `logLevel` is set during initialization
-    /// and remains constant throughout the PowerSync session.
-    ///
-    /// Set to `nil` to disable request logging entirely.
+    /// specified `SyncRequestLoggerConfiguration`. Set to `nil` to disable request logging entirely.
     ///
     /// - SeeAlso: `SyncRequestLoggerConfiguration` for configuration options
     public let requestLogger: SyncRequestLoggerConfiguration?

Sources/PowerSync/Protocol/SyncRequestLogger.swift

@@ -1,14 +1,3 @@
-/// A logger which handles PowerSync network request logs.
-///
-/// Implement this protocol to receive network request logging messages at the level
-/// specified in `SyncRequestLoggerConfiguration`. The `log(_:)` method will be called
-/// for each network event that meets the configured logging criteria.
-public protocol SyncRequestLogger {
-    /// Logs a network-related message.
-    /// - Parameter message: The formatted log message to record
-    func log(_ message: String)
-}
-
 /// Level of logs to expose to a `SyncRequestLogger` handler.
 ///
 /// Controls the verbosity of network logging for PowerSync HTTP requests.
@@ -30,25 +19,65 @@ public enum SyncRequestLogLevel {
 /// Configuration for PowerSync HTTP request logging.
 ///
 /// This configuration is set once during initialization and used throughout
-/// the PowerSync session. The `logLevel` determines which network events
-/// are logged, while the `logger` handles the actual log output.
+/// the PowerSync session. The `requestLevel` determines which network events
+/// are logged.
 ///
-/// - Note: The log level cannot be changed after initialization. A new call to `PowerSyncDatabase.connect` is required to change the level.
+/// - Note: The request levell cannot be changed after initialization. A new call to `PowerSyncDatabase.connect` is required to change the level.
 public struct SyncRequestLoggerConfiguration {
-    /// The logging level that determines which network events are logged.
+    /// The request logging level that determines which network events are logged.
     /// Set once during initialization and used throughout the session.
-    public let logLevel: SyncRequestLogLevel
+    public let requestLevel: SyncRequestLogLevel
 
-    /// The logger instance that receives network request log messages.
-    /// Must conform to `SyncRequestLogger` protocol.
-    public let logger: SyncRequestLogger
+    private let logHandler: (_ message: String) -> Void
 
     /// Creates a new network logger configuration.
     /// - Parameters:
-    ///   - logLevel: The `SyncRequestLogLevel` to use for filtering log messages
-    ///   - logger: A `SyncRequestLogger` instance to handle log output
-    public init(logLevel: SyncRequestLogLevel, logger: SyncRequestLogger) {
-        self.logLevel = logLevel
-        self.logger = logger
+    ///   - requestLevel: The `SyncRequestLogLevel` to use for filtering log messages
+    ///   - logHandler: A  closure which handles log messages
+    public init(
+        requestLevel: SyncRequestLogLevel,
+        logHandler: @escaping (_ message: String) -> Void)
+    {
+        self.requestLevel = requestLevel
+        self.logHandler = logHandler
+    }
+    
+    public func log(_ message: String) {
+        logHandler(message)
+    }
+    
+    /// Creates a new network logger configuration using a `LoggerProtocol` instance.
+    ///
+    /// This initializer allows integration with an existing logging framework by adapting
+    /// a `LoggerProtocol` to conform to `SyncRequestLogger`. The specified `logSeverity`
+    /// controls the severity level at which log messages are recorded. An optional `logTag`
+    /// may be used to help categorize logs.
+    ///
+    /// - Parameters:
+    ///   - requestLevel: The `SyncRequestLogLevel` to use for filtering which network events are logged.
+    ///   - logger: An object conforming to `LoggerProtocol` that will receive log messages.
+    ///   - logSeverity: The severity level to use for all log messages (defaults to `.debug`).
+    ///   - logTag: An optional tag to include with each log message, for use by the logging backend.
+    public init(
+        requestLevel: SyncRequestLogLevel,
+        logger: LoggerProtocol,
+        logSeverity: LogSeverity = .debug,
+        logTag: String? = nil)
+    {
+        self.requestLevel = requestLevel
+        self.logHandler = { message in
+            switch logSeverity {
+                case .debug:
+                    logger.debug(message, tag: logTag)
+                case .info:
+                    logger.info(message, tag: logTag)
+                case .warning:
+                    logger.warning(message, tag: logTag)
+                case .error:
+                    logger.error(message, tag: logTag)
+                case .fault:
+                    logger.fault(message, tag: logTag)
+            }
+        }
     }
 }

Tests/PowerSyncTests/ConnectTests.swift

@@ -96,21 +96,6 @@ final class ConnectTests: XCTestCase {
 
         let fakeUrl = "https://fakepowersyncinstance.fakepowersync.local"
 
-        struct InlineLogger: SyncRequestLogger {
-            let logger: (_: String) -> Void
-            
-            func log(_ message: String) {
-                logger(message)
-            }
-        }
-        
-        let testLogger = InlineLogger { message in
-            // We want to see a request to the specified instance
-            if message.contains(fakeUrl) {
-                expectation.fulfill()
-            }
-        }
-        
         class TestConnector: PowerSyncBackendConnector {
             let url: String
 
@@ -131,10 +116,13 @@ final class ConnectTests: XCTestCase {
             options: ConnectOptions(
                 clientConfiguration: SyncClientConfiguration(
                     requestLogger: SyncRequestLoggerConfiguration(
-                        logLevel:
-                        .all,
-                        logger: testLogger
-                    )
+                        requestLevel: .all
+                    ) { message in
+                        // We want to see a request to the specified instance
+                        if message.contains(fakeUrl) {
+                            expectation.fulfill()
+                        }
+                    }
                 )
             )
         )