@welshman/domain 0.9.0-pre1 → 0.9.0-pre2

package/dist/domain/src/kinds/ZapRequest.js

@@ -1,33 +1,32 @@
-import { spec } from "@welshman/lib";
-import { ZAP_REQUEST, getTag, getTagValue } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { spec, tryCatch, fetchJson } from "@welshman/lib";
+import { ZAP_REQUEST, matchTag, tagSpec, tagValue, stamp } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-57 kind-9734 zap request.
-export class ZapRequest extends EventReader {
-    kind = ZAP_REQUEST;
+export class ZapRequestReader extends EventReader {
     amount() {
-        const amount = getTagValue("amount", this.event.tags);
+        const amount = tagValue(tagSpec("amount"), this.event.tags);
         return amount ? parseInt(amount) : undefined;
     }
     lnurl() {
-        return getTagValue("lnurl", this.event.tags);
+        return tagValue(tagSpec("lnurl"), this.event.tags);
     }
     recipient() {
-        return getTagValue("p", this.event.tags);
+        return tagValue(tagSpec("p"), this.event.tags);
     }
     eventId() {
-        return getTagValue("e", this.event.tags);
+        return tagValue(tagSpec("e"), this.event.tags);
     }
     urls() {
-        const tag = getTag("relays", this.event.tags);
+        const tag = matchTag(tagSpec("relays"), this.event.tags);
         return tag ? tag.slice(1) : [];
     }
-    builder() {
-        return new ZapRequestBuilder(this);
+    anonymous() {
+        return this.event.tags.some(spec(["anon"]));
     }
 }
-export class ZapRequestBuilder extends EventBuilder {
-    kind = ZAP_REQUEST;
+export class ZapRequestWriter extends EventWriter {
     setAmount(amount) {
         return this.dropTags(spec(["amount"])).addTags(["amount", String(amount)]);
     }
@@ -43,5 +42,31 @@ export class ZapRequestBuilder extends EventBuilder {
     setUrls(urls) {
         return this.dropTags(spec(["relays"])).addTags(["relays", ...urls]);
     }
+    setAnonymous(anonymous) {
+        return anonymous
+            ? this.dropTags(spec(["anon"])).addTags(["anon"])
+            : this.dropTags(spec(["anon"]));
+    }
+    async requestInvoice(zapper) {
+        const { signer } = this.context;
+        if (!signer) {
+            throw new Error("A signer is required to request a zap invoice");
+        }
+        const event = await signer.sign(stamp(await this.renderTemplate()));
+        const zapString = encodeURI(JSON.stringify(event));
+        const msats = parseInt(tagValue(tagSpec("amount"), event.tags));
+        const qs = `?amount=${msats}&nostr=${zapString}&lnurl=${zapper.lnurl}`;
+        const res = await tryCatch(() => fetchJson(zapper.callback + qs));
+        return {
+            event,
+            invoice: res?.pr,
+            error: res?.pr ? undefined : res.reason || "Failed to request invoice",
+        };
+    }
 }
+export const ZapRequest = new KindFactory({
+    kind: ZAP_REQUEST,
+    reader: ZapRequestReader,
+    writer: ZapRequestWriter,
+});
 //# sourceMappingURL=ZapRequest.js.map

package/dist/domain/src/kinds/ZapRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZapRequest.js","sourceRoot":"","sources":["../../../../src/kinds/ZapRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,gCAAgC;AAChC,MAAM,OAAO,UAAW,SAAQ,WAAW;IAChC,IAAI,GAAG,WAAW,CAAA;IAE3B,MAAM;QACJ,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAErD,OAAO,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC9C,CAAC;IAED,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,SAAS;QACP,OAAO,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO;QACL,OAAO,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE7C,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAChC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,YAAwB;IACpD,IAAI,GAAG,WAAW,CAAA;IAE3B,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,YAAY,CAAC,SAAiB;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IACrE,CAAC;CACF"}
+{"version":3,"file":"ZapRequest.js","sourceRoot":"","sources":["../../../../src/kinds/ZapRequest.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/other/Relay.d.ts

@@ -0,0 +1,49 @@
+export type RelayInfo = {
+    icon?: string;
+    banner?: string;
+    name?: string;
+    self?: string;
+    pubkey?: string;
+    contact?: string;
+    software?: string;
+    version?: string;
+    negentropy?: number;
+    description?: string;
+    supported_nips?: string[];
+    privacy_policy?: string;
+    terms_of_service?: string;
+    limitation?: {
+        min_pow_difficulty?: number;
+        payment_required?: boolean;
+        auth_required?: boolean;
+    };
+    redirect_to?: string;
+};
+export declare class Relay {
+    url: string;
+    icon?: string;
+    banner?: string;
+    name?: string;
+    self?: string;
+    pubkey?: string;
+    contact?: string;
+    software?: string;
+    version?: string;
+    negentropy?: number;
+    description?: string;
+    supported_nips?: string[];
+    privacy_policy?: string;
+    terms_of_service?: string;
+    limitation?: {
+        min_pow_difficulty?: number;
+        payment_required?: boolean;
+        auth_required?: boolean;
+    };
+    redirect_to?: string;
+    constructor(url: string, json?: RelayInfo);
+    displayUrl(): string;
+    display(fallback?: string): string;
+    hasNegentropy(): boolean;
+    hasNip(nip: number | string): boolean;
+}
+//# sourceMappingURL=Relay.d.ts.map

package/dist/domain/src/other/Relay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../../../src/other/Relay.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE;QACX,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;QAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;KACxB,CAAA;IAGD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,qBAAa,KAAK;IAChB,GAAG,EAAG,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE;QACX,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;QAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;KACxB,CAAA;IACD,WAAW,CAAC,EAAE,MAAM,CAAA;gBAER,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,SAAc;IAU7C,UAAU;IAKV,OAAO,CAAC,QAAQ,SAAoB;IAKpC,aAAa;IASb,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAG5B"}

package/dist/domain/src/other/Relay.js

@@ -0,0 +1,50 @@
+import { displayRelayUrl } from "@welshman/util";
+export class Relay {
+    url;
+    icon;
+    banner;
+    name;
+    self;
+    pubkey;
+    contact;
+    software;
+    version;
+    negentropy;
+    description;
+    supported_nips;
+    privacy_policy;
+    terms_of_service;
+    limitation;
+    redirect_to;
+    constructor(url, json = {}) {
+        // Copy every field, including any non-standard NIP-11 ones, but force the url
+        // and coerce supported_nips (untrusted json) to a string array.
+        Object.assign(this, json, {
+            url,
+            supported_nips: Array.isArray(json.supported_nips) ? json.supported_nips.map(String) : [],
+        });
+    }
+    // This relay's url reduced to its host/path for display, e.g. "relay.example".
+    displayUrl() {
+        return displayRelayUrl(this.url);
+    }
+    // This relay's display name, falling back to its display url (or `fallback`).
+    display(fallback = this.displayUrl()) {
+        return this.name || fallback;
+    }
+    // Whether this relay supports negentropy sync (NIP-77).
+    hasNegentropy() {
+        if (this.negentropy)
+            return true;
+        if (this.supported_nips?.includes("77"))
+            return true;
+        if (this.software?.includes?.("strfry") && !this.version?.match(/^0\./))
+            return true;
+        return false;
+    }
+    // Whether this relay advertises support for the given NIP.
+    hasNip(nip) {
+        return this.supported_nips?.includes(String(nip)) ?? false;
+    }
+}
+//# sourceMappingURL=Relay.js.map

package/dist/domain/src/other/Relay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Relay.js","sourceRoot":"","sources":["../../../../src/other/Relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAA;AA8B9C,MAAM,OAAO,KAAK;IAChB,GAAG,CAAS;IACZ,IAAI,CAAS;IACb,MAAM,CAAS;IACf,IAAI,CAAS;IACb,IAAI,CAAS;IACb,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,QAAQ,CAAS;IACjB,OAAO,CAAS;IAChB,UAAU,CAAS;IACnB,WAAW,CAAS;IACpB,cAAc,CAAW;IACzB,cAAc,CAAS;IACvB,gBAAgB,CAAS;IACzB,UAAU,CAIT;IACD,WAAW,CAAS;IAEpB,YAAY,GAAW,EAAE,OAAkB,EAAE;QAC3C,8EAA8E;QAC9E,gEAAgE;QAChE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE;YACxB,GAAG;YACH,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;SAC1F,CAAC,CAAA;IACJ,CAAC;IAED,+EAA+E;IAC/E,UAAU;QACR,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,8EAA8E;IAC9E,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE;QAClC,OAAO,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAA;IAC9B,CAAC;IAED,wDAAwD;IACxD,aAAa;QACX,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAA;QAChC,IAAI,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAA;QACpD,IAAI,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QAEpF,OAAO,KAAK,CAAA;IACd,CAAC;IAED,2DAA2D;IAC3D,MAAM,CAAC,GAAoB;QACzB,OAAO,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAA;IAC5D,CAAC;CACF"}

package/dist/domain/src/other/Zapper.d.ts

@@ -0,0 +1,40 @@
+import type { TrustedEvent, Filter } from "@welshman/util";
+import type { ZapReceiptReader } from "../kinds/ZapReceipt.js";
+export type Zap = {
+    request: TrustedEvent;
+    response: TrustedEvent;
+    invoiceAmount: number;
+};
+export type ZapperValues = {
+    lnurl: string;
+    pubkey: string;
+    nostrPubkey: string;
+    callback?: string;
+    minSendable?: number;
+    maxSendable?: number;
+    allowsNostr?: boolean;
+};
+export declare class Zapper {
+    lnurl: string;
+    pubkey: string;
+    nostrPubkey: string;
+    callback?: string;
+    minSendable?: number;
+    maxSendable?: number;
+    allowsNostr?: boolean;
+    constructor(values: ZapperValues);
+    /**
+     * Validate a parsed kind-9735 zap receipt against this zapper per NIP-57 and,
+     * if it checks out, return the reconstructed `Zap`. Returns undefined when the
+     * receipt is malformed or fails validation:
+     *
+     * - Missing/malformed zap request or bolt11 invoice
+     * - Invoice amount doesn't match the requested amount
+     * - Self-zap (request author is the zapper's own pubkey)
+     * - lnurl mismatch (if the request carried an lnurl tag)
+     * - Receipt not signed by the zapper's nostr pubkey
+     */
+    validate(receipt: ZapReceiptReader): Zap | undefined;
+    getResponseFilter(pubkey: string, eventId?: string): Filter;
+}
+//# sourceMappingURL=Zapper.d.ts.map

package/dist/domain/src/other/Zapper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Zapper.d.ts","sourceRoot":"","sources":["../../../../src/other/Zapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAA;AACxD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAA;AAK5D,MAAM,MAAM,GAAG,GAAG;IAChB,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,EAAE,YAAY,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAOD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAED,qBAAa,MAAM;IACjB,KAAK,EAAG,MAAM,CAAA;IACd,MAAM,EAAG,MAAM,CAAA;IACf,WAAW,EAAG,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,OAAO,CAAA;gBAET,MAAM,EAAE,YAAY;IAMhC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,GAAG,GAAG,SAAS;IAmCpD,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;CAc5D"}

package/dist/domain/src/other/Zapper.js

@@ -0,0 +1,67 @@
+import { now, fromPairs } from "@welshman/lib";
+import { ZAP_RECEIPT } from "@welshman/util";
+export class Zapper {
+    lnurl;
+    pubkey;
+    nostrPubkey;
+    callback;
+    minSendable;
+    maxSendable;
+    allowsNostr;
+    constructor(values) {
+        // Copy every value, including any non-standard lnurl fields the endpoint
+        // returned, so nothing is silently dropped for downstream consumers.
+        Object.assign(this, values);
+    }
+    /**
+     * Validate a parsed kind-9735 zap receipt against this zapper per NIP-57 and,
+     * if it checks out, return the reconstructed `Zap`. Returns undefined when the
+     * receipt is malformed or fails validation:
+     *
+     * - Missing/malformed zap request or bolt11 invoice
+     * - Invoice amount doesn't match the requested amount
+     * - Self-zap (request author is the zapper's own pubkey)
+     * - lnurl mismatch (if the request carried an lnurl tag)
+     * - Receipt not signed by the zapper's nostr pubkey
+     */
+    validate(receipt) {
+        const request = receipt.request();
+        const invoiceAmount = receipt.invoiceAmount();
+        if (!request || invoiceAmount === undefined) {
+            return undefined;
+        }
+        // Don't count zaps that the user requested for himself
+        if (request.pubkey === this.pubkey) {
+            return undefined;
+        }
+        const { amount, lnurl } = fromPairs(request.tags);
+        // Verify that the zapper actually sent the requested amount (if it was supplied)
+        if (amount && parseInt(amount) !== invoiceAmount) {
+            return undefined;
+        }
+        // If the sending client provided an lnurl tag, verify that too
+        if (lnurl && lnurl !== this.lnurl) {
+            return undefined;
+        }
+        // Verify that the receipt actually came from the recipient's zapper
+        if (receipt.event.pubkey !== this.nostrPubkey) {
+            return undefined;
+        }
+        return { request, response: receipt.event, invoiceAmount };
+    }
+    // A filter matching zap receipts this zapper would publish for the given
+    // recipient (and optionally a specific event).
+    getResponseFilter(pubkey, eventId) {
+        const filter = {
+            kinds: [ZAP_RECEIPT],
+            authors: [this.nostrPubkey],
+            since: now() - 30,
+            "#p": [pubkey],
+        };
+        if (eventId) {
+            filter["#e"] = [eventId];
+        }
+        return filter;
+    }
+}
+//# sourceMappingURL=Zapper.js.map

package/dist/domain/src/other/Zapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Zapper.js","sourceRoot":"","sources":["../../../../src/other/Zapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,SAAS,EAAC,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AA4B1C,MAAM,OAAO,MAAM;IACjB,KAAK,CAAS;IACd,MAAM,CAAS;IACf,WAAW,CAAS;IACpB,QAAQ,CAAS;IACjB,WAAW,CAAS;IACpB,WAAW,CAAS;IACpB,WAAW,CAAU;IAErB,YAAY,MAAoB;QAC9B,yEAAyE;QACzE,qEAAqE;QACrE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC7B,CAAC;IAED;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,OAAyB;QAChC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;QACjC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAA;QAE7C,IAAI,CAAC,OAAO,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAC5C,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,uDAAuD;QACvD,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YACnC,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAE/C,iFAAiF;QACjF,IAAI,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,aAAa,EAAE,CAAC;YACjD,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,+DAA+D;QAC/D,IAAI,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YAClC,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,oEAAoE;QACpE,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9C,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,aAAa,EAAC,CAAA;IAC1D,CAAC;IAED,yEAAyE;IACzE,+CAA+C;IAC/C,iBAAiB,CAAC,MAAc,EAAE,OAAgB;QAChD,MAAM,MAAM,GAAW;YACrB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;YAC3B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE;YACjB,IAAI,EAAE,CAAC,MAAM,CAAC;SACf,CAAA;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/dist/feeds/src/compiler.d.ts

@@ -1,10 +1,10 @@
 import { Filter } from "@welshman/util";
 import { ISigner } from "@welshman/signer";
 import { AdapterContext } from "@welshman/net";
-import type { Router } from "@welshman/router";
+import type { FeedRouter } from "./router.js";
 import { CreatedAtItem, RequestItem, ListItem, LabelItem, WOTItem, DVMItem, Scope, Feed } from "./core.js";
 export type FeedCompilerOptions = {
-    router: Router;
+    router: FeedRouter;
     signer?: ISigner;
     signal?: AbortSignal;
     context?: AdapterContext;

package/dist/feeds/src/compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../feeds/src/compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,EAMP,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EACL,aAAa,EACb,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,OAAO,EACP,KAAK,EACL,IAAI,EAEL,MAAM,WAAW,CAAA;AAIlB,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,kBAAkB,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,EAAE,CAAA;IAC9C,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;CACpE,CAAA;AAED,qBAAa,YAAY;IACX,QAAQ,CAAC,OAAO,EAAE,mBAAmB;gBAA5B,OAAO,EAAE,mBAAmB;IAEjD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAyBzB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0CjD,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE;;;IAIrC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;;;IAItC,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE;iBAmBT,MAAM,EAAE;;IAGvC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE;;;;;IAI9B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE;;;;;IAInC,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;;IAUzB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAwBtD,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0C3D,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA+CpD,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAoC5D,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;CAqCtE"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../feeds/src/compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,EAMP,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,aAAa,CAAA;AAC3C,OAAO,EACL,aAAa,EACb,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,OAAO,EACP,KAAK,EACL,IAAI,EAEL,MAAM,WAAW,CAAA;AAIlB,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,UAAU,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,kBAAkB,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,EAAE,CAAA;IAC9C,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;CACpE,CAAA;AAED,qBAAa,YAAY;IACX,QAAQ,CAAC,OAAO,EAAE,mBAAmB;gBAA5B,OAAO,EAAE,mBAAmB;IAEjD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAyBzB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0CjD,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE;;;IAIrC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;;;IAItC,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE;iBAmBT,MAAM,EAAE;;IAGvC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE;;;;;IAI9B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE;;;;;IAInC,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;;IAUzB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAwBtD,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0C3D,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA+CpD,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAoC5D,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;CAqCtE"}

package/dist/feeds/src/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./core.js";
+export * from "./router.js";
 export * from "./compiler.js";
 export * from "./controller.js";
 export * from "./display.js";

package/dist/feeds/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../feeds/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../feeds/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA"}

package/dist/feeds/src/index.js

@@ -1,4 +1,5 @@
 export * from "./core.js";
+export * from "./router.js";
 export * from "./compiler.js";
 export * from "./controller.js";
 export * from "./display.js";

package/dist/feeds/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../feeds/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../feeds/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA"}

package/dist/feeds/src/request.d.ts

@@ -1,10 +1,10 @@
 import { Filter, TrustedEvent } from "@welshman/util";
 import { ISigner } from "@welshman/signer";
-import { Router } from "@welshman/router";
+import { FeedRouter } from "./router.js";
 import { Tracker, AdapterContext } from "@welshman/net";
 export type RequestPageOptions = {
     filters: Filter[];
-    router: Router;
+    router: FeedRouter;
     onEvent: (event: TrustedEvent) => void;
     relays?: string[];
     tracker?: Tracker;
@@ -15,12 +15,12 @@ export type RequestPageOptions = {
 export declare const requestPage: ({ filters, router, onEvent, relays, tracker, signal, context, autoClose, }: RequestPageOptions) => Promise<TrustedEvent[] | undefined>;
 export type RequestDVMOptions = {
     kind: number;
-    router: Router;
+    router: FeedRouter;
     tags?: string[][];
     relays?: string[];
     signer?: ISigner;
     context?: AdapterContext;
     onResult: (event: TrustedEvent) => void;
 };
-export declare const requestDVM: ({ kind, router, onResult, tags, relays, signer, context, }: RequestDVMOptions) => Promise<[import("@welshman/net").PublishResultsByRelay, TrustedEvent[]]>;
+export declare const requestDVM: ({ kind, router, onResult, tags, relays: relayUrls, signer, context, }: RequestDVMOptions) => Promise<[import("@welshman/net").PublishResultsByRelay, TrustedEvent[]]>;
 //# sourceMappingURL=request.d.ts.map

package/dist/feeds/src/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../feeds/src/request.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,EAEN,YAAY,EAGb,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAc,OAAO,EAAC,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAC,MAAM,EAA2C,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAkB,OAAO,EAAE,cAAc,EAAmB,MAAM,eAAe,CAAA;AAExF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,4EAS/B,kBAAkB,wCAwDpB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;CACxC,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,4DAQ9B,iBAAiB,6EAqCnB,CAAA"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../feeds/src/request.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,EAIN,YAAY,EAMb,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAc,OAAO,EAAC,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAC,UAAU,EAAsB,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAkB,OAAO,EAAE,cAAc,EAAmB,MAAM,eAAe,CAAA;AAExF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,4EAS/B,kBAAkB,wCA0DpB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;CACxC,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,uEAQ9B,iBAAiB,6EAuCnB,CAAA"}

package/dist/feeds/src/request.js

@@ -1,7 +1,7 @@
 import { partition, now, nthEq, race } from "@welshman/lib";
-import { makeEvent, getPubkeyTagValues, getRelayTagValues, RELAYS, } from "@welshman/util";
+import { makeEvent, hexTags, relayTags, tagValues, RELAYS, indexers, relays, searchRelays, addMinimalFallbacks, } from "@welshman/util";
 import { Nip01Signer } from "@welshman/signer";
-import { getFilterSelections, addMinimalFallbacks } from "@welshman/router";
+import { getFilterSelections } from "./router.js";
 import { LOCAL_RELAY_URL, Tracker, request, publish } from "@welshman/net";
 export const requestPage = async ({ filters, router, onEvent, relays = [], tracker = new Tracker(), signal, context, autoClose, }) => {
     if (relays.length > 0) {
@@ -10,6 +10,7 @@ export const requestPage = async ({ filters, router, onEvent, relays = [], track
     const promises = [];
     const [withSearch, withoutSearch] = partition(f => Boolean(f.search), filters);
     if (withSearch.length > 0) {
+        const scenario = await router.resolve([searchRelays()]);
         promises.push(request({
             tracker,
             signal,
@@ -18,11 +19,11 @@ export const requestPage = async ({ filters, router, onEvent, relays = [], track
             threshold: 0.1,
             autoClose,
             filters: withSearch,
-            relays: router.Search().getUrls(),
+            relays: scenario.getUrls(),
         }));
     }
     if (withoutSearch.length > 0) {
-        promises.push(...getFilterSelections(filters, router).flatMap(({ relays, filters }) => request({
+        promises.push(...(await getFilterSelections(filters, router)).flatMap(({ relays, filters }) => request({
             tracker,
             signal,
             context,
@@ -49,23 +50,22 @@ export const requestPage = async ({ filters, router, onEvent, relays = [], track
         autoClose,
     });
 };
-export const requestDVM = async ({ kind, router, onResult, tags = [], relays = [], signer = Nip01Signer.ephemeral(), context, }) => {
-    if (relays.length === 0) {
+export const requestDVM = async ({ kind, router, onResult, tags = [], relays: relayUrls = [], signer = Nip01Signer.ephemeral(), context, }) => {
+    if (relayUrls.length === 0) {
+        const indexScenario = await router.resolve([indexers()]);
         const events = await request({
             autoClose: true,
-            filters: [{ kinds: [RELAYS], authors: getPubkeyTagValues(tags) }],
-            relays: router.Index().policy(addMinimalFallbacks).getUrls(),
+            filters: [{ kinds: [RELAYS], authors: tagValues(hexTags("p"), tags) }],
+            relays: indexScenario.policy(addMinimalFallbacks).getUrls(),
         });
-        relays = router
-            .FromRelays(events.flatMap(e => getRelayTagValues(e.tags)))
-            .policy(addMinimalFallbacks)
-            .getUrls();
+        const scenario = await router.resolve(relays(events.flatMap(e => tagValues(relayTags(["r", "relay"]), e.tags))));
+        relayUrls = scenario.policy(addMinimalFallbacks).getUrls();
     }
     if (!tags.some(nthEq(0, "expiration"))) {
         tags.push(["expiration", String(now() + 60)]);
     }
     if (!tags.some(nthEq(0, "relays"))) {
-        tags.push(["relays", ...relays]);
+        tags.push(["relays", ...relayUrls]);
     }
     if (!tags.some(nthEq(1, "user"))) {
         tags.push(["param", "user", await signer.getPubkey()]);
@@ -76,8 +76,8 @@ export const requestDVM = async ({ kind, router, onResult, tags = [], relays = [
     const event = await signer.sign(makeEvent(kind, { tags }));
     const filters = [{ kinds: [event.kind + 1000], since: now() - 60, "#e": [event.id] }];
     return Promise.all([
-        publish({ event, relays, context }),
-        request({ filters, relays, context, autoClose: true, onEvent: onResult }),
+        publish({ event, relays: relayUrls, context }),
+        request({ filters, relays: relayUrls, context, autoClose: true, onEvent: onResult }),
     ]);
 };
 //# sourceMappingURL=request.js.map

package/dist/feeds/src/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../feeds/src/request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../feeds/src/request.ts"],"names":[],"mappings":"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"}

package/dist/feeds/src/router.d.ts

@@ -0,0 +1,10 @@
+import type { Filter, RelaySelection, RelayScenario } from "@welshman/util";
+export interface FeedRouter {
+    resolve(selections: RelaySelection[]): Promise<RelayScenario>;
+}
+export type RelaysAndFilters = {
+    relays: string[];
+    filters: Filter[];
+};
+export declare const getFilterSelections: (filters: Filter[], router: FeedRouter) => Promise<RelaysAndFilters[]>;
+//# sourceMappingURL=router.d.ts.map

package/dist/feeds/src/router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../feeds/src/router.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAOzE,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;CAC9D;AAED,MAAM,MAAM,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAC,CAAA;AAgCpE,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EAAE,EACjB,QAAQ,UAAU,KACjB,OAAO,CAAC,gBAAgB,EAAE,CAsB5B,CAAA"}

package/dist/feeds/src/router.js

@@ -0,0 +1,45 @@
+import { chunks, clamp } from "@welshman/lib";
+import { WRAP, getFilterId, outbox, userInbox, userMessaging, searchRelays, addMinimalFallbacks, } from "@welshman/util";
+// One rule per outbox-model source. Each maps a filter to a (possibly narrowed)
+// filter plus the selections that should serve it. Ported from @welshman/router's
+// getFilterSelectionsFor* — but producing declarative selections, not scenarios.
+const rules = [
+    // Full-text search goes to the configured search relays.
+    filter => (filter.search ? [{ filter, selections: [searchRelays(10)] }] : []),
+    // Gift wraps (with no explicit authors) go to the user's messaging relays.
+    filter => filter.kinds?.includes(WRAP) && !filter.authors
+        ? [{ filter: { ...filter, kinds: [WRAP] }, selections: [userMessaging()] }]
+        : [],
+    // Authored events go to each author's outbox, chunked to keep filters small.
+    filter => {
+        if (!filter.authors)
+            return [];
+        const chunkCount = clamp([1, 30], Math.round(filter.authors.length / 30));
+        return chunks(chunkCount, filter.authors).map(authors => ({
+            filter: { ...filter, authors },
+            selections: authors.map(pubkey => outbox(pubkey)),
+        }));
+    },
+    // Everything also gets a low-weight pass over the user's own inbox.
+    filter => [{ filter, selections: [userInbox(0.2)] }],
+];
+// Decide which relays to query for which filters under the outbox model. Groups
+// selections by narrowed filter, then resolves each group to concrete relays.
+export const getFilterSelections = async (filters, router) => {
+    const byId = new Map();
+    for (const filter of filters) {
+        for (const rule of rules) {
+            for (const { filter: narrowed, selections } of rule(filter)) {
+                const id = getFilterId(narrowed);
+                const entry = byId.get(id) ?? { filter: narrowed, selections: [] };
+                entry.selections.push(...selections);
+                byId.set(id, entry);
+            }
+        }
+    }
+    return Promise.all(Array.from(byId.values()).map(async ({ filter, selections }) => {
+        const scenario = await router.resolve(selections);
+        return { filters: [filter], relays: scenario.policy(addMinimalFallbacks).getUrls() };
+    }));
+};
+//# sourceMappingURL=router.js.map

package/dist/feeds/src/router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../feeds/src/router.ts"],"names":[],"mappings":"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"}

package/dist/feeds/src/utils.js

@@ -1,6 +1,6 @@
 import { ensureNumber } from "@welshman/lib";
 import { unionFilters } from "@welshman/util";
-import { getTagValues } from "@welshman/util";
+import { tagSpec, tagValues } from "@welshman/util";
 import { FeedType, } from "./core.js";
 export const makeAddressFeed = (...addresses) => [
     FeedType.Address,
@@ -103,7 +103,7 @@ export const defaultTagFeedMappings = [
 export const feedsFromTags = (tags, mappings) => {
     const feeds = [];
     for (const [tagName, templateFeed] of mappings || defaultTagFeedMappings) {
-        let values = getTagValues(tagName, tags);
+        let values = tagValues(tagSpec(tagName), tags);
         if (values.length > 0) {
             if (isKindFeed(templateFeed)) {
                 values = values.map(ensureNumber);