@welshman/app 0.1.1 → 0.2.0

package/dist/app/src/storageAdapters.js

@@ -0,0 +1,174 @@
+import { derived } from "svelte/store";
+import { batch, throttle, sortBy, call, fromPairs } from "@welshman/lib";
+import { PROFILE, FOLLOWS, MUTES, RELAYS, INBOX_RELAYS, getPubkeyTagValues, getListTags, } from "@welshman/util";
+import { throttled, withGetter } from "@welshman/store";
+import { freshness } from "@welshman/store";
+import { getAll, bulkPut, bulkDelete } from "./storage.js";
+import { relays } from "./relays.js";
+import { handles, onHandle } from "./handles.js";
+import { zappers, onZapper } from "./zappers.js";
+import { plaintext } from "./plaintext.js";
+import { repository, tracker } from "./core.js";
+import { sessions } from "./session.js";
+import { userFollows } from "./user.js";
+export class RelaysStorageAdapter {
+    options;
+    keyPath = "url";
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        relays.set(await getAll(this.options.name));
+    }
+    sync() {
+        return throttled(3000, relays).subscribe($relays => bulkPut(this.options.name, $relays));
+    }
+}
+export class HandlesStorageAdapter {
+    options;
+    keyPath = "nip05";
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        handles.set(await getAll(this.options.name));
+    }
+    sync() {
+        return onHandle(batch(300, $handles => bulkPut(this.options.name, $handles)));
+    }
+}
+export class ZappersStorageAdapter {
+    options;
+    keyPath = "lnurl";
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        zappers.set(await getAll(this.options.name));
+    }
+    sync() {
+        return onZapper(batch(300, $zappers => bulkPut(this.options.name, $zappers)));
+    }
+}
+export class FreshnessStorageAdapter {
+    options;
+    keyPath = "key";
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        const items = await getAll(this.options.name);
+        freshness.set(fromPairs(items.map(item => [item.key, item.value])));
+    }
+    sync() {
+        const interval = setInterval(() => {
+            bulkPut(this.options.name, Object.entries(freshness.get()).map(([key, value]) => ({ key, value })));
+        }, 10_000);
+        return () => clearInterval(interval);
+    }
+}
+export class PlaintextStorageAdapter {
+    options;
+    keyPath = "key";
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        const items = await getAll(this.options.name);
+        plaintext.set(fromPairs(items.map(item => [item.key, item.value])));
+    }
+    sync() {
+        const interval = setInterval(() => {
+            bulkPut(this.options.name, Object.entries(plaintext.get()).map(([key, value]) => ({ key, value })));
+        }, 10_000);
+        return () => clearInterval(interval);
+    }
+}
+export class TrackerStorageAdapter {
+    options;
+    keyPath = "id";
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        const relaysById = new Map();
+        for (const { id, relays } of await getAll(this.options.name)) {
+            relaysById.set(id, new Set(relays));
+        }
+        this.options.tracker.load(relaysById);
+    }
+    sync() {
+        const onUpdate = throttle(3000, async () => {
+            await bulkPut(this.options.name, Array.from(this.options.tracker.relaysById.entries()).map(([id, relays]) => ({
+                id,
+                relays: Array.from(relays),
+            })));
+        });
+        this.options.tracker.on("update", onUpdate);
+        return () => this.options.tracker.off("update", onUpdate);
+    }
+}
+export class EventsStorageAdapter {
+    options;
+    keyPath = "id";
+    eventCount = 0;
+    constructor(options) {
+        this.options = options;
+    }
+    async init() {
+        const events = await getAll(this.options.name);
+        this.eventCount = events.length;
+        this.options.repository.load(events);
+    }
+    sync() {
+        const { name, limit, rankEvent } = this.options;
+        const onUpdate = async ({ added, removed }) => {
+            // Only add events we want to keep
+            const keep = added.filter(e => rankEvent(e) > 0);
+            // Add new events
+            if (keep.length > 0) {
+                await bulkPut(name, keep);
+            }
+            // If we're well above our retention limit, drop lowest-ranked events
+            if (this.eventCount > limit * 1.5) {
+                removed = new Set(removed);
+                for (const event of sortBy(e => -rankEvent(e), await getAll(name)).slice(limit)) {
+                    removed.add(event.id);
+                }
+            }
+            if (removed.size > 0) {
+                await bulkDelete(name, Array.from(removed));
+            }
+            // Keep track of our total number of events. This isn't strictly accurate, but it's close enough
+            this.eventCount = this.eventCount + keep.length - removed.size;
+        };
+        this.options.repository.on("update", onUpdate);
+        return () => this.options.repository.off("update", onUpdate);
+    }
+}
+export const defaultStorageAdapters = {
+    relays: new RelaysStorageAdapter({ name: "relays" }),
+    handles: new HandlesStorageAdapter({ name: "handles" }),
+    zappers: new ZappersStorageAdapter({ name: "zappers" }),
+    freshness: new FreshnessStorageAdapter({ name: "freshness" }),
+    plaintext: new PlaintextStorageAdapter({ name: "plaintext" }),
+    tracker: new TrackerStorageAdapter({ name: "tracker", tracker }),
+    events: new EventsStorageAdapter(call(() => {
+        const userFollowPubkeys = withGetter(derived(userFollows, l => new Set(getPubkeyTagValues(getListTags(l)))));
+        return {
+            repository,
+            name: "events",
+            limit: 10_000,
+            rankEvent: (e) => {
+                const $sessions = sessions.get();
+                const metaKinds = [PROFILE, FOLLOWS, MUTES, RELAYS, INBOX_RELAYS];
+                if ($sessions[e.pubkey] || e.tags.some(t => $sessions[t[1]]))
+                    return 1;
+                if (metaKinds.includes(e.kind) && userFollowPubkeys.get()?.has(e.pubkey))
+                    return 1;
+                return 0;
+            },
+        };
+    })),
+};
+//# sourceMappingURL=storageAdapters.js.map

