Merge pull request #207 from synonymdev/feat/force-close

ovitrif · web-flow · commit 7271b5515943 · 2025-11-14T00:56:49.000+01:00
feat: Force Close
diff --git a/Bitkit/AppScene.swift b/Bitkit/AppScene.swift
@@ -50,7 +50,7 @@ struct AppScene: View {
         _currency = StateObject(wrappedValue: CurrencyViewModel())
         _blocktank = StateObject(wrappedValue: BlocktankViewModel())
         _activity = StateObject(wrappedValue: ActivityListViewModel(transferService: transferService))
-        _transfer = StateObject(wrappedValue: TransferViewModel(transferService: transferService))
+        _transfer = StateObject(wrappedValue: TransferViewModel(transferService: transferService, sheetViewModel: sheetViewModel))
         _widgets = StateObject(wrappedValue: WidgetsViewModel())
         _settings = StateObject(wrappedValue: SettingsViewModel.shared)
 
diff --git a/Bitkit/Components/NodeStateView.swift b/Bitkit/Components/NodeStateView.swift
@@ -29,6 +29,7 @@ struct IdentifiableLightningBalance: Identifiable {
 
 struct NodeStateView: View {
     @EnvironmentObject var wallet: WalletViewModel
+    @EnvironmentObject var app: AppViewModel
 
     @State private var closingChannels: [String] = []
 
@@ -118,7 +119,29 @@ struct NodeStateView: View {
                         Text("\(peer.nodeId)@\(peer.address)")
                             .font(.caption)
                         Spacer()
-                        Text(peer.isConnected ? "✅" : "❌")
+
+                        Button {
+                            Task { @MainActor in
+                                do {
+                                    try await wallet.disconnectPeer(peer)
+                                    app.toast(
+                                        type: .info,
+                                        title: tTodo("success"),
+                                        description: tTodo("Peer disconnected.")
+                                    )
+                                } catch {
+                                    app.toast(
+                                        type: .error,
+                                        title: "error_occured",
+                                        description: error.localizedDescription
+                                    )
+                                }
+                            }
+                        } label: {
+                            Image(systemName: "minus.circle")
+                                .foregroundColor(.redAccent)
+                        }
+                        .buttonStyle(.plain)
                     }
                 }
             }
diff --git a/Bitkit/MainNavView.swift b/Bitkit/MainNavView.swift
@@ -139,6 +139,14 @@ struct MainNavView: View {
         ) {
             config in SendSheet(config: config)
         }
+        .sheet(
+            item: $sheets.forceTransferSheetItem,
+            onDismiss: {
+                sheets.hideSheet()
+            }
+        ) {
+            config in ForceTransferSheet(config: config)
+        }
         .accentColor(.white)
         .overlay {
             TabBar()
diff --git a/Bitkit/Services/LightningService.swift b/Bitkit/Services/LightningService.swift
@@ -406,29 +406,60 @@ class LightningService {
         }
     }
 
-    func closeChannel(userChannelId: ChannelId, counterpartyNodeId: PublicKey) async throws {
+    func closeChannel(userChannelId: ChannelId, counterpartyNodeId: PublicKey, force: Bool = false, forceCloseReason: String? = nil) async throws {
         guard let node else {
             throw AppError(serviceError: .nodeNotStarted)
         }
 
         return try await ServiceQueue.background(.ldk) {
-            try node.closeChannel(
-                userChannelId: userChannelId,
-                counterpartyNodeId: counterpartyNodeId
-            )
+            Logger.debug("Initiating channel close (force=\(force)): userChannelId=\(userChannelId)", context: "LightningService")
+
+            if force {
+                try node.forceCloseChannel(
+                    userChannelId: userChannelId,
+                    counterpartyNodeId: counterpartyNodeId,
+                    reason: forceCloseReason ?? ""
+                )
+            } else {
+                try node.closeChannel(
+                    userChannelId: userChannelId,
+                    counterpartyNodeId: counterpartyNodeId
+                )
+            }
         }
     }
 
-    func closeChannel(_ channel: ChannelDetails) async throws {
+    func closeChannel(_ channel: ChannelDetails, force: Bool = false, forceCloseReason: String? = nil) async throws {
         guard let node else {
             throw AppError(serviceError: .nodeNotStarted)
         }
 
-        return try await ServiceQueue.background(.ldk) {
-            try node.closeChannel(
-                userChannelId: channel.userChannelId,
-                counterpartyNodeId: channel.counterpartyNodeId
-            )
+        Logger.debug("closeChannel called to channel=\(channel), force=\(force)", context: "LightningService")
+
+        return try await closeChannel(
+            userChannelId: channel.userChannelId,
+            counterpartyNodeId: channel.counterpartyNodeId,
+            force: force,
+            forceCloseReason: forceCloseReason
+        )
+    }
+
+    func disconnectPeer(peer: PeerDetails) async throws {
+        guard let node else {
+            throw AppError(serviceError: .nodeNotSetup)
+        }
+
+        let uri = "\(peer.nodeId)@\(peer.address)"
+        Logger.debug("Disconnecting peer: \(uri)")
+
+        do {
+            try await ServiceQueue.background(.ldk) {
+                try node.disconnect(nodeId: peer.nodeId)
+            }
+            Logger.info("Peer disconnected: \(uri)")
+        } catch {
+            Logger.warn("Peer disconnect error: \(uri)")
+            throw error
         }
     }
 
diff --git a/Bitkit/ViewModels/SheetViewModel.swift b/Bitkit/ViewModels/SheetViewModel.swift
@@ -5,6 +5,7 @@ enum SheetID: String, CaseIterable {
     case appUpdate
     case backup
     case boost
+    case forceTransfer
     case forgotPin
     case gift
     case highBalance
@@ -287,4 +288,16 @@ class SheetViewModel: ObservableObject {
             }
         }
     }
+
+    var forceTransferSheetItem: ForceTransferSheetItem? {
+        get {
+            guard let config = activeSheetConfiguration, config.id == .forceTransfer else { return nil }
+            return ForceTransferSheetItem()
+        }
+        set {
+            if newValue == nil {
+                activeSheetConfiguration = nil
+            }
+        }
+    }
 }
diff --git a/Bitkit/ViewModels/TransferViewModel.swift b/Bitkit/ViewModels/TransferViewModel.swift
@@ -27,6 +27,7 @@ class TransferViewModel: ObservableObject {
     private let lightningService: LightningService
     private let currencyService: CurrencyService
     private let transferService: TransferService
+    private let sheetViewModel: SheetViewModel
 
     private var refreshTimer: Timer?
     private var refreshTask: Task<Void, Never>?
@@ -39,19 +40,22 @@ class TransferViewModel: ObservableObject {
         coreService: CoreService = .shared,
         lightningService: LightningService = .shared,
         currencyService: CurrencyService = .shared,
-        transferService: TransferService
+        transferService: TransferService,
+        sheetViewModel: SheetViewModel
     ) {
         self.coreService = coreService
         self.lightningService = lightningService
         self.currencyService = currencyService
         self.transferService = transferService
+        self.sheetViewModel = sheetViewModel
     }
 
     /// Convenience initializer for testing and previews
     convenience init(
         coreService: CoreService = .shared,
         lightningService: LightningService = .shared,
-        currencyService: CurrencyService = .shared
+        currencyService: CurrencyService = .shared,
+        sheetViewModel: SheetViewModel = SheetViewModel()
     ) {
         let transferService = TransferService(
             lightningService: lightningService,
@@ -61,7 +65,8 @@ class TransferViewModel: ObservableObject {
             coreService: coreService,
             lightningService: lightningService,
             currencyService: currencyService,
-            transferService: transferService
+            transferService: transferService,
+            sheetViewModel: sheetViewModel
         )
     }
 
@@ -529,22 +534,9 @@ class TransferViewModel: ObservableObject {
 
     func closeChannels(channels: [ChannelDetails]) async throws -> [ChannelDetails] {
         var failedChannels: [ChannelDetails] = []
+        var successfulChannels: [ChannelDetails] = []
 
-        // Create transfer tracking records for each channel being closed
-        for channel in channels {
-            do {
-                let transferId = try await transferService.createTransfer(
-                    type: .toSavings,
-                    amountSats: channel.amountOnClose,
-                    channelId: channel.channelId.description
-                )
-                Logger.info("Created transfer tracking record for channel closure: \(transferId)", context: "TransferViewModel")
-            } catch {
-                Logger.error("Failed to create transfer tracking record for channel: \(channel.channelId)", context: error.localizedDescription)
-                // Continue with closure even if tracking fails
-            }
-        }
-
+        // Close channels in parallel and track which ones succeeded
         try await withThrowingTaskGroup(of: ChannelDetails?.self) { group in
             for channel in channels {
                 group.addTask {
@@ -566,6 +558,26 @@ class TransferViewModel: ObservableObject {
             }
         }
 
+        // Determine which channels closed successfully
+        successfulChannels = channels.filter { channel in
+            !failedChannels.contains { $0.channelId == channel.channelId }
+        }
+
+        // Create transfer tracking records only for successfully closed channels
+        for channel in successfulChannels {
+            do {
+                let transferId = try await transferService.createTransfer(
+                    type: .toSavings,
+                    amountSats: channel.amountOnClose,
+                    channelId: channel.channelId.description
+                )
+                Logger.info("Created transfer tracking record for channel closure: \(transferId)", context: "TransferViewModel")
+            } catch {
+                Logger.error("Failed to create transfer tracking record for channel: \(channel.channelId)", context: error.localizedDescription)
+                // Don't fail the entire operation - the channel is already closed
+            }
+        }
+
         // Sync transfer states after attempting closures
         try? await transferService.syncTransferStates()
 
@@ -605,8 +617,71 @@ class TransferViewModel: ObservableObject {
                 try? await Task.sleep(nanoseconds: UInt64(retryInterval * 1_000_000_000))
             }
 
-            Logger.info("Giving up on coop close.")
-            // TODO: Show force transfer UI
+            Logger.info("Giving up on coop close. Showing force transfer UI.")
+
+            // Show force transfer sheet
+            sheetViewModel.showSheet(.forceTransfer)
+        }
+    }
+
+    /// Force close all channels that failed to cooperatively close
+    func forceCloseChannel() async throws {
+        guard !channelsToClose.isEmpty else {
+            Logger.warn("No channels to force close")
+            return
+        }
+
+        Logger.info("Force closing \(channelsToClose.count) channel(s)")
+
+        var errors: [(channelId: String, error: Error)] = []
+        var successfulChannels: [ChannelDetails] = []
+
+        for channel in channelsToClose {
+            do {
+                // Force close the channel first
+                try await lightningService.closeChannel(
+                    channel,
+                    force: true,
+                    forceCloseReason: "User requested force close after cooperative close failed"
+                )
+                Logger.info("Successfully initiated force close for channel: \(channel.channelId)")
+                successfulChannels.append(channel)
+
+                // Only create transfer tracking record if force close succeeded
+                do {
+                    let transferId = try await transferService.createTransfer(
+                        type: .toSavings,
+                        amountSats: channel.amountOnClose,
+                        channelId: channel.channelId.description
+                    )
+                    Logger.info("Created transfer tracking record for force channel closure: \(transferId)", context: "TransferViewModel")
+                } catch {
+                    Logger.error(
+                        "Failed to create transfer tracking record for force-closed channel: \(channel.channelId)",
+                        context: error.localizedDescription
+                    )
+                    // Don't fail the entire operation - the channel is already force-closed
+                }
+            } catch {
+                Logger.error("Failed to force close channel: \(channel.channelId)", context: error.localizedDescription)
+                errors.append((channelId: channel.channelId, error: error))
+            }
+        }
+
+        // Remove successfully closed channels from the list
+        channelsToClose.removeAll { channel in
+            successfulChannels.contains { $0.channelId == channel.channelId }
+        }
+
+        try? await transferService.syncTransferStates()
+
+        // If any errors occurred, throw an aggregated error
+        if !errors.isEmpty {
+            let errorMessages = errors.map { "\($0.channelId): \($0.error.localizedDescription)" }.joined(separator: ", ")
+            throw AppError(
+                message: "Failed to force close \(errors.count) of \(errors.count + successfulChannels.count) channel(s)",
+                debugMessage: errorMessages
+            )
         }
     }
 }
diff --git a/Bitkit/ViewModels/WalletViewModel.swift b/Bitkit/ViewModels/WalletViewModel.swift
@@ -432,8 +432,18 @@ class WalletViewModel: ObservableObject {
         }
     }
 
-    func closeChannel(_ channel: ChannelDetails) async throws {
-        try await lightningService.closeChannel(userChannelId: channel.userChannelId, counterpartyNodeId: channel.counterpartyNodeId)
+    func closeChannel(_ channel: ChannelDetails, force: Bool = false, forceCloseReason: String? = nil) async throws {
+        try await lightningService.closeChannel(
+            userChannelId: channel.userChannelId,
+            counterpartyNodeId: channel.counterpartyNodeId,
+            force: force,
+            forceCloseReason: forceCloseReason
+        )
+        syncState()
+    }
+
+    func disconnectPeer(_ peer: PeerDetails) async throws {
+        try await lightningService.disconnectPeer(peer: peer)
         syncState()
     }
 
diff --git a/Bitkit/Views/Settings/Advanced/CloseConnectionConfirmation.swift b/Bitkit/Views/Settings/Advanced/CloseConnectionConfirmation.swift
diff --git a/Bitkit/Views/Sheets/ForceTransferSheet.swift b/Bitkit/Views/Sheets/ForceTransferSheet.swift

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ enum SheetID: String, CaseIterable {`
`5`	`5`	`case appUpdate`
`6`	`6`	`case backup`
`7`	`7`	`case boost`
	`8`	`+ case forceTransfer`
`8`	`9`	`case forgotPin`
`9`	`10`	`case gift`
`10`	`11`	`case highBalance`
`@@ -287,4 +288,16 @@ class SheetViewModel: ObservableObject {`
`287`	`288`	`}`
`288`	`289`	`}`
`289`	`290`	`}`
	`291`	`+`
	`292`	`+ var forceTransferSheetItem: ForceTransferSheetItem? {`
	`293`	`+ get {`
	`294`	`+ guard let config = activeSheetConfiguration, config.id == .forceTransfer else { return nil }`
	`295`	`+ return ForceTransferSheetItem()`
	`296`	`+ }`
	`297`	`+ set {`
	`298`	`+ if newValue == nil {`
	`299`	`+ activeSheetConfiguration = nil`
	`300`	`+ }`
	`301`	`+ }`
	`302`	`+ }`
`290`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -432,8 +432,18 @@ class WalletViewModel: ObservableObject {`
`432`	`432`	`}`
`433`	`433`	`}`
`434`	`434`
`435`		`- func closeChannel(_ channel: ChannelDetails) async throws {`
`436`		`- try await lightningService.closeChannel(userChannelId: channel.userChannelId, counterpartyNodeId: channel.counterpartyNodeId)`
	`435`	`+ func closeChannel(_ channel: ChannelDetails, force: Bool = false, forceCloseReason: String? = nil) async throws {`
	`436`	`+ try await lightningService.closeChannel(`
	`437`	`+ userChannelId: channel.userChannelId,`
	`438`	`+ counterpartyNodeId: channel.counterpartyNodeId,`
	`439`	`+ force: force,`
	`440`	`+ forceCloseReason: forceCloseReason`
	`441`	`+ )`
	`442`	`+ syncState()`
	`443`	`+ }`
	`444`	`+`
	`445`	`+ func disconnectPeer(_ peer: PeerDetails) async throws {`
	`446`	`+ try await lightningService.disconnectPeer(peer: peer)`
`437`	`447`	`syncState()`
`438`	`448`	`}`
`439`	`449`