@welshman/app 0.9.0-pre1 → 0.9.0-pre3

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

@@ -1,43 +1,68 @@
-import { fetchJson } from "@welshman/lib";
-import { displayRelayUrl, displayRelayProfile } from "@welshman/util";
-import { LoadableMapPlugin } from "./base.js";
+import { derived } from "svelte/store";
+import { displayRelayUrl } from "@welshman/util";
+import { Relay } from "@welshman/domain";
+import { LoadableMapPlugin, RelayScopedDerivedPlugin, createSearch } from "./base.js";
 /**
  * NIP-11 relay profiles, keyed by url. A "local" loadable collection: items
  * aren't nostr events, they're fetched over HTTP from each relay.
  */
 export class Relays extends LoadableMapPlugin {
+    relaySearch = derived(this.all.$, $relays => createSearch($relays, {
+        getValue: (relay) => relay.url,
+        fuseOptions: {
+            keys: ["url", "name", { name: "description", weight: 0.3 }],
+        },
+    }));
     fetch = async (url) => {
+        const httpUrl = url.replace(/^ws/, "http");
         try {
-            const json = await fetchJson(url.replace(/^ws/, "http"), {
-                headers: {
-                    Accept: "application/nostr+json",
-                },
+            // Don't auto-follow redirects, so a relay whose metadata document has moved
+            // (301/302) is recorded via `redirect_to` rather than silently resolved.
+            const res = await globalThis.fetch(httpUrl, {
+                headers: { Accept: "application/nostr+json" },
+                redirect: "manual",
             });
-            if (json) {
-                const info = { ...json, url };
-                if (!Array.isArray(info.supported_nips)) {
-                    info.supported_nips = [];
+            if (res.status === 301 || res.status === 302) {
+                const location = res.headers.get("location");
+                if (location) {
+                    const relay = new Relay(url, { redirect_to: new URL(location, httpUrl).href });
+                    this.set(url, relay);
+                    return relay;
                 }
-                info.supported_nips = info.supported_nips.map(String);
-                this.set(url, info);
-                return info;
+                return;
+            }
+            const json = await res.json();
+            if (json) {
+                const relay = new Relay(url, json);
+                this.set(url, relay);
+                return relay;
             }
         }
         catch (e) {
             // pass
         }
     };
-    display = (url) => this.project(url, $relay => displayRelayProfile($relay, displayRelayUrl(url)));
-    hasNegentropy = async (url) => {
-        const relay = await this.load(url);
-        if (relay?.negentropy)
-            return true;
-        if (relay?.supported_nips?.includes("77"))
-            return true;
-        if (relay?.software?.includes?.("strfry") && !relay?.version?.match(/^0\./))
-            return true;
-        return false;
-    };
-    hasNip = async (url, nip) => (await this.load(url))?.supported_nips?.includes(String(nip)) ?? false;
+    display = (url) => this.project(url, $relay => $relay?.display() ?? displayRelayUrl(url));
+    hasNegentropy = async (url) => (await this.load(url))?.hasNegentropy() ?? false;
+    hasNip = async (url, nip) => (await this.load(url))?.hasNip(nip) ?? false;
+}
+/**
+ * A `RelayScopedDerivedPlugin` that additionally validates provenance: an item
+ * is only keyed on a relay when the relay ITSELF signed it — i.e. the event's
+ * author matches the relay's NIP-11 `self` pubkey. This is the trust model for
+ * relay-hosted, relay-signed content (NIP-29 room state, relay membership and
+ * roles), and rejects events of these kinds forged by other pubkeys.
+ *
+ * Relay self pubkeys load from NIP-11 and can arrive after the events, so the
+ * collection re-evaluates whenever the relay-profile collection changes.
+ */
+export class RelaySignedDerivedPlugin extends RelayScopedDerivedPlugin {
+    constructor(app, options) {
+        super(app, {
+            ...options,
+            getKey: (item, url) => item.author() === app.use(Relays).get(url)?.self ? options.getKey(item, url) : undefined,
+            revalidateOn: app.use(Relays).index.$,
+        });
+    }
 }
 //# sourceMappingURL=relays.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../../src/plugins/relays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAA;AAEnE,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAG3C;;;GAGG;AACH,MAAM,OAAO,MAAO,SAAQ,iBAA+B;IACzD,KAAK,GAAG,KAAK,EAAE,GAAW,EAAgC,EAAE;QAC1D,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;gBACvD,OAAO,EAAE;oBACP,MAAM,EAAE,wBAAwB;iBACjC;aACF,CAAC,CAAA;YAEF,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,IAAI,GAAG,EAAC,GAAG,IAAI,EAAE,GAAG,EAAiB,CAAA;gBAE3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;oBACxC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAA;gBAC1B,CAAC;gBAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAErD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;gBAEnB,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO;QACT,CAAC;IACH,CAAC,CAAA;IAED,OAAO,GAAG,CAAC,GAAW,EAAsB,EAAE,CAC5C,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAEhF,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,KAAK,EAAE,UAAU;YAAE,OAAO,IAAI,CAAA;QAClC,IAAI,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAA;QACtD,IAAI,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QAExF,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,MAAM,GAAG,KAAK,EAAE,GAAW,EAAE,GAAoB,EAAE,EAAE,CACnD,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAA;CACzE"}
+{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../../src/plugins/relays.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,26 @@
+import type { Maybe } from "@welshman/lib";
+import { RoomListReader, RoomListWriter } from "@welshman/domain";
+import type { Command } from "../command.js";
+import { DerivedPlugin } from "./base.js";
+import type { Projection } from "./base.js";
+import type { IApp } from "../app.js";
+/**
+ * NIP-51 kind-10009 room lists (relays the user belongs to, and the rooms on
+ * them), keyed by pubkey. Loaded via the outbox model (the author's write
+ * relays), so it depends on the relay-list collection.
+ */
+export declare class RoomLists extends DerivedPlugin<RoomListReader> {
+    constructor(app: IApp);
+    fetch(pubkey: string, relayHints?: string[]): Promise<import("@welshman/util").TrustedEvent | undefined>;
+    urls: (pubkey: string) => Projection<string[]>;
+    roomsForUrl: (pubkey: string, url: string) => Projection<string[]>;
+    pubkeysForUrl: (url: string) => Projection<string[]>;
+    update: (fn: (writer: RoomListWriter) => void) => Promise<Command>;
+    addRoom: (roomId: string, url: string) => Promise<Command>;
+    removeRoom: (roomId: string, url?: string) => Promise<Command>;
+    addRelay: (url: string) => Promise<Command>;
+    removeRelay: (url: string) => Promise<Command>;
+    setRelays: (urls: string[]) => Promise<Command>;
+    migrateRelay: (oldUrl: string, newUrl: string) => Promise<Maybe<Command>>;
+}
+//# sourceMappingURL=roomLists.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"roomLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/roomLists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,EAAW,cAAc,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAA;AACzE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAc,MAAM,WAAW,CAAA;AACpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,aAAa,CAAC,cAAc,CAAC;gBAC9C,GAAG,EAAE,IAAI;IAQrB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO;IAI/C,IAAI,GAAI,QAAQ,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAoD;IAEjG,WAAW,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CACL;IAE5D,aAAa,GAAI,KAAK,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAGhD;IAEH,MAAM,GAAU,IAAI,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,sBAOnD;IAED,OAAO,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,sBAAuD;IAE7F,UAAU,GAAI,QAAQ,MAAM,EAAE,MAAM,MAAM,sBACa;IAEvD,QAAQ,GAAI,KAAK,MAAM,sBAAgD;IAEvE,WAAW,GAAI,KAAK,MAAM,sBAAmD;IAE7E,SAAS,GAAI,MAAM,MAAM,EAAE,sBAAkD;IAI7E,YAAY,GAAU,QAAQ,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAW7E;CACF"}

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

@@ -0,0 +1,50 @@
+import { ROOMS, normalizeRelayUrl } from "@welshman/util";
+import { RoomList } from "@welshman/domain";
+import { DerivedPlugin, projectFrom } from "./base.js";
+import { Network } from "./network.js";
+import { Domain } from "./domain.js";
+import { User } from "../user.js";
+/**
+ * NIP-51 kind-10009 room lists (relays the user belongs to, and the rooms on
+ * them), keyed by pubkey. Loaded via the outbox model (the author's write
+ * relays), so it depends on the relay-list collection.
+ */
+export class RoomLists extends DerivedPlugin {
+    constructor(app) {
+        super(app, {
+            filters: [{ kinds: [ROOMS] }],
+            eventToItem: app.use(Domain).reader(RoomList),
+            getKey: list => list.author(),
+        });
+    }
+    fetch(pubkey, relayHints = []) {
+        return this.app.use(Network).loadUsingOutbox(pubkey, { kinds: [ROOMS] }, relayHints);
+    }
+    urls = (pubkey) => this.project(pubkey, list => list?.urls() ?? []);
+    roomsForUrl = (pubkey, url) => this.project(pubkey, list => list?.roomsForUrl(url) ?? []);
+    pubkeysForUrl = (url) => projectFrom(this.all, lists => lists.filter(list => list.urls().includes(normalizeRelayUrl(url))).map(list => list.author()));
+    update = async (fn) => {
+        const user = User.require(this.app);
+        const writer = this.app.use(Domain).writer(RoomList, await this.forceLoad(user.pubkey));
+        fn(writer);
+        return this.app.use(Domain).command(writer);
+    };
+    addRoom = (roomId, url) => this.update(writer => writer.addRoom(roomId, url));
+    removeRoom = (roomId, url) => this.update(writer => writer.removeRoom(roomId, url));
+    addRelay = (url) => this.update(writer => writer.addRelay(url));
+    removeRelay = (url) => this.update(writer => writer.removeRelay(url));
+    setRelays = (urls) => this.update(writer => writer.setRelays(urls));
+    // Point every reference to a relay at its new url. Resolves to undefined when there's
+    // nothing to do, so a no-op migration doesn't publish.
+    migrateRelay = async (oldUrl, newUrl) => {
+        const from = normalizeRelayUrl(oldUrl);
+        const to = normalizeRelayUrl(newUrl);
+        if (from === to)
+            return undefined;
+        const user = User.require(this.app);
+        if (!this.get(user.pubkey)?.urls().includes(from))
+            return undefined;
+        return this.update(writer => writer.migrateRelay(from, to));
+    };
+}
+//# sourceMappingURL=roomLists.js.map

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

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

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

@@ -0,0 +1,18 @@
+import { RoomPinsReader } from "@welshman/domain";
+import type { Projection } from "./base.js";
+import { RelaySignedDerivedPlugin } from "./relays.js";
+import type { IApp } from "../app.js";
+/**
+ * NIP-29 kind-39005 room pin lists, keyed by `${url}'${h}` like the rest of a room's state.
+ * The relay authors the list, so only its own signature counts; clients ask for a change with
+ * a kind-9010 op and the relay republishes the list.
+ */
+export declare class RoomPinLists extends RelaySignedDerivedPlugin<RoomPinsReader> {
+    constructor(app: IApp);
+    fetch(key: string, signal?: AbortSignal): Promise<import("@welshman/util").TrustedEvent[]>;
+    forRoom: (url: string, h: string) => import("svelte/store").Readable<import("@welshman/lib").Maybe<RoomPinsReader>>;
+    loadForRoom: (url: string, h: string, signal?: AbortSignal) => Promise<import("@welshman/lib").Maybe<RoomPinsReader>>;
+    pins: (url: string, h: string) => Projection<string[]>;
+    setPins: (url: string, h: string, idsOrAddresses: string[]) => Promise<import("../command.js").Command>;
+}
+//# sourceMappingURL=roomPins.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"roomPins.d.ts","sourceRoot":"","sources":["../../../../src/plugins/roomPins.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAEzE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAGzC,OAAO,EAAC,wBAAwB,EAAC,MAAM,aAAa,CAAA;AAEpD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,wBAAwB,CAAC,cAAc,CAAC;gBAC5D,GAAG,EAAE,IAAI;IAQrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAQvC,OAAO,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,oFAAkC;IAEnE,WAAW,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,EAAE,SAAS,WAAW,4DACd;IAE7C,IAAI,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAC2B;IAEhF,OAAO,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,EAAE,gBAAgB,MAAM,EAAE,8CAGsC;CAClG"}

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

@@ -0,0 +1,34 @@
+import { ROOM_PINS } from "@welshman/util";
+import { RoomPins, RoomUpdatePins } from "@welshman/domain";
+import { projectFrom } from "./base.js";
+import { Domain } from "./domain.js";
+import { Network } from "./network.js";
+import { RelaySignedDerivedPlugin } from "./relays.js";
+import { makeRoomKey, splitRoomKey } from "./rooms.js";
+/**
+ * NIP-29 kind-39005 room pin lists, keyed by `${url}'${h}` like the rest of a room's state.
+ * The relay authors the list, so only its own signature counts; clients ask for a change with
+ * a kind-9010 op and the relay republishes the list.
+ */
+export class RoomPinLists extends RelaySignedDerivedPlugin {
+    constructor(app) {
+        super(app, {
+            filters: [{ kinds: [ROOM_PINS] }],
+            eventToItem: app.use(Domain).reader(RoomPins),
+            getKey: (pins, url) => makeRoomKey(url, pins.identifier() ?? ""),
+        });
+    }
+    fetch(key, signal) {
+        const [url, h] = splitRoomKey(key);
+        return this.app
+            .use(Network)
+            .load({ relays: [url], signal, filters: [{ kinds: [ROOM_PINS], "#d": [h] }] });
+    }
+    forRoom = (url, h) => this.one(makeRoomKey(url, h));
+    loadForRoom = (url, h, signal) => this.forceLoad(makeRoomKey(url, h), signal);
+    pins = (url, h) => projectFrom(this.index, byKey => byKey.get(makeRoomKey(url, h))?.pins() ?? []);
+    setPins = (url, h, idsOrAddresses) => this.app
+        .use(Domain)
+        .command(this.app.use(Domain).writer(RoomUpdatePins).setRoom(url, h).setPins(idsOrAddresses));
+}
+//# sourceMappingURL=roomPins.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"roomPins.js","sourceRoot":"","sources":["../../../../src/plugins/roomPins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAC,QAAQ,EAAkB,cAAc,EAAC,MAAM,kBAAkB,CAAA;AACzE,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,wBAAwB,EAAC,MAAM,aAAa,CAAA;AACpD,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,YAAY,CAAA;AAGpD;;;;GAIG;AACH,MAAM,OAAO,YAAa,SAAQ,wBAAwC;IACxE,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC;YAC/B,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;SACjE,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,MAAoB;QACrC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QAElC,OAAO,IAAI,CAAC,GAAG;aACZ,GAAG,CAAC,OAAO,CAAC;aACZ,IAAI,CAAC,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAA;IAC9E,CAAC;IAED,OAAO,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IAEnE,WAAW,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,MAAoB,EAAE,EAAE,CAC7D,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAE7C,IAAI,GAAG,CAAC,GAAW,EAAE,CAAS,EAAwB,EAAE,CACtD,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAEhF,OAAO,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,cAAwB,EAAE,EAAE,CAC7D,IAAI,CAAC,GAAG;SACL,GAAG,CAAC,MAAM,CAAC;SACX,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAA;CAClG"}

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

@@ -1,4 +1,19 @@
+import type { Readable } from "svelte/store";
+import type { Maybe } from "@welshman/lib";
+import type { ItemsByKey } from "@welshman/store";
+import { RoomMetaReader, RoomMembersReader, RoomAdminsReader } from "@welshman/domain";
+import type { Projection } from "./base.js";
 import type { IApp } from "../app.js";
+export declare const makeRoomKey: (url: string, room: string) => string;
+export declare const splitRoomKey: (key: string) => [string, string];
+export type Room = {
+    h: string;
+    id: string;
+    url: string;
+    meta?: RoomMetaReader;
+    members?: RoomMembersReader;
+    admins?: RoomAdminsReader;
+};
 export type RoomMeta = {
     h: string;
     name?: string;
@@ -12,19 +27,33 @@ export type RoomMeta = {
     livekit?: boolean;
 };
 /**
- * NIP-29 relay-based group (room) management. Each method publishes the relevant
- * room event to the given relay as the app's user.
+ * NIP-29 relay-based rooms. A `${url}'${h}`-keyed collection whose values bundle
+ * a room's metadata, members, and admins, derived from the repository so a space
+ * can be enumerated without loading each room by id. Also owns room management.
+ *
+ * Rooms a kind-9008 delete supersedes are dropped, so a tombstoned room stops
+ * appearing without the caller having to filter.
  */
 export declare class Rooms {
-    readonly app: IApp;
+    protected readonly app: IApp;
+    index: Projection<ItemsByKey<Room>>;
+    all: Projection<Room[]>;
+    byUrl: Projection<Map<string, Room[]>>;
+    one: (key?: string, ...args: any[]) => Readable<Maybe<Room>>;
+    load: (key: string, ...args: any[]) => Promise<Maybe<Room>>;
+    forceLoad: (key: string, ...args: any[]) => Promise<Maybe<Room>>;
     constructor(app: IApp);
-    private publish;
-    create: (url: string, room: RoomMeta) => Promise<import("./thunk.js").Thunk>;
-    delete: (url: string, room: RoomMeta) => Promise<import("./thunk.js").Thunk>;
-    edit: (url: string, room: RoomMeta) => Promise<import("./thunk.js").Thunk>;
-    join: (url: string, room: RoomMeta) => Promise<import("./thunk.js").Thunk>;
-    leave: (url: string, room: RoomMeta) => Promise<import("./thunk.js").Thunk>;
-    addMember: (url: string, room: RoomMeta, pubkey: string) => Promise<import("./thunk.js").Thunk>;
-    removeMember: (url: string, room: RoomMeta, pubkey: string) => Promise<import("./thunk.js").Thunk>;
+    fetch: (id: string) => Promise<import("@welshman/util").TrustedEvent[]>;
+    get: (key: string) => Room | undefined;
+    project: <U>(key: string, read: (item: Maybe<Room>) => U) => Projection<U>;
+    forRoom: (url: string, h: string) => Readable<Maybe<Room>>;
+    forUrl: (url: string) => Projection<Room[]>;
+    createRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
+    deleteRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
+    editRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
+    joinRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
+    leaveRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
+    addMember: (url: string, room: RoomMeta, pubkey: string) => Promise<import("../command.js").Command>;
+    removeMember: (url: string, room: RoomMeta, pubkey: string) => Promise<import("../command.js").Command>;
 }
 //# sourceMappingURL=rooms.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../../../src/plugins/rooms.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAGnC,MAAM,MAAM,QAAQ,GAAG;IACrB,CAAC,EAAE,MAAM,CAAA;IACT,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED;;;GAGG;AACH,qBAAa,KAAK;IACJ,QAAQ,CAAC,GAAG,EAAE,IAAI;gBAAT,GAAG,EAAE,IAAI;IAE9B,OAAO,CAAC,OAAO,CACuC;IAEtD,MAAM,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,yCACqC;IAEhF,MAAM,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,yCACqC;IAEhF,IAAI,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,yCAexC;IAED,IAAI,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,yCACqC;IAE9E,KAAK,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,yCACqC;IAE/E,SAAS,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,EAAE,QAAQ,MAAM,yCAI3D;IAEH,YAAY,GAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,EAAE,QAAQ,MAAM,yCAI9D;CACJ"}
+{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../../../src/plugins/rooms.ts"],"names":[],"mappings":"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"}

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

@@ -1,36 +1,149 @@
-import { RoomCreateBuilder, RoomDeleteBuilder, RoomEditBuilder, RoomJoinBuilder, RoomLeaveBuilder, RoomAddMemberBuilder, RoomRemoveMemberBuilder, } from "@welshman/domain";
-import { Thunks } from "./thunk.js";
+import { derived } from "svelte/store";
+import { gte, max, pushToMapKey } from "@welshman/lib";
+import { ROOM_META, ROOM_MEMBERS, ROOM_ADMINS, ROOM_DELETE, tagSpec, tagValues } from "@welshman/util";
+import { deriveEventsByIdByUrl, deriveItems, deriveItemsByKeyByUrl, makeDeriveItem, makeForceLoadItem, makeLoadItem, } from "@welshman/store";
+import { RoomCreate, RoomDelete, RoomEdit, RoomJoin, RoomLeave, RoomAddMember, RoomRemoveMember, RoomMeta as RoomMetaKind, RoomMembers, RoomAdmins, } from "@welshman/domain";
+import { projection, projectFrom } from "./base.js";
+import { Domain } from "./domain.js";
+import { Network } from "./network.js";
+import { Relays } from "./relays.js";
+// NIP-29 room metadata (kinds 39000–39002) is addressable per room but hosted
+// on a specific relay, so the same room id can exist independently on many
+// relays. Key it by `${url}'${room}` (the `'` separator matches flotilla's
+// room-id convention; relay urls never contain it).
+export const makeRoomKey = (url, room) => `${url}'${room}`;
+export const splitRoomKey = (key) => {
+    const i = key.indexOf("'");
+    return [key.slice(0, i), key.slice(i + 1)];
+};
+// One room-state kind, keyed per relay. The three kinds are authored by the
+// relay itself, so an event only counts when its author matches the relay's
+// NIP-11 `self` pubkey — that rejects room state forged by other pubkeys.
+// Self pubkeys load from NIP-11 and can arrive after the events, so this
+// re-evaluates whenever the relay-profile collection changes.
+const deriveRoomState = (app, kind, eventToItem) => deriveItemsByKeyByUrl({
+    filters: [{ kinds: [kind] }],
+    eventToItem,
+    getKey: (item, url) => item.author() === app.use(Relays).get(url)?.self
+        ? makeRoomKey(url, item.identifier() ?? "")
+        : undefined,
+    revalidateOn: app.use(Relays).index.$,
+    tracker: app.tracker,
+    repository: app.repository,
+});
 /**
- * NIP-29 relay-based group (room) management. Each method publishes the relevant
- * room event to the given relay as the app's user.
+ * NIP-29 relay-based rooms. A `${url}'${h}`-keyed collection whose values bundle
+ * a room's metadata, members, and admins, derived from the repository so a space
+ * can be enumerated without loading each room by id. Also owns room management.
+ *
+ * Rooms a kind-9008 delete supersedes are dropped, so a tombstoned room stops
+ * appearing without the caller having to filter.
  */
 export class Rooms {
     app;
+    index;
+    all;
+    byUrl;
+    one;
+    load;
+    forceLoad;
     constructor(app) {
         this.app = app;
+        // Deletes are moderation ops rather than relay-signed room state, so they
+        // aren't self-checked, and one event can tombstone several rooms at once.
+        // Keep the newest per room, since a room can be re-created after a delete.
+        const deletedAt = derived(deriveEventsByIdByUrl({
+            filters: [{ kinds: [ROOM_DELETE] }],
+            tracker: app.tracker,
+            repository: app.repository,
+        }), $eventsByIdByUrl => {
+            const result = new Map();
+            for (const [url, eventsById] of $eventsByIdByUrl) {
+                for (const event of eventsById.values()) {
+                    for (const h of tagValues(tagSpec("h"), event.tags)) {
+                        const key = makeRoomKey(url, h);
+                        result.set(key, max([result.get(key), event.created_at]));
+                    }
+                }
+            }
+            return result;
+        });
+        const index = derived([
+            deriveRoomState(app, ROOM_META, app.use(Domain).reader(RoomMetaKind)),
+            deriveRoomState(app, ROOM_MEMBERS, app.use(Domain).reader(RoomMembers)),
+            deriveRoomState(app, ROOM_ADMINS, app.use(Domain).reader(RoomAdmins)),
+            deletedAt,
+        ], ([$metas, $members, $admins, $deletedAt]) => {
+            const result = new Map();
+            for (const id of new Set([...$metas.keys(), ...$members.keys(), ...$admins.keys()])) {
+                const meta = $metas.get(id);
+                const members = $members.get(id);
+                const admins = $admins.get(id);
+                const createdAt = max([meta?.createdAt(), members?.createdAt(), admins?.createdAt()]);
+                if (gte($deletedAt.get(id), createdAt))
+                    continue;
+                const [url, h] = splitRoomKey(id);
+                result.set(id, { id, url, h, meta, members, admins });
+            }
+            return result;
+        });
+        this.index = projection(index);
+        this.all = projection(deriveItems(index));
+        this.byUrl = projectFrom(this.index, byKey => {
+            const result = new Map();
+            for (const room of byKey.values()) {
+                pushToMapKey(result, room.url, room);
+            }
+            return result;
+        });
+        const fetch = (key) => this.fetch(key);
+        const read = (key) => this.index.get().get(key);
+        this.load = makeLoadItem(fetch, read);
+        this.forceLoad = makeForceLoadItem(fetch, read);
+        this.one = makeDeriveItem(index, this.load);
     }
-    publish = (url, event) => this.app.use(Thunks).publish({ event, relays: [url] });
-    create = async (url, room) => this.publish(url, await new RoomCreateBuilder().setGroup(room.h).toTemplate());
-    delete = async (url, room) => this.publish(url, await new RoomDeleteBuilder().setGroup(room.h).toTemplate());
-    edit = async (url, room) => {
-        const builder = new RoomEditBuilder().setGroup(room.h);
+    // The relay's `self` pubkey gates every room-state event, so load the relay
+    // profile before the events that depend on it.
+    fetch = async (id) => {
+        const [url, h] = splitRoomKey(id);
+        await this.app.use(Relays).load(url);
+        return this.app.use(Network).load({
+            relays: [url],
+            filters: [
+                { kinds: [ROOM_META, ROOM_MEMBERS, ROOM_ADMINS], "#d": [h] },
+                { kinds: [ROOM_DELETE], "#h": [h] },
+            ],
+        });
+    };
+    get = (key) => this.index.get().get(key);
+    project = (key, read) => projection(derived(this.one(key), read), () => read(this.get(key)));
+    forRoom = (url, h) => this.one(makeRoomKey(url, h));
+    forUrl = (url) => projectFrom(this.byUrl, byUrl => byUrl.get(url) ?? []);
+    createRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomCreate).setRoom(url, room.h));
+    deleteRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomDelete).setRoom(url, room.h));
+    editRoom = (url, room) => {
+        const writer = this.app.use(Domain).writer(RoomEdit).setRoom(url, room.h);
         if (room.name)
-            builder.setName(room.name);
+            writer.setName(room.name);
         if (room.about)
-            builder.setAbout(room.about);
+            writer.setAbout(room.about);
         if (room.picture)
-            builder.setPicture(room.picture, room.pictureMeta);
-        builder
+            writer.setPicture(room.picture, room.pictureMeta);
+        writer
             .setClosed(Boolean(room.isClosed))
             .setHidden(Boolean(room.isHidden))
             .setPrivate(Boolean(room.isPrivate))
             .setRestricted(Boolean(room.isRestricted))
             .setLivekit(Boolean(room.livekit));
-        return this.publish(url, await builder.toTemplate());
+        return this.app.use(Domain).command(writer);
     };
-    join = async (url, room) => this.publish(url, await new RoomJoinBuilder().setGroup(room.h).toTemplate());
-    leave = async (url, room) => this.publish(url, await new RoomLeaveBuilder().setGroup(room.h).toTemplate());
-    addMember = async (url, room, pubkey) => this.publish(url, await new RoomAddMemberBuilder().setGroup(room.h).addPubkey(pubkey).toTemplate());
-    removeMember = async (url, room, pubkey) => this.publish(url, await new RoomRemoveMemberBuilder().setGroup(room.h).addPubkey(pubkey).toTemplate());
+    joinRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomJoin).setRoom(url, room.h));
+    leaveRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomLeave).setRoom(url, room.h));
+    addMember = (url, room, pubkey) => this.app
+        .use(Domain)
+        .command(this.app.use(Domain).writer(RoomAddMember).setRoom(url, room.h).addPubkey(pubkey));
+    removeMember = (url, room, pubkey) => this.app
+        .use(Domain)
+        .command(this.app.use(Domain).writer(RoomRemoveMember).setRoom(url, room.h).addPubkey(pubkey));
 }
 //# sourceMappingURL=rooms.js.map

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

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

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