package/dist/app/src/storageAdapters.js.map

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

package/{build → dist/app}/src/sync.d.ts

@@ -6,3 +6,4 @@ export type AppSyncOpts = {
 };
 export declare const pull: ({ relays, filters }: AppSyncOpts) => Promise<void>;
 export declare const push: ({ relays, filters }: AppSyncOpts) => Promise<void>;
+//# sourceMappingURL=sync.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAS1C,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,YAQxC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,qBAAmB,WAAW,kBAUxD,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,qBAAmB,WAAW,kBAUxD,CAAA"}

package/{build → dist/app}/src/sync.js

@@ -1,13 +1,15 @@
 import { isSignedEvent } from "@welshman/util";
-import { push as basePush, pull as basePull, PublishEvent, RequestEvent, SinglePublish, SingleRequest, } from "@welshman/net";
+import { push as basePush, pull as basePull, publishOne, requestOne } from "@welshman/net";
 import { repository } from "./core.js";
 import { relaysByUrl } from "./relays.js";
 const query = (filters) => repository.query(filters, { shouldSort: filters.every(f => f.limit === undefined) });
 export const hasNegentropy = (url) => {
     const p = relaysByUrl.get().get(url)?.profile;
-    if (p?.supported_nips?.includes(77))
+    if (p?.negentropy)
         return true;
-    if (p?.software?.includes("strfry") && !p?.version?.match(/^0\./))
+    if (p?.supported_nips?.includes?.(77))
+        return true;
+    if (p?.software?.includes?.("strfry") && !p?.version?.match(/^0\./))
         return true;
     return false;
 };
