feat: save app and ldk logs to same file

Bitkit/Services/LightningService.swift

@@ -8,7 +8,6 @@
 class LightningService {
     private var node: Node?
     var currentWalletIndex: Int = 0
-    private var currentLogFilePath: String?
 
     private let syncStatusChangedSubject = PassthroughSubject<UInt64, Never>()
 
@@ -83,12 +82,7 @@
         config.includeUntrustedPendingInSpendable = true
 
         let builder = Builder.fromConfig(config: config)
-
-        Logger.info("LDK-node log path: \(ldkStoragePath)")
-
-        let logFilePath = generateLogFilePath()
-        currentLogFilePath = logFilePath
-        builder.setFilesystemLogger(logFilePath: logFilePath, maxLogLevel: Env.ldkLogLevel)
+        builder.setCustomLogger(logWriter: LdkLogWriter())
 
         let resolvedElectrumServerUrl = electrumServerUrl ?? Env.electrumServerUrl
 
@@ -527,7 +521,7 @@
     }
 
     func closeChannel(_ channel: ChannelDetails, force: Bool = false, forceCloseReason: String? = nil) async throws {
         guard let node else {
             throw AppError(serviceError: .nodeNotStarted)
         }
 
@@ -604,11 +598,7 @@
     }
 
     func dumpLdkLogs() {
-        guard let logFilePath = currentLogFilePath else {
-            Logger.error("No log file path available")
-            return
-        }
-
+        let logFilePath = Logger.sessionLogFile
         let fileURL = URL(fileURLWithPath: logFilePath)
 
         do {
@@ -644,32 +634,6 @@
         return "Nodes: \(allNodes.count), Last Synced: \(lastRgsSyncString)"
     }
 
-    // MARK: Logging helpers
-
-    private func generateLogFilePath() -> String {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd_HH-mm-ss"
-        dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
-        let timestamp = dateFormatter.string(from: Date())
-
-        let baseDir = Env.logDirectory
-        let contextPrefix = Env.currentExecutionContext.filenamePrefix
-        let logFilePath = "\(baseDir)/ldk_\(contextPrefix)_\(timestamp).log"
-
-        // Create directory if it doesn't exist
-        let directory = URL(fileURLWithPath: baseDir)
-        if !FileManager.default.fileExists(atPath: directory.path) {
-            do {
-                try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
-            } catch {
-                Logger.error("Failed to create log directory: \(error)")
-            }
-        }
-
-        Logger.debug("Generated LDK log file path: \(logFilePath)")
-        return logFilePath
-    }
-
     // MARK: - Configuration Helpers
 
     private func configureGossipSource(builder: Builder, rgsServerUrl: String?) {
@@ -788,7 +752,7 @@
                 onEvent?(event)
 
                 switch event {
                 case let .paymentSuccessful(paymentId, paymentHash, paymentPreimage, feePaidMsat):
                     Logger.info("✅ Payment successful: paymentId: \(paymentId ?? "?") paymentHash: \(paymentHash) feePaidMsat: \(feePaidMsat ?? 0)")
                     Task {
                         let hash = paymentId ?? paymentHash
@@ -813,7 +777,7 @@
                             Logger.warn("No paymentId or paymentHash available for failed payment", context: "LightningService")
                         }
                     }
                 case let .paymentReceived(paymentId, paymentHash, amountMsat, feePaidMsat):
                     Logger.info("🤑 Payment received: paymentId: \(paymentId ?? "?") paymentHash: \(paymentHash) amountMsat: \(amountMsat)")
                     Task {
                         let hash = paymentId ?? paymentHash
@@ -823,7 +787,7 @@
                             Logger.error("Failed to handle payment received for \(hash): \(error)", context: "LightningService")
                         }
                     }
                 case let .paymentClaimable(paymentId, paymentHash, claimableAmountMsat, claimDeadline, customRecords):
                     Logger.info(
                         "🫰 Payment claimable: paymentId: \(paymentId) paymentHash: \(paymentHash) claimableAmountMsat: \(claimableAmountMsat)"
                     )
@@ -852,7 +816,7 @@
 
                     if let channel {
                         await registerClosedChannel(channel: channel, reason: reasonString)
                         await MainActor.run {
                             channelCache.removeValue(forKey: channelIdString)
                         }
                     } else {
@@ -875,7 +839,7 @@
                             Logger.error("Failed to handle transaction received for \(txid): \(error)", context: "LightningService")
                         }
                     }
                 case let .onchainTransactionConfirmed(txid, blockHash, blockHeight, confirmationTime, details):
                     Logger.info("✅ Onchain transaction confirmed: txid=\(txid) blockHeight=\(blockHeight) amountSats=\(details.amountSats)")
                     Task {
                         do {
@@ -929,7 +893,7 @@
 
                 // MARK: Balance Events
 
                 case let .balanceChanged(oldSpendableOnchain, newSpendableOnchain, oldTotalOnchain, newTotalOnchain, oldLightning, newLightning):
                     Logger
                         .info("💰 Balance changed: onchain=\(oldSpendableOnchain)->\(newSpendableOnchain) lightning=\(oldLightning)->\(newLightning)")
 

Bitkit/Utilities/Logger.swift

@@ -1,4 +1,7 @@
 import Foundation
+import LDKNode
+
+// MARK: - Logger
 
 class Logger {
     private init() {}
@@ -96,7 +99,7 @@ class Logger {
         }
     }
 
-    // Cleans up both bitkit and ldk log files
+    // Cleans up log files
     static func cleanUpOldLogFiles(maxTotalSizeMB: Int = 20) {
         queue.async {
             let baseDir = Env.logDirectory
@@ -148,3 +151,43 @@ class Logger {
         }
     }
 }
+
+// MARK: - LdkLogWriter
+
+final class LdkLogWriter: LogWriter {
+    private let maxLogLevel: LogLevel
+
+    init(maxLogLevel: LogLevel = Env.ldkLogLevel) {
+        self.maxLogLevel = maxLogLevel
+    }
+
+    func log(record: LogRecord) {
+        guard logLevelOrder(record.level) >= logLevelOrder(maxLogLevel) else { return }
+
+        let context = "[LDK] [\(record.modulePath):\(record.line)]"
+
+        switch record.level {
+        case .gossip, .trace, .debug:
+            Logger.debug(record.args, context: context)
+        case .info:
+            Logger.info(record.args, context: context)
+        case .warn:
+            Logger.warn(record.args, context: context)
+        case .error:
+            Logger.error(record.args, context: context)
+        }
+    }
+
+    /// Returns the numeric order of a LogLevel for comparison purposes.
+    /// Higher values are more severe (error > warn > info > debug > trace > gossip).
+    private func logLevelOrder(_ level: LogLevel) -> Int {
+        switch level {
+        case .gossip: return 1
+        case .trace: return 2
+        case .debug: return 3
+        case .info: return 4
+        case .warn: return 5
+        case .error: return 6
+        }
+    }
+}