@@ -29,6 +29,11 @@ class _Relay extends RelaySessionNotifier {
2929 final filter = filters.single.toJson ();
3030 if (filters.single.kinds.single == 30177 ) {
3131 inventoryFilters.add (filter);
32+ final d = (filter['#d' ] as List ? )? .cast <String >();
33+ if (d != null ) {
34+ // Return every record so the client must enforce the requested d.
35+ return [for (final page in inventory) ...page];
36+ }
3237 final page = inventoryFilters.length - 1 ;
3338 return page < inventory.length ? inventory[page] : const [];
3439 }
@@ -79,28 +84,30 @@ void main() {
7984
8085 var fakeAgents = 0 ;
8186 String fakeAgent () => (++ fakeAgents).toRadixString (16 ).padLeft (64 , 'a' );
82- // Discovery does not verify inventory signatures (the relay does), so the
83- // records skip Schnorr signing to keep large pagination fixtures fast.
84- var records = 0 ;
85- final ownerPubkey = owner.public;
8687 NostrEvent managed (
8788 String d, {
8889 nostr.Keys ? by,
8990 int time = 1 ,
9091 int kind = 30177 ,
9192 Object ? content = const {'name' : 'Agent' },
92- }) => NostrEvent (
93- id : ( ++ records). toRadixString ( 16 ). padLeft ( 64 , '0' ),
94- pubkey : by ? .public ?? ownerPubkey ,
95- createdAt : time ,
96- kind : kind ,
97- tags : [
98- [ 'd' , d],
99- ],
100- content : jsonEncode (content) ,
101- sig : '' ,
93+ }) => NostrEvent . fromJson (
94+ nostr. Event . from (
95+ kind : kind ,
96+ content : jsonEncode (content) ,
97+ secretKey : (by ?? owner).secret ,
98+ createdAt : time,
99+ tags : [
100+ [ 'd' , d ],
101+ ] ,
102+ ). toMap () ,
102103 );
103104
105+ // A full page of signed records with distinct times, shared because
106+ // signing dominates fixture cost.
107+ late final fullPage = [
108+ for (var i = 0 ; i < 100 ; i++ ) managed (fakeAgent (), time: 5000 - i),
109+ ];
110+
104111 ProviderContainer setup (_Relay relay) {
105112 final sync = MeSync (
106113 relay,
@@ -245,9 +252,7 @@ void main() {
245252 expect (relay.profileAuthors.single, [agent.public]);
246253 });
247254 test ('reads beyond the first inventory page with a cursor' , () async {
248- final first = [
249- for (var i = 0 ; i < 100 ; i++ ) managed (fakeAgent (), time: 200 - i),
250- ];
255+ final first = fullPage;
251256 final relay = _Relay (
252257 inventory: [
253258 first,
@@ -260,7 +265,7 @@ void main() {
260265 agent.public,
261266 );
262267 expect (relay.inventoryFilters.length, 2 );
263- expect (relay.inventoryFilters.last['until' ], 101 );
268+ expect (relay.inventoryFilters.last['until' ], 4901 );
264269 expect (relay.inventoryFilters.last['before_id' ], first.last.id);
265270 expect (relay.profileAuthors.map ((a) => a! .length), [100 , 1 ]);
266271 expect (relay.profileFilters.map ((f) => f['limit' ]), [100 , 1 ]);
@@ -270,11 +275,9 @@ void main() {
270275 () async {
271276 final relay = _Relay (
272277 inventory: [
278+ // Each page ends at an older record, so the cursor keeps advancing.
273279 for (var page = 0 ; page < 11 ; page++ )
274- [
275- for (var i = 0 ; i < 100 ; i++ )
276- managed (fakeAgent (), time: 2000 - page * 100 - i),
277- ],
280+ [...fullPage.take (99 ), managed (fakeAgent (), time: 100 - page)],
278281 ],
279282 );
280283 await expectLater (
@@ -286,8 +289,7 @@ void main() {
286289 },
287290 );
288291 test ('inventory paging fails when the cursor does not advance' , () async {
289- final page = [for (var i = 0 ; i < 100 ; i++ ) managed (fakeAgent ())];
290- final relay = _Relay (inventory: [page, page]);
292+ final relay = _Relay (inventory: [fullPage, fullPage]);
291293 await expectLater (
292294 setup (relay).read (meAssistantsProvider.future),
293295 throwsStateError,
@@ -299,9 +301,12 @@ void main() {
299301 // Relay order is created_at descending, then id ascending. An unordered
300302 // tied page must still advance from its largest id.
301303 final tied = [for (var i = 0 ; i < 100 ; i++ ) managed (fakeAgent (), time: 5 )];
304+ final largest = tied
305+ .map ((e) => e.id)
306+ .reduce ((a, b) => a.compareTo (b) > 0 ? a : b);
302307 final relay = _Relay (
303308 inventory: [
304- [...tied.reversed] ,
309+ [...tied].. sort ((a, b) => b.id. compareTo (a.id)) ,
305310 [managed (agent.public, time: 5 )],
306311 ],
307312 profiles: [profile (agent, ownedBy: owner)],
@@ -311,27 +316,29 @@ void main() {
311316 agent.public,
312317 );
313318 expect (relay.inventoryFilters.last['until' ], 5 );
314- expect (relay.inventoryFilters.last['before_id' ], tied.last.id );
319+ expect (relay.inventoryFilters.last['before_id' ], largest );
315320 });
316321 test ('same-second inventory records keep the lowest id' , () async {
322+ final named = managed (agent.public, time: 5 );
323+ final unnamed = managed (agent.public, time: 5 , content: {'name' : '' });
317324 final relay = _Relay (
318325 inventory: [
319- [
320- managed (agent.public, time: 5 ),
321- managed (agent.public, time: 5 , content: {'name' : '' }),
322- ],
326+ [named, unnamed],
323327 ],
324328 profiles: [profile (agent, ownedBy: owner)],
325329 );
330+ final namedWins = named.id.compareTo (unnamed.id) < 0 ;
326331 expect (
327- (await setup (relay).read (meAssistantsProvider.future)).single.pubkey,
328- agent.public,
332+ (await setup (
333+ relay,
334+ ).read (meAssistantsProvider.future)).map ((a) => a.pubkey),
335+ namedWins ? [agent.public] : isEmpty,
329336 );
330337 });
331338 test ('rejects an inventory page larger than requested' , () async {
332339 final relay = _Relay (
333340 inventory: [
334- [for ( var i = 0 ; i < 101 ; i ++ ) managed (fakeAgent ())],
341+ [...fullPage, managed (fakeAgent ())],
335342 ],
336343 );
337344 await expectLater (
@@ -381,21 +388,77 @@ void main() {
381388 );
382389 }
383390 test ('creation revalidates only the chosen assistant' , () async {
384- final relay = _Relay (profiles: [profile (agent, ownedBy: owner)]);
391+ final relay = _Relay (
392+ inventory: [
393+ [managed (other.public), managed (agent.public)],
394+ ],
395+ profiles: [
396+ profile (agent, ownedBy: owner),
397+ profile (other, ownedBy: owner),
398+ ],
399+ );
385400 final container = setup (relay);
386401 expect (
387402 await isOwnedMeAssistant (container.read (meSyncProvider), agent.public),
388403 isTrue,
389404 );
390- expect (relay.inventoryFilters, isEmpty);
405+ expect (relay.inventoryFilters.single['authors' ], [owner.public]);
406+ expect (relay.inventoryFilters.single['#d' ], [agent.public]);
391407 expect (relay.profileAuthors, [
392408 [agent.public],
393409 ]);
394410 });
411+ test ('creation rejects an agent removed from the inventory' , () async {
412+ final relay = _Relay (
413+ inventory: [
414+ [managed (other.public)],
415+ ],
416+ profiles: [profile (agent, ownedBy: owner)],
417+ );
418+ expect (
419+ await isOwnedMeAssistant (setup (relay).read (meSyncProvider), agent.public),
420+ isFalse,
421+ );
422+ expect (relay.profileFilters, isEmpty);
423+ });
424+ test ('ignores inventory records that fail verification' , () async {
425+ final genuine = managed (other.public, time: 1 );
426+ final forged = managed (agent.public, time: 2 ).toJson ()
427+ ..['sig' ] = genuine.sig;
428+ final superseding =
429+ managed (other.public, time: 3 , content: {'name' : '' }).toJson ()
430+ ..['content' ] = jsonEncode ({'name' : '' })
431+ ..['sig' ] = genuine.sig;
432+ final relay = _Relay (
433+ inventory: [
434+ [
435+ NostrEvent .fromJson (superseding),
436+ NostrEvent .fromJson (forged),
437+ genuine,
438+ ],
439+ ],
440+ profiles: [
441+ profile (agent, ownedBy: owner),
442+ profile (other, ownedBy: owner),
443+ ],
444+ );
445+ final container = setup (relay);
446+ expect (
447+ (await container.read (meAssistantsProvider.future)).map ((a) => a.pubkey),
448+ [other.public],
449+ );
450+ expect (
451+ await isOwnedMeAssistant (container.read (meSyncProvider), agent.public),
452+ isFalse,
453+ );
454+ });
395455 test (
396456 'creation rejects revoked ownership and unrelated returned profiles' ,
397457 () async {
398458 final relay = _Relay (
459+ inventory: [
460+ [managed (agent.public), managed (other.public)],
461+ ],
399462 profiles: [
400463 profile (agent, ownedBy: owner),
401464 profile (agent, time: 2 ),
0 commit comments