@welshman/app 0.12.0 → 0.12.2

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

@@ -1,10 +1,15 @@
 import { first, parseJson, spec } from "@welshman/lib";
-import { GENERIC_REPOST, NOTE, REPOST, getAddress, isReplaceable, kindTags, outbox, tagSpec, tagValue, tagValues, } from "@welshman/util";
+import { GENERIC_REPOST, NOTE, REPOST, getAddress, getHash, isHashedEvent, isReplaceable, kindTags, outbox, tagSpec, tagValue, tagValues, verifyEvent, } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 const TARGET_KEYS = ["e", "a", "p", "k"];
+// The content's event, when it has an event's shape. Its signature is not checked.
+const parseEvent = (content) => {
+    const event = parseJson(content);
+    return event && isHashedEvent(event) ? event : undefined;
+};
 // NIP-18 repost. Kind 6 reposts notes; kind 16 reposts any other kind and names
 // it in a `k` tag. The reposted event is JSON-encoded in the content so a client
 // can render it without a second fetch.
@@ -22,9 +27,12 @@ export class RepostReader extends EventReader {
     eventKind() {
         return this.kind === REPOST ? NOTE : first(tagValues(kindTags("k"), this.event.tags));
     }
-    // The embedded event, or undefined when the content is absent or malformed.
+    // The embedded event, or undefined when the content is absent, malformed, or a
+    // different event from the one the e tag names.
     repostedEvent() {
-        return parseJson(this.event.content);
+        const event = parseEvent(this.event.content);
+        const eventId = this.eventId();
+        return event && (!eventId || event.id === eventId) ? event : undefined;
     }
 }
 export class RepostWriter extends EventWriter {
@@ -53,9 +61,33 @@ export class RepostWriter extends EventWriter {
     }
     validate() {
         super.validate();
-        if (!this.extraTags.some(spec(["e"]))) {
+        const eventId = this.extraTags.find(spec(["e"]))?.[1];
+        const kind = this.extraTags.find(spec(["k"]))?.[1];
+        if (!eventId) {
             throw new Error("A repost must reference an event via an e tag");
         }
+        // Content may be left empty (e.g. for a protected event), but anything else must be the event.
+        if (this.content) {
+            const event = parseEvent(this.content);
+            if (!event) {
+                throw new Error("A repost's content must be the reposted event");
+            }
+            if (event.id !== eventId) {
+                throw new Error("A repost's embedded event must be the one its e tag names");
+            }
+            if (getHash(event) !== event.id) {
+                throw new Error("A repost's embedded event has an invalid id");
+            }
+            if (!verifyEvent(event)) {
+                throw new Error("A repost's embedded event has an invalid signature");
+            }
+            if (this.kind === REPOST && event.kind !== NOTE) {
+                throw new Error("A kind 6 repost must embed a kind 1 note; use GenericRepost for other kinds");
+            }
+            if (kind !== undefined && kind !== String(event.kind)) {
+                throw new Error("A repost's embedded event must match its k tag");
+            }
+        }
     }
 }
 export class RepostQuery extends EventQuery {

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

@@ -1 +1 @@
-{"version":3,"file":"Repost.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Repost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAEpD,OAAO,EACL,cAAc,EACd,IAAI,EACJ,MAAM,EACN,UAAU,EACV,aAAa,EACb,QAAQ,EACR,MAAM,EACN,OAAO,EACP,QAAQ,EACR,SAAS,GACV,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAExC,gFAAgF;AAChF,iFAAiF;AACjF,wCAAwC;AACxC,MAAM,OAAO,YAAa,SAAQ,WAAW;IAC3C,OAAO;QACL,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,YAAY;QACV,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,MAAM;QACJ,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,+DAA+D;IAC/D,SAAS;QACP,OAAO,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvF,CAAC;IAED,4EAA4E;IAC5E,aAAa;QACX,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAwB,CAAA;IAC7D,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,WAAyB;IACzD,oEAAoE;IACpE,QAAQ,CAAC,KAAmB;QAC1B,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC,CAAC,CAAA;QACxD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAE7B,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAElB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACzC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;YAEzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAElB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACzC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;YACf,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,qEAAqE;QACrE,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACzC,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,UAAU;IAC/B,YAAY;QACpB,OAAO,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC;IACpC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,WAAW;CACnB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,WAAW,CAAC;IAC3C,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,WAAW;CACnB,CAAC,CAAA"}
+{"version":3,"file":"Repost.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Repost.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/kinds/RoomList.d.ts

@@ -2,6 +2,7 @@ import { ListReader } from "../core/ListReader.js";
 import { ListWriter } from "../core/ListWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
+import type { KindContext } from "../core/Kind.js";
 export declare class RoomListReader extends ListReader {
     rooms(): string[];
     roomTags(): string[][];
@@ -10,6 +11,7 @@ export declare class RoomListReader extends ListReader {
     roomsForUrl(url: string): string[];
 }
 export declare class RoomListWriter extends ListWriter<RoomListReader> {
+    constructor(kind: number, context: KindContext, reader?: RoomListReader);
     scenario(): Promise<import("@welshman/util").RelayScenario>;
     protected renderRoutes(): Promise<import("@welshman/util").RelaySelection[]>;
     addRoom(roomId: string, url: string): this;

package/dist/domain/src/kinds/RoomList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomList.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAmB3C,qBAAa,cAAe,SAAQ,UAAU;IAC5C,KAAK;IAIL,QAAQ;IAIR,MAAM;IAIN,IAAI;IAIJ,WAAW,CAAC,GAAG,EAAE,MAAM;CAOxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;IAGtD,QAAQ;cAOE,YAAY;IAO5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAInC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAWvC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAWpB,WAAW,CAAC,GAAG,EAAE,MAAM;IAYvB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE;IAcxB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAiB5C;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}
+{"version":3,"file":"RoomList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomList.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAqBhD,qBAAa,cAAe,SAAQ,UAAU;IAC5C,KAAK;IAIL,QAAQ;IAIR,MAAM;IAIN,IAAI;IAIJ,WAAW,CAAC,GAAG,EAAE,MAAM;CAOxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;gBAChD,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,cAAc;IAYjE,QAAQ;cAOE,YAAY;IAO5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAInC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAQvC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAWpB,WAAW,CAAC,GAAG,EAAE,MAAM;IAYvB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE;IAcxB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAwB5C;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}

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

@@ -1,5 +1,5 @@
 import { nth, uniq, spec, partition, indexBy } from "@welshman/lib";
-import { ROOMS, matchTags, tagSpec, tagValues, isRelayUrl, normalizeRelayUrl, relays, userOutbox, } from "@welshman/util";
+import { ROOMS, matchTags, tagMatcher, tagSpec, tagValues, isRelayUrl, normalizeRelayUrl, relays, userOutbox, } from "@welshman/util";
 import { ListReader } from "../core/ListReader.js";
 import { ListWriter } from "../core/ListWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
@@ -7,6 +7,7 @@ import { KindFactory } from "../core/Kind.js";
 // Room tags (`h`, and the `group` tag NIP-51 uses for this list) carry the room
 // id at t[1] and a relay hint at t[2].
 const roomSpec = tagSpec(["h", "group"]);
+const isRoomTag = tagMatcher(roomSpec);
 const matchesUrl = (normalized, value = "") => isRelayUrl(value) && normalizeRelayUrl(value) === normalized;
 // Every relay a room list references: its `r` relays plus the relay hints on its
 // room tags, normalized and deduped.
@@ -35,6 +36,14 @@ export class RoomListReader extends ListReader {
     }
 }
 export class RoomListWriter extends ListWriter {
+    constructor(kind, context, reader) {
+        super(kind, context, reader);
+        // Legacy `h` entries are listed rooms, not this event's own room scope.
+        if (reader) {
+            this.roomTag = undefined;
+            this.publicTags = reader.event.tags.filter(t => t[0] === "h" || this.publicTags.includes(t));
+        }
+    }
     // Every relay this event routes to has to receive it, so lift the scenario's
     // default limit, which is tuned for reads and would drop most of them.
     async scenario() {
@@ -53,9 +62,7 @@ export class RoomListWriter extends ListWriter {
     }
     removeRoom(roomId, url) {
         const normalized = url ? normalizeRelayUrl(url) : undefined;
-        return this.dropTags(t => t[0] === "group" &&
-            t[1] === roomId &&
-            (!normalized || matchesUrl(normalized, t[2])));
+        return this.dropTags(t => isRoomTag(t) && t[1] === roomId && (!normalized || matchesUrl(normalized, t[2])));
     }
     addRelay(url) {
         const normalized = normalizeRelayUrl(url);
@@ -68,7 +75,7 @@ export class RoomListWriter extends ListWriter {
     removeRelay(url) {
         const normalized = normalizeRelayUrl(url);
         return this.dropTags(t => (t[0] === "r" && matchesUrl(normalized, t[1])) ||
-            (t[0] === "group" && matchesUrl(normalized, t[2])));
+            (isRoomTag(t) && matchesUrl(normalized, t[2])));
     }
     // Replace the relay set, in the given order. Existing tags are reused so any extra values
     // they carry survive a reorder, and non-relay tags are left alone.
@@ -87,11 +94,14 @@ export class RoomListWriter extends ListWriter {
         const from = normalizeRelayUrl(oldUrl);
         const to = normalizeRelayUrl(newUrl);
         const rewrite = (tags) => tags.map(t => {
-            if (t[0] === "r" && matchesUrl(from, t[1]))
-                return ["r", to];
-            if (t[0] === "group" && matchesUrl(from, t[2]))
-                return ["group", t[1], to];
-            return t;
+            let tag = t;
+            if (t[0] === "r" && matchesUrl(from, t[1])) {
+                tag = ["r", to, ...t.slice(2)];
+            }
+            if (isRoomTag(t) && matchesUrl(from, t[2])) {
+                tag = [t[0], t[1], to, ...t.slice(3)];
+            }
+            return tag;
         });
         this.publicTags = rewrite(this.publicTags);
         this.privateTags = rewrite(this.privateTags);

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

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

package/dist/domain/src/kinds/RoomPins.d.ts

@@ -8,12 +8,12 @@ export declare class RoomPinsReader extends EventReader {
     addresses(): string[];
     isPinned(idOrAddress: string): boolean;
 }
-export declare class RoomPinsWriter extends EventWriter<RoomPinsReader> {
+export declare class RoomPinsWriter<Reader extends RoomPinsReader = RoomPinsReader> extends EventWriter<Reader> {
     readonly requiresRelays = true;
     setPins(idsOrAddresses: string[]): this;
 }
 export declare class RoomPinsQuery extends EventQuery {
     protected renderRoutes(): never[];
 }
-export declare const RoomPins: KindFactory<RoomPinsReader, RoomPinsWriter, RoomPinsQuery>;
+export declare const RoomPins: KindFactory<RoomPinsReader, RoomPinsWriter<RoomPinsReader>, RoomPinsQuery>;
 //# sourceMappingURL=RoomPins.d.ts.map

package/dist/domain/src/kinds/RoomPins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomPins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomPins.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,IAAI;IAQJ,GAAG;IAIH,SAAS;IAIT,QAAQ,CAAC,WAAW,EAAE,MAAM;CAG7B;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,cAAc,QAAO;IAE9B,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE;CAOjC;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}
+{"version":3,"file":"RoomPins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomPins.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAI3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,IAAI;IAQJ,GAAG;IAIH,SAAS;IAIT,QAAQ,CAAC,WAAW,EAAE,MAAM;CAG7B;AAED,qBAAa,cAAc,CACzB,MAAM,SAAS,cAAc,GAAG,cAAc,CAC9C,SAAQ,WAAW,CAAC,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,QAAO;IAE9B,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE;CAOjC;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4EAKnB,CAAA"}

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

@@ -5,6 +5,7 @@ import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 // NIP-29 kind-39005 room pin list (see https://github.com/nostr-protocol/nips/pull/2379).
+// The kind-9010 op carries the same tags, so `RoomUpdatePins` extends these classes.
 export class RoomPinsReader extends EventReader {
     pins() {
         return uniq(this.event.tags

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

@@ -1 +1 @@
-{"version":3,"file":"RoomPins.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomPins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC9F,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,0FAA0F;AAC1F,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,IAAI;QACF,OAAO,IAAI,CACT,IAAI,CAAC,KAAK,CAAC,IAAI;aACZ,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACxE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACf,CAAA;IACH,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED,QAAQ,CAAC,WAAmB;QAC1B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAA2B;IACpD,cAAc,GAAG,IAAI,CAAA;IAE9B,OAAO,CAAC,cAAwB;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC9D,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CACvD,CACF,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACjC,YAAY;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,aAAa;CACrB,CAAC,CAAA"}
+{"version":3,"file":"RoomPins.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomPins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC9F,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,0FAA0F;AAC1F,qFAAqF;AACrF,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,IAAI;QACF,OAAO,IAAI,CACT,IAAI,CAAC,KAAK,CAAC,IAAI;aACZ,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACxE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACf,CAAA;IACH,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED,QAAQ,CAAC,WAAmB;QAC1B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,MAAM,OAAO,cAEX,SAAQ,WAAmB;IAClB,cAAc,GAAG,IAAI,CAAA;IAE9B,OAAO,CAAC,cAAwB;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC9D,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CACvD,CACF,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACjC,YAAY;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,aAAa;CACrB,CAAC,CAAA"}

package/dist/domain/src/kinds/RoomUpdatePins.d.ts

@@ -1,16 +1,10 @@
-import { EventReader } from "../core/EventReader.js";
-import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
-export declare class RoomUpdatePinsReader extends EventReader {
-    pins(): string[];
-    ids(): string[];
-    addresses(): string[];
+import { RoomPinsReader, RoomPinsWriter } from "./RoomPins.js";
+export declare class RoomUpdatePinsReader extends RoomPinsReader {
 }
-export declare class RoomUpdatePinsWriter extends EventWriter<RoomUpdatePinsReader> {
-    readonly requiresRelays = true;
+export declare class RoomUpdatePinsWriter extends RoomPinsWriter<RoomUpdatePinsReader> {
     validate(): void;
-    setPins(idsOrAddresses: string[]): this;
 }
 export declare class RoomUpdatePinsQuery extends EventQuery {
     protected renderRoutes(): never[];

package/dist/domain/src/kinds/RoomUpdatePins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomUpdatePins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomUpdatePins.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAI3C,qBAAa,oBAAqB,SAAQ,WAAW;IACnD,IAAI;IAQJ,GAAG;IAIH,SAAS;CAGV;AAED,qBAAa,oBAAqB,SAAQ,WAAW,CAAC,oBAAoB,CAAC;IACzE,QAAQ,CAAC,cAAc,QAAO;IAE9B,QAAQ;IAQR,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE;CAOjC;AAED,qBAAa,mBAAoB,SAAQ,UAAU;IACjD,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,cAAc,8EAKzB,CAAA"}
+{"version":3,"file":"RoomUpdatePins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomUpdatePins.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,eAAe,CAAA;AAI5D,qBAAa,oBAAqB,SAAQ,cAAc;CAAG;AAE3D,qBAAa,oBAAqB,SAAQ,cAAc,CAAC,oBAAoB,CAAC;IAC5E,QAAQ;CAOT;AAED,qBAAa,mBAAoB,SAAQ,UAAU;IACjD,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,cAAc,8EAKzB,CAAA"}

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

@@ -1,35 +1,18 @@
-import { nth, somePass, spec, uniq } from "@welshman/lib";
-import { Address, ROOM_UPDATE_PINS, addressTags, hexTags, tagMatcher, tagValues, } from "@welshman/util";
-import { EventReader } from "../core/EventReader.js";
-import { EventWriter } from "../core/EventWriter.js";
+import { ROOM_UPDATE_PINS } from "@welshman/util";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
+import { RoomPinsReader, RoomPinsWriter } from "./RoomPins.js";
 // NIP-29 kind-9010 update-pins op. The relay replaces the room's kind-39005 list with what this
 // carries, so it's always the full list rather than a delta.
-export class RoomUpdatePinsReader extends EventReader {
-    pins() {
-        return uniq(this.event.tags
-            .filter(somePass(tagMatcher(hexTags("e")), tagMatcher(addressTags("a"))))
-            .map(nth(1)));
-    }
-    ids() {
-        return uniq(tagValues(hexTags("e"), this.event.tags));
-    }
-    addresses() {
-        return uniq(tagValues(addressTags("a"), this.event.tags));
-    }
+export class RoomUpdatePinsReader extends RoomPinsReader {
 }
-export class RoomUpdatePinsWriter extends EventWriter {
-    requiresRelays = true;
+export class RoomUpdatePinsWriter extends RoomPinsWriter {
     validate() {
         super.validate();
         if (!this.roomTag) {
             throw new Error("RoomUpdatePins requires a room");
         }
     }
-    setPins(idsOrAddresses) {
-        return this.dropTags(somePass(spec(["e"]), spec(["a"]))).addTags(...uniq(idsOrAddresses).map(value => Address.isAddress(value) ? ["a", value] : ["e", value]));
-    }
 }
 export class RoomUpdatePinsQuery extends EventQuery {
     renderRoutes() {

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

@@ -1 +1 @@
-{"version":3,"file":"RoomUpdatePins.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomUpdatePins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,WAAW,EACX,OAAO,EACP,UAAU,EACV,SAAS,GACV,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,gGAAgG;AAChG,6DAA6D;AAC7D,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACnD,IAAI;QACF,OAAO,IAAI,CACT,IAAI,CAAC,KAAK,CAAC,IAAI;aACZ,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACxE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACf,CAAA;IACH,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3D,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,WAAiC;IAChE,cAAc,GAAG,IAAI,CAAA;IAE9B,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAED,OAAO,CAAC,cAAwB;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC9D,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CACvD,CACF,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,UAAU;IACvC,YAAY;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;IAC5C,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,oBAAoB;IAC5B,MAAM,EAAE,oBAAoB;IAC5B,KAAK,EAAE,mBAAmB;CAC3B,CAAC,CAAA"}
+{"version":3,"file":"RoomUpdatePins.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomUpdatePins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,eAAe,CAAA;AAE5D,gGAAgG;AAChG,6DAA6D;AAC7D,MAAM,OAAO,oBAAqB,SAAQ,cAAc;CAAG;AAE3D,MAAM,OAAO,oBAAqB,SAAQ,cAAoC;IAC5E,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,UAAU;IACvC,YAAY;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;IAC5C,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,oBAAoB;IAC5B,MAAM,EAAE,oBAAoB;IAC5B,KAAK,EAAE,mBAAmB;CAC3B,CAAC,CAAA"}

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

@@ -1,5 +1,5 @@
 import { spec, sum, uniq } from "@welshman/lib";
-import { ZAP_GOAL, matchTags, tagSpec, tagValue } from "@welshman/util";
+import { ZAP_GOAL, matchTags, msatsTags, tagSpec, tagValue } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
@@ -15,9 +15,9 @@ export class ZapGoalReader extends EventReader {
     image() {
         return tagValue(tagSpec("image"), this.event.tags);
     }
-    // Target amount, in millisats.
+    // Target amount in millisats, or the writer's own zero when the tag is malformed.
     amount() {
-        return parseInt(tagValue(tagSpec("amount"), this.event.tags) || "0") || 0;
+        return tagValue(msatsTags("amount"), this.event.tags) ?? 0;
     }
     // NIP-75 packs every relay into a single tag, but tolerate one-per-tag as well.
     urls() {

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

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

package/dist/domain/src/kinds/ZapRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZapRequest.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/ZapRequest.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,cAAc,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC7E,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAY,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAEhD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAA;AAG9C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM;IAMN,KAAK;IAIL,SAAS;IAIT,OAAO;IAIP,IAAI;IAMJ,SAAS;CAGV;AAED,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IAEjE,WAAW,EAAE,cAAc,EAAE,CAAK;gBAEtB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,gBAAgB;IAezE,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,YAAY,CAAC,SAAS,EAAE,MAAM;IAM9B,QAAQ,CAAC,KAAK,EAAE,YAAY;IAS5B,YAAY,CAAC,SAAS,EAAE,OAAO;cAQf,YAAY,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAQnD,QAAQ;IAQR,MAAM;cAKI,gBAAgB;IAM1B,cAAc,CAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CAmBnE;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,UAAU,kEAKrB,CAAA"}
+{"version":3,"file":"ZapRequest.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/ZapRequest.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,cAAc,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC7E,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAY,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAEhD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAA;AAG9C,qBAAa,gBAAiB,SAAQ,WAAW;IAE/C,MAAM;IAIN,KAAK;IAIL,SAAS;IAIT,OAAO;IAIP,IAAI;IAMJ,SAAS;CAGV;AAED,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IAEjE,WAAW,EAAE,cAAc,EAAE,CAAK;gBAEtB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,gBAAgB;IAezE,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,YAAY,CAAC,SAAS,EAAE,MAAM;IAM9B,QAAQ,CAAC,KAAK,EAAE,YAAY;IAS5B,YAAY,CAAC,SAAS,EAAE,OAAO;cAQf,YAAY,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAQnD,QAAQ;IAQR,MAAM;cAKI,gBAAgB;IAM1B,cAAc,CAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CAyBnE;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,UAAU,kEAKrB,CAAA"}

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

@@ -1,5 +1,5 @@
 import { first, spec, tryCatch, fetchJson } from "@welshman/lib";
-import { ZAP_GOAL, ZAP_REQUEST, inbox, matchTag, relays, tagSpec, tagValue, stamp, } from "@welshman/util";
+import { ZAP_GOAL, ZAP_REQUEST, inbox, matchTag, msatsTags, relays, tagSpec, tagValue, stamp, } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter, TagParser } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
@@ -7,9 +7,9 @@ import { KindFactory } from "../core/Kind.js";
 import { ZapGoalReader } from "./ZapGoal.js";
 // NIP-57 kind-9734 zap request.
 export class ZapRequestReader extends EventReader {
+    // The requested amount in millisats, undefined unless the tag holds whole millisats.
     amount() {
-        const amount = tagValue(tagSpec("amount"), this.event.tags);
-        return amount ? parseInt(amount) : undefined;
+        return tagValue(msatsTags("amount"), this.event.tags);
     }
     lnurl() {
         return tagValue(tagSpec("lnurl"), this.event.tags);
@@ -92,9 +92,13 @@ export class ZapRequestWriter extends EventWriter {
         if (!signer) {
             throw new Error("A signer is required to request a zap invoice");
         }
-        const event = await signer.sign(stamp(await this.renderTemplate()));
+        const template = stamp(await this.renderTemplate());
+        const msats = tagValue(msatsTags("amount"), template.tags);
+        if (msats === undefined) {
+            throw new Error("A whole number of millisats is required to request a zap invoice");
+        }
+        const event = await signer.sign(template);
         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 {

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

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

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

@@ -1,5 +1,5 @@
 import { now, fromPairs } from "@welshman/lib";
-import { ZAP_RECEIPT } from "@welshman/util";
+import { ZAP_RECEIPT, isMsats } from "@welshman/util";
 export class Zapper {
     lnurl;
     pubkey;
@@ -35,8 +35,8 @@ export class Zapper {
             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) {
+        // The zapper has to have sent what was requested, and an unreadable amount matches nothing
+        if (amount && (!isMsats(amount) || Number(amount) !== invoiceAmount)) {
             return undefined;
         }
         // If the sending client provided an lnurl tag, verify that too

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

@@ -1 +1 @@
-{"version":3,"file":"Zapper.js","sourceRoot":"","sources":["../../../../../domain/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"}
+{"version":3,"file":"Zapper.js","sourceRoot":"","sources":["../../../../../domain/src/other/Zapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,SAAS,EAAC,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAA;AA4BnD,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,2FAA2F;QAC3F,IAAI,MAAM,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,aAAa,CAAC,EAAE,CAAC;YACrE,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/router.d.ts.map

@@ -1 +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"}
+{"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;AAGzE,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;AA8BpE,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EAAE,EACjB,QAAQ,UAAU,KACjB,OAAO,CAAC,gBAAgB,EAAE,CAsB5B,CAAA"}

package/dist/feeds/src/router.js

@@ -1,8 +1,6 @@
 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.
+// One rule per outbox-model source, mapping a filter to a narrowed filter and the selections that serve it.
 const rules = [
     // Full-text search goes to the configured search relays.
     filter => (filter.search ? [{ filter, selections: [searchRelays(10)] }] : []),

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

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../feeds/src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../feeds/src/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EACL,IAAI,EACJ,WAAW,EACX,MAAM,EACN,SAAS,EACT,aAAa,EACb,YAAY,EACZ,mBAAmB,GACpB,MAAM,gBAAgB,CAAA;AAYvB,4GAA4G;AAC5G,MAAM,KAAK,GAA+C;IACxD,yDAAyD;IACzD,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,2EAA2E;IAC3E,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;QAC7C,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,EAAC,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAC,EAAE,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC,EAAC,CAAC;QACvE,CAAC,CAAC,EAAE;IACR,6EAA6E;IAC7E,MAAM,CAAC,EAAE;QACP,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,CAAA;QAE9B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAA;QAEzE,OAAO,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxD,MAAM,EAAE,EAAC,GAAG,MAAM,EAAE,OAAO,EAAC;YAC5B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAClD,CAAC,CAAC,CAAA;IACL,CAAC;IACD,oEAAoE;IACpE,MAAM,CAAC,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAC,CAAC;CACnD,CAAA;AAED,gFAAgF;AAChF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,OAAiB,EACjB,MAAkB,EACW,EAAE;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAA4B,CAAA;IAEhD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1D,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;gBAChC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAC,CAAA;gBAEhE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAA;gBACpC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAC,MAAM,EAAE,UAAU,EAAC,EAAE,EAAE;QAC3D,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAEjD,OAAO,EAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAC,CAAA;IACpF,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}

package/dist/lib/src/Tools.d.ts

@@ -530,13 +530,17 @@ export declare const switcher: <T>(k: string, m: Record<string, T>) => T;
 export declare const mapPop: <K, T>(k: K, m: Map<K, T>) => T | undefined;
 /** Returns a function that returns the boolean negation of the given function */
 export declare const complement: <T extends unknown[]>(f: (...args: T) => any) => (...args: T) => boolean;
+type TryCatch = {
+    <T>(f: () => Promise<T>, onError?: (e: Error) => void): Promise<T | undefined>;
+    <T>(f: () => T, onError?: (e: Error) => void): T | undefined;
+};
 /**
  * Safely executes function and handles errors
  * @param f - Function to execute
  * @param onError - Optional error handler
- * @returns Function result or undefined if error
+ * @returns Function result, or undefined if it throws or its promise rejects
  */
-export declare const tryCatch: <T>(f: () => T, onError?: (e: Error) => void) => T | undefined;
+export declare const tryCatch: TryCatch;
 /**
  * Throws an error with the given message
  */