Skip to content

Commit 71e0376

Browse files
committed
msglist: Throttle fetchOlder retries
This approach is different from how a BackoffMachine is typically used, because the message list doesn't send and retry requests in a loop; its caller retries rapidly on scroll changes, and we want to ignore the excessive requests. The test drops irrelevant requests with `connection.takeRequests` without checking, as we are only interested in verifying that no request was sent. Fixes: #945 Signed-off-by: Zixuan James Li <[email protected]>
1 parent 67fbf9e commit 71e0376

File tree

2 files changed

+130
-14
lines changed

2 files changed

+130
-14
lines changed

lib/model/message_list.dart

+63-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import 'dart:async';
2+
13
import 'package:collection/collection.dart';
24
import 'package:flutter/foundation.dart';
35

6+
import '../api/backoff.dart';
47
import '../api/model/events.dart';
58
import '../api/model/model.dart';
69
import '../api/route/messages.dart';
@@ -89,9 +92,32 @@ mixin _MessageSequence {
8992
bool _haveOldest = false;
9093

9194
/// Whether we are currently fetching the next batch of older messages.
95+
///
96+
/// When this is true, [fetchOlder] is a no-op.
97+
/// That method is called frequently by Flutter's scrolling logic,
98+
/// and this field helps us avoid spamming the same request just to get
99+
/// the same response each time.
100+
///
101+
/// See also [fetchOlderCoolingDown].
92102
bool get fetchingOlder => _fetchingOlder;
93103
bool _fetchingOlder = false;
94104

105+
/// Whether [fetchOlder] had a request error recently.
106+
///
107+
/// When this is true, [fetchOlder] is a no-op.
108+
/// That method is called frequently by Flutter's scrolling logic,
109+
/// and this field mitigates spamming the same request and getting
110+
/// the same error each time.
111+
///
112+
/// "Recently" is decided by a [BackoffMachine] that resets
113+
/// when a [fetchOlder] request succeeds.
114+
///
115+
/// See also [fetchingOlder].
116+
bool get fetchOlderCoolingDown => _fetchOlderCoolingDown;
117+
bool _fetchOlderCoolingDown = false;
118+
119+
BackoffMachine? _fetchOlderCooldownBackoffMachine;
120+
95121
/// The parsed message contents, as a list parallel to [messages].
96122
///
97123
/// The i'th element is the result of parsing the i'th element of [messages].
@@ -107,7 +133,7 @@ mixin _MessageSequence {
107133
/// before, between, or after the messages.
108134
///
109135
/// This information is completely derived from [messages] and
110-
/// the flags [haveOldest] and [fetchingOlder].
136+
/// the flags [haveOldest], [fetchingOlder] and [fetchOlderCoolingDown].
111137
/// It exists as an optimization, to memoize that computation.
112138
final QueueList<MessageListItem> items = QueueList();
113139

@@ -241,6 +267,8 @@ mixin _MessageSequence {
241267
_fetched = false;
242268
_haveOldest = false;
243269
_fetchingOlder = false;
270+
_fetchOlderCoolingDown = false;
271+
_fetchOlderCooldownBackoffMachine = null;
244272
contents.clear();
245273
items.clear();
246274
}
@@ -290,10 +318,12 @@ mixin _MessageSequence {
290318
void _updateEndMarkers() {
291319
assert(fetched);
292320
assert(!(haveOldest && fetchingOlder));
293-
final startMarker = switch ((fetchingOlder, haveOldest)) {
294-
(true, _) => const MessageListLoadingItem(MessageListDirection.older),
295-
(_, true) => const MessageListHistoryStartItem(),
296-
(_, _) => null,
321+
assert(!(fetchingOlder && fetchOlderCoolingDown));
322+
final startMarker = switch ((fetchingOlder, haveOldest, fetchOlderCoolingDown)) {
323+
(true, _, _) => const MessageListLoadingItem(MessageListDirection.older),
324+
(_, true, _) => const MessageListHistoryStartItem(),
325+
(_, _, true) => const MessageListLoadingItem(MessageListDirection.older),
326+
(_, _, _) => null,
297327
};
298328
final hasStartMarker = switch (items.firstOrNull) {
299329
MessageListLoadingItem() => true,
@@ -470,7 +500,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
470500
Future<void> fetchInitial() async {
471501
// TODO(#80): fetch from anchor firstUnread, instead of newest
472502
// TODO(#82): fetch from a given message ID as anchor
473-
assert(!fetched && !haveOldest && !fetchingOlder);
503+
assert(!fetched && !haveOldest && !fetchingOlder && !fetchOlderCoolingDown);
474504
assert(messages.isEmpty && contents.isEmpty);
475505
// TODO schedule all this in another isolate
476506
final generation = this.generation;
@@ -498,20 +528,28 @@ class MessageListView with ChangeNotifier, _MessageSequence {
498528
Future<void> fetchOlder() async {
499529
if (haveOldest) return;
500530
if (fetchingOlder) return;
531+
if (fetchOlderCoolingDown) return;
501532
assert(fetched);
502533
assert(messages.isNotEmpty);
503534
_fetchingOlder = true;
504535
_updateEndMarkers();
505536
notifyListeners();
506537
final generation = this.generation;
538+
bool hasFetchError = false;
507539
try {
508-
final result = await getMessages(store.connection,
509-
narrow: narrow.apiEncode(),
510-
anchor: NumericAnchor(messages[0].id),
511-
includeAnchor: false,
512-
numBefore: kMessageListFetchBatchSize,
513-
numAfter: 0,
514-
);
540+
final GetMessagesResult result;
541+
try {
542+
result = await getMessages(store.connection,
543+
narrow: narrow.apiEncode(),
544+
anchor: NumericAnchor(messages[0].id),
545+
includeAnchor: false,
546+
numBefore: kMessageListFetchBatchSize,
547+
numAfter: 0,
548+
);
549+
} catch (e) {
550+
hasFetchError = true;
551+
rethrow;
552+
}
515553
if (this.generation > generation) return;
516554

517555
if (result.messages.isNotEmpty
@@ -529,12 +567,24 @@ class MessageListView with ChangeNotifier, _MessageSequence {
529567

530568
_insertAllMessages(0, fetchedMessages);
531569
_haveOldest = result.foundOldest;
570+
_fetchOlderCooldownBackoffMachine = null;
532571
} finally {
533572
if (this.generation != generation) {
534573
// ignore: control_flow_in_finally
535574
return;
536575
}
537576
_fetchingOlder = false;
577+
if (hasFetchError) {
578+
assert(!fetchOlderCoolingDown);
579+
_fetchOlderCoolingDown = true;
580+
unawaited((_fetchOlderCooldownBackoffMachine ??= BackoffMachine())
581+
.wait().then((_) {
582+
if (this.generation != generation) return;
583+
_fetchOlderCoolingDown = false;
584+
_updateEndMarkers();
585+
notifyListeners();
586+
}));
587+
}
538588
_updateEndMarkers();
539589
notifyListeners();
540590
}

test/model/message_list_test.dart

+67-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'dart:convert';
33
import 'package:checks/checks.dart';
44
import 'package:http/http.dart' as http;
55
import 'package:test/scaffolding.dart';
6+
import 'package:zulip/api/exception.dart';
67
import 'package:zulip/api/model/events.dart';
78
import 'package:zulip/api/model/model.dart';
89
import 'package:zulip/api/model/narrow.dart';
@@ -236,6 +237,34 @@ void main() {
236237
..messages.length.equals(30);
237238
});
238239

240+
test('fetchOlder nop during backoff', () => awaitFakeAsync((async) async {
241+
final olderMessages = List.generate(5, (i) => eg.streamMessage());
242+
final initialMessages = List.generate(5, (i) => eg.streamMessage());
243+
await prepare(narrow: const CombinedFeedNarrow());
244+
await prepareMessages(foundOldest: false, messages: initialMessages);
245+
246+
connection.prepare(httpStatus: 400, json: {
247+
'result': 'error', 'code': 'BAD_REQUEST', 'msg': 'Bad request'});
248+
check(async.pendingTimers).isEmpty();
249+
await check(model.fetchOlder()).throws<ZulipApiException>();
250+
checkNotified(count: 2);
251+
check(model).fetchOlderCoolingDown.isTrue();
252+
253+
connection.takeRequests();
254+
await model.fetchOlder();
255+
checkNotNotified();
256+
check(model).fetchOlderCoolingDown.isTrue();
257+
check(model).fetchingOlder.isFalse();
258+
259+
async.flushTimers();
260+
check(model).fetchOlderCoolingDown.isFalse();
261+
262+
connection.prepare(json: olderResult(
263+
anchor: 1000, foundOldest: false, messages: olderMessages).toJson());
264+
await model.fetchOlder();
265+
checkNotified(count: 2);
266+
}));
267+
239268
test('fetchOlder handles servers not understanding includeAnchor', () async {
240269
const narrow = CombinedFeedNarrow();
241270
await prepare(narrow: narrow);
@@ -983,6 +1012,42 @@ void main() {
9831012
checkNotifiedOnce();
9841013
}));
9851014

1015+
test('fetchOlder backoff start, _reset, fetchOlder backoff ends, move fetch finishes', () => awaitFakeAsync((async) async {
1016+
await prepareNarrow(narrow, initialMessages);
1017+
1018+
connection.prepare(httpStatus: 400, json: {
1019+
'result': 'error', 'code': 'BAD_REQUEST', 'msg': 'Bad request'});
1020+
await check(model.fetchOlder()).throws<ZulipApiException>();
1021+
final backoffTimer = async.pendingTimers.single;
1022+
check(model).fetchOlderCoolingDown.isTrue();
1023+
checkHasMessages(initialMessages);
1024+
checkNotified(count: 2);
1025+
1026+
connection.prepare(delay: const Duration(seconds: 2), json: newestResult(
1027+
foundOldest: false,
1028+
messages: initialMessages + movedMessages,
1029+
).toJson());
1030+
await store.handleEvent(eg.updateMessageEventMoveTo(
1031+
origTopic: movedMessages[0].topic,
1032+
origStreamId: otherStream.streamId,
1033+
newMessages: movedMessages,
1034+
));
1035+
check(model).fetchOlderCoolingDown.isFalse();
1036+
check(async.pendingTimers).contains(backoffTimer);
1037+
checkHasMessages([]);
1038+
checkNotifiedOnce();
1039+
1040+
// The first backoff is expected to be short enough to complete.
1041+
async.elapse(const Duration(seconds: 1));
1042+
check(model).fetchOlderCoolingDown.isFalse();
1043+
check(async.pendingTimers).not((x) => x.contains(backoffTimer));
1044+
checkNotNotified();
1045+
1046+
async.elapse(const Duration(seconds: 1));
1047+
checkHasMessages(initialMessages + movedMessages);
1048+
checkNotifiedOnce();
1049+
}));
1050+
9861051
test('fetchOlder, _reset, move fetch finishes, fetchOlder returns', () => awaitFakeAsync((async) async {
9871052
await prepareNarrow(narrow, initialMessages);
9881053

@@ -1791,7 +1856,7 @@ void checkInvariants(MessageListView model) {
17911856
if (model.haveOldest) {
17921857
check(model.items[i++]).isA<MessageListHistoryStartItem>();
17931858
}
1794-
if (model.fetchingOlder) {
1859+
if (model.fetchingOlder || model.fetchOlderCoolingDown) {
17951860
check(model.items[i++]).isA<MessageListLoadingItem>();
17961861
}
17971862
for (int j = 0; j < model.messages.length; j++) {
@@ -1847,6 +1912,7 @@ extension MessageListViewChecks on Subject<MessageListView> {
18471912
Subject<bool> get fetched => has((x) => x.fetched, 'fetched');
18481913
Subject<bool> get haveOldest => has((x) => x.haveOldest, 'haveOldest');
18491914
Subject<bool> get fetchingOlder => has((x) => x.fetchingOlder, 'fetchingOlder');
1915+
Subject<bool> get fetchOlderCoolingDown => has((x) => x.fetchOlderCoolingDown, 'fetchOlderCoolingDown');
18501916
}
18511917

18521918
/// A GetMessagesResult the server might return on an `anchor=newest` request.

0 commit comments

Comments
 (0)