@@ -16,9 +18,7 @@ export const pull = async ({ relays, filters }) => {
     await Promise.all(relays.map(async (relay) => {
         await (hasNegentropy(relay)
             ? basePull({ filters, events, relays: [relay] })
-            : new Promise(resolve => {
-                new SingleRequest({ filters, relay, autoClose: true }).on(RequestEvent.Close, resolve);
-            }));
+            : requestOne({ filters, relay, autoClose: true }));
     }));
 };
 export const push = async ({ relays, filters }) => {
@@ -26,9 +26,7 @@ export const push = async ({ relays, filters }) => {
     await Promise.all(relays.map(async (relay) => {
         await (hasNegentropy(relay)
             ? basePush({ filters, events, relays: [relay] })
-            : Promise.all(events.map((event) => new Promise(resolve => {
-                new SinglePublish({ event, relay }).on(PublishEvent.Complete, resolve);
-            }))));
+            : Promise.all(events.map((event) => publishOne({ event, relay }))));
     }));
 };
 //# sourceMappingURL=sync.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAc,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAC,IAAI,IAAI,QAAQ,EAAE,IAAI,IAAI,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,eAAe,CAAA;AACxF,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAA;AAEvC,MAAM,KAAK,GAAG,CAAC,OAAiB,EAAE,EAAE,CAClC,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;AAEpF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3C,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,CAAA;IAE7C,IAAI,CAAC,EAAE,UAAU;QAAE,OAAO,IAAI,CAAA;IAC9B,IAAI,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAAE,OAAO,IAAI,CAAA;IAClD,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IAEhF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;IAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEnD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACvB,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YACzB,CAAC,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;YAC9C,CAAC,CAAC,UAAU,CAAC,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE;IAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEnD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACvB,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YACzB,CAAC,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;YAC9C,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}

package/{build → dist/app}/src/tags.d.ts

@@ -7,3 +7,4 @@ export declare const tagEventForQuote: (event: TrustedEvent) => string[];
 export declare const tagEventForReply: (event: TrustedEvent) => string[][];
 export declare const tagEventForComment: (event: TrustedEvent) => string[][];
 export declare const tagEventForReaction: (event: TrustedEvent) => string[][];
+//# sourceMappingURL=tags.d.ts.map

package/dist/app/src/tags.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tags.d.ts","sourceRoot":"","sources":["../../../src/tags.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAKhD,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,EAAE,cAAS,aAKpD,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,EAAE,GAAG,MAAM,OAAO,EAAE,aAK3D,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,YAAY,EAAE,aAAS,eAStD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,YAAY,eAC4C,CAAA;AAE/F,eAAO,MAAM,gBAAgB,GAAI,OAAO,YAAY,aAKnD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,OAAO,YAAY,eA8CnD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,YAAY,eAiCrD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,OAAO,YAAY,eAiBtD,CAAA"}

package/{build → dist/app}/src/tags.js

@@ -1,22 +1,22 @@
 import { uniq, remove, nthEq } from "@welshman/lib";
 import { getAddress, isReplaceable, getReplyTags, getPubkeyTagValues, isReplaceableKind, } from "@welshman/util";
+import { Router } from "@welshman/router";
 import { displayProfileByPubkey } from "./profiles.js";
 import { pubkey } from "./session.js";
