mixer: pass opts through to all getFilters functions

This commit is contained in:
Alex Gleason 2023-08-16 21:21:29 -05:00
parent d4721fb82d
commit bbaf1cb012
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
4 changed files with 24 additions and 17 deletions

View File

@ -1,9 +1,9 @@
import { Conf } from '@/config.ts';
import { Author, type Filter, findReplyTag, matchFilters, RelayPool, TTLCache } from '@/deps.ts';
import { type Event, type SignedEvent } from '@/event.ts';
import { eventDateComparator, type PaginationParams, Time } from '@/utils.ts';
import { Conf } from './config.ts';
import { eventDateComparator, type PaginationParams, Time } from './utils.ts';
import type { GetFiltersOpts } from '@/types.ts';
const db = await Deno.openKv();
@ -29,12 +29,8 @@ function getPool(): Pool {
return pool;
}
interface GetFilterOpts {
timeout?: number;
}
/** Get events from a NIP-01 filter. */
function getFilters<K extends number>(filters: Filter<K>[], opts: GetFilterOpts = {}): Promise<SignedEvent<K>[]> {
function getFilters<K extends number>(filters: Filter<K>[], opts: GetFiltersOpts = {}): Promise<SignedEvent<K>[]> {
return new Promise((resolve) => {
let tid: number;
const results: SignedEvent[] = [];
@ -79,7 +75,7 @@ function getFilters<K extends number>(filters: Filter<K>[], opts: GetFilterOpts
}
/** @deprecated Use `getFilters` instead. */
function getFilter<K extends number>(filter: Filter<K>, opts: GetFilterOpts = {}): Promise<SignedEvent<K>[]> {
function getFilter<K extends number>(filter: Filter<K>, opts: GetFiltersOpts = {}): Promise<SignedEvent<K>[]> {
return getFilters([filter], opts);
}

View File

@ -2,7 +2,7 @@ import { db, type TagRow } from '@/db.ts';
import { type Insertable } from '@/deps.ts';
import { type SignedEvent } from '@/event.ts';
import type { DittoFilter } from '@/types.ts';
import type { DittoFilter, GetFiltersOpts } from '@/types.ts';
type TagCondition = ({ event, count }: { event: SignedEvent; count: number }) => boolean;
@ -105,7 +105,10 @@ function getFilterQuery(filter: DittoFilter) {
}
/** Get events for filters from the database. */
async function getFilters<K extends number>(filters: DittoFilter<K>[]): Promise<SignedEvent<K>[]> {
async function getFilters<K extends number>(
filters: DittoFilter<K>[],
_opts?: GetFiltersOpts,
): Promise<SignedEvent<K>[]> {
const events = await filters
.map(getFilterQuery)
.reduce((acc, curr) => acc.union(curr))
@ -116,7 +119,7 @@ async function getFilters<K extends number>(filters: DittoFilter<K>[]): Promise<
));
}
/** Get events for a filter from the database. */
/** @deprecated Use `getFilters` instead. */
function getFilter<K extends number = number>(filter: DittoFilter<K>): Promise<SignedEvent<K>[]> {
return getFilters<K>([filter]);
}

View File

@ -5,13 +5,16 @@ import { getFilters as getFiltersDB } from '@/db/events.ts';
import { eventDateComparator } from '@/utils.ts';
import type { SignedEvent } from '@/event.ts';
import type { DittoFilter } from '@/types.ts';
import type { DittoFilter, GetFiltersOpts } from '@/types.ts';
/** Get filters from the database and pool, and mix the best results together. */
async function getFilters<K extends number>(filters: DittoFilter<K>[]): Promise<SignedEvent<K>[]> {
async function getFilters<K extends number>(
filters: DittoFilter<K>[],
opts?: GetFiltersOpts,
): Promise<SignedEvent<K>[]> {
const results = await Promise.allSettled([
getFiltersClient(filters),
getFiltersDB(filters),
getFiltersClient(filters, opts),
getFiltersDB(filters, opts),
]);
const events = results

View File

@ -5,4 +5,9 @@ interface DittoFilter<K extends number = number> extends Filter<K> {
local?: boolean;
}
export { type DittoFilter };
/** Additional options to apply to the whole subscription. */
interface GetFiltersOpts {
timeout?: number;
}
export type { DittoFilter, GetFiltersOpts };