diff --git a/src/common.ts b/src/common.ts index 14614597..0424b524 100644 --- a/src/common.ts +++ b/src/common.ts @@ -3,7 +3,7 @@ import { Time } from '@/utils/time.ts'; const reqmeister = new Reqmeister({ delay: Time.seconds(1), - timeout: Time.seconds(1), + signal: AbortSignal.timeout(Time.seconds(1)), }); export { reqmeister }; diff --git a/src/reqmeister.ts b/src/reqmeister.ts index f7f469e1..eb1f26d7 100644 --- a/src/reqmeister.ts +++ b/src/reqmeister.ts @@ -6,7 +6,7 @@ import { eventToMicroFilter, getFilterId, type MicroFilter } from '@/filter.ts'; interface ReqmeisterOpts { delay?: number; - timeout?: number; + signal?: AbortSignal; } type ReqmeisterQueueItem = [string, MicroFilter, WebSocket['url'][]]; @@ -55,7 +55,7 @@ class Reqmeister extends EventEmitter<{ [filterId: string]: (event: Event) => an if (wantedEvents.size) filters.push({ ids: [...wantedEvents] }); if (wantedAuthors.size) filters.push({ kinds: [0], authors: [...wantedAuthors] }); - const events = await client.getFilters(filters, { timeout: this.#opts.timeout }); + const events = await client.getFilters(filters, { signal: this.#opts.signal }); for (const event of events) { this.encounter(event);