reqmeister: accept `signal`
This commit is contained in:
parent
2d19ab207e
commit
08da26b12a
|
@ -144,7 +144,7 @@ function fetchRelatedEvents(event: Event, data: EventData) {
|
|||
}
|
||||
for (const [name, id, relay] of event.tags) {
|
||||
if (name === 'e' && !memorelay.hasEventById(id)) {
|
||||
reqmeister.req({ ids: [id] }, [relay]).catch(() => {});
|
||||
reqmeister.req({ ids: [id] }, { relays: [relay] }).catch(() => {});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -52,7 +52,7 @@ const getEvent = async <K extends number = number>(
|
|||
|
||||
if (memoryEvent) return memoryEvent;
|
||||
|
||||
return await reqmeister.req(microfilter).catch(() => undefined) as Event<K> | undefined;
|
||||
return await reqmeister.req(microfilter, opts).catch(() => undefined) as Event<K> | undefined;
|
||||
};
|
||||
|
||||
/** Get a Nostr `set_medatadata` event for a user's pubkey. */
|
||||
|
@ -74,7 +74,7 @@ const getAuthor = async (pubkey: string, opts: GetEventOpts<0> = {}): Promise<Ev
|
|||
if (dbEvent) return dbEvent;
|
||||
if (memoryEvent) return memoryEvent;
|
||||
|
||||
return reqmeister.req(microfilter).catch(() => undefined);
|
||||
return reqmeister.req(microfilter, opts).catch(() => undefined);
|
||||
};
|
||||
|
||||
/** Get users the given pubkey follows. */
|
||||
|
|
|
@ -10,6 +10,11 @@ interface ReqmeisterOpts {
|
|||
timeout?: number;
|
||||
}
|
||||
|
||||
interface ReqmeisterReqOpts {
|
||||
relays?: WebSocket['url'][];
|
||||
signal?: AbortSignal;
|
||||
}
|
||||
|
||||
type ReqmeisterQueueItem = [string, MicroFilter, WebSocket['url'][]];
|
||||
|
||||
/** Batches requests to Nostr relays using microfilters. */
|
||||
|
@ -70,15 +75,21 @@ class Reqmeister extends EventEmitter<{ [filterId: string]: (event: Event) => an
|
|||
this.#perform();
|
||||
}
|
||||
|
||||
req(filter: IdMicrofilter, relays?: WebSocket['url'][]): Promise<Event>;
|
||||
req(filter: AuthorMicrofilter, relays?: WebSocket['url'][]): Promise<Event<0>>;
|
||||
req(filter: MicroFilter, relays?: WebSocket['url'][]): Promise<Event>;
|
||||
req(filter: MicroFilter, relays: WebSocket['url'][] = []): Promise<Event> {
|
||||
req(filter: IdMicrofilter, opts?: ReqmeisterReqOpts): Promise<Event>;
|
||||
req(filter: AuthorMicrofilter, opts?: ReqmeisterReqOpts): Promise<Event<0>>;
|
||||
req(filter: MicroFilter, opts?: ReqmeisterReqOpts): Promise<Event>;
|
||||
req(filter: MicroFilter, opts: ReqmeisterReqOpts = {}): Promise<Event> {
|
||||
const { relays = [], signal } = opts;
|
||||
if (signal?.aborted) return Promise.reject(new DOMException('Aborted', 'AbortError'));
|
||||
|
||||
const filterId = getFilterId(filter);
|
||||
|
||||
this.#queue.push([filterId, filter, relays]);
|
||||
|
||||
return new Promise<Event>((resolve, reject) => {
|
||||
this.once(filterId, resolve);
|
||||
this.#promise.finally(() => setTimeout(reject, 0));
|
||||
signal?.addEventListener('abort', () => reject(new DOMException('Aborted', 'AbortError')), { once: true });
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue