@welshman/app 0.9.0-pre1 → 0.9.0-pre2

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

@@ -1,36 +1,82 @@
-import { RoomCreateBuilder, RoomDeleteBuilder, RoomEditBuilder, RoomJoinBuilder, RoomLeaveBuilder, RoomAddMemberBuilder, RoomRemoveMemberBuilder, } from "@welshman/domain";
-import { Thunks } from "./thunk.js";
+import { gt } from "@welshman/lib";
+import { ROOM_META, ROOM_MEMBERS, ROOM_ADMINS } from "@welshman/util";
+import { RoomCreate, RoomDelete, RoomEdit, RoomJoin, RoomLeave, RoomAddMember, RoomRemoveMember, RoomMeta as RoomMetaKind, RoomMembers, RoomAdmins, } from "@welshman/domain";
+import { LoadableMapPlugin, projectFrom } from "./base.js";
+import { Domain } from "./domain.js";
+import { Network } from "./network.js";
+import { Relays } from "./relays.js";
+// NIP-29 group metadata (kinds 39000–39002) is addressable per group but hosted
+// on a specific relay, so the same group id can exist independently on many
+// relays. Key it by `${url}'${group}` (the `'` separator matches flotilla's
+// room-id convention; relay urls never contain it).
+export const makeGroupKey = (url, group) => `${url}'${group}`;
+export const splitGroupKey = (key) => {
+    const i = key.indexOf("'");
+    return [key.slice(0, i), key.slice(i + 1)];
+};
 /**
- * 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 groups (rooms). A `${url}'${h}`-keyed collection whose
+ * values bundle a room's metadata, members, and admins. Also owns room management.
+ *
+ * The three group-state kinds are authored by the relay itself, so an event is
+ * only merged when its author matches the relay's NIP-11 `self` pubkey.
  */
