@welshman/app 0.1.2 → 0.2.1

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

@@ -0,0 +1,88 @@
+import { TrustedEvent } from "@welshman/util";
+import { Tracker } from "@welshman/net";
+import { Repository } from "@welshman/relay";
+export type RelaysStorageAdapterOptions = {
+    name: string;
+};
+export declare class RelaysStorageAdapter {
+    readonly options: RelaysStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: RelaysStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): import("svelte/store").Unsubscriber;
+}
+export type HandlesStorageAdapterOptions = {
+    name: string;
+};
+export declare class HandlesStorageAdapter {
+    readonly options: HandlesStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: HandlesStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type ZappersStorageAdapterOptions = {
+    name: string;
+};
+export declare class ZappersStorageAdapter {
+    readonly options: ZappersStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: ZappersStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type FreshnessStorageAdapterOptions = {
+    name: string;
+};
+export declare class FreshnessStorageAdapter {
+    readonly options: FreshnessStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: FreshnessStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type PlaintextStorageAdapterOptions = {
+    name: string;
+};
+export declare class PlaintextStorageAdapter {
+    readonly options: PlaintextStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: PlaintextStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type TrackerStorageAdapterOptions = {
+    name: string;
+    tracker: Tracker;
+};
+export declare class TrackerStorageAdapter {
+    readonly options: TrackerStorageAdapterOptions;
+    keyPath: string;
+    constructor(options: TrackerStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => void;
+}
+export type EventsStorageAdapterOptions = {
+    name: string;
+    limit: number;
+    repository: Repository;
+    rankEvent: (event: TrustedEvent) => number;
+};
+export declare class EventsStorageAdapter {
+    readonly options: EventsStorageAdapterOptions;
+    keyPath: string;
+    eventCount: number;
+    constructor(options: EventsStorageAdapterOptions);
+    init(): Promise<void>;
+    sync(): () => Repository<TrustedEvent>;
+}
+export declare const defaultStorageAdapters: {
+    relays: RelaysStorageAdapter;
+    handles: HandlesStorageAdapter;
+    zappers: ZappersStorageAdapter;
+    freshness: FreshnessStorageAdapter;
+    plaintext: PlaintextStorageAdapter;
+    tracker: TrackerStorageAdapter;
+    events: EventsStorageAdapter;
+};
+//# sourceMappingURL=storageAdapters.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"storageAdapters.d.ts","sourceRoot":"","sources":["../../../src/storageAdapters.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,YAAY,EACb,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAErC,OAAO,EAAC,UAAU,EAAmB,MAAM,iBAAiB,CAAA;AAU5D,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,oBAAoB;IAGnB,QAAQ,CAAC,OAAO,EAAE,2BAA2B;IAFzD,OAAO,SAAQ;gBAEM,OAAO,EAAE,2BAA2B;IAEnD,IAAI;IAIV,IAAI;CAGL;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,qBAAqB;IAGpB,QAAQ,CAAC,OAAO,EAAE,4BAA4B;IAF1D,OAAO,SAAU;gBAEI,OAAO,EAAE,4BAA4B;IAEpD,IAAI;IAIV,IAAI;CAGL;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,qBAAqB;IAGpB,QAAQ,CAAC,OAAO,EAAE,4BAA4B;IAF1D,OAAO,SAAU;gBAEI,OAAO,EAAE,4BAA4B;IAEpD,IAAI;IAIV,IAAI;CAGL;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,uBAAuB;IAGtB,QAAQ,CAAC,OAAO,EAAE,8BAA8B;IAF5D,OAAO,SAAQ;gBAEM,OAAO,EAAE,8BAA8B;IAEtD,IAAI;IAMV,IAAI;CAUL;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,qBAAa,uBAAuB;IAGtB,QAAQ,CAAC,OAAO,EAAE,8BAA8B;IAF5D,OAAO,SAAQ;gBAEM,OAAO,EAAE,8BAA8B;IAEtD,IAAI;IAMV,IAAI;CAUL;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,qBAAa,qBAAqB;IAGpB,QAAQ,CAAC,OAAO,EAAE,4BAA4B;IAF1D,OAAO,SAAO;gBAEO,OAAO,EAAE,4BAA4B;IAEpD,IAAI;IAUV,IAAI;CAyBL;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAA;CAC3C,CAAA;AAED,qBAAa,oBAAoB;IAInB,QAAQ,CAAC,OAAO,EAAE,2BAA2B;IAHzD,OAAO,SAAO;IACd,UAAU,SAAI;gBAEO,OAAO,EAAE,2BAA2B;IAEnD,IAAI;IAQV,IAAI;CAiCL;AAED,eAAO,MAAM,sBAAsB;;;;;;;;CA6BlC,CAAA"}

package/dist/app/src/storageAdapters.js

@@ -0,0 +1,181 @@
+import { derived } from "svelte/store";
+import { batch, 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 => Boolean(console.log('relays', $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 updateOne = (id, relay) => bulkPut(this.options.name, [{ id, relays: Array.from(this.options.tracker.getRelays(id)) }]);
+        const updateAll = () => bulkPut(this.options.name, Array.from(this.options.tracker.relaysById.entries()).map(([id, relays]) => ({
+            id,
+            relays: Array.from(relays),
+        })));
+        this.options.tracker.on("add", updateOne);
+        this.options.tracker.on("remove", updateOne);
+        this.options.tracker.on("load", updateAll);
+        this.options.tracker.on("clear", updateAll);
+        return () => {
+            this.options.tracker.off("add", updateOne);
+            this.options.tracker.off("remove", updateOne);
+            this.options.tracker.off("load", updateAll);
+            this.options.tracker.off("clear", updateAll);
+        };
+    }
+}
+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/dist/app/src/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAgB1C,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,YAOxC,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,kBAYxD,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,qBAAmB,WAAW,kBAiBxD,CAAA"}
+{"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/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

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAc,MAAM,gBAAgB,CAAA;AACzD,OAAO,EACL,IAAI,IAAI,QAAQ,EAChB,IAAI,IAAI,QAAQ,EAChB,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,GACd,MAAM,eAAe,CAAA;AACtB,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,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;QAAE,OAAO,IAAI,CAAA;IAChD,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IAE9E,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,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC1B,IAAI,aAAa,CAAC,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YACtF,CAAC,CAAC,CAAC,CAAA;IACT,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,CACT,MAAM,CAAC,GAAG,CACR,CAAC,KAAkB,EAAE,EAAE,CACrB,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC1B,IAAI,aAAa,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACtE,CAAC,CAAC,CACL,CACF,CAAC,CAAA;IACR,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}
+{"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/dist/app/src/tags.js

@@ -1,8 +1,8 @@
 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,

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

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

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

@@ -1,63 +1,48 @@
-import { Writable, Readable } from "svelte/store";
-import { Deferred, TaskQueue } from "@welshman/lib";
+import type { Subscriber } from "svelte/store";
+import { TaskQueue } from "@welshman/lib";
 import { TrustedEvent, EventTemplate, StampedEvent, OwnedEvent } from "@welshman/util";
-import { AdapterContext, PublishStatus } from "@welshman/net";
+import { PublishStatus, PublishOptions, PublishStatusByRelay } from "@welshman/net";
 export type ThunkEvent = EventTemplate | StampedEvent | OwnedEvent | TrustedEvent;
-export type ThunkRequest = {
+export declare const prepEvent: (event: ThunkEvent) => TrustedEvent;
+export type ThunkOptions = Omit<PublishOptions, "event"> & {
     event: ThunkEvent;
-    relays: string[];
     delay?: number;
-    timeout?: number;
-    context?: AdapterContext;
-};
-export type ThunkStatus = {
-    message: string;
-    status: PublishStatus;
 };
-export type ThunkStatusByUrl = Record<string, ThunkStatus>;
-export type Thunk = {
+export declare class Thunk {
+    readonly options: ThunkOptions;
+    _subs: Subscriber<Thunk>[];
     event: TrustedEvent;
-    request: ThunkRequest;
+    result: import("@welshman/lib").Deferred<PublishStatusByRelay, PublishStatusByRelay>;
+    status: PublishStatusByRelay;
+    details: Record<string, string>;
     controller: AbortController;
-    result: Deferred<ThunkStatusByUrl>;
-    status: Writable<ThunkStatusByUrl>;
-};
-export declare const prepEvent: (event: ThunkEvent) => TrustedEvent;
-export declare const makeThunk: (request: ThunkRequest) => {
-    event: TrustedEvent;
-    request: ThunkRequest;
-    controller: AbortController;
-    result: Deferred<ThunkStatusByUrl>;
-    status: Writable<ThunkStatusByUrl>;
-};
-export type MergedThunk = {
-    thunks: Thunk[];
-    controller: AbortController;
-    result: Promise<ThunkStatusByUrl[]>;
-    status: Readable<ThunkStatusByUrl>;
-};
-export declare const isMergedThunk: (thunk: Thunk | MergedThunk) => thunk is MergedThunk;
-export declare const mergeThunks: (thunks: Thunk[]) => {
-    thunks: Thunk[];
+    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;
-    result: Promise<ThunkStatusByUrl[]>;
-    status: Readable<ThunkStatusByUrl>;
-};
-export declare function walkThunks(thunks: (Thunk | MergedThunk)[]): Iterable<Thunk>;
-export declare const thunks: Writable<Record<string, Thunk | MergedThunk>>;
-export declare const publishThunk: (request: ThunkRequest) => {
-    event: TrustedEvent;
-    request: ThunkRequest;
-    controller: AbortController;
-    result: Deferred<ThunkStatusByUrl>;
-    status: Writable<ThunkStatusByUrl>;
-};
-export declare const publishThunks: (requests: ThunkRequest[]) => {
-    thunks: Thunk[];
-    controller: AbortController;
-    result: Promise<ThunkStatusByUrl[]>;
-    status: Readable<ThunkStatusByUrl>;
-};
-export declare const abortThunk: (thunk: Thunk) => void;
+    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

@@ -1 +1 @@
-{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAyB,MAAM,cAAc,CAAA;AACvE,OAAO,EACL,QAAQ,EAER,SAAS,EAOV,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,YAAY,EAEZ,aAAa,EAEb,YAAY,EACZ,UAAU,EAMX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAe,cAAc,EAAE,aAAa,EAAe,MAAM,eAAe,CAAA;AAMvF,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,YAAY,GAAG,UAAU,GAAG,YAAY,CAAA;AAEjF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,UAAU,CAAA;IACjB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,aAAa,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;AAE1D,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,EAAE,eAAe,CAAA;IAC3B,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;IAClC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;CACnC,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,OAAO,UAAU,KAazB,YACjB,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,SAAS,YAAY;;;;;;CAO9C,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,UAAU,EAAE,eAAe,CAAA;IAC3B,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAA;IACnC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;CACnC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,GAAG,WAAW,KAAG,KAAK,IAAI,WACpC,CAAA;AAEhC,eAAO,MAAM,WAAW,GAAI,QAAQ,KAAK,EAAE;;;;;CAiC1C,CAAA;AAED,wBAAiB,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,GAAG,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAQ5E;AAED,eAAO,MAAM,MAAM,+CAAoD,CAAA;AAEvE,eAAO,MAAM,YAAY,GAAI,SAAS,YAAY;;;;;;CAcjD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,UAAU,YAAY,EAAE;;;;;CAiBrD,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAO,KAAK,SAItC,CAAA;AAED,eAAO,MAAM,UAAU,kBA0GrB,CAAA"}
+{"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"}