Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class TaskShepherd {
required bool Function(T) checkTaskStatus,
Future<void> Function(int taskId)? cancelTask,
Duration pollingInterval = const Duration(seconds: 1),
Duration Function(T status)? pollingIntervalForStatus,
}) {
final controller = StreamController<T>();
var taskCompletedNaturally = false;
Expand Down Expand Up @@ -79,7 +80,9 @@ class TaskShepherd {
return;
}

await Future<void>.delayed(pollingInterval);
final nextDelay =
pollingIntervalForStatus != null ? pollingIntervalForStatus(status) : null;
await Future<void>.delayed(nextDelay ?? pollingInterval);
}
} catch (e, stackTrace) {
controller.addError(e, stackTrace);
Expand All @@ -97,13 +100,15 @@ extension TaskRpcBuddy on NewTaskResponse {
required bool Function(T) isTaskComplete,
Future<void> Function(int taskId)? cancelTask,
Duration pollingInterval = const Duration(seconds: 1),
Duration Function(T status)? pollingIntervalForStatus,
}) {
return TaskShepherd.executeTask<T>(
initTask: () async => this,
getTaskStatus: getTaskStatus,
checkTaskStatus: isTaskComplete,
cancelTask: cancelTask,
pollingInterval: pollingInterval,
pollingIntervalForStatus: pollingIntervalForStatus,
);
}
}
Expand All @@ -114,13 +119,15 @@ extension TaskRpcBuddyFuture on Future<NewTaskResponse> {
required bool Function(T) isTaskComplete,
Future<void> Function(int taskId)? cancelTask,
Duration pollingInterval = const Duration(seconds: 1),
Duration Function(T status)? pollingIntervalForStatus,
}) {
return TaskShepherd.executeTask<T>(
initTask: () async => this,
getTaskStatus: getTaskStatus,
checkTaskStatus: isTaskComplete,
cancelTask: cancelTask,
pollingInterval: pollingInterval,
pollingIntervalForStatus: pollingIntervalForStatus,
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ class ZhtlcActivationStrategy extends ProtocolActivationStrategy {
isTaskComplete: (TaskStatusResponse s) =>
s.status == 'Ok' || s.status == 'Error',
pollingInterval: effectivePollingInterval,
pollingIntervalForStatus: (TaskStatusResponse s) {
final parsed = progressEstimator.parse(s.details);
// Back off to 5s until requesting balance; then use the effective (fast) interval.
return parsed.phase == ZhtlcActivationPhase.requestingWalletBalance
? effectivePollingInterval
: const Duration(seconds: 5);
},
// cancelTask intentionally omitted, as it is not used in this
// context and leaving it enabled lead to uncaught exceptions
// when taskId was already finished.
Expand Down
Loading