-export class Rooms {
-    app;
-    constructor(app) {
-        this.app = app;
-    }
-    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);
+export class Rooms extends LoadableMapPlugin {
+    fetch = async (id) => {
+        const [url, h] = splitGroupKey(id);
+        const relay = await this.app.use(Relays).load(url);
+        const room = this.get(id) ?? { id, url, h };
+        await this.app.use(Network).load({
+            relays: [url],
+            filters: [{ kinds: [ROOM_META, ROOM_MEMBERS, ROOM_ADMINS], "#d": [h] }],
+            onEvent: async (event) => {
+                if (event.pubkey !== relay?.self)
+                    return;
+                if (event.kind === ROOM_META && gt(event.created_at, room.meta?.createdAt())) {
+                    room.meta = await this.app.use(Domain).reader(RoomMetaKind)(event);
+                    this.set(id, room);
+                }
+                else if (event.kind === ROOM_MEMBERS && gt(event.created_at, room.members?.createdAt())) {
+                    room.members = await this.app.use(Domain).reader(RoomMembers)(event);
+                    this.set(id, room);
+                }
+                else if (event.kind === ROOM_ADMINS && gt(event.created_at, room.admins?.createdAt())) {
+                    room.admins = await this.app.use(Domain).reader(RoomAdmins)(event);
+                    this.set(id, room);
+                }
+            },
+        });
+        return room;
+    };
+    forGroup = (url, h) => this.one(makeGroupKey(url, h));
+    forUrl = (url) => projectFrom(this.index, byKey => Array.from(byKey.entries())
+        .filter(([key]) => key.startsWith(`${url}'`))
+        .map(([, room]) => room));
+    createRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomCreate).setGroup(url, room.h));
+    deleteRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomDelete).setGroup(url, room.h));
+    editRoom = (url, room) => {
+        const writer = this.app.use(Domain).writer(RoomEdit).setGroup(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).setGroup(url, room.h));
+    leaveRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomLeave).setGroup(url, room.h));
+    addMember = (url, room, pubkey) => this.app
+        .use(Domain)
+        .command(this.app.use(Domain).writer(RoomAddMember).setGroup(url, room.h).addPubkey(pubkey));
+    removeMember = (url, room, pubkey) => this.app
+        .use(Domain)
+        .command(this.app.use(Domain).writer(RoomRemoveMember).setGroup(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"}

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

@@ -1,26 +1,95 @@
-import { RelayMode } from "@welshman/util";
-import { Router as BaseRouter } from "@welshman/router";
+import { uniq } from "@welshman/lib";
+import { Resolver, Address, isReplaceableKind } from "@welshman/util";
 import { RelayLists } from "./relayLists.js";
+import { MessagingRelayLists } from "./messagingRelayLists.js";
 import { RelayStats } from "./relayStats.js";
+import { User } from "../user.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 class Router extends BaseRouter {
+export class Router {
+    app;
+    resolver;
     constructor(app) {
-        super({
-            getUserPubkey: () => app.user?.pubkey,
-            getPubkeyRelays: (pubkey, mode) => (mode === RelayMode.Read
-                ? app.use(RelayLists).readUrls(pubkey)
-                : app.use(RelayLists).writeUrls(pubkey)).get(),
-            getRelayQuality: url => app.use(RelayStats).getQuality(url),
-            getDefaultRelays: app.config.getDefaultRelays,
-            getIndexerRelays: app.config.getIndexerRelays,
-            getSearchRelays: app.config.getSearchRelays,
+        this.app = app;
+        this.resolver = new Resolver(this.resolveRoute, {
+            getRelayQuality: url => this.app.use(RelayStats).getQuality(url),
+            getDefaultRelays: this.app.config.getDefaultRelays,
         });
     }
+    // Resolve selections into a scored `RelayScenario`
+    resolve = (selections) => this.resolver.scenario(selections);
+    // Resolve a single route into concrete relay urls.
+    resolveRoute = (route) => {
+        switch (route.type) {
+            case "userInbox":
+                return this.inboxRelays(User.require(this.app).pubkey);
+            case "userOutbox":
+                return this.outboxRelays(User.require(this.app).pubkey);
+            case "userMessaging":
+                return this.messagingRelays(User.require(this.app).pubkey);
+            case "pubkeyInbox":
+                return this.inboxRelays(route.pubkey);
+            case "pubkeyOutbox":
+                return this.outboxRelays(route.pubkey);
+            case "pubkeyMessaging":
+                return this.messagingRelays(route.pubkey);
+            case "eventInbox":
+                return this.resolveEvent(route.ref, this.inboxRelays);
+            case "eventOutbox":
+                return this.resolveEvent(route.ref, this.outboxRelays);
+            case "seen":
+                return this.resolveSeen(route.ref);
+            case "index":
+                return this.app.config.getIndexerRelays?.() ?? [];
+            case "search":
+                return this.app.config.getSearchRelays?.() ?? [];
+            case "relay":
+                return [route.url];
+        }
+    };
+    // A pubkey's read relays (its inbox — where to deliver so it receives events).
+    inboxRelays = async (pubkey) => pubkey ? ((await this.app.use(RelayLists).load(pubkey))?.readUrls() ?? []) : [];
+    // A pubkey's write relays (its outbox — where its events live).
+    outboxRelays = async (pubkey) => pubkey ? ((await this.app.use(RelayLists).load(pubkey))?.writeUrls() ?? []) : [];
+    // A pubkey's NIP-17 messaging relays.
+    messagingRelays = async (pubkey) => pubkey ? ((await this.app.use(MessagingRelayLists).load(pubkey))?.urls() ?? []) : [];
+    // Resolve an event reference to a pubkey's relays: route directly to a known
+    // pubkey, else look the event up in the repository to find its author, else fall
+    // back to any relay hints on the reference.
+    resolveEvent = async (ref, getRelays) => {
+        const relays = ref.relays ? [...ref.relays] : [];
+        if (ref.pubkey) {
+            relays.push(...(await getRelays(ref.pubkey)));
+        }
+        if (ref.id) {
+            const event = this.app.repository.getEvent(ref.id);
+            if (event) {
+                relays.push(...(await getRelays(event.pubkey)));
+            }
+        }
+        return uniq(relays);
+    };
+    // Relays an event was found on: the tracker's record (keyed by event id) plus
+    // any relay hints carried on the reference.
+    resolveSeen = (ref) => {
+        const relays = ref.relays ? [...ref.relays] : [];
+        if (ref.id) {
+            relays.push(...this.app.tracker.getRelays(ref.id));
+        }
+        else if (ref.pubkey && ref.kind !== undefined && isReplaceableKind(ref.kind)) {
+            const address = new Address(ref.kind, ref.pubkey, ref.identifier ?? "").toString();
+            const event = this.app.repository.getEvent(address);
+            if (event) {
+                relays.push(...this.app.tracker.getRelays(event.id));
+            }
+        }
+        return relays;
+    };
 }
 //# sourceMappingURL=router.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../src/plugins/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAG1C;;;;;;GAMG;AACH,MAAM,OAAO,MAAO,SAAQ,UAAU;IACpC,YAAY,GAAS;QACnB,KAAK,CAAC;YACJ,aAAa,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM;YACrC,eAAe,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAChC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI;gBACtB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACtC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CACxC,CAAC,GAAG,EAAE;YACT,eAAe,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAC3D,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;YAC7C,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;YAC7C,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe;SAC5C,CAAC,CAAA;IACJ,CAAC;CACF"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../src/plugins/router.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import { SearchRelayList, SearchRelayListBuilder } from "@welshman/domain";
+import { SearchRelayListReader, SearchRelayListWriter } from "@welshman/domain";
 import { DerivedPlugin } from "./base.js";
 import type { Projection } from "./base.js";
 import type { IApp } from "../app.js";
@@ -7,13 +7,13 @@ import type { IApp } from "../app.js";
  * outbox model (the author's write relays), so it depends on the relay-list
  * collection.
  */
-export declare class SearchRelayLists extends DerivedPlugin<SearchRelayList> {
+export declare class SearchRelayLists extends DerivedPlugin<SearchRelayListReader> {
     constructor(app: IApp);
     fetch(pubkey: string, relayHints?: string[]): Promise<import("@welshman/util").TrustedEvent | undefined>;
     urls: (pubkey: string) => Projection<string[]>;
-    update: (fn: (builder: SearchRelayListBuilder) => void) => Promise<import("./thunk.js").Thunk>;
-    addUrl: (url: string) => Promise<import("./thunk.js").Thunk>;
-    removeUrl: (url: string) => Promise<import("./thunk.js").Thunk>;
-    setUrls: (urls: string[]) => Promise<import("./thunk.js").Thunk>;
+    update: (fn: (writer: SearchRelayListWriter) => void) => Promise<import("../command.js").Command>;
+    addUrl: (url: string) => Promise<import("../command.js").Command>;
+    removeUrl: (url: string) => Promise<import("../command.js").Command>;
+    setUrls: (urls: string[]) => Promise<import("../command.js").Command>;
 }
 //# sourceMappingURL=searchRelayLists.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"searchRelayLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/searchRelayLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAC,MAAM,kBAAkB,CAAA;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,eAAe,CAAC;gBACtD,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,MAAM,GAAU,IAAI,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,yCAS5D;IAED,MAAM,GAAI,KAAK,MAAM,yCAAgD;IAErE,SAAS,GAAI,KAAK,MAAM,yCAAmD;IAE3E,OAAO,GAAI,MAAM,MAAM,EAAE,yCAAkD;CAC5E"}
+{"version":3,"file":"searchRelayLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/searchRelayLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,qBAAqB,EAAE,qBAAqB,EAAC,MAAM,kBAAkB,CAAA;AAC9F,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,qBAAqB,CAAC;gBAC5D,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,MAAM,GAAU,IAAI,CAAC,MAAM,EAAE,qBAAqB,KAAK,IAAI,8CAO1D;IAED,MAAM,GAAI,KAAK,MAAM,8CAA8C;IAEnE,SAAS,GAAI,KAAK,MAAM,8CAAiD;IAEzE,OAAO,GAAI,MAAM,MAAM,EAAE,8CAAgD;CAC1E"}

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

@@ -1,9 +1,9 @@
 import { SEARCH_RELAYS } from "@welshman/util";
-import { SearchRelayList, SearchRelayListBuilder } from "@welshman/domain";
+import { SearchRelayList } from "@welshman/domain";
 import { DerivedPlugin } from "./base.js";
 import { Network } from "./network.js";
+import { Domain } from "./domain.js";
 import { User } from "../user.js";
-import { Thunks } from "./thunk.js";
 /**
  * NIP-51 search relay lists (kind 10007), keyed by pubkey. Loaded via the
  * outbox model (the author's write relays), so it depends on the relay-list
@@ -13,7 +13,7 @@ export class SearchRelayLists extends DerivedPlugin {
     constructor(app) {
         super(app, {
             filters: [{ kinds: [SEARCH_RELAYS] }],
-            eventToItem: SearchRelayList.factory(app.user?.signer),
+            eventToItem: app.use(Domain).reader(SearchRelayList),
             getKey: list => list.author(),
         });
     }
@@ -23,13 +23,12 @@ export class SearchRelayLists extends DerivedPlugin {
     urls = (pubkey) => this.project(pubkey, list => list?.urls() ?? []);
     update = async (fn) => {
         const user = User.require(this.app);
-        const builder = new SearchRelayListBuilder(await this.forceLoad(user.pubkey));
-        fn(builder);
-        const event = await builder.toTemplate(user.signer);
-        return this.app.use(Thunks).publishToOutbox({ event });
+        const writer = this.app.use(Domain).writer(SearchRelayList, await this.forceLoad(user.pubkey));
+        fn(writer);
+        return this.app.use(Domain).command(writer);
     };
-    addUrl = (url) => this.update(builder => builder.addUrl(url));
-    removeUrl = (url) => this.update(builder => builder.removeUrl(url));
-    setUrls = (urls) => this.update(builder => builder.setUrls(urls));
+    addUrl = (url) => this.update(writer => writer.addUrl(url));
+    removeUrl = (url) => this.update(writer => writer.removeUrl(url));
+    setUrls = (urls) => this.update(writer => writer.setUrls(urls));
 }
 //# sourceMappingURL=searchRelayLists.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"searchRelayLists.js","sourceRoot":"","sources":["../../../../src/plugins/searchRelayLists.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAC,MAAM,kBAAkB,CAAA;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAA;AAEvC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAA;AAGjC;;;;GAIG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAA8B;IAClE,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,aAAa,CAAC,EAAC,CAAC;YACnC,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC;YACtD,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAc,EAAE,aAAuB,EAAE;QAC7C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,CAAC,aAAa,CAAC,EAAC,EAAE,UAAU,CAAC,CAAA;IAC5F,CAAC;IAED,IAAI,GAAG,CAAC,MAAc,EAAwB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAEjG,MAAM,GAAG,KAAK,EAAE,EAA6C,EAAE,EAAE;QAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACnC,MAAM,OAAO,GAAG,IAAI,sBAAsB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAE7E,EAAE,CAAC,OAAO,CAAC,CAAA;QAEX,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEnD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;IACtD,CAAC,CAAA;IAED,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAErE,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAE3E,OAAO,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;CAC5E"}
+{"version":3,"file":"searchRelayLists.js","sourceRoot":"","sources":["../../../../src/plugins/searchRelayLists.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAC,eAAe,EAA+C,MAAM,kBAAkB,CAAA;AAC9F,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAA;AAEvC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAG/B;;;;GAIG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAAoC;IACxE,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,aAAa,CAAC,EAAC,CAAC;YACnC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;YACpD,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAc,EAAE,aAAuB,EAAE;QAC7C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,CAAC,aAAa,CAAC,EAAC,EAAE,UAAU,CAAC,CAAA;IAC5F,CAAC;IAED,IAAI,GAAG,CAAC,MAAc,EAAwB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAEjG,MAAM,GAAG,KAAK,EAAE,EAA2C,EAAE,EAAE;QAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAE9F,EAAE,CAAC,MAAM,CAAC,CAAA;QAEV,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C,CAAC,CAAA;IAED,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAEnE,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAEzE,OAAO,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;CAC1E"}

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

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/plugins/sync.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAc,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAInC,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED;;;;;GAKG;AACH,qBAAa,IAAI;IACH,QAAQ,CAAC,GAAG,EAAE,IAAI;gBAAT,GAAG,EAAE,IAAI;IAE9B,KAAK,GAAI,SAAS,MAAM,EAAE,6CACmE;IAE7F,IAAI,GAAU,qBAAmB,WAAW,mBAa3C;IAED,IAAI,GAAU,qBAAmB,WAAW,mBAe3C;CACF"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/plugins/sync.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAc,MAAM,gBAAgB,CAAA;AAEvD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAInC,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED;;;;;GAKG;AACH,qBAAa,IAAI;IACH,QAAQ,CAAC,GAAG,EAAE,IAAI;gBAAT,GAAG,EAAE,IAAI;IAE9B,KAAK,GAAI,SAAS,MAAM,EAAE,6CACmE;IAE7F,IAAI,GAAU,qBAAmB,WAAW,mBAa3C;IAED,IAAI,GAAU,qBAAmB,WAAW,mBAe3C;CACF"}

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

@@ -1,4 +1,5 @@
 import { isSignedEvent } from "@welshman/util";
+import { pull, push } from "@welshman/net";
 import { Network } from "./network.js";
 import { Relays } from "./relays.js";
 /**
@@ -18,7 +19,7 @@ export class Sync {
         const events = this.query(filters).filter(isSignedEvent);
         await Promise.all(relays.map(async (relay) => {
             if (await this.app.use(Relays).hasNegentropy(relay)) {
-                await net.pull({ filters, events, relays: [relay] });
+                await pull({ filters, events, relays: [relay], context: this.app.netContext });
             }
             else {
                 await net.request({ filters, relays: [relay], autoClose: true });
@@ -30,7 +31,7 @@ export class Sync {
         const events = this.query(filters).filter(isSignedEvent);
         await Promise.all(relays.map(async (relay) => {
             if (await this.app.use(Relays).hasNegentropy(relay)) {
-                await net.push({ filters, events, relays: [relay] });
+                await push({ filters, events, relays: [relay], context: this.app.netContext });
             }
             else {
                 await Promise.all(events.map((event) => net.publish({ event, relays: [relay] })));

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

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../../src/plugins/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAG5C,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAOlC;;;;;GAKG;AACH,MAAM,OAAO,IAAI;IACM;IAArB,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;IAAG,CAAC;IAElC,KAAK,GAAG,CAAC,OAAiB,EAAE,EAAE,CAC5B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,EAAC,CAAC,CAAA;IAE7F,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAExD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACvB,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpD,MAAM,GAAG,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAA;YACpD,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;YAChE,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IAED,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAExD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACvB,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpD,MAAM,GAAG,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAA;YACpD,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC,CAC1E,CAAA;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;CACF"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../../src/plugins/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAE5C,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAOlC;;;;;GAKG;AACH,MAAM,OAAO,IAAI;IACM;IAArB,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;IAAG,CAAC;IAElC,KAAK,GAAG,CAAC,OAAiB,EAAE,EAAE,CAC5B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,EAAC,CAAC,CAAA;IAE7F,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAExD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACvB,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAC,CAAC,CAAA;YAC9E,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;YAChE,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IAED,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAExD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACvB,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAC,CAAC,CAAA;YAC9E,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC,CAC1E,CAAA;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;CACF"}

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

@@ -67,7 +67,6 @@ export declare class Thunks {
     constructor(app: IApp);
     enqueue(thunk: Thunk): void;
     publish: (options: Omit<ThunkOptions, "app">) => Thunk;
-    publishToOutbox: (options: Omit<ThunkOptions, "app" | "relays">) => Thunk;
     retry: (thunk: BaseThunk) => Thunk | MergedThunk;
     merge(thunks: BaseThunk[]): MergedThunk;
     flatten(thunks: BaseThunk[]): Iterable<Thunk>;

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

@@ -1 +1 @@
-{"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;AAInC,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;IAMtB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAL1C,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;gBAEG,OAAO,EAAE,YAAY;IA4B1C,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;IA+Db,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;IAqBpB,OAAO,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAM5C;IAGD,eAAe,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,QAAQ,CAAC,WAI5D;IAEJ,KAAK,GAAI,OAAO,SAAS,yBAGmB;IAE5C,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;IAIxB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;CAS/C"}
+{"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;IAMtB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAL1C,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;gBAEG,OAAO,EAAE,YAAY;IA4B1C,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;IAiEb,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,yBAGmB;IAE5C,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;IAIxB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;CAS/C"}

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

@@ -4,8 +4,6 @@ import { isSignedEvent, WRAPPED_KINDS, prep, makePow, } from "@welshman/util";
 import { PublishStatus } from "@welshman/net";
 import { Nip01Signer, Nip59 } from "@welshman/signer";
 import { Network } from "./network.js";
-import { addMinimalFallbacks } from "@welshman/router";
-import { Router } from "./router.js";
 import { User } from "../user.js";
 /**
  * Shared base for `Thunk` and `MergedThunk`: a subscribable bag of per-relay
@@ -201,6 +199,7 @@ export class Thunk extends BaseThunk {
         // Allow for lazily signing/powing events in order to decrease apparent latency in the UI
         // that results from waiting for remote signers
         try {
+            const unsignedId = this.event.id;
             if (this.options.pow) {
                 this.event = await makePow(this.event, this.options.pow).result;
             }
@@ -210,11 +209,11 @@ export class Thunk extends BaseThunk {
             // Update tracker and repository with the signed event since the id will have changed
             if (this.options.pow) {
                 for (const url of this.options.relays) {
-                    this.options.app.tracker.removeRelay(this.event.id, url);
+                    this.options.app.tracker.removeRelay(unsignedId, url);
                     this.options.app.tracker.track(signedEvent.id, url);
                 }
             }
-            this.options.app.repository.removeEvent(this.event.id);
+            this.options.app.repository.removeEvent(unsignedId);
             this.options.app.repository.publish(signedEvent);
             return this._publish(signedEvent);
         }
@@ -284,12 +283,11 @@ export class Thunks {
         this.app.repository.publish(thunk.event);
         this.history.update($history => append(thunk, $history));
         thunk.controller.signal.addEventListener("abort", () => {
+            // wrapManager.remove may not have registered the wrap yet if abort races it.
             if (thunk.wrap) {
                 this.app.wrapManager.remove(thunk.wrap.id);
             }
-            else {
-                this.app.repository.removeEvent(thunk.event.id);
-            }
+            this.app.repository.removeEvent(thunk.event.id);
             this.history.update($history => remove(thunk, $history));
         });
     }
@@ -298,11 +296,6 @@ export class Thunks {
         this.enqueue(thunk);
         return thunk;
     };
-    // Publish as the user to their outbox (write) relays
-    publishToOutbox = (options) => this.publish({
-        ...options,
-        relays: this.app.use(Router).FromUser().policy(addMinimalFallbacks).getUrls(),
-    });
     retry = (thunk) => thunk instanceof MergedThunk
         ? new MergedThunk(thunk.thunks.map(t => this.publish(t.options)))
         : this.publish(thunk.options);

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

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

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

@@ -1,4 +1,5 @@
 import type { Readable } from "svelte/store";
+import type { Projection, Search } from "./base.js";
 import type { IApp } from "../app.js";
 export type Topic = {
     name: string;
@@ -10,8 +11,9 @@ export type Topic = {
  */
 export declare class Topics {
     readonly app: IApp;
-    byName: Readable<Map<string, Topic>>;
-    all: Readable<Topic[]>;
+    byName: Projection<Map<string, Topic>>;
+    all: Projection<Topic[]>;
+    topicSearch: Readable<Search<string, Topic>>;
     constructor(app: IApp);
 }
 //# sourceMappingURL=topics.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["../../../../src/plugins/topics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAA;AAK1C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;GAGG;AACH,qBAAa,MAAM;IAIL,QAAQ,CAAC,GAAG,EAAE,IAAI;IAH9B,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;IACpC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;gBAED,GAAG,EAAE,IAAI;CAsC/B"}
+{"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["../../../../src/plugins/topics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAA;AAM1C,OAAO,KAAK,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,WAAW,CAAA;AACjD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;GAGG;AACH,qBAAa,MAAM;IAKL,QAAQ,CAAC,GAAG,EAAE,IAAI;IAJ9B,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;IACtC,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAA;IACxB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;gBAEvB,GAAG,EAAE,IAAI;CAgD/B"}