@@ -1,13 +1,25 @@
-import { Router as BaseRouter } from "@welshman/router";
+import { Resolver } from "@welshman/util";
+import type { RelayRoute, RelaySelection } from "@welshman/util";
+import type { FeedRouter } from "@welshman/feeds";
 import type { IApp } from "../app.js";
 /**
- * The upstream `@welshman/router` Router, wired to this app: relay lists come
- * from the `RelayLists` collection, quality from `RelayStats`, and the user
- * pubkey + relay-getters from the app (via `app.config`). Reach it via
- * `app.use(Router)`. This replaces the old forked copy — one source of truth,
- * no global `routerContext`/`Router.get()`.
+ * The app's relay router. Reach it via `app.use(Router)`.
+ *
+ * `resolve(selections)` turns the declarative `RelaySelection` DSL (from
+ * `@welshman/util`) into a scored `RelayScenario`. `resolver` turns a single
+ * declarative route into concrete urls (the domain kinds' resolver, injected via
+ * `app.use(Domain)`).
  */
-export declare class Router extends BaseRouter {
+export declare class Router implements FeedRouter {
+    readonly app: IApp;
+    resolver: Resolver;
     constructor(app: IApp);
+    resolve: (selections: RelaySelection[]) => Promise<import("@welshman/util").RelayScenario>;
+    resolveRoute: (route: RelayRoute) => string[] | Promise<string[]>;
+    private inboxRelays;
+    private outboxRelays;
+    private messagingRelays;
+    private resolveEvent;
+    private resolveSeen;
 }
 //# sourceMappingURL=router.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../src/plugins/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAGrD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;;;GAMG;AACH,qBAAa,MAAO,SAAQ,UAAU;gBACxB,GAAG,EAAE,IAAI;CActB"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../src/plugins/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAA6B,MAAM,gBAAgB,CAAA;AACnE,OAAO,KAAK,EAAC,UAAU,EAAE,cAAc,EAAW,MAAM,gBAAgB,CAAA;AACxE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAK/C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,UAAU;IAG3B,QAAQ,CAAC,GAAG,EAAE,IAAI;IAF9B,QAAQ,EAAE,QAAQ,CAAA;gBAEG,GAAG,EAAE,IAAI;IAQ9B,OAAO,GAAI,YAAY,cAAc,EAAE,qDAAuC;IAG9E,YAAY,GAAI,OAAO,UAAU,kCA2BhC;IAGD,OAAO,CAAC,WAAW,CAC8D;IAGjF,OAAO,CAAC,YAAY,CAC8D;IAGlF,OAAO,CAAC,eAAe,CAC+D;IAKtF,OAAO,CAAC,YAAY,CAmBnB;IAID,OAAO,CAAC,WAAW,CAelB;CACF"}