@@ -4,6 +4,7 @@ import { keypair, message, metadata, roster, signed } from "./testing";
44import type { RelayEvent , ReadFilter } from "./events" ;
55import type { LiveCallbacks } from "./live" ;
66import { byteSize } from "./budget" ;
7+ import { createInboxFeed } from "./inbox-feed" ;
78
89// General #e reads return an empty terminal page. The ordinary #p response is
910// still explicitly gated by each test; no incidental timer orders admission.
@@ -1200,66 +1201,123 @@ it("a fully visibility-filtered auxiliary page is incomplete, not a false termin
12001201 }
12011202} ) ;
12021203
1203- it . each ( [ "bounded" , "events" , "bytes" ] as const ) (
1204+ it ( "a signed short-page walk settles edits and checks their deletion dependencies" , async ( ) => {
1205+ const h = setup ( ) ;
1206+ h . admit ( [ h . viewer . pubkey , h . alice . pubkey ] ) ;
1207+ const target = addressed ( h , "original" , 20 ) ;
1208+ const edits = Array . from ( { length : 3 } , ( _ , i ) =>
1209+ signed ( h . alice , {
1210+ kind : 40003 ,
1211+ created_at : 33 - i ,
1212+ content : `revision ${ i } ` ,
1213+ tags : [
1214+ [ "h" , "room" ] ,
1215+ [ "e" , target . id ] ,
1216+ ] ,
1217+ } ) ,
1218+ ) ;
1219+ const pages : ReadFilter [ ] = [ ] ;
1220+ h . query . mockImplementation ( async ( [ filter ] ) => {
1221+ if ( filter ?. [ "#p" ] ) return [ target ] ;
1222+ if ( filter ?. [ "#e" ] ?. includes ( target . id ) ) {
1223+ pages . push ( filter ) ;
1224+ return edits
1225+ . filter (
1226+ ( edit ) =>
1227+ filter . until === undefined || edit . created_at < filter . until ,
1228+ )
1229+ . slice ( 0 , 1 ) ;
1230+ }
1231+ return [ ] ;
1232+ } ) ;
1233+ await h . session . inboxFeed . ensure ( ) ;
1234+ expect ( pages . map ( ( filter ) => filter . until ) ) . toEqual ( [ undefined , 33 , 32 , 31 ] ) ;
1235+ expect ( h . session . inboxFeed . snapshot ( ) ) . toMatchObject ( {
1236+ status : "ready" ,
1237+ incomplete : [ ] ,
1238+ } ) ;
1239+ expect ( rows ( h ) [ 0 ] ?. preview ) . toBe ( "revision 0" ) ;
1240+ expect (
1241+ h . query . mock . calls . some (
1242+ ( [ filters ] ) =>
1243+ filters [ 0 ] ?. kinds ?. join ( "," ) === "5,9005" &&
1244+ filters [ 0 ] ?. [ "#e" ] ?. length === 3 ,
1245+ ) ,
1246+ ) . toBe ( true ) ;
1247+ } ) ;
1248+
1249+ // Retention budgets belong to the feed, not signing/session folding. Synthetic
1250+ // DTOs model the already-verified reader boundary here; signed admission, edits,
1251+ // and short-page closure remain covered through the real session above.
1252+ it . each ( [ "events" , "bytes" ] as const ) (
12041253 "walks advancing auxiliary pages with a discriminating %s budget outcome" ,
12051254 async ( budget ) => {
12061255 const h = setup ( ) ;
12071256 h . admit ( [ h . viewer . pubkey , h . alice . pubkey ] ) ;
12081257 const target = addressed ( h , "original" , 20 ) ;
1209- const count = budget === "events" ? 2001 : budget === "bytes" ? 9 : 3 ;
1210- const edits = Array . from ( { length : count } , ( _ , i ) =>
1211- signed ( h . alice , {
1212- kind : 40003 ,
1213- created_at : 30 + count - i ,
1214- content : budget === "bytes" ? "x" . repeat ( 512 * 1024 ) : `revision ${ i } ` ,
1215- tags : [
1216- [ "h" , "room" ] ,
1217- [ "e ", target . id ] ,
1218- ] ,
1219- } ) ,
1220- ) ;
1258+ const count = budget === "events" ? 2001 : 9 ;
1259+ const edits : RelayEvent [ ] = Array . from ( { length : count } , ( _ , i ) => ( {
1260+ ... target ,
1261+ id : ( i + 1 ) . toString ( 16 ) . padStart ( 64 , "0" ) ,
1262+ kind : 40003 ,
1263+ created_at : 30 + count - i ,
1264+ content : budget === "bytes" ? "x" . repeat ( 512 * 1024 ) : `revision ${ i } ` ,
1265+ tags : [
1266+ [ "h ", "room" ] ,
1267+ [ "e" , target . id ] ,
1268+ ] ,
1269+ } ) ) ;
12211270 expect ( edits . length > 2000 ) . toBe ( budget === "events" ) ;
12221271 expect ( byteSize ( edits ) > 4 * 1024 * 1024 ) . toBe ( budget === "bytes" ) ;
1223- const pageSize = budget === "events" ? 500 : budget === "bytes" ? 3 : 1 ;
1272+ const pageSize = budget === "events" ? 500 : 3 ;
12241273 const pages : ReadFilter [ ] = [ ] ;
1225- h . query . mockImplementation ( async ( [ filter ] ) => {
1226- if ( filter ?. [ "#p" ] ) return [ target ] ;
1227- if ( filter ?. [ "#e" ] ?. includes ( target . id ) ) {
1274+ const reader = {
1275+ read : vi . fn ( async ( filters : readonly ReadFilter [ ] ) => {
1276+ const filter = filters [ 0 ] ;
1277+ if ( ! filter ?. [ "#e" ] ?. includes ( target . id ) ) return [ ] ;
12281278 pages . push ( filter ) ;
12291279 return edits
12301280 . filter (
12311281 ( edit ) =>
12321282 filter . until === undefined || edit . created_at < filter . until ,
12331283 )
12341284 . slice ( 0 , pageSize ) ;
1235- }
1236- return [ ] ;
1285+ } ) ,
1286+ } ;
1287+ const feed = createInboxFeed ( {
1288+ viewer : h . viewer . pubkey ,
1289+ channels : h . session . channels ,
1290+ reader,
1291+ async addressedRead ( _filter , _signal , prepare ) {
1292+ prepare ( [ target ] ) ;
1293+ return [ target ] ;
1294+ } ,
1295+ retainedEvent : ( id ) => ( id === target . id ? target : undefined ) ,
1296+ retainedEditIds : ( ) => [ ] ,
12371297 } ) ;
1238- await h . session . inboxFeed . ensure ( ) ;
1239- expect ( pages . length ) . toBe (
1240- budget === "events" ? 5 : budget === "bytes" ? 3 : 4 ,
1241- ) ;
1242- expect ( h . session . inboxFeed . snapshot ( ) ) . toMatchObject (
1243- budget === "bounded"
1244- ? {
1245- status : "ready" ,
1246- incomplete : [ ] ,
1247- }
1248- : {
1249- status : "error" ,
1250- incomplete : [ target . id ] ,
1251- error : "Inbox message updates exceed the read budget. Retry inbox." ,
1252- } ,
1253- ) ;
1254- expect ( rows ( h ) [ 0 ] ?. preview ) . toBe ( edits [ 0 ] ?. content ) ;
1255- if ( budget === "bounded" )
1256- expect (
1257- h . query . mock . calls . some (
1258- ( [ filters ] ) =>
1259- filters [ 0 ] ?. kinds ?. join ( "," ) === "5,9005" &&
1260- filters [ 0 ] ?. [ "#e" ] ?. length === 3 ,
1261- ) ,
1262- ) . toBe ( true ) ;
1298+ try {
1299+ await feed . ensure ( ) ;
1300+ expect ( pages . length ) . toBe ( budget === "events" ? 5 : 3 ) ;
1301+ expect ( feed . snapshot ( ) ) . toMatchObject ( {
1302+ status : "error" ,
1303+ incomplete : [ target . id ] ,
1304+ error : "Inbox message updates exceed the read budget. Retry inbox." ,
1305+ } ) ;
1306+ // Failure must be retryable; no blanket pagination rejection may pass.
1307+ pages . length = 0 ;
1308+ const first = edits [ 0 ] ;
1309+ if ( ! first ) throw Error ( "Missing budget fixture edit" ) ;
1310+ edits . splice ( 0 , edits . length , { ...first , content : "bounded retry" } ) ;
1311+ await feed . refresh ( ) ;
1312+ expect ( pages ) . toHaveLength ( 2 ) ;
1313+ expect ( feed . snapshot ( ) ) . toMatchObject ( {
1314+ status : "ready" ,
1315+ incomplete : [ ] ,
1316+ } ) ;
1317+ expect ( reader . read . mock . calls . at ( - 1 ) ?. [ 0 ] [ 0 ] ?. [ "#e" ] ) . toEqual ( [ first . id ] ) ;
1318+ } finally {
1319+ feed . dispose ( ) ;
1320+ }
12631321 } ,
12641322) ;
12651323
0 commit comments