@welshman/domain 0.9.0-pre1 → 0.9.0-pre3

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

@@ -1 +1 @@
-{"version":3,"file":"RelayJoin.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayJoin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,SAAU,SAAQ,WAAW;IACxC,QAAQ,CAAC,IAAI,SAAa;IAE1B,KAAK;IAIL,MAAM;IAIN,OAAO;CAGR;AAED,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC3D,QAAQ,CAAC,IAAI,SAAa;IAE1B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM;CAGzB"}
+{"version":3,"file":"RelayJoin.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayJoin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,KAAK;IAIL,MAAM;CAGP;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;IAC/D,QAAQ,CAAC,cAAc,QAAO;IAE9B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM;CAGzB;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}

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

@@ -1,22 +1,19 @@
 import { spec } from "@welshman/lib";
-import { RELAY_JOIN, getTagValue } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { RELAY_JOIN, tagSpec, tagValue } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // Ephemeral kind-28934 relay/space join request.
-export class RelayJoin extends EventReader {
-    kind = RELAY_JOIN;
+export class RelayJoinReader extends EventReader {
     claim() {
-        return getTagValue("claim", this.event.tags);
+        return tagValue(tagSpec("claim"), this.event.tags);
     }
     reason() {
         return this.event.content || undefined;
     }
-    builder() {
-        return new RelayJoinBuilder(this);
-    }
 }
-export class RelayJoinBuilder extends EventBuilder {
-    kind = RELAY_JOIN;
+export class RelayJoinWriter extends EventWriter {
+    requiresRelays = true;
     setClaim(claim) {
         return this.dropTags(spec(["claim"])).addTags(["claim", claim]);
     }
@@ -24,4 +21,9 @@ export class RelayJoinBuilder extends EventBuilder {
         return this.setContent(reason);
     }
 }
+export const RelayJoin = new KindFactory({
+    kind: RELAY_JOIN,
+    reader: RelayJoinReader,
+    writer: RelayJoinWriter,
+});
 //# sourceMappingURL=RelayJoin.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayJoin.js","sourceRoot":"","sources":["../../../../src/kinds/RelayJoin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,iDAAiD;AACjD,MAAM,OAAO,SAAU,SAAQ,WAAW;IAC/B,IAAI,GAAG,UAAU,CAAA;IAE1B,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAA;IACxC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,YAAuB;IAClD,IAAI,GAAG,UAAU,CAAA;IAE1B,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,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"RelayJoin.js","sourceRoot":"","sources":["../../../../src/kinds/RelayJoin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,iDAAiD;AACjD,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC9C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,WAA4B;IACtD,cAAc,GAAG,IAAI,CAAA;IAE9B,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,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC;IACvC,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;CACxB,CAAC,CAAA"}

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

@@ -1,10 +1,10 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RelayLeave extends EventReader {
-    readonly kind = 28936;
-    builder(): RelayLeaveBuilder;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RelayLeaveReader extends EventReader {
 }
-export declare class RelayLeaveBuilder extends EventBuilder<RelayLeave> {
-    readonly kind = 28936;
+export declare class RelayLeaveWriter extends EventWriter<RelayLeaveReader> {
+    readonly requiresRelays = true;
 }
+export declare const RelayLeave: KindFactory<RelayLeaveReader, RelayLeaveWriter>;
 //# sourceMappingURL=RelayLeave.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayLeave.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayLeave.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,UAAW,SAAQ,WAAW;IACzC,QAAQ,CAAC,IAAI,SAAc;IAE3B,OAAO;CAGR;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,UAAU,CAAC;IAC7D,QAAQ,CAAC,IAAI,SAAc;CAC5B"}
+{"version":3,"file":"RelayLeave.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayLeave.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,gBAAiB,SAAQ,WAAW;CAAG;AAEpD,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IACjE,QAAQ,CAAC,cAAc,QAAO;CAC/B;AAED,eAAO,MAAM,UAAU,iDAIrB,CAAA"}

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

@@ -1,14 +1,16 @@
 import { RELAY_LEAVE } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // Ephemeral kind-28936 relay/space leave marker.
-export class RelayLeave extends EventReader {
-    kind = RELAY_LEAVE;
-    builder() {
-        return new RelayLeaveBuilder(this);
-    }
+export class RelayLeaveReader extends EventReader {
 }
-export class RelayLeaveBuilder extends EventBuilder {
-    kind = RELAY_LEAVE;
+export class RelayLeaveWriter extends EventWriter {
+    requiresRelays = true;
 }
+export const RelayLeave = new KindFactory({
+    kind: RELAY_LEAVE,
+    reader: RelayLeaveReader,
+    writer: RelayLeaveWriter,
+});
 //# sourceMappingURL=RelayLeave.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayLeave.js","sourceRoot":"","sources":["../../../../src/kinds/RelayLeave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,iDAAiD;AACjD,MAAM,OAAO,UAAW,SAAQ,WAAW;IAChC,IAAI,GAAG,WAAW,CAAA;IAE3B,OAAO;QACL,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,YAAwB;IACpD,IAAI,GAAG,WAAW,CAAA;CAC5B"}
+{"version":3,"file":"RelayLeave.js","sourceRoot":"","sources":["../../../../src/kinds/RelayLeave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,iDAAiD;AACjD,MAAM,OAAO,gBAAiB,SAAQ,WAAW;CAAG;AAEpD,MAAM,OAAO,gBAAiB,SAAQ,WAA6B;IACxD,cAAc,GAAG,IAAI,CAAA;CAC/B;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC;IACxC,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,gBAAgB;IACxB,MAAM,EAAE,gBAAgB;CACzB,CAAC,CAAA"}

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

@@ -1,14 +1,13 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RelayList extends EventReader {
-    readonly kind = 10002;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RelayListReader extends EventReader {
     urls(): string[];
     readUrls(): string[];
     writeUrls(): string[];
-    builder(): RelayListBuilder;
 }
-export declare class RelayListBuilder extends EventBuilder<RelayList> {
-    readonly kind = 10002;
+export declare class RelayListWriter extends EventWriter<RelayListReader> {
+    protected renderRoutes(): Promise<import("@welshman/util").RelaySelection[]>;
     addReadUrl(url: string): this;
     addWriteUrl(url: string): this;
     removeReadUrl(url: string): this;
@@ -21,4 +20,5 @@ export declare class RelayListBuilder extends EventBuilder<RelayList> {
     private setUrlsForModes;
     setTags(tags: string[][]): this;
 }
+export declare const RelayList: KindFactory<RelayListReader, RelayListWriter>;
 //# sourceMappingURL=RelayList.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAW/C,qBAAa,SAAU,SAAQ,WAAW;IACxC,QAAQ,CAAC,IAAI,SAAS;IAEtB,IAAI;IAIJ,QAAQ;IAIR,SAAS;IAIT,OAAO;CAGR;AAED,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC3D,QAAQ,CAAC,IAAI,SAAS;IAEtB,UAAU,CAAC,GAAG,EAAE,MAAM;IAItB,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,aAAa,CAAC,GAAG,EAAE,MAAM;IAIzB,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,gBAAgB;IAexB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;IAI1B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE;IAI3B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;CAKzB"}
+{"version":3,"file":"RelayList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayList.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAW3C,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,IAAI;IAIJ,QAAQ;IAIR,SAAS;CAGV;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;cAI/C,YAAY;IAO5B,UAAU,CAAC,GAAG,EAAE,MAAM;IAItB,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,aAAa,CAAC,GAAG,EAAE,MAAM;IAIzB,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,gBAAgB;IAexB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;IAI1B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE;IAI3B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;CAKzB;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}

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

@@ -1,13 +1,13 @@
 import { nth, uniq, uniqBy, remove } from "@welshman/lib";
-import { RELAYS, getRelayTags, normalizeRelayUrl } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-const getUrls = (tags, mode) => uniqBy(normalizeRelayUrl, getRelayTags(tags)
+import { RELAYS, matchTags, relayTags, normalizeRelayUrl, relays, indexers, userOutbox, } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+const getUrls = (tags, mode) => uniqBy(normalizeRelayUrl, matchTags(relayTags(["r", "relay"]), tags)
     .filter(t => !mode || !t[2] || t[2] === mode)
     .map(nth(1)));
 // NIP-65 kind-10002 relay list.
-export class RelayList extends EventReader {
-    kind = RELAYS;
+export class RelayListReader extends EventReader {
     urls() {
         return getUrls(this.tags());
     }
@@ -17,12 +17,16 @@ export class RelayList extends EventReader {
     writeUrls() {
         return getUrls(this.tags(), "write");
     }
-    builder() {
-        return new RelayListBuilder(this);
-    }
 }
-export class RelayListBuilder extends EventBuilder {
-    kind = RELAYS;
+export class RelayListWriter extends EventWriter {
+    // Kind 10002 is indexed, and publishes to every relay the list references — both
+    // its current urls and the ones it used to have (via the seed reader) — so each
+    // relay learns when it's added to or removed from the list.
+    async renderRoutes() {
+        const original = this.reader?.urls() ?? [];
+        const current = getUrls(await this.renderTags());
+        return [userOutbox(), indexers(), ...relays(uniq([...original, ...current]))];
+    }
     addReadUrl(url) {
         return this.addUrlForMode(url, "read");
     }
@@ -86,4 +90,9 @@ export class RelayListBuilder extends EventBuilder {
         return this;
     }
 }
+export const RelayList = new KindFactory({
+    kind: RELAYS,
+    reader: RelayListReader,
+    writer: RelayListWriter,
+});
 //# sourceMappingURL=RelayList.js.map

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

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

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

@@ -1,17 +1,17 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RelayMembers extends EventReader {
-    readonly kind = 13534;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+import type { KindContext } from "../core/Kind.js";
+export declare class RelayMembersReader extends EventReader {
     pubkeys(): string[];
     isMember(pubkey: string): boolean;
-    builder(): RelayMembersBuilder;
 }
-export declare class RelayMembersBuilder extends EventBuilder<RelayMembers> {
-    readonly reader?: RelayMembers | undefined;
-    readonly kind = 13534;
-    constructor(reader?: RelayMembers | undefined);
+export declare class RelayMembersWriter extends EventWriter<RelayMembersReader> {
+    readonly requiresRelays = true;
+    constructor(kind: number, context: KindContext, reader?: RelayMembersReader);
     addPubkey(pubkey: string, role?: string): this;
     removePubkey(pubkey: string): this;
     setPubkeys(pubkeys: string[]): this;
 }
+export declare const RelayMembers: KindFactory<RelayMembersReader, RelayMembersWriter>;
 //# sourceMappingURL=RelayMembers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayMembers.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayMembers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAI/C,qBAAa,YAAa,SAAQ,WAAW;IAC3C,QAAQ,CAAC,IAAI,SAAgB;IAE7B,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;IAIvB,OAAO;CAGR;AAED,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,YAAY,CAAC;IAGrD,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY;IAF1C,QAAQ,CAAC,IAAI,SAAgB;gBAER,MAAM,CAAC,EAAE,YAAY,YAAA;IAO1C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAMvC,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B"}
+{"version":3,"file":"RelayMembers.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayMembers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAIhD,qBAAa,kBAAmB,SAAQ,WAAW;IACjD,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;CAGxB;AAED,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,kBAAkB,CAAC;IACrE,QAAQ,CAAC,cAAc,QAAO;gBAElB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,kBAAkB;IAO3E,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAMvC,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B;AAED,eAAO,MAAM,YAAY,qDAIvB,CAAA"}

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

@@ -1,27 +1,22 @@
 import { uniq, spec, removeUndefined } from "@welshman/lib";
-import { RELAY_MEMBERS, getTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { RELAY_MEMBERS, tagSpec, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // Flotilla kind-13534 relay/space member-list snapshot. Members are carried in
 // NIP-43 `member` tags, and the event is NIP-70 protected (`-`).
-export class RelayMembers extends EventReader {
-    kind = RELAY_MEMBERS;
+export class RelayMembersReader extends EventReader {
     pubkeys() {
-        return uniq(getTagValues("member", this.event.tags));
+        return uniq(tagValues(tagSpec("member"), this.event.tags));
     }
     isMember(pubkey) {
         return this.pubkeys().includes(pubkey);
     }
-    builder() {
-        return new RelayMembersBuilder(this);
-    }
 }
-export class RelayMembersBuilder extends EventBuilder {
-    reader;
-    kind = RELAY_MEMBERS;
-    constructor(reader) {
-        super(reader);
-        this.reader = reader;
+export class RelayMembersWriter extends EventWriter {
+    requiresRelays = true;
+    constructor(kind, context, reader) {
+        super(kind, context, reader);
         // NIP-43 requires kind-13534 member lists to be NIP-70 protected.
         this.setProtected(true);
     }
@@ -35,4 +30,9 @@ export class RelayMembersBuilder extends EventBuilder {
         return this.dropTags(spec(["member"])).addTags(...uniq(pubkeys).map(pk => ["member", pk]));
     }
 }
+export const RelayMembers = new KindFactory({
+    kind: RELAY_MEMBERS,
+    reader: RelayMembersReader,
+    writer: RelayMembersWriter,
+});
 //# sourceMappingURL=RelayMembers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayMembers.js","sourceRoot":"","sources":["../../../../src/kinds/RelayMembers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,+EAA+E;AAC/E,iEAAiE;AACjE,MAAM,OAAO,YAAa,SAAQ,WAAW;IAClC,IAAI,GAAG,aAAa,CAAA;IAE7B,OAAO;QACL,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,YAA0B;IAG5C;IAFZ,IAAI,GAAG,aAAa,CAAA;IAE7B,YAAqB,MAAqB;QACxC,KAAK,CAAC,MAAM,CAAC,CAAA;QADM,WAAM,GAAN,MAAM,CAAe;QAGxC,kEAAkE;QAClE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,IAAa;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CACpD,eAAe,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAC1C,CAAA;IACH,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5F,CAAC;CACF"}
+{"version":3,"file":"RelayMembers.js","sourceRoot":"","sources":["../../../../src/kinds/RelayMembers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,+EAA+E;AAC/E,iEAAiE;AACjE,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IACjD,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,WAA+B;IAC5D,cAAc,GAAG,IAAI,CAAA;IAE9B,YAAY,IAAY,EAAE,OAAoB,EAAE,MAA2B;QACzE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAE5B,kEAAkE;QAClE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,IAAa;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CACpD,eAAe,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAC1C,CAAA;IACH,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5F,CAAC;CACF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC;IAC1C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;CAC3B,CAAC,CAAA"}

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

@@ -1,12 +1,12 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RelayRemoveMember extends EventReader {
-    readonly kind = 8001;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RelayRemoveMemberReader extends EventReader {
     pubkeys(): string[];
-    builder(): RelayRemoveMemberBuilder;
 }
-export declare class RelayRemoveMemberBuilder extends EventBuilder<RelayRemoveMember> {
-    readonly kind = 8001;
+export declare class RelayRemoveMemberWriter extends EventWriter<RelayRemoveMemberReader> {
+    readonly requiresRelays = true;
     addPubkey(pubkey: string): this;
 }
+export declare const RelayRemoveMember: KindFactory<RelayRemoveMemberReader, RelayRemoveMemberWriter>;
 //# sourceMappingURL=RelayRemoveMember.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayRemoveMember.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayRemoveMember.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,IAAI,QAAsB;IAEnC,OAAO;IAIP,OAAO;CAGR;AAED,qBAAa,wBAAyB,SAAQ,YAAY,CAAC,iBAAiB,CAAC;IAC3E,QAAQ,CAAC,IAAI,QAAsB;IAEnC,SAAS,CAAC,MAAM,EAAE,MAAM;CAGzB"}
+{"version":3,"file":"RelayRemoveMember.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayRemoveMember.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,uBAAwB,SAAQ,WAAW;IACtD,OAAO;CAGR;AAED,qBAAa,uBAAwB,SAAQ,WAAW,CAAC,uBAAuB,CAAC;IAC/E,QAAQ,CAAC,cAAc,QAAO;IAE9B,SAAS,CAAC,MAAM,EAAE,MAAM;CAGzB;AAED,eAAO,MAAM,iBAAiB,+DAI5B,CAAA"}

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

@@ -1,21 +1,23 @@
 import { uniq, spec, removeUndefined } from "@welshman/lib";
-import { RELAY_REMOVE_MEMBER, getPubkeyTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { RELAY_REMOVE_MEMBER, hexTags, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // Flotilla relay/space remove-member op (kind 8001).
-export class RelayRemoveMember extends EventReader {
-    kind = RELAY_REMOVE_MEMBER;
+export class RelayRemoveMemberReader extends EventReader {
     pubkeys() {
-        return uniq(getPubkeyTagValues(this.event.tags));
-    }
-    builder() {
-        return new RelayRemoveMemberBuilder(this);
+        return uniq(tagValues(hexTags("p"), this.event.tags));
     }
 }
-export class RelayRemoveMemberBuilder extends EventBuilder {
-    kind = RELAY_REMOVE_MEMBER;
+export class RelayRemoveMemberWriter extends EventWriter {
+    requiresRelays = true;
     addPubkey(pubkey) {
         return this.dropTags(spec(["p", pubkey])).addTags(removeUndefined(["p", pubkey]));
     }
 }
+export const RelayRemoveMember = new KindFactory({
+    kind: RELAY_REMOVE_MEMBER,
+    reader: RelayRemoveMemberReader,
+    writer: RelayRemoveMemberWriter,
+});
 //# sourceMappingURL=RelayRemoveMember.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelayRemoveMember.js","sourceRoot":"","sources":["../../../../src/kinds/RelayRemoveMember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAA;AACtE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,qDAAqD;AACrD,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACvC,IAAI,GAAG,mBAAmB,CAAA;IAEnC,OAAO;QACL,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,wBAAwB,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,YAA+B;IAClE,IAAI,GAAG,mBAAmB,CAAA;IAEnC,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;CACF"}
+{"version":3,"file":"RelayRemoveMember.js","sourceRoot":"","sources":["../../../../src/kinds/RelayRemoveMember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACtE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,qDAAqD;AACrD,MAAM,OAAO,uBAAwB,SAAQ,WAAW;IACtD,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,WAAoC;IACtE,cAAc,GAAG,IAAI,CAAA;IAE9B,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;CACF;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAC;IAC/C,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,uBAAuB;IAC/B,MAAM,EAAE,uBAAuB;CAChC,CAAC,CAAA"}

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

@@ -0,0 +1,18 @@
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RelayRoleReader extends EventReader {
+    label(): string | undefined;
+    description(): string | undefined;
+    color(): number | undefined;
+    order(): number;
+}
+export declare class RelayRoleWriter extends EventWriter<RelayRoleReader> {
+    readonly requiresRelays = true;
+    setLabel(label: string): this;
+    setDescription(description: string): this;
+    setColor(hue: number): this;
+    setOrder(order: number): this;
+}
+export declare const RelayRole: KindFactory<RelayRoleReader, RelayRoleWriter>;
+//# sourceMappingURL=RelayRole.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RelayRole.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelayRole.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAK3C,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,KAAK;IAIL,WAAW;IAKX,KAAK;IAML,KAAK;CAKN;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;IAC/D,QAAQ,CAAC,cAAc,QAAO;IAE9B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,QAAQ,CAAC,KAAK,EAAE,MAAM;CAGvB;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}

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

@@ -0,0 +1,46 @@
+import { spec } from "@welshman/lib";
+import { RELAY_ROLE, tagSpec, tagValue } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+// Flotilla kind-33534 relay role definition, published by the relay's self
+// key. The `d` tag is the role id; kind-13534 member lists reference roles via
+// extra values on `member` tags (["member", pubkey, ...roleIds]).
+export class RelayRoleReader extends EventReader {
+    label() {
+        return tagValue(tagSpec("label"), this.event.tags);
+    }
+    description() {
+        return tagValue(tagSpec("description"), this.event.tags);
+    }
+    // A hue, 0 to 360. Undefined when unset or invalid, so the client can default.
+    color() {
+        const hue = parseInt(tagValue(tagSpec("color"), this.event.tags) ?? "");
+        return isNaN(hue) ? undefined : hue;
+    }
+    order() {
+        const order = parseInt(tagValue(tagSpec("order"), this.event.tags) ?? "");
+        return isNaN(order) ? 0 : order;
+    }
+}
+export class RelayRoleWriter extends EventWriter {
+    requiresRelays = true;
+    setLabel(label) {
+        return this.dropTags(spec(["label"])).addTags(["label", label]);
+    }
+    setDescription(description) {
+        return this.dropTags(spec(["description"])).addTags(["description", description]);
+    }
+    setColor(hue) {
+        return this.dropTags(spec(["color"])).addTags(["color", String(hue)]);
+    }
+    setOrder(order) {
+        return this.dropTags(spec(["order"])).addTags(["order", String(order)]);
+    }
+}
+export const RelayRole = new KindFactory({
+    kind: RELAY_ROLE,
+    reader: RelayRoleReader,
+    writer: RelayRoleWriter,
+});
+//# sourceMappingURL=RelayRole.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RelayRole.js","sourceRoot":"","sources":["../../../../src/kinds/RelayRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,2EAA2E;AAC3E,+EAA+E;AAC/E,kEAAkE;AAClE,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC9C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,+EAA+E;IAC/E,KAAK;QACH,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAEvE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAA;IACrC,CAAC;IAED,KAAK;QACH,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAEzE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IACjC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,WAA4B;IACtD,cAAc,GAAG,IAAI,CAAA;IAE9B,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,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACzE,CAAC;CACF;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC;IACvC,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;CACxB,CAAC,CAAA"}

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

@@ -1,15 +1,13 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RelaySet extends EventReader {
-    readonly kind = 30002;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RelaySetReader extends EventReader {
     title(): string | undefined;
     description(): string | undefined;
     image(): string | undefined;
     urls(): string[];
-    builder(): RelaySetBuilder;
 }
-export declare class RelaySetBuilder extends EventBuilder<RelaySet> {
-    readonly kind = 30002;
+export declare class RelaySetWriter extends EventWriter<RelaySetReader> {
     setTitle(title: string): this;
     setDescription(description: string): this;
     setImage(image: string): this;
@@ -17,4 +15,5 @@ export declare class RelaySetBuilder extends EventBuilder<RelaySet> {
     removeUrl(url: string): this;
     setUrls(urls: string[]): this;
 }
+export declare const RelaySet: KindFactory<RelaySetReader, RelaySetWriter>;
 //# sourceMappingURL=RelaySet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelaySet.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelaySet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,QAAS,SAAQ,WAAW;IACvC,QAAQ,CAAC,IAAI,SAAe;IAE5B,KAAK;IAIL,WAAW;IAIX,KAAK;IAIL,IAAI;IAIJ,OAAO;CAGR;AAED,qBAAa,eAAgB,SAAQ,YAAY,CAAC,QAAQ,CAAC;IACzD,QAAQ,CAAC,IAAI,SAAe;IAE5B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB"}
+{"version":3,"file":"RelaySet.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RelaySet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,KAAK;IAIL,WAAW;IAIX,KAAK;IAIL,IAAI;CAGL;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}

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

@@ -1,28 +1,24 @@
 import { uniqBy, spec } from "@welshman/lib";
-import { NAMED_RELAYS, getTagValue, getTagValues, normalizeRelayUrl } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { NAMED_RELAYS, tagSpec, tagValue, tagValues, normalizeRelayUrl } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-51 kind-30002 relay set.
-export class RelaySet extends EventReader {
-    kind = NAMED_RELAYS;
+export class RelaySetReader extends EventReader {
     title() {
-        return getTagValue("title", this.event.tags);
+        return tagValue(tagSpec("title"), this.event.tags);
     }
     description() {
-        return getTagValue("description", this.event.tags);
+        return tagValue(tagSpec("description"), this.event.tags);
     }
     image() {
-        return getTagValue("image", this.event.tags);
+        return tagValue(tagSpec("image"), this.event.tags);
     }
     urls() {
-        return uniqBy(normalizeRelayUrl, getTagValues("relay", this.tags()));
-    }
-    builder() {
-        return new RelaySetBuilder(this);
+        return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
     }
 }
-export class RelaySetBuilder extends EventBuilder {
-    kind = NAMED_RELAYS;
+export class RelaySetWriter extends EventWriter {
     setTitle(title) {
         return this.dropTags(spec(["title"])).addTags(["title", title]);
     }
@@ -42,4 +38,9 @@ export class RelaySetBuilder extends EventBuilder {
         return this.dropTags(spec(["relay"])).addTags(...urls.map(url => ["relay", normalizeRelayUrl(url)]));
     }
 }
+export const RelaySet = new KindFactory({
+    kind: NAMED_RELAYS,
+    reader: RelaySetReader,
+    writer: RelaySetWriter,
+});
 //# sourceMappingURL=RelaySet.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RelaySet.js","sourceRoot":"","sources":["../../../../src/kinds/RelaySet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACzF,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,+BAA+B;AAC/B,MAAM,OAAO,QAAS,SAAQ,WAAW;IAC9B,IAAI,GAAG,YAAY,CAAA;IAE5B,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,WAAW;QACT,OAAO,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACtE,CAAC;IAED,OAAO;QACL,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,YAAsB;IAChD,IAAI,GAAG,YAAY,CAAA;IAE5B,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,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,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,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"RelaySet.js","sourceRoot":"","sources":["../../../../src/kinds/RelaySet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAC5F,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,+BAA+B;AAC/B,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAA2B;IAC7D,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,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,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,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;CACvB,CAAC,CAAA"}

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

@@ -1,18 +1,19 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class Report extends EventReader {
-    readonly kind = 1984;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+import type { KindContext } from "../core/Kind.js";
+export declare class ReportReader extends EventReader {
     pubkey(): string | undefined;
     eventId(): string | undefined;
     reason(): string | undefined;
-    builder(): ReportBuilder;
 }
-export declare class ReportBuilder extends EventBuilder<Report> {
-    readonly kind = 1984;
-    constructor(reader?: Report);
+export declare class ReportWriter extends EventWriter<ReportReader> {
+    constructor(kind: number, context: KindContext, reader?: ReportReader);
+    protected renderRoutes(): Promise<import("@welshman/util").RelaySelection[]>;
     private reason;
     setPubkey(pubkey: string): this;
     setEventId(eventId: string): this;
     setReason(reason: string): this;
 }
+export declare const Report: KindFactory<ReportReader, ReportWriter>;
 //# sourceMappingURL=Report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Report.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,MAAO,SAAQ,WAAW;IACrC,QAAQ,CAAC,IAAI,QAAS;IAEtB,MAAM;IAIN,OAAO;IAIP,MAAM;IAIN,OAAO;CAGR;AAED,qBAAa,aAAc,SAAQ,YAAY,CAAC,MAAM,CAAC;IACrD,QAAQ,CAAC,IAAI,QAAS;gBAEV,MAAM,CAAC,EAAE,MAAM;IAY3B,OAAO,CAAC,MAAM;IAOd,SAAS,CAAC,MAAM,EAAE,MAAM;IAOxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAO1B,SAAS,CAAC,MAAM,EAAE,MAAM;CAczB"}
+{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Report.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAGhD,qBAAa,YAAa,SAAQ,WAAW;IAC3C,MAAM;IAIN,OAAO;IAIP,MAAM;CAKP;AAED,qBAAa,YAAa,SAAQ,WAAW,CAAC,YAAY,CAAC;gBAC7C,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,YAAY;cAYrD,YAAY;IAI5B,OAAO,CAAC,MAAM;IAOd,SAAS,CAAC,MAAM,EAAE,MAAM;IAOxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAO1B,SAAS,CAAC,MAAM,EAAE,MAAM;CAczB;AAED,eAAO,MAAM,MAAM,yCAIjB,CAAA"}