Skip to content

fix: add network error retry for transfer polling #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jvsena42 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: add network error retry for transfer polling #763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
e = 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)
}
}
Expand Down Expand Up @@ -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
Expand Down
Loading