Skip to content

Commit 40ea7f3

Browse files
author
npub102wg7q285p64ch2fjvstmf2ntn2sz3c4u5hmwatalc76mhsuauysftjtfj
committed
Bound optimistic publish ownership
Co-authored-by: npub102wg7q285p64ch2fjvstmf2ntn2sz3c4u5hmwatalc76mhsuauysftjtfj <7a9c8f0147a0755c5d499320bda5535cd5014715e52fb7757dfe3dadde1cef09@buzz.block.builderlab.xyz> Signed-off-by: npub102wg7q285p64ch2fjvstmf2ntn2sz3c4u5hmwatalc76mhsuauysftjtfj <7a9c8f0147a0755c5d499320bda5535cd5014715e52fb7757dfe3dadde1cef09@buzz.block.builderlab.xyz>
1 parent 9f334f1 commit 40ea7f3

4 files changed

Lines changed: 148 additions & 1 deletion

File tree

‎mobile/lib/features/channels/channel_messages_provider.dart‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,12 @@ class ChannelMessagesNotifier extends Notifier<AsyncValue<List<NostrEvent>>> {
162162
);
163163

164164
void _handleLiveEvent(NostrEvent event, {bool authoritative = true}) {
165-
if (authoritative) _confirmLocalMessages([event.id]);
165+
// Reply ownership and its thread-local overlay must transition together.
166+
// The authoritative thread query performs both confirmations after it
167+
// contains the reply; a live echo only triggers that query below.
168+
if (authoritative && event.threadReference.parentId == null) {
169+
_confirmLocalMessages([event.id]);
170+
}
166171
if (_usingChannelWindow) {
167172
_handleWindowLiveEvent(event);
168173
} else {
@@ -271,6 +276,13 @@ class ChannelMessagesNotifier extends Notifier<AsyncValue<List<NostrEvent>>> {
271276
_handleLiveEvent(event, authoritative: false);
272277
}
273278

279+
/// Releases rollback ownership after the publish future succeeds. The
280+
/// optimistic row (and any thread overlay) remains visible until relay data
281+
/// replaces it, because OK and EVENT delivery are unordered.
282+
void completeLocalMessage(String eventId) {
283+
_confirmLocalMessages([eventId]);
284+
}
285+
274286
/// Rolls back a local message when its publish is rejected or times out.
275287
void removeLocalMessage(String eventId) {
276288
final pending = ref

‎mobile/lib/features/channels/send_message_provider.dart‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class SendMessage {
1313
final Future<List<ChannelMember>> Function(String channelId) _fetchMembers;
1414
final Map<String, UserProfile> Function() _readUserCache;
1515
final void Function(String channelId, NostrEvent event) _addLocalMessage;
16+
final void Function(String channelId, String eventId) _completeLocalMessage;
1617
final void Function(String channelId, String eventId) _removeLocalMessage;
1718

1819
SendMessage({
@@ -21,11 +22,14 @@ class SendMessage {
2122
fetchMembers,
2223
required Map<String, UserProfile> Function() readUserCache,
2324
required void Function(String channelId, NostrEvent event) addLocalMessage,
25+
required void Function(String channelId, String eventId)
26+
completeLocalMessage,
2427
required void Function(String channelId, String eventId) removeLocalMessage,
2528
}) : _signedEventRelay = signedEventRelay,
2629
_fetchMembers = fetchMembers,
2730
_readUserCache = readUserCache,
2831
_addLocalMessage = addLocalMessage,
32+
_completeLocalMessage = completeLocalMessage,
2933
_removeLocalMessage = removeLocalMessage;
3034

3135
/// Send a text message to a channel.
@@ -76,6 +80,8 @@ class SendMessage {
7680
_addLocalMessage(channelId, event);
7781
},
7882
);
83+
final event = localMessage;
84+
if (event != null) _completeLocalMessage(channelId, event.id);
7985
} catch (_) {
8086
final event = localMessage;
8187
if (event != null) _removeLocalMessage(channelId, event.id);
@@ -167,6 +173,9 @@ final sendMessageProvider = Provider<SendMessage>((ref) {
167173
addLocalMessage: (channelId, event) => ref
168174
.read(channelMessagesProvider(channelId).notifier)
169175
.addLocalMessage(event),
176+
completeLocalMessage: (channelId, eventId) => ref
177+
.read(channelMessagesProvider(channelId).notifier)
178+
.completeLocalMessage(eventId),
170179
removeLocalMessage: (channelId, eventId) => ref
171180
.read(channelMessagesProvider(channelId).notifier)
172181
.removeLocalMessage(eventId),

‎mobile/test/features/channels/channel_messages_provider_test.dart‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,35 @@ void main() {
178178
},
179179
);
180180

181+
test(
182+
'legacy websocket echo retires ownership without duplicating the row',
183+
() async {
184+
final relaySession = _RecordingRelaySessionNotifier();
185+
final container = _buildContainer(relaySession);
186+
addTearDown(container.dispose);
187+
188+
container.read(channelMessagesProvider(_channelId));
189+
await relaySession.subscribed;
190+
final notifier = container.read(
191+
channelMessagesProvider(_channelId).notifier,
192+
);
193+
final local = _event(id: 'local', createdAt: 20);
194+
notifier.addLocalMessage(local);
195+
196+
relaySession.emit(local);
197+
await _pumpEventQueue();
198+
199+
expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
200+
expect(
201+
container
202+
.read(channelMessagesProvider(_channelId))
203+
.value
204+
?.map((event) => event.id),
205+
['local'],
206+
);
207+
},
208+
);
209+
181210
test('adds and rolls back a local message in the channel window', () async {
182211
final relaySession = _RecordingRelaySessionNotifier(
183212
queryResults: [
@@ -340,6 +369,97 @@ void main() {
340369
},
341370
);
342371

372+
test(
373+
'thread live echo keeps ownership until the authoritative refetch succeeds',
374+
() async {
375+
final relaySession = _RecordingRelaySessionNotifier(
376+
queryResults: [
377+
[_event(id: 'history', createdAt: 10), _bounds()],
378+
<NostrEvent>[],
379+
Exception('thread refetch failed'),
380+
],
381+
);
382+
final container = _buildContainer(relaySession);
383+
addTearDown(container.dispose);
384+
385+
container.read(channelMessagesProvider(_channelId));
386+
await relaySession.subscribed;
387+
await _pumpEventQueue();
388+
const args = ThreadRepliesArgs(channelId: _channelId, rootId: 'root');
389+
container.read(threadRepliesWithLocalProvider(args));
390+
await _pumpEventQueue();
391+
final notifier = container.read(
392+
channelMessagesProvider(_channelId).notifier,
393+
);
394+
final reply = _event(
395+
id: 'reply',
396+
createdAt: 20,
397+
extraTags: const [
398+
['e', 'root', '', 'reply'],
399+
],
400+
);
401+
notifier.addLocalMessage(reply);
402+
403+
relaySession.emit(reply);
404+
await _pumpEventQueue();
405+
406+
expect(container.read(pendingLocalMessagesProvider(_channelId)).keys, [
407+
'reply',
408+
]);
409+
expect(
410+
container
411+
.read(threadLocalRepliesProvider(args))
412+
.map((event) => event.id),
413+
['reply'],
414+
);
415+
expect(
416+
container
417+
.read(threadRepliesWithLocalProvider(args))
418+
.value
419+
?.map((event) => event.id),
420+
['reply'],
421+
);
422+
},
423+
);
424+
425+
test(
426+
'successful never-echoed send releases ownership but keeps its row across reconnect',
427+
() async {
428+
final relaySession = _RecordingRelaySessionNotifier(
429+
queryResults: [
430+
[_event(id: 'history', createdAt: 10), _bounds()],
431+
[_event(id: 'history', createdAt: 10), _bounds()],
432+
],
433+
);
434+
final container = _buildContainer(relaySession);
435+
addTearDown(container.dispose);
436+
437+
container.read(channelMessagesProvider(_channelId));
438+
await relaySession.subscribed;
439+
await _pumpEventQueue();
440+
final notifier = container.read(
441+
channelMessagesProvider(_channelId).notifier,
442+
);
443+
notifier.addLocalMessage(_event(id: 'local', createdAt: 20));
444+
notifier.completeLocalMessage('local');
445+
446+
expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
447+
relaySession.setConnected(false);
448+
await _pumpEventQueue();
449+
relaySession.setConnected(true);
450+
await _pumpEventQueue();
451+
452+
expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
453+
expect(
454+
container
455+
.read(channelMessagesProvider(_channelId))
456+
.value
457+
?.map((event) => event.id),
458+
['history', 'local'],
459+
);
460+
},
461+
);
462+
343463
test(
344464
'window dedupes echoes and orders rapid equal-time local sends',
345465
() async {

‎mobile/test/features/channels/send_message_provider_test.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ void main() {
1212
final session = _PendingPublishRelaySession();
1313
final localMessages = <NostrEvent>[];
1414
final removedIds = <String>[];
15+
final completedIds = <String>[];
1516
final send = SendMessage(
1617
signedEventRelay: SignedEventRelay(
1718
session: session,
@@ -20,6 +21,7 @@ void main() {
2021
fetchMembers: (_) async => const [],
2122
readUserCache: () => const {},
2223
addLocalMessage: (_, event) => localMessages.add(event),
24+
completeLocalMessage: (_, eventId) => completedIds.add(eventId),
2325
removeLocalMessage: (_, eventId) => removedIds.add(eventId),
2426
);
2527

@@ -34,13 +36,15 @@ void main() {
3436

3537
session.accept();
3638
await result;
39+
expect(completedIds, [localMessages.single.id]);
3740
expect(removedIds, isEmpty);
3841
},
3942
);
4043

4144
test('rolls back the signed local message when publish fails', () async {
4245
final session = _PendingPublishRelaySession();
4346
final localMessages = <NostrEvent>[];
47+
final completedIds = <String>[];
4448
final removedIds = <String>[];
4549
final send = SendMessage(
4650
signedEventRelay: SignedEventRelay(
@@ -50,6 +54,7 @@ void main() {
5054
fetchMembers: (_) async => const [],
5155
readUserCache: () => const {},
5256
addLocalMessage: (_, event) => localMessages.add(event),
57+
completeLocalMessage: (_, eventId) => completedIds.add(eventId),
5358
removeLocalMessage: (_, eventId) => removedIds.add(eventId),
5459
);
5560

@@ -58,6 +63,7 @@ void main() {
5863
session.reject();
5964

6065
await expectLater(result, throwsException);
66+
expect(completedIds, isEmpty);
6167
expect(removedIds, [localMessages.single.id]);
6268
});
6369
}

0 commit comments

Comments
 (0)