Merge branch 'master' into fix/stale-graph-reset

Author: ovitrif

app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt

@@ -134,8 +134,8 @@ class BlocktankRepo @Inject constructor(
         }
     }
 
-    suspend fun refreshOrders() = withContext(bgDispatcher) {
-        if (isRefreshing) return@withContext
+    suspend fun refreshOrders(): Result<Unit> = withContext(bgDispatcher) {
+        if (isRefreshing) return@withContext Result.success(Unit)
         isRefreshing = true
 
         runCatching {
@@ -172,11 +172,9 @@ class BlocktankRepo @Inject constructor(
                 context = TAG
             )
             openChannelWithPaidOrders()
-        }.onFailure {
-            Logger.error("Failed to refresh orders", it, context = TAG)
+        }.also {
+            isRefreshing = false
         }
-
-        isRefreshing = false
     }
 
     suspend fun refreshMinCjitSats() = withContext(bgDispatcher) {
@@ -303,7 +301,7 @@ class BlocktankRepo @Inject constructor(
     ): Result<IBtOrder?> = withContext(bgDispatcher) {
         runCatching {
             if (refresh) {
-                refreshOrders()
+                refreshOrders().getOrThrow()
             }
             val order = _blocktankState.value.orders.find { it.id == orderId }
             return@runCatching order

app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/MapWebViewClient.kt

@@ -38,13 +38,15 @@ class MapWebViewClient(
         )
         onLoadingStateChanged(false)
 
-        error?.let {
-            if (it.errorCode == ERROR_HOST_LOOKUP ||
-                it.errorCode == ERROR_CONNECT ||
-                it.errorCode == ERROR_TIMEOUT ||
-                it.errorCode == ERROR_FILE_NOT_FOUND
-            ) {
-                onError?.invoke()
+        if (request?.isForMainFrame == true) {
+            error?.let {
+                if (it.errorCode == ERROR_HOST_LOOKUP ||
+                    it.errorCode == ERROR_CONNECT ||
+                    it.errorCode == ERROR_TIMEOUT ||
+                    it.errorCode == ERROR_FILE_NOT_FOUND
+                ) {
+                    onError?.invoke()
+                }
             }
         }
     }

app/src/main/java/to/bitkit/ui/screens/shop/shopWebView/ShopWebViewClient.kt

@@ -62,13 +62,15 @@ class ShopWebViewClient(
         )
         onLoadingStateChanged(false)
 
-        error?.let {
-            if (it.errorCode == ERROR_HOST_LOOKUP ||
-                it.errorCode == ERROR_CONNECT ||
-                it.errorCode == ERROR_TIMEOUT ||
-                it.errorCode == ERROR_FILE_NOT_FOUND
-            ) {
-                onError()
+        if (request?.isForMainFrame == true) {
+            error?.let {
+                if (it.errorCode == ERROR_HOST_LOOKUP ||
+                    it.errorCode == ERROR_CONNECT ||
+                    it.errorCode == ERROR_TIMEOUT ||
+                    it.errorCode == ERROR_FILE_NOT_FOUND
+                ) {
+                    onError()
+                }
             }
         }
     }

app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsViewModel.kt

@@ -32,10 +32,12 @@ import to.bitkit.ext.createChannelDetails
 import to.bitkit.ext.filterOpen
 import to.bitkit.ext.filterPending
 import to.bitkit.models.Toast
+import to.bitkit.models.TransferType
 import to.bitkit.repositories.ActivityRepo
 import to.bitkit.repositories.BlocktankRepo
 import to.bitkit.repositories.LightningRepo
 import to.bitkit.repositories.LogsRepo
+import to.bitkit.repositories.TransferRepo
 import to.bitkit.repositories.WalletRepo
 import to.bitkit.ui.shared.toast.ToastEventBus
 import to.bitkit.utils.Logger
@@ -51,6 +53,7 @@ class LightningConnectionsViewModel @Inject constructor(
     private val logsRepo: LogsRepo,
     private val walletRepo: WalletRepo,
     private val activityRepo: ActivityRepo,
+    private val transferRepo: TransferRepo,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(LightningConnectionsUiState())
@@ -452,6 +455,12 @@ class LightningConnectionsViewModel @Inject constructor(
 
             lightningRepo.closeChannel(channel).fold(
                 onSuccess = {
+                    transferRepo.createTransfer(
+                        type = TransferType.COOP_CLOSE,
+                        amountSats = channel.amountOnClose.toLong(),
+                        channelId = channel.channelId,
+                        fundingTxId = channel.fundingTxo?.txid,
+                    )
                     walletRepo.syncNodeAndWallet()
 
                     ToastEventBus.send(

app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt

@@ -263,19 +263,40 @@ class TransferViewModel @Inject constructor(
     }
 
     private suspend fun pollUntil(orderId: String, condition: (IBtOrder) -> Boolean): IBtOrder? {
+        var consecutiveErrors = 0
+
         while (true) {
-            val order = blocktankRepo.getOrder(orderId, refresh = true).getOrNull()
-            if (order == null) {
-                Logger.error("Order not found: '$orderId'", context = TAG)
-                return null
-            }
-            if (order.state2 == BtOrderState2.EXPIRED) {
-                Logger.error("Order expired: '$orderId'", context = TAG)
-                return null
-            }
-            if (condition(order)) {
-                return order
-            }
+            blocktankRepo.getOrder(orderId, refresh = true).fold(
+                onSuccess = { order ->
+                    consecutiveErrors = 0
+
+                    if (order == null) {
+                        Logger.error("Order not found: '$orderId'", context = TAG)
+                        return null
+                    }
+                    if (order.state2 == BtOrderState2.EXPIRED) {
+                        Logger.error("Order expired: '$orderId'", context = TAG)
+                        return null
+                    }
+                    if (condition(order)) {
+                        return order
+                    }
+                },
+                onFailure = {
+                    consecutiveErrors++
+                    Logger.warn(
+                        "Failed to fetch order '$orderId' (attempt $consecutiveErrors/$MAX_CONSECUTIVE_ERRORS)",
+                        it,
+                        context = TAG
+                    )
+
+                    if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
+                        Logger.error("Too many consecutive errors polling order '$orderId', giving up", context = TAG)
+                        return null
+                    }
+                }
+            )
+
             delay(POLL_INTERVAL_MS)
         }
     }
@@ -539,6 +560,7 @@ class TransferViewModel @Inject constructor(
         private const val TAG = "TransferViewModel"
         private const val MIN_STEP_DELAY_MS = 500L
         private const val POLL_INTERVAL_MS = 2_500L
+        private const val MAX_CONSECUTIVE_ERRORS = 5
         const val LN_SETUP_STEP_0 = 0
         const val LN_SETUP_STEP_1 = 1
         const val LN_SETUP_STEP_2 = 2

app/src/test/java/to/bitkit/repositories/BlocktankRepoTest.kt

@@ -172,4 +172,24 @@ class BlocktankRepoTest : BaseUnitTest() {
         assertTrue(result.isSuccess)
         assertNull(result.getOrThrow())
     }
+
+    @Test
+    fun `refreshOrders returns failure when server throws`() {
+        sut = createSut()
+        whenever { coreService.blocktank.orders(refresh = true) }.thenThrow(RuntimeException("Network error"))
+        test {
+            val result = sut.refreshOrders()
+            assertTrue(result.isFailure)
+        }
+    }
+
+    @Test
+    fun `getOrder returns failure when refresh fails`() {
+        sut = createSut()
+        whenever { coreService.blocktank.orders(refresh = true) }.thenThrow(RuntimeException("Network error"))
+        test {
+            val result = sut.getOrder(testOrder1.id, refresh = true)
+            assertTrue(result.isFailure)
+        }
+    }
 }