formatted code

This commit is contained in:
zjs81
2026-03-20 01:55:08 -07:00
parent 4962a48e64
commit 4ad4a93a20
5 changed files with 143 additions and 116 deletions
+12 -5
View File
@@ -22,7 +22,11 @@ class _AckHistoryEntry {
}
/// (messageId, timestamp, attemptIndex) — stored per ACK hash for O(1) lookup.
typedef AckHashMapping = ({String messageId, DateTime timestamp, int attemptIndex});
typedef AckHashMapping = ({
String messageId,
DateTime timestamp,
int attemptIndex,
});
class RetryServiceConfig {
final void Function(Contact, String, int, int) sendMessage;
@@ -31,7 +35,7 @@ class RetryServiceConfig {
final Function(Contact)? clearContactPath;
final Function(Contact, Uint8List, int)? setContactPath;
final int Function(int pathLength, int messageBytes, {String? contactKey})?
calculateTimeout;
calculateTimeout;
final Uint8List? Function()? getSelfPublicKey;
final String Function(Contact, String)? prepareContactOutboundText;
final AppSettingsService? appSettingsService;
@@ -43,7 +47,8 @@ class RetryServiceConfig {
int attemptIndex,
int maxRetries,
List<PathSelection> recentSelections,
)? selectRetryPath;
)?
selectRetryPath;
const RetryServiceConfig({
required this.sendMessage,
@@ -132,7 +137,8 @@ class MessageRetryService extends ChangeNotifier {
}) async {
final messageId = const Uuid().v4();
final resolved = resolvePathSelection(contact);
final messagePathBytes = pathBytes ?? Uint8List.fromList(resolved.pathBytes);
final messagePathBytes =
pathBytes ?? Uint8List.fromList(resolved.pathBytes);
final messagePathLength =
pathLength ?? (resolved.useFlood ? -1 : resolved.hopCount);
final message = Message(
@@ -262,7 +268,8 @@ class MessageRetryService extends ChangeNotifier {
if (config.setContactPath != null && config.clearContactPath != null) {
final bool useFlood = currentSelection != null
? currentSelection.useFlood
: (effectiveMessage.pathLength != null && effectiveMessage.pathLength! < 0);
: (effectiveMessage.pathLength != null &&
effectiveMessage.pathLength! < 0);
final List<int> pathBytes = currentSelection != null
? currentSelection.pathBytes
: effectiveMessage.pathBytes;
+13 -13
View File
@@ -469,17 +469,18 @@ class PathHistoryService extends ChangeNotifier {
final highestRouteWeight = _getHighestKnownRouteWeight(ranked);
ranked.sort((a, b) {
final scoreCompare = _scorePathRecord(
b,
fastestTripMs: fastestTripMs,
highestRouteWeight: highestRouteWeight,
).compareTo(
_scorePathRecord(
a,
fastestTripMs: fastestTripMs,
highestRouteWeight: highestRouteWeight,
),
);
final scoreCompare =
_scorePathRecord(
b,
fastestTripMs: fastestTripMs,
highestRouteWeight: highestRouteWeight,
).compareTo(
_scorePathRecord(
a,
fastestTripMs: fastestTripMs,
highestRouteWeight: highestRouteWeight,
),
);
if (scoreCompare != 0) {
return scoreCompare;
}
@@ -531,8 +532,7 @@ class PathHistoryService extends ChangeNotifier {
(DateTime.now().difference(path.timestamp!).inMinutes /
60.0 /
24.0));
final routeWeight =
(path.routeWeight / highestRouteWeight).clamp(0.0, 1.0);
final routeWeight = (path.routeWeight / highestRouteWeight).clamp(0.0, 1.0);
return (reliability * 0.45) +
(latency * 0.25) +