mirror of
https://github.com/block/buzz.git
synced 2026-10-31 06:21:34 +00:00
## Summary - refetch mounted mobile thread replies after relay reconnect, preserving the previous reply list during recovery - auto-dispose route-scoped relay reply caches so reopening a thread queries current relay state - invalidate live replies through both the channel-window and legacy websocket-history paths - preserve optimistic-reply confirmation when the route closes before its deferred cleanup - stabilize rapid same-second messages using desktop's existing split contract: channel timelines render `(created_at ASC, id DESC)` while threads render `(created_at ASC, id ASC)` - retain late live rows after a channel window is exhausted instead of dropping same-second tail messages Closes #4404. Closes #4830. Closes #6204. ## Context The broad all-channel/all-DM stale-session defect reported in #4402 is already addressed on current `main` by #4372 and #3053. Two distinct mobile gaps remained: 1. `threadRepliesProvider` was a process-lifetime one-shot query, so replies missed while the socket was stale remained absent after reconnect or after closing and reopening the thread. 2. Mobile had inconsistent timestamp-only and event-id ordering across channel producers. Rapid messages routinely share Nostr's one-second timestamp, so later hydration/live reconciliation could reshuffle them. Desktop deliberately has two render contracts: channel windows reverse the relay's composite order to `(created_at ASC, id DESC)`, while thread replies use `(created_at ASC, id ASC)`. This consolidates the current-main portions of #4831 and #3243 rather than reviving stale overlapping branches. ## Validation Exact pushed head: `be92d9542c6cd1342733bdc5e8359664b511ce02` - focused channel-provider/window/thread suites: 48/48 passed - incident regression: a mounted thread misses a reply while disconnected, reconnects, and renders the recovered reply - route regression: closing and reopening a thread performs a fresh authoritative query - websocket fallback regression: live reply invalidates the mounted thread even without the channel-window path - disposal regression: optimistic confirmation survives provider disposal between rebuild and deferred cleanup - ordering regressions: channel window/live, websocket fallback, optimistic sends, deep links, both pagination paths, and thread merges preserve their desktop-compatible same-second order - boundary regression: exhausted windows admit late same-second live rows without weakening open-page cursor boundaries - independent adversarial review: no production blocker; source contract verified across all producers and relay cursor semantics unchanged - pre-push Mobile lane passed at exact head, including analysis, file-size/branch checks, and full Flutter suite: 1,675/1,675 passed - `git diff --check` --------- Signed-off-by: Wes <wesbillman@users.noreply.github.com> Co-authored-by: Carl <32a2e2c9d428ee08902cab75d956da2c1d235a22d4766b0dd4138bf6e2e5db1d@buzz.block.builderlab.xyz>
161 lines
5.3 KiB
Dart
161 lines
5.3 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
|
|
import '../../shared/relay/relay.dart';
|
|
import 'channel_event_order.dart';
|
|
import 'pending_local_messages_provider.dart';
|
|
|
|
class ThreadRepliesArgs {
|
|
final String channelId;
|
|
final String rootId;
|
|
|
|
const ThreadRepliesArgs({required this.channelId, required this.rootId});
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is ThreadRepliesArgs &&
|
|
channelId == other.channelId &&
|
|
rootId == other.rootId;
|
|
|
|
@override
|
|
int get hashCode => Object.hash(channelId, rootId);
|
|
}
|
|
|
|
class _ThreadCursor {
|
|
final int createdAt;
|
|
final String eventId;
|
|
|
|
const _ThreadCursor({required this.createdAt, required this.eventId});
|
|
}
|
|
|
|
final threadRepliesProvider = FutureProvider.autoDispose
|
|
.family<List<NostrEvent>, ThreadRepliesArgs>((ref, args) async {
|
|
// A reply missed while the socket is stale cannot invalidate this
|
|
// one-shot query. Refresh mounted threads when the session recovers;
|
|
// auto-dispose also makes reopening a thread start from relay truth.
|
|
ref.listen(relaySessionProvider, (previous, next) {
|
|
if (previous?.status != SessionStatus.connected &&
|
|
next.status == SessionStatus.connected) {
|
|
ref.invalidateSelf();
|
|
}
|
|
});
|
|
final session = ref.read(relaySessionProvider.notifier);
|
|
final replies = <NostrEvent>[];
|
|
_ThreadCursor? cursor;
|
|
for (var page = 0; page < 500; page++) {
|
|
final events = await session.queryRelay([
|
|
_threadRepliesFilter(args, cursor),
|
|
]);
|
|
replies.addAll(events);
|
|
if (events.length < 200) return replies;
|
|
final last = events.last;
|
|
cursor = _ThreadCursor(createdAt: last.createdAt, eventId: last.id);
|
|
}
|
|
throw Exception('Thread ${args.rootId} exceeded the page safety limit.');
|
|
});
|
|
|
|
NostrFilter _threadRepliesFilter(
|
|
ThreadRepliesArgs args,
|
|
_ThreadCursor? cursor,
|
|
) {
|
|
return NostrFilter(
|
|
kinds: EventKind.channelTimelineContentKinds,
|
|
tags: {
|
|
'#e': [args.rootId],
|
|
'#h': [args.channelId],
|
|
},
|
|
limit: 200,
|
|
extensions: {
|
|
'depth_limit': 64,
|
|
if (cursor != null) 'thread_cursor': cursor.createdAt,
|
|
if (cursor != null) 'thread_cursor_id': cursor.eventId,
|
|
},
|
|
);
|
|
}
|
|
|
|
class ThreadLocalRepliesNotifier extends Notifier<List<NostrEvent>> {
|
|
final ThreadRepliesArgs args;
|
|
|
|
ThreadLocalRepliesNotifier(this.args);
|
|
|
|
@override
|
|
List<NostrEvent> build() => const [];
|
|
|
|
void add(NostrEvent event) {
|
|
state = _mergeReplies(state, [event]);
|
|
}
|
|
|
|
void remove(String eventId) {
|
|
state = state.where((event) => event.id != eventId).toList();
|
|
}
|
|
|
|
void confirm(Set<String> eventIds) {
|
|
if (!state.any((event) => eventIds.contains(event.id))) return;
|
|
state = state.where((event) => !eventIds.contains(event.id)).toList();
|
|
}
|
|
}
|
|
|
|
final threadLocalRepliesProvider =
|
|
NotifierProvider.family<
|
|
ThreadLocalRepliesNotifier,
|
|
List<NostrEvent>,
|
|
ThreadRepliesArgs
|
|
>(ThreadLocalRepliesNotifier.new);
|
|
|
|
/// Relay-backed replies merged with signed local replies that are still
|
|
/// waiting for acknowledgement.
|
|
///
|
|
/// The relay query is route-scoped, while the optimistic local overlay stays
|
|
/// alive until confirmation so it can survive closing and reopening a thread.
|
|
final threadRepliesWithLocalProvider = Provider.autoDispose
|
|
.family<AsyncValue<List<NostrEvent>>, ThreadRepliesArgs>((ref, args) {
|
|
final relayReplies = ref.watch(threadRepliesProvider(args));
|
|
final localReplies = ref.watch(threadLocalRepliesProvider(args));
|
|
final authoritative = relayReplies.value;
|
|
if (authoritative != null && localReplies.isNotEmpty) {
|
|
final authoritativeIds = authoritative.map((event) => event.id).toSet();
|
|
if (localReplies.any((event) => authoritativeIds.contains(event.id))) {
|
|
final localRepliesNotifier = ref.read(
|
|
threadLocalRepliesProvider(args).notifier,
|
|
);
|
|
final pendingMessagesNotifier = ref.read(
|
|
pendingLocalMessagesProvider(args.channelId).notifier,
|
|
);
|
|
Future.microtask(() {
|
|
localRepliesNotifier.confirm(authoritativeIds);
|
|
pendingMessagesNotifier.confirm(authoritativeIds);
|
|
});
|
|
}
|
|
}
|
|
if (localReplies.isEmpty) return relayReplies;
|
|
return relayReplies.when(
|
|
data: (events) => AsyncData(_mergeReplies(events, localReplies)),
|
|
loading: () => AsyncData(localReplies),
|
|
error: (error, stackTrace) => AsyncData(localReplies),
|
|
);
|
|
});
|
|
|
|
/// Union two event lists by id, newest-wins, in timeline order.
|
|
///
|
|
/// The thread view needs this to fold the channel's live socket events into its
|
|
/// own one-shot query result: the query asks for content kinds only, so
|
|
/// reactions, edits, and deletions that land while a thread is open never reach
|
|
/// it on their own.
|
|
List<NostrEvent> mergeThreadEvents(
|
|
Iterable<NostrEvent> first,
|
|
Iterable<NostrEvent> second,
|
|
) => _mergeReplies(first, second);
|
|
|
|
List<NostrEvent> _mergeReplies(
|
|
Iterable<NostrEvent> first,
|
|
Iterable<NostrEvent> second,
|
|
) {
|
|
final byId = <String, NostrEvent>{};
|
|
for (final event in [...first, ...second]) {
|
|
byId[event.id] = event;
|
|
}
|
|
return byId.values.toList()..sort(compareThreadRepliesChronologically);
|
|
}
|