ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: DM retry stuck — reduce jitter, fix flood-only retry count

Browse Source 
- maxRetryAttemptsFloodOnly: 1→0 (was causing an extra retry for
  flood contacts that the official app doesn't do)
- isLastAttempt: fix off-by-one (retryAttempt already incremented
  when called from _scheduleRetry)
- Reduce ACK timeout jitter from 1-8s to 0.5-2s to avoid long waits
  that make the UI appear stuck
This commit is contained in:
Janez T
2026-03-17 10:48:53 +01:00
parent fa2b586ab7
commit c01ef7a059
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/providers/helpers/message_retry_manager.dart
View File

@@ -25,7 +25,8 @@ class MessageRetryManager {
static const int maxRetryAttemptsWithPath = 5; static const int maxRetryAttemptsWithPath = 5;
/// No retries for flood-only contacts (no known path). /// No retries for flood-only contacts (no known path).
static const int maxRetryAttemptsFloodOnly = 1; /// Value 0 means: don't retry at all, go straight to fallback/fail.
static const int maxRetryAttemptsFloodOnly = 0;
@Deprecated('Use maxRetryAttemptsForContact instead') @Deprecated('Use maxRetryAttemptsForContact instead')
static const int maxRetryAttempts = maxRetryAttemptsWithPath; static const int maxRetryAttempts = maxRetryAttemptsWithPath;
@@ -75,8 +76,8 @@ class MessageRetryManager {
} }
} }
// Add random jitter: 1000-8000ms (matches official app) // Add random jitter: 500-2000ms to avoid collision
final jitterMs = 1000 + _rng.nextInt(7001); final jitterMs = 500 + _rng.nextInt(1501);
return baseTimeout + jitterMs; return baseTimeout + jitterMs;
} }
@@ -90,11 +91,14 @@ class MessageRetryManager {
return message.retryAttempt < maxRetryAttemptsForContact(contact); return message.retryAttempt < maxRetryAttemptsForContact(contact);
} }
/// Whether the next attempt is the last one. /// Whether this is the last retry attempt.
/// When true, the caller should reset the path to force flood mode. /// When true, the caller should reset the path to force flood mode.
///
/// Note: called AFTER retryAttempt has been incremented, so we compare
/// directly against maxAttempts (not +1).
bool isLastAttempt(Message message, Contact contact) { bool isLastAttempt(Message message, Contact contact) {
final maxAttempts = maxRetryAttemptsForContact(contact); final maxAttempts = maxRetryAttemptsForContact(contact);
return maxAttempts > 1 && message.retryAttempt + 1 >= maxAttempts; return maxAttempts > 1 && message.retryAttempt >= maxAttempts;
} }
/// Track a retry attempt for a message /// Track a retry attempt for a message