-import { Router } from "./router.js";
 export const tagZapSplit = (pubkey, split = 1) => [
     "zap",
     pubkey,
-    Router.get().FromPubkey(pubkey).getUrl(),
+    Router.get().FromPubkey(pubkey).getUrl() || "",
     String(split),
 ];
 export const tagPubkey = (pubkey, ...args) => [
     "p",
     pubkey,
-    Router.get().FromPubkey(pubkey).getUrl(),
+    Router.get().FromPubkey(pubkey).getUrl() || "",
     displayProfileByPubkey(pubkey),
 ];
 export const tagEvent = (event, mark = "") => {
-    const url = Router.get().Event(event).getUrl();
+    const url = Router.get().Event(event).getUrl() || "";
     const tags = [["e", event.id, url, mark, event.pubkey]];
     if (isReplaceable(event)) {
         tags.push(["a", getAddress(event), url, mark, event.pubkey]);
@@ -27,7 +27,7 @@ export const tagEventPubkeys = (event) => uniq(remove(pubkey.get(), [event.pubke
 export const tagEventForQuote = (event) => [
     "q",
     event.id,
-    Router.get().Event(event).getUrl(),
+    Router.get().Event(event).getUrl() || "",
     event.pubkey,
 ];
 export const tagEventForReply = (event) => {
@@ -37,12 +37,12 @@ export const tagEventForReply = (event) => {
     // Root comes first
     if (roots.length > 0) {
         for (const t of roots) {
-            tags.push([...t.slice(0, 2), Router.get().EventRoots(event).getUrl(), "root"]);
+            tags.push([...t.slice(0, 2), Router.get().EventRoots(event).getUrl() || "", "root"]);
         }
     }
     else {
         for (const t of replies) {
-            tags.push([...t.slice(0, 2), Router.get().EventParents(event).getUrl(), "root"]);
+            tags.push([...t.slice(0, 2), Router.get().EventParents(event).getUrl() || "", "root"]);
         }
     }
     // Inherit mentions
@@ -61,7 +61,7 @@ export const tagEventForReply = (event) => {
     }
     // Finally, tag the event itself
     const mark = replies.length > 0 ? "reply" : "root";
-    const hint = Router.get().Event(event).getUrl();
+    const hint = Router.get().Event(event).getUrl() || "";
     // e-tag the event
     tags.push(["e", event.id, hint, mark, event.pubkey]);
     // a-tag the event
@@ -71,8 +71,8 @@ export const tagEventForReply = (event) => {
     return tags;
 };
 export const tagEventForComment = (event) => {
-    const pubkeyHint = Router.get().FromPubkey(event.pubkey).getUrl();
-    const eventHint = Router.get().Event(event).getUrl();
+    const pubkeyHint = Router.get().FromPubkey(event.pubkey).getUrl() || "";
+    const eventHint = Router.get().Event(event).getUrl() || "";
     const address = getAddress(event);
     const seenRoots = new Set();
     const tags = [];
@@ -99,7 +99,7 @@ export const tagEventForComment = (event) => {
     return tags;
 };
 export const tagEventForReaction = (event) => {
-    const hint = Router.get().Event(event).getUrl();
+    const hint = Router.get().Event(event).getUrl() || "";
     const tags = [];
     // Mention the event's author
     if (event.pubkey !== pubkey.get()) {

package/dist/app/src/tags.js.map

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

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

@@ -0,0 +1,48 @@
+import type { Subscriber } from "svelte/store";
+import { TaskQueue } from "@welshman/lib";
+import { TrustedEvent, EventTemplate, StampedEvent, OwnedEvent } from "@welshman/util";
+import { PublishStatus, PublishOptions, PublishStatusByRelay } from "@welshman/net";
+export type ThunkEvent = EventTemplate | StampedEvent | OwnedEvent | TrustedEvent;
+export declare const prepEvent: (event: ThunkEvent) => TrustedEvent;
+export type ThunkOptions = Omit<PublishOptions, "event"> & {
+    event: ThunkEvent;
+    delay?: number;
+};
+export declare class Thunk {
+    readonly options: ThunkOptions;
+    _subs: Subscriber<Thunk>[];
+    event: TrustedEvent;
+    result: import("@welshman/lib").Deferred<PublishStatusByRelay, PublishStatusByRelay>;
+    status: PublishStatusByRelay;
+    details: Record<string, string>;
+    controller: AbortController;
+    constructor(options: ThunkOptions);
+    _notify(): void;
+    _fail(message: string): void;
+    publish(): Promise<void>;
+    subscribe(subscriber: Subscriber<Thunk>): () => void;
+}
+export declare class MergedThunk {
+    readonly thunks: Thunk[];
+    _subs: Subscriber<MergedThunk>[];
+    controller: AbortController;
+    status: PublishStatusByRelay;
+    details: Record<string, string>;
+    constructor(thunks: Thunk[]);
+    _notify(): void;
+    subscribe(subscriber: Subscriber<MergedThunk>): () => void;
+}
+export type AbstractThunk = Thunk | MergedThunk;
+export declare const isThunk: (thunk: AbstractThunk) => thunk is Thunk;
+export declare const isMergedThunk: (thunk: AbstractThunk) => thunk is MergedThunk;
+export declare const thunkHasStatus: (thunk: AbstractThunk, status: PublishStatus) => boolean;
+export declare const thunkUrlsWithStatus: (thunk: AbstractThunk, status: PublishStatus) => string[];
+export declare const thunkCompleteUrls: (thunk: AbstractThunk) => string[];
+export declare const thunkIncompleteUrls: (thunk: AbstractThunk) => string[];
+export declare const thunkIsComplete: (thunk: AbstractThunk) => boolean;
+export declare function walkThunks(thunks: AbstractThunk[]): Iterable<Thunk>;
+export declare const thunks: import("svelte/store").Writable<Record<string, AbstractThunk>>;
+export declare const thunkQueue: TaskQueue<Thunk>;
+export declare const publishThunk: (options: ThunkOptions) => Thunk;
+export declare const abortThunk: (thunk: Thunk) => void;
+//# sourceMappingURL=thunk.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,EACL,SAAS,EAUV,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,YAAY,EAEZ,aAAa,EAEb,YAAY,EACZ,UAAU,EAMX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAU,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAA;AAI1F,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,YAAY,GAAG,UAAU,GAAG,YAAY,CAAA;AAEjF,eAAO,MAAM,SAAS,GAAI,OAAO,UAAU,KAazB,YACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG;IACzD,KAAK,EAAE,UAAU,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,qBAAa,KAAK;IASJ,QAAQ,CAAC,OAAO,EAAE,YAAY;IAR1C,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,CAAK;IAE/B,KAAK,EAAE,YAAY,CAAA;IACnB,MAAM,+EAAgC;IACtC,MAAM,EAAE,oBAAoB,CAAK;IACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IACpC,UAAU,kBAAwB;gBAEb,OAAO,EAAE,YAAY;IAQ1C,OAAO;IAMP,KAAK,CAAC,OAAO,EAAE,MAAM;IASf,OAAO;IAwFb,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC;CASxC;AAED,qBAAa,WAAW;IAOV,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;IANpC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,EAAE,CAAK;IAErC,UAAU,kBAAwB;IAClC,MAAM,EAAE,oBAAoB,CAAK;IACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;gBAEf,MAAM,EAAE,KAAK,EAAE;IA+BpC,OAAO;IAMP,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC;CAS9C;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,WAAW,CAAA;AAE/C,eAAO,MAAM,OAAO,GAAI,OAAO,aAAa,KAAG,KAAK,IAAI,KAA+B,CAAA;AAEvF,eAAO,MAAM,aAAa,GAAI,OAAO,aAAa,KAAG,KAAK,IAAI,WAChC,CAAA;AAE9B,eAAO,MAAM,cAAc,GAAI,OAAO,aAAa,EAAE,QAAQ,aAAa,YACrB,CAAA;AAErD,eAAO,MAAM,mBAAmB,GAAI,OAAO,aAAa,EAAE,QAAQ,aAAa,aACZ,CAAA;AAEnE,eAAO,MAAM,iBAAiB,GAAI,OAAO,aAAa,aAMrD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,OAAO,aAAa,aAMvD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,aAAa,YAAwC,CAAA;AAE5F,wBAAiB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAQpE;AAED,eAAO,MAAM,MAAM,gEAA8C,CAAA;AAEjE,eAAO,MAAM,UAAU,kBAKrB,CAAA;AAEF,eAAO,MAAM,YAAY,GAAI,SAAS,YAAY,UAcjD,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAO,KAAK,SAItC,CAAA"}

package/dist/app/src/thunk.js

@@ -0,0 +1,225 @@
+import { writable, get } from "svelte/store";
+import { TaskQueue, ifLet, dissoc, remove, defer, sleep, assoc, spec, nthEq, nth, } from "@welshman/lib";
+import { stamp, own, hash } from "@welshman/signer";
+import { isStampedEvent, isOwnedEvent, isHashedEvent, isUnwrappedEvent, isSignedEvent, } from "@welshman/util";
+import { publish, PublishStatus } from "@welshman/net";
+import { repository, tracker } from "./core.js";
+import { pubkey, getSession, getSigner } from "./session.js";
+export const prepEvent = (event) => {
+    if (!isStampedEvent(event)) {
+        event = stamp(event);
+    }
+    if (!isOwnedEvent(event)) {
+        event = own(event, get(pubkey));
+    }
+    if (!isHashedEvent(event)) {
+        event = hash(event);
+    }
+    return event;
+};
+export class Thunk {
+    options;
+    _subs = [];
+    event;
+    result = defer();
+    status = {};
+    details = {};
+    controller = new AbortController();
+    constructor(options) {
+        this.options = options;
+        this.event = prepEvent(options.event);
+        for (const relay of options.relays) {
+            this.status[relay] = PublishStatus.Sending;
+        }
+    }
+    _notify() {
+        for (const subscriber of this._subs) {
+            subscriber(this);
+        }
+    }
+    _fail(message) {
+        for (const relay of this.options.relays) {
+            this.status[relay] = PublishStatus.Failure;
+            this.details[relay] = message;
+        }
+        this._notify();
+    }
+    async publish() {
+        let event = this.event;
+        // Handle abort immediately if possible
+        if (this.controller.signal.aborted)
+            return;
+        // If we were given a wrapped event, make sure to publish the wrapper, not the rumor
+        if (isUnwrappedEvent(event)) {
+            event = event.wrap;
+        }
+        // If the event was already signed, leave it alone. Otherwise, sign it now. This is to
+        // decrease apparent latency in the UI that results from waiting for remote signers
+        if (!isSignedEvent(event)) {
+            const signer = getSigner(getSession(event.pubkey));
+            if (!signer) {
+                return this._fail(`No signer found for ${event.pubkey}`);
+            }
+            try {
+                event = await signer.sign(event);
+            }
+            catch (e) {
+                return this._fail(String(e.error || e));
+            }
+        }
+        // We're guaranteed to have a signed event at this point
+        const signedEvent = event;
+        // Copy the signature over since we had deferred signing
+        ifLet(repository.getEvent(signedEvent.id), savedEvent => {
+            savedEvent.sig = signedEvent.sig;
+        });
+        // Wait if the thunk is to be delayed
+        if (this.options.delay) {
+            await sleep(this.options.delay);
+        }
+        // Skip publishing if aborted
+        if (this.controller.signal.aborted) {
+            return;
+        }
+        // Send it off
+        this.result.resolve(await publish({
+            ...this.options,
+            event: signedEvent,
+            onSuccess: (message, relay) => {
+                tracker.track(signedEvent.id, relay);
+                this.options.onSuccess?.(message, relay);
+                this.status[relay] = PublishStatus.Success;
+                this.details[relay] = message;
+                this._notify();
+            },
+            onFailure: (message, relay) => {
+                this.options.onFailure?.(message, relay);
+                this.status[relay] = PublishStatus.Failure;
+                this.details[relay] = message;
+                this._notify();
+            },
+            onPending: (relay) => {
+                this.options.onPending?.(relay);
+                this.status[relay] = PublishStatus.Pending;
+                this._notify();
+            },
+            onTimeout: (relay) => {
+                this.options.onTimeout?.(relay);
+                this.status[relay] = PublishStatus.Timeout;
+                this.details[relay] = "Publish timed out";
+                this._notify();
+            },
+            onAborted: (relay) => {
+                this.options.onAborted?.(relay);
+                this.status[relay] = PublishStatus.Aborted;
+                this.details[relay] = "Publish was aborted";
+                this._notify();
+            },
+            onComplete: () => {
+                this.options.onComplete?.();
+                this._subs = [];
+            },
+        }));
+    }
+    subscribe(subscriber) {
+        this._subs.push(subscriber);
+        subscriber(this);
+        return () => {
+            this._subs = remove(subscriber, this._subs);
+        };
+    }
+}
+export class MergedThunk {
+    thunks;
+    _subs = [];
+    controller = new AbortController();
+    status = {};
+    details = {};
+    constructor(thunks) {
+        this.thunks = thunks;
+        const { Aborted, Failure, Timeout, Pending, Success } = PublishStatus;
+        const relays = new Set(thunks.flatMap(thunk => Object.keys(thunk.options.relays)));
+        for (const thunk of thunks) {
+            this.controller.signal.addEventListener("abort", () => thunk.controller.abort());
+            thunk.subscribe($thunk => {
+                this.status = {};
+                this.details = {};
+                for (const relay of relays) {
+                    for (const status of [Aborted, Failure, Timeout, Pending, Success]) {
+                        const thunk = thunks.find(spec({ [relay]: status }));
+                        if (thunk) {
+                            this.status[relay] = thunk.status[relay];
+                            this.details[relay] = thunk.details[relay];
+                        }
+                    }
+                }
+                this._notify();
+                if (thunks.filter(thunkIsComplete).length === thunks.length) {
+                    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);
+        };
+    }
+}
+export const isThunk = (thunk) => thunk instanceof Thunk;
+export const isMergedThunk = (thunk) => thunk instanceof MergedThunk;
+export const thunkHasStatus = (thunk, status) => Object.entries(thunk.status).some(nthEq(1, status));
+export const thunkUrlsWithStatus = (thunk, status) => Object.entries(thunk.status).filter(nthEq(1, status)).map(nth(0));
+export const thunkCompleteUrls = (thunk) => {
+    const incompleteStatuses = [PublishStatus.Sending, PublishStatus.Pending];
+    return Object.entries(thunk.status)
+        .filter(([_, s]) => !incompleteStatuses.includes(s))
+        .map(nth(1));
+};
+export const thunkIncompleteUrls = (thunk) => {
+    const incompleteStatuses = [PublishStatus.Sending, PublishStatus.Pending];
+    return Object.entries(thunk.status)
+        .filter(([_, s]) => incompleteStatuses.includes(s))
+        .map(nth(1));
+};
+export const thunkIsComplete = (thunk) => thunkCompleteUrls(thunk).length > 0;
+export function* walkThunks(thunks) {
+    for (const thunk of thunks) {
+        if (thunk instanceof MergedThunk) {
+            yield* walkThunks(thunk.thunks);
+        }
+        else {
+            yield thunk;
+        }
+    }
+}
+export const thunks = writable({});
+export const thunkQueue = new TaskQueue({
+    batchSize: 50,
+    processItem: (thunk) => {
+        thunk.publish();
+    },
+});
+export const publishThunk = (options) => {
+    const thunk = new Thunk(options);
+    thunkQueue.push(thunk);
+    repository.publish(thunk.event);
+    thunks.update(assoc(thunk.event.id, thunk));
+    thunk.controller.signal.addEventListener("abort", () => {
+        repository.removeEvent(thunk.event.id);
+    });
+    return thunk;
+};
+export const abortThunk = (thunk) => {
+    thunk.controller.abort();
+    thunks.update(dissoc(thunk.event.id));
+    repository.removeEvent(thunk.event.id);
+};
+//# sourceMappingURL=thunk.js.map

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

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

package/{build → dist/app}/src/topics.d.ts

@@ -3,3 +3,4 @@ export type Topic = {
     count: number;
 };
 export declare const topics: import("@welshman/store").WritableWithGetter<Topic[]>;
+//# sourceMappingURL=topics.d.ts.map