@welshman/app 0.11.2 → 0.12.0

package/dist/app/src/plugins/wraps.js

@@ -1,7 +1,7 @@
 import { TaskQueue, uniq, now } from "@welshman/lib";
 import { hexTags, tagValues, prep } from "@welshman/util";
 import { Nip59 } from "@welshman/signer";
-import { MergedThunk, Thunks } from "./thunk.js";
+import { PublicationGroup, Publisher } from "./publisher.js";
 import { User } from "../user.js";
 import { MessagingRelayLists } from "./messagingRelayLists.js";
 export const MAX_UNWRAP_ATTEMPTS = 3;
@@ -89,9 +89,11 @@ export class Wraps {
         const user = User.require(this.app);
         // Stabilize the event id across the different wraps
         const stableEvent = prep(event, user.pubkey, now());
-        return new MergedThunk(await Promise.all(uniq(recipients).map(async (recipient) => {
+        return new PublicationGroup(await Promise.all(uniq(recipients).map(async (recipient) => {
             const relays = (await this.app.use(MessagingRelayLists).load(recipient))?.urls() ?? [];
-            return this.app.use(Thunks).publish({ event: stableEvent, relays, recipient, ...options });
+            return this.app
+                .use(Publisher)
+                .publish({ event: stableEvent, relays, recipient, ...options });
         })));
     };
 }

package/dist/app/src/plugins/wraps.js.map

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

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

@@ -12,8 +12,8 @@ export declare class CalendarRsvpReader extends EventReader {
     freebusy(): RsvpFreebusy | undefined;
 }
 export declare class CalendarRsvpWriter extends EventWriter<CalendarRsvpReader> {
-    setCalendarEvent(address: string): this;
-    setCalendarEventFromEvent(event: TrustedEvent): this;
+    setCalendarEvent(address: string, relay?: string): this;
+    setCalendarEventFromEvent(event: TrustedEvent, relay?: string): this;
     setStatus(status: RsvpStatus): this;
     setFreebusy(freebusy: RsvpFreebusy): this;
     clearFreebusy(): this;

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

@@ -1 +1 @@
-{"version":3,"file":"CalendarRsvp.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/CalendarRsvp.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,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,MAAM,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,CAAA;AAE9D,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,MAAM,CAAA;AAI1C,qBAAa,kBAAmB,SAAQ,WAAW;IACjD,aAAa;IAKb,eAAe;IAIf,MAAM,IACmD,UAAU,GAAG,SAAS;IAK/E,QAAQ,IAC6C,YAAY,GAAG,SAAS;CAE9E;AAED,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,kBAAkB,CAAC;IAErE,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAMhC,yBAAyB,CAAC,KAAK,EAAE,YAAY;IAe7C,SAAS,CAAC,MAAM,EAAE,UAAU;IAW5B,WAAW,CAAC,QAAQ,EAAE,YAAY;IAIlC,aAAa;IAIb,QAAQ;CAeT;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAE/C,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAIhC,SAAS,CAAC,YAAY;CAWvB;AAED,eAAO,MAAM,YAAY,wEAKvB,CAAA"}
+{"version":3,"file":"CalendarRsvp.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/CalendarRsvp.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,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,MAAM,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,CAAA;AAE9D,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,MAAM,CAAA;AAI1C,qBAAa,kBAAmB,SAAQ,WAAW;IACjD,aAAa;IAKb,eAAe;IAIf,MAAM,IACmD,UAAU,GAAG,SAAS;IAK/E,QAAQ,IAC6C,YAAY,GAAG,SAAS;CAE9E;AAED,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,kBAAkB,CAAC;IAErE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAOhD,yBAAyB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,MAAM;IAiB7D,SAAS,CAAC,MAAM,EAAE,UAAU;IAW5B,WAAW,CAAC,QAAQ,EAAE,YAAY;IAIlC,aAAa;IAIb,QAAQ;CAeT;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAE/C,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAIhC,SAAS,CAAC,YAAY;CAWvB;AAED,eAAO,MAAM,YAAY,wEAKvB,CAAA"}

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

@@ -1,4 +1,4 @@
-import { spec } from "@welshman/lib";
+import { removeUndefined, spec } from "@welshman/lib";
 import { Address, EVENT_RSVP, addressTags, getAddress, hexTags, inbox, outbox, tagSpec, tagValue, } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
@@ -25,19 +25,22 @@ export class CalendarRsvpReader extends EventReader {
 }
 export class CalendarRsvpWriter extends EventWriter {
     // An rsvp answers exactly one calendar event, so replace any existing one.
-    setCalendarEvent(address) {
-        return this.dropTags(spec(["a"])).addTags(["a", address]);
+    setCalendarEvent(address, relay) {
+        return this.dropTags(spec(["a"])).addTags(removeUndefined(["a", address, relay]));
     }
     // Pins the rsvp to this revision of the event and credits its organizer, so the
-    // rsvp reaches their inbox.
-    setCalendarEventFromEvent(event) {
-        this.setCalendarEvent(getAddress(event));
+    // rsvp reaches their inbox. Pass `relay` when the event lives on a known relay
+    // (e.g. a NIP-29 space); otherwise the organizer's outbox fills in the `e` hint.
+    setCalendarEventFromEvent(event, relay) {
+        this.setCalendarEvent(getAddress(event), relay);
         this.addMention(event.pubkey);
-        const tag = ["e", event.id, ""];
+        const tag = ["e", event.id, relay ?? ""];
         this.dropTags(spec(["e"])).addTags(tag);
-        this.hint(outbox(event.pubkey)).then(url => {
-            tag[2] = url;
-        });
+        if (!relay) {
+            this.hint(outbox(event.pubkey)).then(url => {
+                tag[2] = url;
+            });
+        }
         return this;
     }
     setStatus(status) {

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

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

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

@@ -4,6 +4,10 @@ import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 export declare class MuteListReader extends ListReader {
     pubkeys(): string[];
+    words(): string[];
+    topics(): string[];
+    ids(): string[];
+    addresses(): string[];
     includes(pubkey: string): boolean;
 }
 export declare class MuteListWriter extends ListWriter<MuteListReader> {

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

@@ -1 +1 @@
-{"version":3,"file":"MuteList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/MuteList.ts"],"names":[],"mappings":"AAEA,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;AAG3C,qBAAa,cAAe,SAAQ,UAAU;IAC5C,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;CAGxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;cAC5C,YAAY;IAI5B,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,MAAM,CAAC,MAAM,EAAE,MAAM;CAGtB;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}
+{"version":3,"file":"MuteList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/MuteList.ts"],"names":[],"mappings":"AAUA,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;AAG3C,qBAAa,cAAe,SAAQ,UAAU;IAC5C,OAAO;IAIP,KAAK;IAIL,MAAM;IAIN,GAAG;IAIH,SAAS;IAIT,QAAQ,CAAC,MAAM,EAAE,MAAM;CAGxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;cAC5C,YAAY;IAI5B,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,MAAM,CAAC,MAAM,EAAE,MAAM;CAGtB;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}

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

@@ -1,5 +1,5 @@
 import { uniq, spec } from "@welshman/lib";
-import { MUTES, hexTags, tagValues, userOutbox } from "@welshman/util";
+import { MUTES, addressTags, hexTags, tagSpec, tagValues, topicTags, userOutbox, } from "@welshman/util";
 import { ListReader } from "../core/ListReader.js";
 import { ListWriter } from "../core/ListWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
@@ -9,6 +9,18 @@ export class MuteListReader extends ListReader {
     pubkeys() {
         return uniq(tagValues(hexTags("p"), this.tags()));
     }
+    words() {
+        return uniq(tagValues(tagSpec("word"), this.tags()));
+    }
+    topics() {
+        return uniq(tagValues(topicTags("t"), this.tags()));
+    }
+    ids() {
+        return uniq(tagValues(hexTags("e"), this.tags()));
+    }
+    addresses() {
+        return uniq(tagValues(addressTags("a"), this.tags()));
+    }
     includes(pubkey) {
         return this.pubkeys().includes(pubkey);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"MuteList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/MuteList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACpE,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;AAE3C,+BAA+B;AAC/B,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC5C,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,UAA0B;IAClD,KAAK,CAAC,YAAY;QAC1B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;IACvB,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACjC,YAAY;QACpB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,aAAa;CACrB,CAAC,CAAA"}
+{"version":3,"file":"MuteList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/MuteList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,KAAK,EACL,WAAW,EACX,OAAO,EACP,OAAO,EACP,SAAS,EACT,SAAS,EACT,UAAU,GACX,MAAM,gBAAgB,CAAA;AACvB,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;AAE3C,+BAA+B;AAC/B,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC5C,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,UAA0B;IAClD,KAAK,CAAC,YAAY;QAC1B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;IACvB,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACjC,YAAY;QACpB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,aAAa;CACrB,CAAC,CAAA"}

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

@@ -6,13 +6,16 @@ import type { KindContext } from "../core/Kind.js";
 export declare class RelayMembersReader extends EventReader {
     pubkeys(): string[];
     isMember(pubkey: string): boolean;
+    rolesByPubkey(): Map<string, string[]>;
+    rolesFor(pubkey: string): string[];
 }
 export declare class RelayMembersWriter extends EventWriter<RelayMembersReader> {
     readonly requiresRelays = true;
     constructor(kind: number, context: KindContext, reader?: RelayMembersReader);
-    addPubkey(pubkey: string, role?: string): this;
+    addPubkey(pubkey: string, roles?: string[]): this;
     removePubkey(pubkey: string): this;
     setPubkeys(pubkeys: string[]): this;
+    private rolesFor;
 }
 export declare class RelayMembersQuery extends EventQuery {
     protected renderRoutes(): never[];

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

@@ -1 +1 @@
-{"version":3,"file":"RelayMembers.d.ts","sourceRoot":"","sources":["../../../../../domain/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,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,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,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,YAAY,wEAKvB,CAAA"}
+{"version":3,"file":"RelayMembers.d.ts","sourceRoot":"","sources":["../../../../../domain/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,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAKhD,qBAAa,kBAAmB,SAAQ,WAAW;IACjD,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;IAIvB,aAAa;IAeb,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;IAQ3E,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,WAAwB;IAIvD,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;IAM5B,OAAO,CAAC,QAAQ;CAGjB;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,YAAY,wEAKvB,CAAA"}

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

@@ -1,11 +1,12 @@
-import { uniq, spec, removeUndefined } from "@welshman/lib";
-import { RELAY_MEMBERS, tagSpec, tagValues } from "@welshman/util";
+import { uniq, spec } from "@welshman/lib";
+import { RELAY_MEMBERS, matchTags, tagSpec, tagValues } 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";
 // Flotilla kind-13534 relay/space member-list snapshot. Members are carried in
-// NIP-43 `member` tags, and the event is NIP-70 protected (`-`).
+// NIP-43 `member` tags, `["member", pubkey, ...roleIds]`, and the event is NIP-70
+// protected (`-`).
 export class RelayMembersReader extends EventReader {
     pubkeys() {
         return uniq(tagValues(tagSpec("member"), this.event.tags));
@@ -13,6 +14,18 @@ export class RelayMembersReader extends EventReader {
     isMember(pubkey) {
         return this.pubkeys().includes(pubkey);
     }
+    rolesByPubkey() {
+        const rolesByPubkey = new Map();
+        for (const [, pubkey, ...roles] of matchTags(tagSpec("member"), this.event.tags)) {
+            if (pubkey) {
+                rolesByPubkey.set(pubkey, uniq([...(rolesByPubkey.get(pubkey) ?? []), ...roles.filter(Boolean)]));
+            }
+        }
+        return rolesByPubkey;
+    }
+    rolesFor(pubkey) {
+        return this.rolesByPubkey().get(pubkey) ?? [];
+    }
 }
 export class RelayMembersWriter extends EventWriter {
     requiresRelays = true;
@@ -21,14 +34,19 @@ export class RelayMembersWriter extends EventWriter {
         // NIP-43 requires kind-13534 member lists to be NIP-70 protected.
         this.setProtected(true);
     }
-    addPubkey(pubkey, role) {
-        return this.dropTags(spec(["member", pubkey])).addTags(removeUndefined(["member", pubkey, role]));
+    // Omitting `roles` keeps whatever roles the member already has.
+    addPubkey(pubkey, roles = this.rolesFor(pubkey)) {
+        return this.dropTags(spec(["member", pubkey])).addTags(["member", pubkey, ...roles]);
     }
     removePubkey(pubkey) {
         return this.dropTags(spec(["member", pubkey]));
     }
     setPubkeys(pubkeys) {
-        return this.dropTags(spec(["member"])).addTags(...uniq(pubkeys).map(pk => ["member", pk]));
+        const tags = uniq(pubkeys).map(pk => ["member", pk, ...this.rolesFor(pk)]);
+        return this.dropTags(spec(["member"])).addTags(...tags);
+    }
+    rolesFor(pubkey) {
+        return this.extraTags.find(spec(["member", pubkey]))?.slice(2) ?? [];
     }
 }
 export class RelayMembersQuery extends EventQuery {

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

@@ -1 +1 @@
-{"version":3,"file":"RelayMembers.js","sourceRoot":"","sources":["../../../../../domain/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,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,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,OAAO,iBAAkB,SAAQ,UAAU;IACrC,YAAY;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC;IAC1C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;IAC1B,KAAK,EAAE,iBAAiB;CACzB,CAAC,CAAA"}
+{"version":3,"file":"RelayMembers.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelayMembers.ts"],"names":[],"mappings":"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"}

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

@@ -4,12 +4,15 @@ import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 export declare class RoomAdminsReader extends EventReader {
     pubkeys(): string[];
+    rolesByPubkey(): Map<string, string[]>;
+    rolesFor(pubkey: string): string[];
 }
 export declare class RoomAdminsWriter extends EventWriter<RoomAdminsReader> {
     readonly requiresRelays = true;
-    addPubkey(pubkey: string): this;
+    addPubkey(pubkey: string, roles?: string[]): this;
     removePubkey(pubkey: string): this;
     setPubkeys(pubkeys: string[]): this;
+    private rolesFor;
 }
 export declare class RoomAdminsQuery extends EventQuery {
     protected renderRoutes(): never[];

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

@@ -1 +1 @@
-{"version":3,"file":"RoomAdmins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomAdmins.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,gBAAiB,SAAQ,WAAW;IAC/C,OAAO;CAGR;AAED,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IACjE,QAAQ,CAAC,cAAc,QAAO;IAE9B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,UAAU,kEAKrB,CAAA"}
+{"version":3,"file":"RoomAdmins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomAdmins.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,gBAAiB,SAAQ,WAAW;IAC/C,OAAO;IAIP,aAAa;IAab,QAAQ,CAAC,MAAM,EAAE,MAAM;CAGxB;AAED,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IACjE,QAAQ,CAAC,cAAc,QAAO;IAG9B,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,WAAwB;IAIvD,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;IAM5B,OAAO,CAAC,QAAQ;CAGjB;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,UAAU,kEAKrB,CAAA"}

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

@@ -1,25 +1,40 @@
-import { uniq, spec, removeUndefined } from "@welshman/lib";
-import { ROOM_ADMINS, hexTags, tagValues } from "@welshman/util";
+import { uniq, spec } from "@welshman/lib";
+import { ROOM_ADMINS, hexTags, matchTags, tagValues } 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";
-// NIP-29 kind-39001 room admins list.
+// NIP-29 kind-39001 room admins list. Each admin is a `["p", pubkey, ...roles]` tag.
 export class RoomAdminsReader extends EventReader {
     pubkeys() {
         return uniq(tagValues(hexTags("p"), this.event.tags));
     }
+    rolesByPubkey() {
+        const rolesByPubkey = new Map();
+        for (const [, pubkey, ...roles] of matchTags(hexTags("p"), this.event.tags)) {
+            rolesByPubkey.set(pubkey, uniq([...(rolesByPubkey.get(pubkey) ?? []), ...roles.filter(Boolean)]));
+        }
+        return rolesByPubkey;
+    }
+    rolesFor(pubkey) {
+        return this.rolesByPubkey().get(pubkey) ?? [];
+    }
 }
 export class RoomAdminsWriter extends EventWriter {
     requiresRelays = true;
-    addPubkey(pubkey) {
-        return this.dropTags(spec(["p", pubkey])).addTags(removeUndefined(["p", pubkey]));
+    // Omitting `roles` keeps whatever roles the admin already has.
+    addPubkey(pubkey, roles = this.rolesFor(pubkey)) {
+        return this.dropTags(spec(["p", pubkey])).addTags(["p", pubkey, ...roles]);
     }
     removePubkey(pubkey) {
         return this.dropTags(spec(["p", pubkey]));
     }
     setPubkeys(pubkeys) {
-        return this.dropTags(spec(["p"])).addTags(...uniq(pubkeys).map(pk => ["p", pk]));
+        const tags = uniq(pubkeys).map(pk => ["p", pk, ...this.rolesFor(pk)]);
+        return this.dropTags(spec(["p"])).addTags(...tags);
+    }
+    rolesFor(pubkey) {
+        return this.extraTags.find(spec(["p", pubkey]))?.slice(2) ?? [];
     }
 }
 export class RoomAdminsQuery extends EventQuery {

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

@@ -1 +1 @@
-{"version":3,"file":"RoomAdmins.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomAdmins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC9D,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,sCAAsC;AACtC,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IAC/C,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,gBAAiB,SAAQ,WAA6B;IACxD,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;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IACnC,YAAY;QACpB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC;IACxC,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,gBAAgB;IACxB,MAAM,EAAE,gBAAgB;IACxB,KAAK,EAAE,eAAe;CACvB,CAAC,CAAA"}
+{"version":3,"file":"RoomAdmins.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomAdmins.ts"],"names":[],"mappings":"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"}

package/dist/store/src/misc.d.ts

@@ -14,8 +14,9 @@ export type WritableWithGetter<T> = Writable<T> & {
 export type ReadableWithGetter<T> = Readable<T> & {
     get: () => T;
 };
-export declare function withGetter<T>(store: Writable<T>): WritableWithGetter<T>;
-export declare function withGetter<T>(store: Readable<T>): ReadableWithGetter<T>;
+export declare const withGetter: <S extends Readable<any>>(store: S) => S & {
+    get: () => StoresValues<S>;
+};
 export declare const memoized: <T>(store: Readable<T>) => {
     subscribe: (f: Subscriber<T>) => Unsubscriber;
 };

package/dist/store/src/misc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../store/src/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAC,MAAM,cAAc,CAAA;AAIvF,KAAK,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;AAC7F,KAAK,YAAY,CAAC,CAAC,IACjB,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAAC,CAAA;AAKhG,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAGlB,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;CACf,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,sBAAwB,aAAa,CAAC,CAAC,CAAM,YA0C1F,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC,CAAA;CAAC,CAAA;AAChE,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC,CAAA;CAAC,CAAA;AAEhE,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;AACxE,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;AAKxE,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,OAAO,QAAQ,CAAC,CAAC,CAAC;mBAGX,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,MAAM,EAAE,OAAO,CAAC,MAQ1E,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,EACpD,QAAQ,CAAC,EACT,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KACvC,QAAQ,CAAC,CAAC,CAWZ,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,EAC3D,QAAQ,CAAC,EACT,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KACvC,QAAQ,CAAC,CAAC,CAWZ,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS,MAAM,EAAE,QAAQ,CAAC,oHAA8B,CAAA"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../store/src/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAC,MAAM,cAAc,CAAA;AAIvF,KAAK,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;AAC7F,KAAK,YAAY,CAAC,CAAC,IACjB,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAAC,CAAA;AAKhG,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAGlB,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;CACf,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,sBAAwB,aAAa,CAAC,CAAC,CAAM,YA0C1F,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC,CAAA;CAAC,CAAA;AAChE,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC,CAAA;CAAC,CAAA;AAGhE,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,KACL,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,YAAY,CAAC,CAAC,CAAC,CAAA;CAAC,CAAA;AAEvF,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,OAAO,QAAQ,CAAC,CAAC,CAAC;mBAGX,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,MAAM,EAAE,OAAO,CAAC,MAQ1E,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,EACpD,QAAQ,CAAC,EACT,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KACvC,QAAQ,CAAC,CAAC,CAWZ,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,EAC3D,QAAQ,CAAC,EACT,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KACvC,QAAQ,CAAC,CAAC,CAWZ,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS,MAAM,EAAE,QAAQ,CAAC,oHAA8B,CAAA"}

package/dist/store/src/misc.js

@@ -37,9 +37,8 @@ export const getter = (store, { threshold = 10, read } = {}) => {
         }
     };
 };
-export function withGetter(store) {
-    return { ...store, get: getter(store) };
-}
+// Keeps whatever else the store carries (e.g. `synced`'s `ready`) alongside `get`.
+export const withGetter = (store) => ({ ...store, get: getter(store) });
 export const memoized = (store) => {
     const { subscribe } = store;
     return { ...store, subscribe: (f) => subscribe(memoize(f)) };

package/dist/store/src/misc.js.map

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

package/dist/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/app.ts","../src/command.ts","../src/createapp.ts","../src/index.ts","../src/policy.ts","../src/session.ts","../src/user.ts","../src/plugins/base.ts","../src/plugins/blockedrelaylists.ts","../src/plugins/blossomserverlists.ts","../src/plugins/deletes.ts","../src/plugins/domain.ts","../src/plugins/events.ts","../src/plugins/feedlists.ts","../src/plugins/feeds.ts","../src/plugins/followlists.ts","../src/plugins/handles.ts","../src/plugins/logger.ts","../src/plugins/messagingrelaylists.ts","../src/plugins/mutelists.ts","../src/plugins/network.ts","../src/plugins/pinboards.ts","../src/plugins/pins.ts","../src/plugins/plaintext.ts","../src/plugins/profiles.ts","../src/plugins/reactions.ts","../src/plugins/relaylists.ts","../src/plugins/relaymanagement.ts","../src/plugins/relaymembers.ts","../src/plugins/relayroles.ts","../src/plugins/relaystats.ts","../src/plugins/relays.ts","../src/plugins/roomlists.ts","../src/plugins/roompins.ts","../src/plugins/rooms.ts","../src/plugins/router.ts","../src/plugins/searchrelaylists.ts","../src/plugins/sync.ts","../src/plugins/thunk.ts","../src/plugins/topics.ts","../src/plugins/wot.ts","../src/plugins/wraps.ts","../src/plugins/zapgoals.ts","../src/plugins/zappers.ts"],"version":"5.8.3"}
+{"root":["../src/app.ts","../src/command.ts","../src/createapp.ts","../src/index.ts","../src/policy.ts","../src/session.ts","../src/user.ts","../src/plugins/base.ts","../src/plugins/blockedrelaylists.ts","../src/plugins/blossomserverlists.ts","../src/plugins/deletes.ts","../src/plugins/domain.ts","../src/plugins/events.ts","../src/plugins/feedlists.ts","../src/plugins/feeds.ts","../src/plugins/followlists.ts","../src/plugins/handles.ts","../src/plugins/logger.ts","../src/plugins/messagingrelaylists.ts","../src/plugins/mutelists.ts","../src/plugins/network.ts","../src/plugins/pinboards.ts","../src/plugins/pins.ts","../src/plugins/plaintext.ts","../src/plugins/profiles.ts","../src/plugins/publisher.ts","../src/plugins/reactions.ts","../src/plugins/relaylists.ts","../src/plugins/relaymanagement.ts","../src/plugins/relaymembers.ts","../src/plugins/relayroles.ts","../src/plugins/relaystats.ts","../src/plugins/relays.ts","../src/plugins/roomlists.ts","../src/plugins/roompins.ts","../src/plugins/rooms.ts","../src/plugins/router.ts","../src/plugins/searchrelaylists.ts","../src/plugins/sync.ts","../src/plugins/topics.ts","../src/plugins/wot.ts","../src/plugins/wraps.ts","../src/plugins/zapgoals.ts","../src/plugins/zappers.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/app",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "author": "hodlbod",
   "license": "MIT",
   "description": "An instance-based, composable client for building nostr applications",
@@ -21,13 +21,13 @@
   "peerDependencies": {
     "@pomade/core": "^0.3.3",
     "svelte": "^4.0.0 || ^5.0.0",
-    "@welshman/net": "0.11.2",
-    "@welshman/lib": "0.11.2",
-    "@welshman/signer": "0.11.2",
-    "@welshman/store": "0.11.2",
-    "@welshman/domain": "0.11.2",
-    "@welshman/util": "0.11.2",
-    "@welshman/feeds": "0.11.2"
+    "@welshman/domain": "0.12.0",
+    "@welshman/lib": "0.12.0",
+    "@welshman/feeds": "0.12.0",
+    "@welshman/net": "0.12.0",
+    "@welshman/signer": "0.12.0",
+    "@welshman/util": "0.12.0",
+    "@welshman/store": "0.12.0"
   },
   "devDependencies": {
     "rimraf": "~6.0.0",
@@ -35,13 +35,13 @@
     "@pomade/core": "^0.3.3",
     "@types/throttle-debounce": "^5.0.2",
     "svelte": "5.55.9",
-    "@welshman/domain": "0.11.2",
-    "@welshman/lib": "0.11.2",
-    "@welshman/net": "0.11.2",
-    "@welshman/signer": "0.11.2",
-    "@welshman/util": "0.11.2",
-    "@welshman/store": "0.11.2",
-    "@welshman/feeds": "0.11.2"
+    "@welshman/lib": "0.12.0",
+    "@welshman/net": "0.12.0",
+    "@welshman/feeds": "0.12.0",
+    "@welshman/signer": "0.12.0",
+    "@welshman/domain": "0.12.0",
+    "@welshman/util": "0.12.0",
+    "@welshman/store": "0.12.0"
   },
   "scripts": {
     "build": "pnpm run clean && pnpm run compile --force",

package/dist/app/src/plugins/thunk.d.ts

@@ -1,76 +0,0 @@
-import type { Subscriber } from "svelte/store";
-import type { Override } from "@welshman/lib";
-import { TaskQueue } from "@welshman/lib";
-import { HashedEvent, EventTemplate, SignedEvent } from "@welshman/util";
-import { PublishStatus, PublishResult, PublishOptions, PublishResultsByRelay } from "@welshman/net";
-import type { IApp } from "../app.js";
-import { User } from "../user.js";
-export type ThunkOptions = Override<PublishOptions, {
-    app: IApp;
-    event: EventTemplate;
-    recipient?: string;
-    delay?: number;
-    pow?: number;
-}>;
-/**
- * Shared base for `Thunk` and `MergedThunk`: a subscribable bag of per-relay
- * publish `results`.
- */
-export declare abstract class BaseThunk {
-    _subs: Subscriber<any>[];
-    results: PublishResultsByRelay;
-    abstract abort(): void;
-    _notify(): void;
-    subscribe(subscriber: Subscriber<this>): () => void;
-    getUrlsWithStatus(statuses: PublishStatus | PublishStatus[]): string[];
-    getCompleteUrls(): string[];
-    getIncompleteUrls(): string[];
-    getFailedUrls(): string[];
-    hasStatus(statuses: PublishStatus | PublishStatus[]): boolean;
-    isComplete(): boolean;
-    getError(): string | undefined;
-    waitForError(): Promise<string>;
-    waitForCompletion(): Promise<void>;
-}
-export declare class Thunk extends BaseThunk {
-    readonly options: Override<ThunkOptions, {
-        event: HashedEvent;
-    }>;
-    complete: import("@welshman/lib").Deferred<void, void>;
-    controller: AbortController;
-    wrap?: SignedEvent;
-    initialId: string;
-    constructor(options: ThunkOptions);
-    get user(): User;
-    _fail(detail: string): void;
-    _setPending: (result: PublishResult) => void;
-    _setTimeout: (result: PublishResult) => void;
-    _setAborted: (result: PublishResult) => void;
-    _publish(event: SignedEvent): Promise<void>;
-    publish(): Promise<void>;
-    abort(): void;
-}
-export declare class MergedThunk extends BaseThunk {
-    readonly thunks: Thunk[];
-    constructor(thunks: Thunk[]);
-    abort(): void;
-}
-/**
- * Per-app thunk manager — the publish-side counterpart of `Network`. Owns
- * the app's optimistic-publish `history` store and the `queue` that paces
- * publishing. Reach it via `app.use(Thunks)`; `publish` fills in the app
- * (the acting user is derived from it), enqueues the thunk (optimistically
- * writing it to the repository), and returns it.
- */
-export declare class Thunks {
-    readonly app: IApp;
-    history: import("svelte/store").Writable<Thunk[]>;
-    queue: TaskQueue<Thunk>;
-    constructor(app: IApp);
-    enqueue(thunk: Thunk): void;
-    publish: (options: Omit<ThunkOptions, "app">) => Thunk;
-    retry: (thunk: BaseThunk) => Thunk | MergedThunk;
-    merge(thunks: BaseThunk[]): MergedThunk;
-    flatten(thunks: BaseThunk[]): Iterable<Thunk>;
-}
-//# sourceMappingURL=thunk.d.ts.map

package/dist/app/src/plugins/thunk.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAS,SAAS,EAAmD,MAAM,eAAe,CAAA;AACjG,OAAO,EACL,WAAW,EACX,aAAa,EACb,WAAW,EAKZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAC,MAAM,eAAe,CAAA;AAEjG,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAE/B,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,cAAc,EACd;IACE,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED;;;GAGG;AACH,8BAAsB,SAAS;IAC7B,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAK;IAC7B,OAAO,EAAE,qBAAqB,CAAK;IAEnC,QAAQ,CAAC,KAAK,IAAI,IAAI;IAEtB,OAAO;IAMP,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC;IAUtC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE,GAKvC,MAAM,EAAE;IAG5B,eAAe;IAMf,iBAAiB;IAIjB,aAAa;IAIb,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE;IAInD,UAAU;IAIV,QAAQ;IAYR,YAAY;IAYZ,iBAAiB;CASlB;AAED,qBAAa,KAAM,SAAQ,SAAS;IAClC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,EAAE;QAAC,KAAK,EAAE,WAAW,CAAA;KAAC,CAAC,CAAA;IAC9D,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;IAGlB,SAAS,EAAE,MAAM,CAAA;gBAEL,OAAO,EAAE,YAAY;IA6BjC,IAAI,IAAI,SAEP;IAED,KAAK,CAAC,MAAM,EAAE,MAAM;IAYpB,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAEK,QAAQ,CAAC,KAAK,EAAE,WAAW;IA0C3B,OAAO;IA8Eb,KAAK;CAGN;AAED,qBAAa,WAAY,SAAQ,SAAS;IAC5B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;gBAAf,MAAM,EAAE,KAAK,EAAE;IA6BpC,KAAK;CAGN;AAED;;;;;;GAMG;AACH,qBAAa,MAAM;IAWL,QAAQ,CAAC,GAAG,EAAE,IAAI;IAV9B,OAAO,2CAAwB;IAE/B,KAAK,mBAMH;gBAEmB,GAAG,EAAE,IAAI;IAe9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAsBpB,OAAO,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAM5C;IAED,KAAK,GAAI,OAAO,SAAS,yBAMxB;IAED,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;IAIxB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;CAS/C"}