@welshman/app 0.8.16 → 0.9.0-pre2

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,19 @@
+import { SearchRelayListReader, SearchRelayListWriter } from "@welshman/domain";
+import { DerivedPlugin } from "./base.js";
+import type { Projection } from "./base.js";
+import type { IApp } from "../app.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
+ * collection.
+ */
+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: (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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,34 @@
+import { SEARCH_RELAYS } from "@welshman/util";
+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";
+/**
+ * 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
+ * collection.
+ */
+export class SearchRelayLists extends DerivedPlugin {
+    constructor(app) {
+        super(app, {
+            filters: [{ kinds: [SEARCH_RELAYS] }],
+            eventToItem: app.use(Domain).reader(SearchRelayList),
+            getKey: list => list.author(),
+        });
+    }
+    fetch(pubkey, relayHints = []) {
+        return this.app.use(Network).loadUsingOutbox(pubkey, { kinds: [SEARCH_RELAYS] }, relayHints);
+    }
+    urls = (pubkey) => this.project(pubkey, list => list?.urls() ?? []);
+    update = async (fn) => {
+        const user = User.require(this.app);
+        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(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

@@ -0,0 +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,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

@@ -0,0 +1,20 @@
+import type { Filter } from "@welshman/util";
+import type { IApp } from "../app.js";
+export type AppSyncOpts = {
+    relays: string[];
+    filters: Filter[];
+};
+/**
+ * Negentropy-aware sync. Pulls/pushes events between the local repository and a
+ * set of relays, using NIP-77 reconciliation where the relay supports it and
+ * falling back to plain request/publish otherwise. Reads NIP-11 relay profiles
+ * from the `Relays` collection to detect negentropy support.
+ */
+export declare class Sync {
+    readonly app: IApp;
+    constructor(app: IApp);
+    query: (filters: Filter[]) => import("@welshman/util").TrustedEvent[];
+    pull: ({ relays, filters }: AppSyncOpts) => Promise<void>;
+    push: ({ relays, filters }: AppSyncOpts) => Promise<void>;
+}
+//# sourceMappingURL=sync.d.ts.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,42 @@
+import { isSignedEvent } from "@welshman/util";
+import { pull, push } from "@welshman/net";
+import { Network } from "./network.js";
+import { Relays } from "./relays.js";
+/**
+ * Negentropy-aware sync. Pulls/pushes events between the local repository and a
+ * set of relays, using NIP-77 reconciliation where the relay supports it and
+ * falling back to plain request/publish otherwise. Reads NIP-11 relay profiles
+ * from the `Relays` collection to detect negentropy support.
+ */
+export class Sync {
+    app;
+    constructor(app) {
+        this.app = app;
+    }
+    query = (filters) => this.app.repository.query(filters, { shouldSort: filters.every(f => f.limit === undefined) });
+    pull = async ({ relays, filters }) => {
+        const net = this.app.use(Network);
+        const events = this.query(filters).filter(isSignedEvent);
+        await Promise.all(relays.map(async (relay) => {
+            if (await this.app.use(Relays).hasNegentropy(relay)) {
+                await pull({ filters, events, relays: [relay], context: this.app.netContext });
+            }
+            else {
+                await net.request({ filters, relays: [relay], autoClose: true });
+            }
+        }));
+    };
+    push = async ({ relays, filters }) => {
+        const net = this.app.use(Network);
+        const events = this.query(filters).filter(isSignedEvent);
+        await Promise.all(relays.map(async (relay) => {
+            if (await this.app.use(Relays).hasNegentropy(relay)) {
+                await push({ filters, events, relays: [relay], context: this.app.netContext });
+            }
+            else {
+                await Promise.all(events.map((event) => net.publish({ event, relays: [relay] })));
+            }
+        }));
+    };
+}
+//# sourceMappingURL=sync.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,74 @@
+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: ThunkOptions;
+    event: HashedEvent;
+    complete: import("@welshman/lib").Deferred<void, void>;
+    controller: AbortController;
+    wrap?: SignedEvent;
+    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

@@ -0,0 +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;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/{thunk.js → plugins/thunk.js}

@@ -1,36 +1,93 @@
 import { writable } from "svelte/store";
 import { append, TaskQueue, ensurePlural, remove, defer, sleep, nth, without } from "@welshman/lib";
 import { isSignedEvent, WRAPPED_KINDS, prep, makePow, } from "@welshman/util";
-import { publish, PublishStatus, } from "@welshman/net";
+import { PublishStatus } from "@welshman/net";
 import { Nip01Signer, Nip59 } from "@welshman/signer";
-import { repository, tracker } from "./core.js";
-import { pubkey, signer, wrapManager } from "./session.js";
-export class Thunk {
-    options;
+import { Network } from "./network.js";
+import { User } from "../user.js";
+/**
+ * Shared base for `Thunk` and `MergedThunk`: a subscribable bag of per-relay
+ * publish `results`.
+ */
+export class BaseThunk {
     _subs = [];
-    pubkey;
-    signer;
-    event;
     results = {};
+    _notify() {
+        for (const subscriber of this._subs) {
+            subscriber(this);
+        }
+    }
+    subscribe(subscriber) {
+        this._subs.push(subscriber);
+        subscriber(this);
+        return () => {
+            this._subs = remove(subscriber, this._subs);
+        };
+    }
+    getUrlsWithStatus(statuses) {
+        const matches = ensurePlural(statuses);
+        return Object.entries(this.results)
+            .filter(([_, { status }]) => matches.includes(status))
+            .map(nth(0));
+    }
+    getCompleteUrls() {
+        return this.getUrlsWithStatus(without([PublishStatus.Sending, PublishStatus.Pending], Object.values(PublishStatus)));
+    }
+    getIncompleteUrls() {
+        return this.getUrlsWithStatus([PublishStatus.Sending, PublishStatus.Pending]);
+    }
+    getFailedUrls() {
+        return this.getUrlsWithStatus([PublishStatus.Failure, PublishStatus.Timeout]);
+    }
+    hasStatus(statuses) {
+        return this.getUrlsWithStatus(statuses).length > 0;
+    }
+    isComplete() {
+        return !this.hasStatus([PublishStatus.Sending, PublishStatus.Pending]);
+    }
+    getError() {
+        for (const [_, { status, detail }] of Object.entries(this.results)) {
+            if (status === PublishStatus.Failure) {
+                return detail;
+            }
+        }
+        if (this.isComplete()) {
+            return "";
+        }
+    }
+    waitForError() {
+        return new Promise(resolve => {
+            this.subscribe(thunk => {
+                const error = thunk.getError();
+                if (error !== undefined) {
+                    resolve(error);
+                }
+            });
+        });
+    }
+    waitForCompletion() {
+        return new Promise(resolve => {
+            this.subscribe(thunk => {
+                if (thunk.isComplete()) {
+                    resolve();
+                }
+            });
+        });
+    }
+}
+export class Thunk extends BaseThunk {
+    options;
+    event;
     complete = defer();
     controller = new AbortController();
     wrap;
     constructor(options) {
+        super();
         this.options = options;
         if (!options.recipient && WRAPPED_KINDS.includes(options.event.kind)) {
             throw new Error(`Attempted to publish a kind ${options.event.kind} without wrapping it`);
         }
-        const $pubkey = pubkey.get();
-        if (!$pubkey) {
-            throw new Error(`Attempted to publish an event without an active pubkey`);
-        }
-        const $signer = signer.get();
-        if (!$signer) {
-            throw new Error(`Attempted to publish an event without an active signer`);
-        }
-        this.pubkey = $pubkey;
-        this.signer = $signer;
-        this.event = prep(options.event, this.pubkey);
+        this.event = prep(options.event, this.user.pubkey);
         for (const relay of options.relays) {
             this.results[relay] = {
                 relay,
@@ -48,10 +105,8 @@ export class Thunk {
             }
         });
     }
-    _notify() {
-        for (const subscriber of this._subs) {
-            subscriber(this);
-        }
+    get user() {
+        return User.require(this.options.app);
     }
     _fail(detail) {
         for (const relay of this.options.relays) {
@@ -88,7 +143,7 @@ export class Thunk {
             return;
         }
         // Send it off
-        await publish({
+        await this.options.app.use(Network).publish({
             ...this.options,
             event,
             onSuccess: (result) => {
@@ -97,21 +152,17 @@ export class Thunk {
                 this._notify();
             },
             onFailure: (result) => {
-                tracker.removeRelay(event.id, result.relay);
                 this.options.onFailure?.(result);
                 this.results[result.relay] = result;
                 this._notify();
             },
             onPending: this._setPending,
-            onTimeout: (result) => {
-                tracker.removeRelay(event.id, result.relay);
-                this._setTimeout(result);
-            },
-            onAborted: (result) => {
-                tracker.removeRelay(event.id, result.relay);
-                this._setAborted(result);
-            },
+            onTimeout: this._setTimeout,
+            onAborted: this._setAborted,
             onComplete: (result) => {
+                if (result.status !== PublishStatus.Success) {
+                    this.options.app.tracker.removeRelay(event.id, result.relay);
+                }
                 this.options.onComplete?.(result);
                 this._subs = [];
             },
@@ -127,7 +178,7 @@ export class Thunk {
         // If we're sending it privately, wrap the event using nip 59
         if (recipient) {
             const wrapper = Nip01Signer.ephemeral();
-            const nip59 = new Nip59(this.signer, wrapper);
+            const nip59 = new Nip59(this.user.signer, wrapper);
             this.wrap = await nip59.wrap(recipient, this.event);
             // If we're calculating pow, update the hash and re-sign
             if (this.options.pow) {
@@ -135,7 +186,7 @@ export class Thunk {
                     signal: AbortSignal.timeout(30_000),
                 });
             }
-            wrapManager.add({ recipient, wrap: this.wrap, rumor: this.event });
+            this.options.app.wrapManager.add({ recipient, wrap: this.wrap, rumor: this.event });
             return this._publish(this.wrap);
         }
         // If the event has been signed, we're good to go
@@ -148,21 +199,22 @@ export class Thunk {
         // 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;
             }
-            const signedEvent = await this.signer.sign(this.event, {
+            const signedEvent = await this.user.signer.sign(this.event, {
                 signal: AbortSignal.timeout(30_000),
             });
             // 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) {
-                    tracker.removeRelay(this.event.id, url);
-                    tracker.track(signedEvent.id, url);
+                    this.options.app.tracker.removeRelay(unsignedId, url);
+                    this.options.app.tracker.track(signedEvent.id, url);
                 }
             }
-            repository.removeEvent(this.event.id);
-            repository.publish(signedEvent);
+            this.options.app.repository.removeEvent(unsignedId);
+            this.options.app.repository.publish(signedEvent);
             return this._publish(signedEvent);
         }
         catch (e) {
@@ -170,144 +222,95 @@ export class Thunk {
             return this._fail(String(e || "Failed to sign event"));
         }
     }
-    enqueue() {
-        thunkQueue.push(this);
-        for (const url of this.options.relays) {
-            tracker.track(this.event.id, url);
-        }
-        repository.publish(this.event);
-        thunks.update($thunks => append(this, $thunks));
-        this.controller.signal.addEventListener("abort", () => {
-            if (this.wrap) {
-                wrapManager.remove(this.wrap.id);
-            }
-            else {
-                repository.removeEvent(this.event.id);
-            }
-            thunks.update($thunks => remove(this, $thunks));
-        });
-    }
-    subscribe(subscriber) {
-        this._subs.push(subscriber);
-        subscriber(this);
-        return () => {
-            this._subs = remove(subscriber, this._subs);
-        };
+    abort() {
+        this.controller.abort();
     }
 }
-export class MergedThunk {
+export class MergedThunk extends BaseThunk {
     thunks;
-    _subs = [];
-    results = {};
     constructor(thunks) {
+        super();
         this.thunks = thunks;
         const { Aborted, Failure, Timeout, Pending, Sending, Success } = PublishStatus;
         const relays = new Set(thunks.flatMap(thunk => thunk.options.relays));
         for (const thunk of thunks) {
-            thunk.subscribe($thunk => {
+            thunk.subscribe(() => {
                 this.results = {};
                 for (const relay of relays) {
                     for (const status of [Aborted, Failure, Timeout, Pending, Sending, Success]) {
-                        const thunk = thunks.find(t => t.results[relay]?.status === status);
-                        if (thunk) {
-                            this.results[relay] = thunk.results[relay];
+                        const match = thunks.find(t => t.results[relay]?.status === status);
+                        if (match) {
+                            this.results[relay] = match.results[relay];
                         }
                     }
                 }
                 this._notify();
-                if (thunks.every(thunkIsComplete)) {
+                if (thunks.every(t => t.isComplete())) {
                     this._subs = [];
                 }
             });
         }
     }
-    _notify() {
-        for (const subscriber of this._subs) {
-            subscriber(this);
-        }
-    }
-    subscribe(subscriber) {
-        this._subs.push(subscriber);
-        subscriber(this);
-        return () => {
-            this._subs = remove(subscriber, this._subs);
-        };
+    abort() {
+        this.thunks.forEach(thunk => thunk.abort());
     }
 }
-export const isThunk = (thunk) => thunk instanceof Thunk;
-export const isMergedThunk = (thunk) => thunk instanceof MergedThunk;
-// Thunk status urls
-export const getThunkUrlsWithStatus = (statuses, thunk) => {
-    statuses = ensurePlural(statuses);
-    return Object.entries(thunk.results)
-        .filter(([_, { status }]) => statuses.includes(status))
-        .map(nth(0));
-};
-export const getCompleteThunkUrls = (thunk) => getThunkUrlsWithStatus(without([PublishStatus.Sending, PublishStatus.Pending], Object.values(PublishStatus)), thunk);
-export const getIncompleteThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
-export const getFailedThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Failure, PublishStatus.Timeout], thunk);
-// Thunk status checks
-export const thunkHasStatus = (statuses, thunk) => getThunkUrlsWithStatus(statuses, thunk).length > 0;
-export const thunkIsComplete = (thunk) => !thunkHasStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
-// Thunk errors
-export const getThunkError = (thunk) => {
-    for (const [_, { status, detail }] of Object.entries(thunk.results)) {
-        if (status === PublishStatus.Failure) {
-            return detail;
+/**
+ * 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 class Thunks {
+    app;
+    history = writable([]);
+    queue = new TaskQueue({
+        batchSize: 10,
+        batchDelay: 100,
+        processItem: (thunk) => {
+            thunk.publish();
+        },
+    });
+    constructor(app) {
+        this.app = app;
+    }
+    enqueue(thunk) {
+        this.queue.push(thunk);
+        for (const url of thunk.options.relays) {
+            this.app.tracker.track(thunk.event.id, url);
         }
+        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);
+            }
+            this.app.repository.removeEvent(thunk.event.id);
+            this.history.update($history => remove(thunk, $history));
+        });
     }
-    if (thunkIsComplete(thunk)) {
-        return "";
+    publish = (options) => {
+        const thunk = new Thunk({ ...options, app: this.app });
+        this.enqueue(thunk);
+        return thunk;
+    };
+    retry = (thunk) => thunk instanceof MergedThunk
+        ? new MergedThunk(thunk.thunks.map(t => this.publish(t.options)))
+        : this.publish(thunk.options);
+    merge(thunks) {
+        return new MergedThunk(Array.from(this.flatten(thunks)));
     }
-};
-// Thunk utilities that return promises
-export const waitForThunkError = (thunk) => new Promise(resolve => {
-    thunk.subscribe($thunk => {
-        const error = getThunkError($thunk);
-        if (error !== undefined) {
-            resolve(error);
-        }
-    });
-});
-export const waitForThunkCompletion = (thunk) => new Promise(resolve => {
-    thunk.subscribe($thunk => {
-        if (thunkIsComplete($thunk)) {
-            resolve();
-        }
-    });
-});
-// Thunk state
-export const thunks = writable([]);
-export const thunkQueue = new TaskQueue({
-    batchSize: 10,
-    batchDelay: 100,
-    processItem: (thunk) => {
-        thunk.publish();
-    },
-});
-// Other thunk utilities
-export const mergeThunks = (thunks) => new MergedThunk(Array.from(flattenThunks(thunks)));
-export function* flattenThunks(thunks) {
-    for (const thunk of thunks) {
-        if (isMergedThunk(thunk)) {
-            yield* flattenThunks(thunk.thunks);
-        }
-        else {
-            yield thunk;
+    *flatten(thunks) {
+        for (const thunk of thunks) {
+            if (thunk instanceof MergedThunk) {
+                yield* this.flatten(thunk.thunks);
+            }
+            else if (thunk instanceof Thunk) {
+                yield thunk;
+            }
         }
     }
 }
-export const publishThunk = (options) => {
-    const thunk = new Thunk(options);
-    thunk.enqueue();
-    return thunk;
-};
-export const abortThunk = (thunk) => {
-    for (const child of flattenThunks([thunk])) {
-        child.controller.abort();
-    }
-};
-export const retryThunk = (thunk) => isMergedThunk(thunk)
-    ? mergeThunks(thunk.thunks.map(t => publishThunk(t.options)))
-    : publishThunk(thunk.options);
 //# sourceMappingURL=thunk.js.map