@ -58,7 +58,7 @@ async function prioritizeSearchEvents(
@@ -58,7 +58,7 @@ async function prioritizeSearchEvents(
events : NDKEvent [ ] ,
targetPubkey? : string ,
maxResults : number = SEARCH_LIMITS . GENERAL_CONTENT ,
ndk? : NDK
ndk? : NDK ,
) : Promise < NDKEvent [ ] > {
if ( events . length === 0 ) {
return [ ] ;
@ -72,7 +72,9 @@ async function prioritizeSearchEvents(
@@ -72,7 +72,9 @@ async function prioritizeSearchEvents(
if ( ndk ) {
try {
// Import user list functions dynamically to avoid circular dependencies
const { fetchCurrentUserLists , getPubkeysFromListKind } = await import ( "./user_lists.ts" ) ;
const { fetchCurrentUserLists , getPubkeysFromListKind } = await import (
"./user_lists.ts"
) ;
const { checkCommunity } = await import ( "./community_checker.ts" ) ;
// Get current user's follow lists (if logged in)
@ -80,10 +82,14 @@ async function prioritizeSearchEvents(
@@ -80,10 +82,14 @@ async function prioritizeSearchEvents(
userFollowPubkeys = getPubkeysFromListKind ( userLists , 3 ) ; // Kind 3 = follow list
// Check community status for unique pubkeys in events (limit to prevent hanging)
const uniquePubkeys = new Set ( events . map ( e = > e . pubkey ) . filter ( Boolean ) ) ;
const uniquePubkeys = new Set (
events . map ( ( e ) = > e . pubkey ) . filter ( Boolean ) ,
) ;
const pubkeysToCheck = Array . from ( uniquePubkeys ) . slice ( 0 , 20 ) ; // Limit to first 20 pubkeys
console . log ( ` subscription_search: Checking community status for ${ pubkeysToCheck . length } pubkeys out of ${ uniquePubkeys . size } total ` ) ;
console . log (
` subscription_search: Checking community status for ${ pubkeysToCheck . length } pubkeys out of ${ uniquePubkeys . size } total ` ,
) ;
const communityChecks = await Promise . allSettled (
pubkeysToCheck . map ( async ( pubkey ) = > {
@ -91,19 +97,25 @@ async function prioritizeSearchEvents(
@@ -91,19 +97,25 @@ async function prioritizeSearchEvents(
const isCommunityMember = await Promise . race ( [
checkCommunity ( pubkey ) ,
new Promise ( ( _ , reject ) = >
setTimeout ( ( ) = > reject ( new Error ( 'Community check timeout' ) ) , 2000 )
setTimeout (
( ) = > reject ( new Error ( "Community check timeout" ) ) ,
2000 ,
)
) ,
] ) ;
return { pubkey , isCommunityMember } ;
} catch ( error ) {
console . warn ( ` subscription_search: Community check failed for ${ pubkey } : ` , error ) ;
console . warn (
` subscription_search: Community check failed for ${ pubkey } : ` ,
error ,
) ;
return { pubkey , isCommunityMember : false } ;
}
} )
} ) ,
) ;
// Build set of community member pubkeys
communityChecks . forEach ( result = > {
communityChecks . forEach ( ( result ) = > {
if ( result . status === "fulfilled" && result . value . isCommunityMember ) {
communityMemberPubkeys . add ( result . value . pubkey ) ;
}
@ -112,13 +124,18 @@ async function prioritizeSearchEvents(
@@ -112,13 +124,18 @@ async function prioritizeSearchEvents(
console . log ( "subscription_search: Prioritization data loaded:" , {
userFollows : userFollowPubkeys.size ,
communityMembers : communityMemberPubkeys.size ,
totalEvents : events.length
totalEvents : events.length ,
} ) ;
} catch ( error ) {
console . warn ( "subscription_search: Failed to load prioritization data:" , error ) ;
console . warn (
"subscription_search: Failed to load prioritization data:" ,
error ,
) ;
}
} else {
console . log ( "subscription_search: No NDK provided, skipping user list and community checks" ) ;
console . log (
"subscription_search: No NDK provided, skipping user list and community checks" ,
) ;
}
// Separate events into priority tiers
@ -131,7 +148,9 @@ async function prioritizeSearchEvents(
@@ -131,7 +148,9 @@ async function prioritizeSearchEvents(
const isFromTarget = targetPubkey && event . pubkey === targetPubkey ;
const isPrioritizedKind = PRIORITIZED_EVENT_KINDS . has ( event . kind || 0 ) ;
const isFromFollow = userFollowPubkeys . has ( event . pubkey || "" ) ;
const isFromCommunityMember = communityMemberPubkeys . has ( event . pubkey || "" ) ;
const isFromCommunityMember = communityMemberPubkeys . has (
event . pubkey || "" ,
) ;
// AI-NOTE: Prioritized kinds are always in tier 1
// Target pubkey priority only applies to n: searches (when targetPubkey is provided)
@ -181,7 +200,7 @@ async function prioritizeSearchEvents(
@@ -181,7 +200,7 @@ async function prioritizeSearchEvents(
tier2 : tier2.length , // User follows
tier3 : tier3.length , // Community members
tier4 : tier4.length , // Others
total : result.length
total : result.length ,
} ) ;
return result ;
@ -224,25 +243,34 @@ export async function searchBySubscription(
@@ -224,25 +243,34 @@ export async function searchBySubscription(
// AI-NOTE: Ensure cached events have created_at property preserved
// This fixes the "Unknown date" issue when events are retrieved from cache
const eventsWithCreatedAt = cachedResult . events . map ( event = > {
if ( event && typeof event === 'object' && ! event . created_at ) {
console . warn ( "subscription_search: Event missing created_at, setting to 0:" , event . id ) ;
const eventsWithCreatedAt = cachedResult . events . map ( ( event ) = > {
if ( event && typeof event === "object" && ! event . created_at ) {
console . warn (
"subscription_search: Event missing created_at, setting to 0:" ,
event . id ,
) ;
( event as any ) . created_at = 0 ;
}
return event ;
} ) ;
const secondOrderWithCreatedAt = cachedResult . secondOrder . map ( event = > {
if ( event && typeof event === 'object' && ! event . created_at ) {
console . warn ( "subscription_search: Second order event missing created_at, setting to 0:" , event . id ) ;
const secondOrderWithCreatedAt = cachedResult . secondOrder . map ( ( event ) = > {
if ( event && typeof event === "object" && ! event . created_at ) {
console . warn (
"subscription_search: Second order event missing created_at, setting to 0:" ,
event . id ,
) ;
( event as any ) . created_at = 0 ;
}
return event ;
} ) ;
const tTagEventsWithCreatedAt = cachedResult . tTagEvents . map ( event = > {
if ( event && typeof event === 'object' && ! event . created_at ) {
console . warn ( "subscription_search: T-tag event missing created_at, setting to 0:" , event . id ) ;
const tTagEventsWithCreatedAt = cachedResult . tTagEvents . map ( ( event ) = > {
if ( event && typeof event === "object" && ! event . created_at ) {
console . warn (
"subscription_search: T-tag event missing created_at, setting to 0:" ,
event . id ,
) ;
( event as any ) . created_at = 0 ;
}
return event ;
@ -252,18 +280,22 @@ export async function searchBySubscription(
@@ -252,18 +280,22 @@ export async function searchBySubscription(
. . . cachedResult ,
events : eventsWithCreatedAt ,
secondOrder : secondOrderWithCreatedAt ,
tTagEvents : tTagEventsWithCreatedAt
tTagEvents : tTagEventsWithCreatedAt ,
} ;
// AI-NOTE: Return cached results immediately but trigger second-order search in background
// This ensures we get fast results while still updating second-order data
console . log ( "subscription_search: Returning cached result immediately, triggering background second-order search" ) ;
console . log (
"subscription_search: Returning cached result immediately, triggering background second-order search" ,
) ;
// Trigger second-order search in background for all search types
if ( ndk ) {
// Start second-order search in background for n and d searches only
if ( searchType === "n" || searchType === "d" ) {
console . log ( "subscription_search: Triggering background second-order search for cached result" ) ;
console . log (
"subscription_search: Triggering background second-order search for cached result" ,
) ;
performSecondOrderSearchInBackground (
searchType as "n" | "d" ,
eventsWithCreatedAt ,
@ -271,7 +303,7 @@ export async function searchBySubscription(
@@ -271,7 +303,7 @@ export async function searchBySubscription(
cachedResult . addresses || new Set ( ) ,
ndk ,
searchType === "n" ? eventsWithCreatedAt [ 0 ] ? . pubkey : undefined ,
callbacks
callbacks ,
) ;
}
}
@ -316,7 +348,10 @@ export async function searchBySubscription(
@@ -316,7 +348,10 @@ export async function searchBySubscription(
// AI-NOTE: Check for preloaded events first (for profile searches)
if ( searchFilter . preloadedEvents && searchFilter . preloadedEvents . length > 0 ) {
console . log ( "subscription_search: Using preloaded events:" , searchFilter . preloadedEvents . length ) ;
console . log (
"subscription_search: Using preloaded events:" ,
searchFilter . preloadedEvents . length ,
) ;
processPrimaryRelayResults (
new Set ( searchFilter . preloadedEvents ) ,
searchType ,
@ -328,7 +363,9 @@ export async function searchBySubscription(
@@ -328,7 +363,9 @@ export async function searchBySubscription(
) ;
if ( hasResults ( searchState , searchType ) ) {
console . log ( "subscription_search: Found results from preloaded events, returning immediately" ) ;
console . log (
"subscription_search: Found results from preloaded events, returning immediately" ,
) ;
const immediateResult = createSearchResult (
searchState ,
searchType ,
@ -376,10 +413,16 @@ export async function searchBySubscription(
@@ -376,10 +413,16 @@ export async function searchBySubscription(
) ;
const timeoutPromise = new Promise ( ( _ , reject ) = > {
setTimeout ( ( ) = > reject ( new Error ( "Primary relay search timeout" ) ) , TIMEOUTS . SUBSCRIPTION_SEARCH ) ;
setTimeout (
( ) = > reject ( new Error ( "Primary relay search timeout" ) ) ,
TIMEOUTS . SUBSCRIPTION_SEARCH ,
) ;
} ) ;
const primaryEvents = await Promise . race ( [ primaryEventsPromise , timeoutPromise ] ) as any ;
const primaryEvents = await Promise . race ( [
primaryEventsPromise ,
timeoutPromise ,
] ) as any ;
console . log (
"subscription_search: Primary relay returned" ,
@ -473,10 +516,16 @@ export async function searchBySubscription(
@@ -473,10 +516,16 @@ export async function searchBySubscription(
) ;
const fallbackTimeoutPromise = new Promise ( ( _ , reject ) = > {
setTimeout ( ( ) = > reject ( new Error ( "Fallback search timeout" ) ) , TIMEOUTS . SUBSCRIPTION_SEARCH ) ;
setTimeout (
( ) = > reject ( new Error ( "Fallback search timeout" ) ) ,
TIMEOUTS . SUBSCRIPTION_SEARCH ,
) ;
} ) ;
const fallbackEvents = await Promise . race ( [ fallbackEventsPromise , fallbackTimeoutPromise ] ) as any ;
const fallbackEvents = await Promise . race ( [
fallbackEventsPromise ,
fallbackTimeoutPromise ,
] ) as any ;
console . log (
"subscription_search: Fallback search returned" ,
@ -520,8 +569,13 @@ export async function searchBySubscription(
@@ -520,8 +569,13 @@ export async function searchBySubscription(
) ;
// If it's a timeout error, continue to return empty result
if ( fallbackError instanceof Error && fallbackError . message . includes ( "timeout" ) ) {
console . log ( "subscription_search: Fallback search timed out, returning empty result" ) ;
if (
fallbackError instanceof Error &&
fallbackError . message . includes ( "timeout" )
) {
console . log (
"subscription_search: Fallback search timed out, returning empty result" ,
) ;
}
}
@ -556,7 +610,9 @@ export async function searchBySubscription(
@@ -556,7 +610,9 @@ export async function searchBySubscription(
// If it's a timeout error, continue to Phase 2 instead of failing
if ( error instanceof Error && error . message . includes ( "timeout" ) ) {
console . log ( "subscription_search: Primary relay search timed out, continuing to Phase 2" ) ;
console . log (
"subscription_search: Primary relay search timed out, continuing to Phase 2" ,
) ;
} else {
// For other errors, we might want to fail the search
throw error ;
@ -685,7 +741,11 @@ async function createSearchFilter(
@@ -685,7 +741,11 @@ async function createSearchFilter(
hexPubkey = decoded . data as string ;
}
} catch ( e ) {
console . warn ( "subscription_search: Failed to decode npub:" , profile . pubkey , e ) ;
console . warn (
"subscription_search: Failed to decode npub:" ,
profile . pubkey ,
e ,
) ;
}
}
event . pubkey = hexPubkey ;
@ -695,11 +755,17 @@ async function createSearchFilter(
@@ -695,11 +755,17 @@ async function createSearchFilter(
// This ensures the profile cards show the actual creation date instead of "Unknown date"
if ( ( profile as any ) . created_at ) {
event . created_at = ( profile as any ) . created_at ;
console . log ( "subscription_search: Using preserved timestamp:" , event . created_at ) ;
console . log (
"subscription_search: Using preserved timestamp:" ,
event . created_at ,
) ;
} else {
// Fallback to current timestamp if no preserved timestamp
event . created_at = Math . floor ( Date . now ( ) / 1000 ) ;
console . log ( "subscription_search: Using fallback timestamp:" , event . created_at ) ;
console . log (
"subscription_search: Using fallback timestamp:" ,
event . created_at ,
) ;
}
return event ;
@ -712,7 +778,10 @@ async function createSearchFilter(
@@ -712,7 +778,10 @@ async function createSearchFilter(
searchTerm : normalizedSearchTerm ,
preloadedEvents : events , // AI-NOTE: Pass preloaded events
} ;
console . log ( "subscription_search: Created profile filter with preloaded events:" , nFilter ) ;
console . log (
"subscription_search: Created profile filter with preloaded events:" ,
nFilter ,
) ;
return nFilter ;
}
default : {
@ -721,8 +790,6 @@ async function createSearchFilter(
@@ -721,8 +790,6 @@ async function createSearchFilter(
}
}
/ * *
* Create primary relay set for search operations
* AI - NOTE : Updated to use all available relays to prevent search failures
@ -816,7 +883,9 @@ function processPrimaryRelayResults(
@@ -816,7 +883,9 @@ function processPrimaryRelayResults(
for ( const event of events ) {
// Check if we've reached the event limit
if ( processedCount >= maxEvents ) {
console . log ( ` subscription_search: Reached event limit of ${ maxEvents } in primary relay processing ` ) ;
console . log (
` subscription_search: Reached event limit of ${ maxEvents } in primary relay processing ` ,
) ;
break ;
}
@ -1029,7 +1098,9 @@ function searchOtherRelaysInBackground(
@@ -1029,7 +1098,9 @@ function searchOtherRelaysInBackground(
sub . on ( "event" , ( event : NDKEvent ) = > {
// Check if we've reached the event limit
if ( eventCount >= maxEvents ) {
console . log ( ` subscription_search: Reached event limit of ${ maxEvents } , stopping event processing ` ) ;
console . log (
` subscription_search: Reached event limit of ${ maxEvents } , stopping event processing ` ,
) ;
sub . stop ( ) ;
return ;
}
@ -1058,7 +1129,9 @@ function searchOtherRelaysInBackground(
@@ -1058,7 +1129,9 @@ function searchOtherRelaysInBackground(
// Add timeout to prevent hanging
const timeoutId = setTimeout ( async ( ) = > {
if ( ! resolved ) {
console . log ( "subscription_search: Background search timeout, resolving with current results" ) ;
console . log (
"subscription_search: Background search timeout, resolving with current results" ,
) ;
resolved = true ;
sub . stop ( ) ;
const result = await processEoseResults (
@ -1106,7 +1179,12 @@ async function processEoseResults(
@@ -1106,7 +1179,12 @@ async function processEoseResults(
if ( searchType === "n" ) {
return processProfileEoseResults ( searchState , searchFilter , ndk , callbacks ) ;
} else if ( searchType === "d" ) {
return await processContentEoseResults ( searchState , searchType , ndk , callbacks ) ;
return await processContentEoseResults (
searchState ,
searchType ,
ndk ,
callbacks ,
) ;
} else if ( searchType === "t" ) {
return await processTTagEoseResults ( searchState , ndk ) ;
}
@ -1242,7 +1320,7 @@ async function processContentEoseResults(
@@ -1242,7 +1320,7 @@ async function processContentEoseResults(
dedupedEvents ,
undefined , // No specific target pubkey for d-tag searches
SEARCH_LIMITS . GENERAL_CONTENT ,
ndk
ndk ,
) ;
// AI-NOTE: Attach profile data to first-order events for display
@ -1276,7 +1354,10 @@ async function processContentEoseResults(
@@ -1276,7 +1354,10 @@ async function processContentEoseResults(
/ * *
* Process t - tag EOSE results
* /
async function processTTagEoseResults ( searchState : any , ndk? : NDK ) : Promise < SearchResult > {
async function processTTagEoseResults (
searchState : any ,
ndk? : NDK ,
) : Promise < SearchResult > {
if ( searchState . tTagEvents . length === 0 ) {
return createEmptySearchResult ( "t" , searchState . normalizedSearchTerm ) ;
}
@ -1287,7 +1368,7 @@ async function processTTagEoseResults(searchState: any, ndk?: NDK): Promise<Sear
@@ -1287,7 +1368,7 @@ async function processTTagEoseResults(searchState: any, ndk?: NDK): Promise<Sear
searchState . tTagEvents ,
undefined , // No specific target pubkey for t-tag searches
SEARCH_LIMITS . GENERAL_CONTENT ,
ndk
ndk ,
) ;
// AI-NOTE: Attach profile data to t-tag events for display
@ -1460,7 +1541,9 @@ async function performSecondOrderSearchInBackground(
@@ -1460,7 +1541,9 @@ async function performSecondOrderSearchInBackground(
await Promise . race ( [ fetchPromise , fetchTimeoutPromise ] ) ;
// Now do the prioritization without timeout
console . log ( "subscription_search: Event fetching completed, starting prioritization..." ) ;
console . log (
"subscription_search: Event fetching completed, starting prioritization..." ,
) ;
// Deduplicate by event ID
const uniqueSecondOrder = new Map < string , NDKEvent > ( ) ;
@ -1484,18 +1567,18 @@ async function performSecondOrderSearchInBackground(
@@ -1484,18 +1567,18 @@ async function performSecondOrderSearchInBackground(
deduplicatedSecondOrder ,
targetPubkey ,
SEARCH_LIMITS . SECOND_ORDER_RESULTS ,
ndk
ndk ,
) ;
const prioritizationTimeoutPromise = new Promise ( ( _ , reject ) = > {
setTimeout ( ( ) = > reject ( new Error ( 'Prioritization timeout' ) ) , 15000 ) ; // 15 second timeout
setTimeout ( ( ) = > reject ( new Error ( "Prioritization timeout" ) ) , 15000 ) ; // 15 second timeout
} ) ;
let prioritizedSecondOrder : NDKEvent [ ] ;
try {
prioritizedSecondOrder = await Promise . race ( [
prioritizationPromise ,
prioritizationTimeoutPromise
prioritizationTimeoutPromise ,
] ) as NDKEvent [ ] ;
console . log (
@ -1504,7 +1587,10 @@ async function performSecondOrderSearchInBackground(
@@ -1504,7 +1587,10 @@ async function performSecondOrderSearchInBackground(
"prioritized results" ,
) ;
} catch ( error ) {
console . warn ( "subscription_search: Prioritization failed, using simple sorting:" , error ) ;
console . warn (
"subscription_search: Prioritization failed, using simple sorting:" ,
error ,
) ;
// Fallback to simple sorting if prioritization fails
prioritizedSecondOrder = deduplicatedSecondOrder . sort ( ( a , b ) = > {
// Prioritize events from target pubkey first (for n: searches)
@ -1577,16 +1663,23 @@ async function performSecondOrderSearchInBackground(
@@ -1577,16 +1663,23 @@ async function performSecondOrderSearchInBackground(
* @param ndk NDK instance for fetching profile data
* @returns Promise that resolves when profile data is attached
* /
async function attachProfileDataToEvents ( events : NDKEvent [ ] , ndk : NDK ) : Promise < void > {
async function attachProfileDataToEvents (
events : NDKEvent [ ] ,
ndk : NDK ,
) : Promise < void > {
if ( events . length === 0 ) {
return ;
}
console . log ( ` subscription_search: Attaching profile data to ${ events . length } events ` ) ;
console . log (
` subscription_search: Attaching profile data to ${ events . length } events ` ,
) ;
try {
// Import user list functions dynamically to avoid circular dependencies
const { fetchCurrentUserLists , isPubkeyInUserLists } = await import ( "./user_lists.ts" ) ;
const { fetchCurrentUserLists , isPubkeyInUserLists } = await import (
"./user_lists.ts"
) ;
// Get current user's lists for user list status
const userLists = await fetchCurrentUserLists ( undefined , ndk ) ;
@ -1599,14 +1692,18 @@ async function attachProfileDataToEvents(events: NDKEvent[], ndk: NDK): Promise<
@@ -1599,14 +1692,18 @@ async function attachProfileDataToEvents(events: NDKEvent[], ndk: NDK): Promise<
}
} ) ;
console . log ( ` subscription_search: Found ${ uniquePubkeys . size } unique pubkeys to fetch profiles for ` ) ;
console . log (
` subscription_search: Found ${ uniquePubkeys . size } unique pubkeys to fetch profiles for ` ,
) ;
// Fetch profile data for each unique pubkey
const profilePromises = Array . from ( uniquePubkeys ) . map ( async ( pubkey ) = > {
try {
// Import getUserMetadata dynamically to avoid circular dependencies
const { getUserMetadata } = await import ( "./nostrUtils.ts" ) ;
const npub = await import ( "./nostrUtils.ts" ) . then ( m = > m . toNpub ( pubkey ) ) ;
const npub = await import ( "./nostrUtils.ts" ) . then ( ( m ) = >
m . toNpub ( pubkey )
) ;
if ( npub ) {
const profileData = await getUserMetadata ( npub , ndk , true ) ;
@ -1619,13 +1716,16 @@ async function attachProfileDataToEvents(events: NDKEvent[], ndk: NDK): Promise<
@@ -1619,13 +1716,16 @@ async function attachProfileDataToEvents(events: NDKEvent[], ndk: NDK): Promise<
pubkey ,
profileData : {
. . . profileData ,
isInUserLists : isInLists
}
isInUserLists : isInLists ,
} ,
} ;
}
}
} catch ( error ) {
console . warn ( ` subscription_search: Failed to fetch profile for ${ pubkey } : ` , error ) ;
console . warn (
` subscription_search: Failed to fetch profile for ${ pubkey } : ` ,
error ,
) ;
}
return null ;
} ) ;
@ -1640,7 +1740,9 @@ async function attachProfileDataToEvents(events: NDKEvent[], ndk: NDK): Promise<
@@ -1640,7 +1740,9 @@ async function attachProfileDataToEvents(events: NDKEvent[], ndk: NDK): Promise<
}
} ) ;
console . log ( ` subscription_search: Successfully fetched ${ profileMap . size } profiles ` ) ;
console . log (
` subscription_search: Successfully fetched ${ profileMap . size } profiles ` ,
) ;
// Attach profile data to each event
events . forEach ( ( event ) = > {
buttercat1791
6 months ago