Kieran
06b7dcad11
Various other fixes: - Better handeling of limit/since/before merging - Expose timeout through request builder - Expose PickN through request builder - Fix tests
53 lines
1.4 KiB
TypeScript
53 lines
1.4 KiB
TypeScript
import { schnorr } from "@noble/curves/secp256k1";
|
|
import { ReqFilter } from "../nostr";
|
|
import { expandFilter } from "./request-expander";
|
|
import { flatMerge, mergeSimilar } from "./request-merger";
|
|
import { diffFilters } from "./request-splitter";
|
|
|
|
export interface FlatReqFilter {
|
|
keys: number;
|
|
ids?: string;
|
|
authors?: string;
|
|
kinds?: number;
|
|
"#e"?: string;
|
|
"#p"?: string;
|
|
"#t"?: string;
|
|
"#d"?: string;
|
|
"#r"?: string;
|
|
search?: string;
|
|
since?: number;
|
|
until?: number;
|
|
limit?: number;
|
|
resultSetId: string;
|
|
}
|
|
|
|
export interface QueryOptimizer {
|
|
expandFilter(f: ReqFilter): Array<FlatReqFilter>;
|
|
getDiff(prev: Array<ReqFilter>, next: Array<ReqFilter>): Array<FlatReqFilter>;
|
|
flatMerge(all: Array<FlatReqFilter>): Array<ReqFilter>;
|
|
compress(all: Array<ReqFilter>): Array<ReqFilter>;
|
|
schnorrVerify(hash: string, sig: string, pubkey: string): boolean;
|
|
}
|
|
|
|
export const DefaultQueryOptimizer = {
|
|
expandFilter: (f: ReqFilter) => {
|
|
return expandFilter(f);
|
|
},
|
|
getDiff: (prev: Array<ReqFilter>, next: Array<ReqFilter>) => {
|
|
const diff = diffFilters(
|
|
prev.flatMap(a => expandFilter(a)),
|
|
next.flatMap(a => expandFilter(a)),
|
|
);
|
|
return diff.added;
|
|
},
|
|
flatMerge: (all: Array<FlatReqFilter>) => {
|
|
return flatMerge(all);
|
|
},
|
|
compress: (all: Array<ReqFilter>) => {
|
|
return mergeSimilar(all);
|
|
},
|
|
schnorrVerify: (hash, sig, pubkey) => {
|
|
return schnorr.verify(sig, hash, pubkey);
|
|
},
|
|
} as QueryOptimizer;
|