mirror of
https://github.com/dergigi/boris.git
synced 2026-01-18 06:14:27 +01:00
8eaba04d91
Set accounts.disableQueue = true on AccountManager during initialization: - Applies to all accounts automatically - No need for temporary queue toggling in individual operations - Makes all bunker requests instant (no internal queueing) Removed temporary queue disabling from bookmarkProcessing.ts since it's now globally disabled. Updated Amber.md to document the global approach. This eliminates the root cause of decrypt hangs - requests no longer wait in an internal queue for previous requests to complete.
65 lines
2.1 KiB
TypeScript
65 lines
2.1 KiB
TypeScript
import { RelayPool, completeOnEose, onlyEvents } from 'applesauce-relay'
|
|
import { Observable, merge, toArray, tap, lastValueFrom } from 'rxjs'
|
|
import { NostrEvent } from 'nostr-tools'
|
|
import { Filter } from 'nostr-tools/filter'
|
|
import { prioritizeLocalRelays, partitionRelays } from '../utils/helpers'
|
|
|
|
export interface QueryOptions {
|
|
relayUrls?: string[]
|
|
onEvent?: (event: NostrEvent) => void
|
|
}
|
|
|
|
/**
|
|
* Unified local-first query helper with optional streaming callback.
|
|
* Returns all collected events (deduped by id) after both streams complete (EOSE).
|
|
* Trusts relay EOSE signals - no artificial timeouts.
|
|
*/
|
|
export async function queryEvents(
|
|
relayPool: RelayPool,
|
|
filter: Filter,
|
|
options: QueryOptions = {}
|
|
): Promise<NostrEvent[]> {
|
|
const {
|
|
relayUrls,
|
|
onEvent
|
|
} = options
|
|
|
|
const urls = relayUrls && relayUrls.length > 0
|
|
? relayUrls
|
|
: Array.from(relayPool.relays.values()).map(r => r.url)
|
|
|
|
const ordered = prioritizeLocalRelays(urls)
|
|
const { local: localRelays, remote: remoteRelays } = partitionRelays(ordered)
|
|
|
|
const local$: Observable<NostrEvent> = localRelays.length > 0
|
|
? relayPool
|
|
.req(localRelays, filter)
|
|
.pipe(
|
|
onlyEvents(),
|
|
onEvent ? tap((e: NostrEvent) => onEvent(e)) : tap(() => {}),
|
|
completeOnEose()
|
|
) as unknown as Observable<NostrEvent>
|
|
: new Observable<NostrEvent>((sub) => sub.complete())
|
|
|
|
const remote$: Observable<NostrEvent> = remoteRelays.length > 0
|
|
? relayPool
|
|
.req(remoteRelays, filter)
|
|
.pipe(
|
|
onlyEvents(),
|
|
onEvent ? tap((e: NostrEvent) => onEvent(e)) : tap(() => {}),
|
|
completeOnEose()
|
|
) as unknown as Observable<NostrEvent>
|
|
: new Observable<NostrEvent>((sub) => sub.complete())
|
|
|
|
const events = await lastValueFrom(merge(local$, remote$).pipe(toArray()))
|
|
|
|
// Deduplicate by id (callers can perform higher-level replaceable grouping if needed)
|
|
const byId = new Map<string, NostrEvent>()
|
|
for (const ev of events) {
|
|
if (!byId.has(ev.id)) byId.set(ev.id, ev)
|
|
}
|
|
return Array.from(byId.values())
|
|
}
|
|
|
|
|