@ -4,6 +4,8 @@ import {
@@ -4,6 +4,8 @@ import {
FAST_WRITE_RELAY_URLS ,
DOCUMENT_RELAY_URLS ,
FIRST_RELAY_RESULT_GRACE_MS ,
HTTP_TIMELINE_POLL_INTERVAL_MS ,
HTTP_TIMELINE_POLL_SINCE_OVERLAP_SEC ,
isDocumentRelayKind ,
isSocialKindBlockedKind ,
relayFilterIncludesDocumentRelayKind ,
@ -2286,6 +2288,23 @@ class ClientService extends EventTarget {
@@ -2286,6 +2288,23 @@ class ClientService extends EventTarget {
let eosedAt : number | null = null
let eventIds = new Set < string > ( )
const httpTimelinePollBases = Array . from (
new Set (
relays
. filter ( ( u ) = > isHttpRelayUrl ( u ) )
. map ( ( u ) = > normalizeHttpRelayUrl ( u ) || u )
. filter ( Boolean )
)
)
let httpPollIntervalId : ReturnType < typeof setInterval > | null = null
let httpPollCursorUnix = 0
const clearHttpTimelinePoll = ( ) = > {
if ( httpPollIntervalId != null ) {
clearInterval ( httpPollIntervalId )
httpPollIntervalId = null
}
}
let firstResultGraceTimer : ReturnType < typeof setTimeout > | null = null
const clearFirstResultGraceTimer = ( ) = > {
if ( firstResultGraceTimer != null ) {
@ -2358,6 +2377,108 @@ class ClientService extends EventTarget {
@@ -2358,6 +2377,108 @@ class ClientService extends EventTarget {
logger . warn ( '[ClientService] Timeline disk hydrate failed' , err )
}
const applySubscribedTimelineEvent = ( evt : NEvent ) = > {
that . addEventToCache ( evt )
if ( ! eosedAt ) {
if ( eventIds . has ( evt . id ) ) return
eventIds . add ( evt . id )
events . push ( evt )
flushStreamingSnapshot ( )
armFirstResultGraceAfterFirstEvent ( )
return
}
if ( eventIds . has ( evt . id ) ) return
const wallClockAtEose = eosedAt
const isBacklogStraggler = evt . created_at + TIMELINE_STRAGGLER_MAX_AGE_SEC < wallClockAtEose
if ( isBacklogStraggler ) {
eventIds . add ( evt . id )
events . push ( evt )
if ( needSort ) {
events = events . sort ( ( a , b ) = > b . created_at - a . created_at ) . slice ( 0 , filter . limit )
}
eventIds = new Set ( events . map ( ( e ) = > e . id ) )
onEvents ( [ . . . events ] , false )
const timeline = that . timelines [ key ]
if ( timeline && ! Array . isArray ( timeline ) ) {
timeline . refs = events
. map ( ( e ) = > [ e . id , e . created_at ] as TTimelineRef )
. sort ( ( a , b ) = > b [ 1 ] - a [ 1 ] )
that . scheduleTimelinePersist ( key )
}
return
}
eventIds . add ( evt . id )
onNew ( evt )
const timeline = that . timelines [ key ]
if ( ! timeline || Array . isArray ( timeline ) ) {
return
}
if ( timeline . refs . length === 0 ) {
timeline . refs = events . map ( ( e ) = > [ e . id , e . created_at ] as TTimelineRef ) . sort ( ( a , b ) = > b [ 1 ] - a [ 1 ] )
that . scheduleTimelinePersist ( key )
return
}
let idx = 0
for ( const ref of timeline . refs ) {
if ( evt . created_at > ref [ 1 ] || ( evt . created_at === ref [ 1 ] && evt . id < ref [ 0 ] ) ) {
break
}
if ( evt . created_at === ref [ 1 ] && evt . id === ref [ 0 ] ) {
return
}
idx ++
}
if ( idx >= timeline . refs . length ) return
timeline . refs . splice ( idx , 0 , [ evt . id , evt . created_at ] )
that . scheduleTimelinePersist ( key )
}
const runHttpTimelinePollQuery = async ( pollFilter : Filter ) = > {
if ( httpTimelinePollBases . length === 0 ) return
try {
await this . query (
httpTimelinePollBases ,
pollFilter ,
( evt : NEvent ) = > {
applySubscribedTimelineEvent ( evt )
} ,
{
firstRelayResultGraceMs : false ,
globalTimeout : 25_000 ,
eoseTimeout : 2500
}
)
} catch ( err ) {
logger . debug ( '[ClientService] HTTP index timeline poll failed' , err )
}
}
const armHttpTimelinePollingAfterInitial = ( ) = > {
clearHttpTimelinePoll ( )
if ( httpTimelinePollBases . length === 0 ) return
const newestCreated = events . length > 0 ? Math . max ( . . . events . map ( ( e ) = > e . created_at ) ) : 0
httpPollCursorUnix = Math . max ( eosedAt ? ? 0 , newestCreated )
httpPollIntervalId = setInterval ( ( ) = > {
const base = { . . . ( filter as Filter ) } as Filter & { until? : number }
delete base . until
const since = Math . max ( 0 , httpPollCursorUnix - HTTP_TIMELINE_POLL_SINCE_OVERLAP_SEC )
const pollLimit = Math . min ( Math . max ( filter . limit ? ? 200 , 1 ) , 500 )
const pollFilter : Filter = { . . . base , since , limit : pollLimit }
void runHttpTimelinePollQuery ( pollFilter ) . then ( ( ) = > {
httpPollCursorUnix = dayjs ( ) . unix ( )
} )
} , HTTP_TIMELINE_POLL_INTERVAL_MS )
}
const handleTimelineEose = ( eosed : boolean ) = > {
if ( ! eosed ) return
if ( eosedAt != null ) return
@ -2367,6 +2488,7 @@ class ClientService extends EventTarget {
@@ -2367,6 +2488,7 @@ class ClientService extends EventTarget {
eosedAt = dayjs ( ) . unix ( )
if ( ! needSort ) {
armHttpTimelinePollingAfterInitial ( )
return onEvents ( [ . . . events ] , true )
}
@ -2378,7 +2500,7 @@ class ClientService extends EventTarget {
@@ -2378,7 +2500,7 @@ class ClientService extends EventTarget {
that . timelines [ key ] = {
refs : events.map ( ( evt ) = > [ evt . id , evt . created_at ] ) ,
filter ,
urls
urls : relays
}
} else if ( tl . refs . length === 0 ) {
tl . refs = events . map ( ( evt ) = > [ evt . id , evt . created_at ] as TTimelineRef )
@ -2393,6 +2515,7 @@ class ClientService extends EventTarget {
@@ -2393,6 +2515,7 @@ class ClientService extends EventTarget {
tl . refs = newRefs . concat ( tl . refs )
}
}
armHttpTimelinePollingAfterInitial ( )
onEvents ( [ . . . events ] , true )
that . scheduleTimelinePersist ( key )
}
@ -2400,80 +2523,24 @@ class ClientService extends EventTarget {
@@ -2400,80 +2523,24 @@ class ClientService extends EventTarget {
const subCloser = this . subscribe ( relays , filter , {
startLogin ,
onevent : ( evt : NEvent ) = > {
that . addEventToCache ( evt )
// not eosed yet, push to events
if ( ! eosedAt ) {
if ( eventIds . has ( evt . id ) ) return
eventIds . add ( evt . id )
events . push ( evt )
flushStreamingSnapshot ( )
armFirstResultGraceAfterFirstEvent ( )
return
}
if ( eventIds . has ( evt . id ) ) return
const wallClockAtEose = eosedAt
const isBacklogStraggler =
evt . created_at + TIMELINE_STRAGGLER_MAX_AGE_SEC < wallClockAtEose
if ( isBacklogStraggler ) {
eventIds . add ( evt . id )
events . push ( evt )
if ( needSort ) {
events = events . sort ( ( a , b ) = > b . created_at - a . created_at ) . slice ( 0 , filter . limit )
}
eventIds = new Set ( events . map ( ( e ) = > e . id ) )
onEvents ( [ . . . events ] , false )
const timeline = that . timelines [ key ]
if ( timeline && ! Array . isArray ( timeline ) ) {
timeline . refs = events
. map ( ( e ) = > [ e . id , e . created_at ] as TTimelineRef )
. sort ( ( a , b ) = > b [ 1 ] - a [ 1 ] )
that . scheduleTimelinePersist ( key )
}
return
}
eventIds . add ( evt . id )
onNew ( evt )
const timeline = that . timelines [ key ]
if ( ! timeline || Array . isArray ( timeline ) ) {
return
}
if ( timeline . refs . length === 0 ) {
timeline . refs = events . map ( ( e ) = > [ e . id , e . created_at ] as TTimelineRef ) . sort ( ( a , b ) = > b [ 1 ] - a [ 1 ] )
that . scheduleTimelinePersist ( key )
return
}
let idx = 0
for ( const ref of timeline . refs ) {
if ( evt . created_at > ref [ 1 ] || ( evt . created_at === ref [ 1 ] && evt . id < ref [ 0 ] ) ) {
break
}
if ( evt . created_at === ref [ 1 ] && evt . id === ref [ 0 ] ) {
return
}
idx ++
}
if ( idx >= timeline . refs . length ) return
timeline . refs . splice ( idx , 0 , [ evt . id , evt . created_at ] )
that . scheduleTimelinePersist ( key )
applySubscribedTimelineEvent ( evt )
} ,
oneose : handleTimelineEose ,
onclose : onClose
} ,
relayReqLog )
if ( httpTimelinePollBases . length > 0 ) {
const backfillFilter = { . . . ( filter as Filter ) } as Filter & { until? : number }
delete backfillFilter . until
void runHttpTimelinePollQuery ( backfillFilter )
}
return {
timelineKey : key ,
closer : ( ) = > {
clearFirstResultGraceTimer ( )
clearHttpTimelinePoll ( )
onEvents = ( ) = > { }
onNew = ( ) = > { }
subCloser . close ( )
@ -2602,8 +2669,19 @@ class ClientService extends EventTarget {
@@ -2602,8 +2669,19 @@ class ClientService extends EventTarget {
} = { }
) {
const originalDedupedRelays = Array . from ( new Set ( urls ) )
let relays = originalDedupedRelays . filter ( ( url ) = > ! isHttpRelayUrl ( url ) )
if ( relays . length === 0 ) relays = [ . . . FAST_READ_RELAY_URLS ]
const httpRelayBases = Array . from (
new Set (
originalDedupedRelays
. filter ( ( u ) = > isHttpRelayUrl ( u ) )
. map ( ( u ) = > normalizeHttpRelayUrl ( u ) || u )
. filter ( Boolean )
)
)
const wsOriginal = originalDedupedRelays . filter ( ( url ) = > ! isHttpRelayUrl ( url ) )
let relays = [ . . . wsOriginal ]
if ( relays . length === 0 && httpRelayBases . length === 0 ) {
relays = [ . . . FAST_READ_RELAY_URLS ]
}
const filters = Array . isArray ( filter ) ? filter : [ filter ]
relays = withDocumentRelayUrlsForFilters ( relays , filters )
const stripSocialBlockedRelays =
@ -2612,10 +2690,11 @@ class ClientService extends EventTarget {
@@ -2612,10 +2690,11 @@ class ClientService extends EventTarget {
if ( stripSocialBlockedRelays ) {
const socialKindBlockedSet = new Set ( SOCIAL_KIND_BLOCKED_RELAY_URLS . map ( ( u ) = > normalizeUrl ( u ) || u ) )
const stripped = relays . filter ( ( url ) = > ! socialKindBlockedSet . has ( normalizeUrl ( url ) || url ) )
relays = relaysAfterSocialKindBlockedStrip ( originalDedupedRelays , stripped )
relays = relaysAfterSocialKindBlockedStrip ( wsOriginal , stripped )
}
relays = this . relayUrlsAfterStrikesOrRecover ( relays )
const events = await this . queryService . query ( relays , filter , onevent , {
const queryRelays = dedupeNormalizeRelayUrlsOrdered ( [ . . . relays , . . . httpRelayBases ] )
const events = await this . queryService . query ( queryRelays , filter , onevent , {
eoseTimeout ,
globalTimeout ,
firstRelayResultGraceMs ,
