Skip to content

Commit c1ed1dd

Browse files
committed
♻️ Reorg expire durations
1 parent ab6d6f8 commit c1ed1dd

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

packages/agent_dart_base/lib/agent/agent/http/index.dart

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,13 @@ Future<T> withRetry<T>(
3939
}
4040
}
4141

42+
/// Most of the timeouts will happen in 5 minutes.
43+
const defaultExpireInMinutes = 5;
44+
const defaultExpireInDuration = Duration(minutes: defaultExpireInMinutes);
45+
4246
/// Default delta for ingress expiry is 5 minutes.
43-
const _defaultIngressExpiryDeltaInMilliseconds = 5 * 60 * 1000;
47+
const _defaultIngressExpiryDeltaInMilliseconds =
48+
defaultExpireInMinutes * 60 * 1000;
4449

4550
/// Root public key for the IC, encoded as hex
4651
const _icRootKey = '308182301d060d2b0601040182dc7c0503010201060c2b0601040182dc7'

packages/agent_dart_base/lib/agent/polling/strategy.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PollStrategy defaultStrategy() {
1919
return chain([
2020
conditionalDelay(once(), 1000),
2121
backoff(1000, 1.2),
22-
timeout(5 * 60 * 1000),
22+
timeout(defaultExpireInDuration),
2323
]);
2424
}
2525

@@ -84,19 +84,19 @@ PollStrategy throttlePolling(int throttleMilliseconds) {
8484
};
8585
}
8686

87-
PollStrategy timeout(int milliseconds) {
88-
final end = DateTime.now().millisecondsSinceEpoch + milliseconds;
87+
PollStrategy timeout(Duration duration) {
88+
final end = DateTime.now().add(duration);
8989
return (
9090
Principal canisterId,
9191
RequestId requestId,
9292
RequestStatusResponseStatus status,
9393
) async {
94-
if (DateTime.now().millisecondsSinceEpoch > end) {
94+
if (DateTime.now().isAfter(end)) {
9595
throw TimeoutException(
96-
'Request timed out after $milliseconds milliseconds:\n'
96+
'Request timed out after $duration:\n'
9797
' Request ID: ${requestIdToHex(requestId)}\n'
9898
' Request status: $status\n',
99-
Duration(milliseconds: milliseconds),
99+
duration,
100100
);
101101
}
102102
};

packages/agent_dart_base/lib/identity/delegation.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,7 @@ class DelegationChain {
164164
DelegationChain? previous,
165165
List<Principal>? targets,
166166
}) async {
167-
expiration ??= DateTime.fromMillisecondsSinceEpoch(
168-
DateTime.now().millisecondsSinceEpoch + 15 * 60 * 1000,
169-
);
167+
expiration ??= DateTime.now().add(const Duration(minutes: 15));
170168
final delegation = await _createSingleDelegation(
171169
from,
172170
to,

0 commit comments

Comments
 (0)