@welshman/app 0.1.2 → 0.2.0

package/dist/app/src/thunk.js

@@ -1,11 +1,10 @@
-import { writable, derived, get } from "svelte/store";
-import { fromPairs, TaskQueue, dissoc, identity, uniq, defer, sleep, assoc, } from "@welshman/lib";
+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 { MultiPublish, PublishStatus, PublishEvent } from "@welshman/net";
+import { publish, PublishStatus } from "@welshman/net";
 import { repository, tracker } from "./core.js";
 import { pubkey, getSession, getSigner } from "./session.js";
-const { Pending, Success, Failure, Timeout, Aborted } = PublishStatus;
 export const prepEvent = (event) => {
     if (!isStampedEvent(event)) {
         event = stamp(event);
@@ -18,43 +17,182 @@ export const prepEvent = (event) => {
     }
     return event;
 };
-export const makeThunk = (request) => {
-    const event = prepEvent(request.event);
-    const controller = new AbortController();
-    const result = defer();
-    const status = writable({});
-    return { event, request, controller, result, status };
-};
-export const isMergedThunk = (thunk) => Boolean(thunk.thunks);
-export const mergeThunks = (thunks) => {
-    const controller = new AbortController();
-    controller.signal.addEventListener("abort", () => {
-        for (const thunk of thunks) {
-            thunk.controller.abort();
+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;
         }
-    });
-    return {
-        thunks,
-        controller,
-        result: Promise.all(thunks.map(thunk => thunk.result)),
-        status: derived(thunks.map(thunk => thunk.status), statuses => {
-            const mergedStatus = {};
-            for (const url of uniq(statuses.flatMap(s => Object.keys(s)))) {
-                const urlStatuses = statuses.map(s => s[url]);
-                const thunkStatus = [Aborted, Failure, Timeout, Pending, Success]
-                    .map(status => urlStatuses.find(s => s?.status === status))
-                    .find(identity);
-                if (thunkStatus) {
-                    mergedStatus[url] = thunkStatus;
-                }
+    }
+    _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);
             }
-            return mergedStatus;
-        }),
-    };
+            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 (isMergedThunk(thunk)) {
+        if (thunk instanceof MergedThunk) {
             yield* walkThunks(thunk.thunks);
         }
         else {
@@ -63,8 +201,14 @@ export function* walkThunks(thunks) {
     }
 }
 export const thunks = writable({});
-export const publishThunk = (request) => {
-    const thunk = makeThunk(request);
+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));
@@ -73,103 +217,9 @@ export const publishThunk = (request) => {
     });
     return thunk;
 };
-export const publishThunks = (requests) => {
-    const newThunks = requests.map(makeThunk);
-    const mergedThunk = mergeThunks(newThunks);
-    for (const thunk of newThunks) {
-        thunkQueue.push(thunk);
-        repository.publish(thunk.event);
-        thunks.update(assoc(thunk.event.id, mergedThunk));
-        thunk.controller.signal.addEventListener("abort", () => {
-            repository.removeEvent(thunk.event.id);
-        });
-    }
-    return mergedThunk;
-};
 export const abortThunk = (thunk) => {
     thunk.controller.abort();
     thunks.update(dissoc(thunk.event.id));
     repository.removeEvent(thunk.event.id);
 };
-export const thunkQueue = new TaskQueue({
-    batchSize: 50,
-    processItem: (thunk) => {
-        let event = thunk.event;
-        // Handle abort immediately if possible
-        if (thunk.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;
-        }
-        // Avoid making this function async so multiple publishes can run concurrently
-        Promise.resolve().then(async () => {
-            const fail = (message) => {
-                const status = {};
-                for (const url of thunk.request.relays) {
-                    status[url] = { status: PublishStatus.Failure, message };
-                }
-                thunk.status.set(status);
-            };
-            // 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 fail(`No signer found for ${event.pubkey}`);
-                }
-                try {
-                    event = await signer.sign(event);
-                }
-                catch (e) {
-                    return fail(String(e.error || e));
-                }
-            }
-            // We're guaranteed to have a signed event at this point
-            const signedEvent = event;
-            // Wait if the thunk is to be delayed
-            if (thunk.request.delay) {
-                await sleep(thunk.request.delay);
-            }
-            // Skip publishing if aborted
-            if (thunk.controller.signal.aborted) {
-                return;
-            }
-            // Update status to pending
-            thunk.status.set(fromPairs(thunk.request.relays.map(url => [
-                url,
-                { status: PublishStatus.Pending, message: "Sending your message..." },
-            ])));
-            // Send it off
-            const pub = new MultiPublish({
-                event: signedEvent,
-                relays: thunk.request.relays,
-                context: thunk.request.context,
-                timeout: thunk.request.timeout,
-            });
-            // Copy the signature over since we had deferred it
-            const savedEvent = repository.getEvent(signedEvent.id);
-            // The event may already be replaced or deleted
-            if (savedEvent) {
-                savedEvent.sig = signedEvent.sig;
-            }
-            pub.on(PublishEvent.Success, (id, message, url) => {
-                tracker.track(id, url);
-                thunk.status.update(assoc(url, { status: PublishStatus.Success, message }));
-            });
-            pub.on(PublishEvent.Failure, (id, message, url) => {
-                thunk.status.update(assoc(url, { status: PublishStatus.Failure, message }));
-            });
-            pub.on(PublishEvent.Timeout, (url) => {
-                thunk.status.update(assoc(url, { status: PublishStatus.Timeout, message: "Publish timed out" }));
-            });
-            pub.on(PublishEvent.Aborted, (url) => {
-                thunk.status.update(assoc(url, { status: PublishStatus.Aborted, message: "Publish was aborted" }));
-            });
-            pub.on(PublishEvent.Complete, () => {
-                thunk.result.resolve(get(thunk.status));
-            });
-        });
-    },
-});
 //# sourceMappingURL=thunk.js.map

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

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

package/dist/app/src/zappers.js

@@ -1,6 +1,6 @@
 import { writable, derived } from "svelte/store";
 import { identity, fetchJson, uniq, bech32ToHex, hexToBech32, tryCatch, batcher, postJson, } from "@welshman/lib";
-import { collection } from "./collection.js";
+import { collection } from "@welshman/store";
 import { deriveProfile } from "./profiles.js";
 import { appContext } from "./context.js";
 export const zappers = writable([]);

package/dist/dvm/src/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../dvm/src/handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAC,YAAY,EAAE,YAAY,EAAS,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAAyD,cAAc,EAAC,MAAM,eAAe,CAAA;AAEpG,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;IACjB,WAAW,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,cAAc,CAAC,YAAY,CAAC,CAAA;CAC/D,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,UAAU,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,qBAAa,GAAG;IAOF,QAAQ,CAAC,IAAI,EAAE,OAAO;IANlC,MAAM,UAAQ;IACd,SAAS,UAAQ;IACjB,IAAI,eAAY;IAChB,QAAQ,gBAAY;IACpB,MAAM,EAAE,WAAW,CAAA;gBAEE,IAAI,EAAE,OAAO;IAQ5B,KAAK;IAwBX,IAAI;IAQE,OAAO,CAAC,OAAO,EAAE,YAAY;IA6C7B,OAAO,CAAC,QAAQ,EAAE,YAAY;CAQrC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../dvm/src/handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAC,YAAY,EAAE,YAAY,EAAS,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAAmB,cAAc,EAAC,MAAM,eAAe,CAAA;AAE9D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;IACjB,WAAW,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,cAAc,CAAC,YAAY,CAAC,CAAA;CAC/D,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,UAAU,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,qBAAa,GAAG;IAOF,QAAQ,CAAC,IAAI,EAAE,OAAO;IANlC,MAAM,UAAQ;IACd,SAAS,UAAQ;IACjB,IAAI,eAAY;IAChB,QAAQ,gBAAY;IACpB,MAAM,EAAE,WAAW,CAAA;gBAEE,IAAI,EAAE,OAAO;IAQ5B,KAAK;IA2BX,IAAI;IAQE,OAAO,CAAC,OAAO,EAAE,YAAY;IA6C7B,OAAO,CAAC,QAAQ,EAAE,YAAY;CAMrC"}

package/dist/dvm/src/handler.js

@@ -1,6 +1,6 @@
 import { now } from "@welshman/lib";
 import { Nip01Signer } from "@welshman/signer";
-import { MultiRequest, MultiPublish, PublishEvent, RequestEvent } from "@welshman/net";
+import { request, publish } from "@welshman/net";
 export class DVM {
     opts;
     active = false;
@@ -27,9 +27,13 @@ export class DVM {
                 if (requireMention) {
                     filter["#p"] = [pubkey];
                 }
-                const req = new MultiRequest({ relays, filters: [filter], context });
-                req.on(RequestEvent.Event, this.onEvent);
-                req.on(RequestEvent.Close, resolve);
+                request({
+                    relays,
+                    filters: [filter],
+                    context,
+                    onClose: resolve,
+                    onEvent: this.onEvent,
+                });
             });
         }
     }
@@ -74,9 +78,7 @@ export class DVM {
     async publish(template) {
         const { relays, context } = this.opts;
         const event = await this.signer.sign(template);
-        await new Promise(resolve => {
-            new MultiPublish({ event, relays, context }).on(PublishEvent.Complete, resolve);
-        });
+        await publish({ event, relays, context });
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/dvm/src/handler.js.map

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

package/dist/dvm/src/request.d.ts

@@ -1,23 +1,14 @@
-import { Emitter } from "@welshman/lib";
-import { SignedEvent } from "@welshman/util";
-import { MultiRequest, MultiPublish, AdapterContext } from "@welshman/net";
-export declare enum DVMEvent {
-    Progress = "progress",
-    Result = "result"
-}
+import { TrustedEvent, SignedEvent } from "@welshman/util";
+import { AdapterContext } from "@welshman/net";
 export type DVMRequestOptions = {
     event: SignedEvent;
     relays: string[];
     timeout?: number;
     autoClose?: boolean;
-    reportProgress?: boolean;
     context?: AdapterContext;
+    onResult?: (event: TrustedEvent, url: string) => void;
+    onProgress?: (event: TrustedEvent, url: string) => void;
 };
-export type DVMRequest = {
-    request: DVMRequestOptions;
-    emitter: Emitter;
-    sub: MultiRequest;
-    pub: MultiPublish;
-};
-export declare const makeDvmRequest: (request: DVMRequestOptions) => DVMRequest;
+export declare const requestDvmResponse: (options: DVMRequestOptions) => Promise<TrustedEvent[]>;
+export declare const makeDvmRequest: (options: DVMRequestOptions) => Promise<[import("@welshman/net").PublishStatusByRelay, TrustedEvent[]]>;
 //# sourceMappingURL=request.d.ts.map

package/dist/dvm/src/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../dvm/src/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAM,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAe,WAAW,EAAS,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAC,YAAY,EAAE,YAAY,EAAgB,cAAc,EAAC,MAAM,eAAe,CAAA;AAEtF,oBAAY,QAAQ;IAClB,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,iBAAiB,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,YAAY,CAAA;IACjB,GAAG,EAAE,YAAY,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,SAAS,iBAAiB,KA6BhB,UACxC,CAAA"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../dvm/src/request.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAE,WAAW,EAAS,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAmB,cAAc,EAAC,MAAM,eAAe,CAAA;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACrD,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CACxD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,4BAyB5D,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,SAAS,iBAAiB,4EACK,CAAA"}

package/dist/dvm/src/request.js

@@ -1,29 +1,29 @@
-import { Emitter, now } from "@welshman/lib";
-import { MultiRequest, MultiPublish, RequestEvent } from "@welshman/net";
-export var DVMEvent;
-(function (DVMEvent) {
-    DVMEvent["Progress"] = "progress";
-    DVMEvent["Result"] = "result";
-})(DVMEvent || (DVMEvent = {}));
-export const makeDvmRequest = (request) => {
-    const emitter = new Emitter();
-    const { event, relays, context, timeout = 30_000, autoClose = true, reportProgress = true, } = request;
+import { now } from "@welshman/lib";
+import { request, publish } from "@welshman/net";
+export const requestDvmResponse = (options) => {
+    const { event, relays, context, timeout = 30_000, autoClose = true, onResult, onProgress } = options;
     const kind = event.kind + 1000;
-    const kinds = reportProgress ? [kind, 7000] : [kind];
+    const kinds = onProgress ? [kind, 7000] : [kind];
     const filters = [{ kinds, since: now() - 60, "#e": [event.id] }];
-    const sub = new MultiRequest({ relays, filters, timeout, context });
-    const pub = new MultiPublish({ relays, event, timeout, context });
-    sub.on(RequestEvent.Event, (event, url) => {
-        if (event.kind === 7000) {
-            emitter.emit(DVMEvent.Progress, url, event);
-        }
-        else {
-            emitter.emit(DVMEvent.Result, url, event);
-            if (autoClose) {
-                sub.close();
+    const abortController = new AbortController();
+    const signal = AbortSignal.any([abortController.signal, AbortSignal.timeout(timeout)]);
+    return request({
+        signal,
+        relays,
+        filters,
+        context,
+        onEvent: (event, url) => {
+            if (event.kind === 7000) {
+                onProgress?.(event, url);
             }
-        }
+            else {
+                onResult?.(event, url);
+                if (autoClose) {
+                    abortController.abort();
+                }
+            }
+        },
     });
-    return { request, emitter, sub, pub };
 };
+export const makeDvmRequest = (options) => Promise.all([publish(options), requestDvmResponse(options)]);
 //# sourceMappingURL=request.js.map

package/dist/dvm/src/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../dvm/src/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,GAAG,EAAC,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAiB,MAAM,eAAe,CAAA;AAEtF,MAAM,CAAN,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6BAAiB,CAAA;AACnB,CAAC,EAHW,QAAQ,KAAR,QAAQ,QAGnB;AAkBD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA0B,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAA;IAC7B,MAAM,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,OAAO,GAAG,MAAM,EAChB,SAAS,GAAG,IAAI,EAChB,cAAc,GAAG,IAAI,GACtB,GAAG,OAAO,CAAA;IACX,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IAC9B,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACpD,MAAM,OAAO,GAAa,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAC,CAAC,CAAA;IAExE,MAAM,GAAG,GAAG,IAAI,YAAY,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAC,CAAC,CAAA;IACjE,MAAM,GAAG,GAAG,IAAI,YAAY,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAC,CAAC,CAAA;IAE/D,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,KAAmB,EAAE,GAAW,EAAE,EAAE;QAC9D,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;YAEzC,IAAI,SAAS,EAAE,CAAC;gBACd,GAAG,CAAC,KAAK,EAAE,CAAA;YACb,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAe,CAAA;AACnD,CAAC,CAAA"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../dvm/src/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AAEjC,OAAO,EAAC,OAAO,EAAE,OAAO,EAAiB,MAAM,eAAe,CAAA;AAY9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAA0B,EAAE,EAAE;IAC/D,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,OAAO,CAAA;IAClG,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAChD,MAAM,OAAO,GAAa,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAC,CAAC,CAAA;IACxE,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAEtF,OAAO,OAAO,CAAC;QACb,MAAM;QACN,MAAM;QACN,OAAO;QACP,OAAO;QACP,OAAO,EAAE,CAAC,KAAmB,EAAE,GAAW,EAAE,EAAE;YAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACxB,UAAU,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YAC1B,CAAC;iBAAM,CAAC;gBACN,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBAEtB,IAAI,SAAS,EAAE,CAAC;oBACd,eAAe,CAAC,KAAK,EAAE,CAAA;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA0B,EAAE,EAAE,CAC3D,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA"}

package/dist/feeds/src/compiler.d.ts

@@ -1,8 +1,19 @@
-import type { Filter } from "@welshman/util";
-import type { CreatedAtItem, RequestItem, ListItem, LabelItem, WOTItem, DVMItem, Scope, Feed, FeedOptions } from "./core.js";
+import { Filter } from "@welshman/util";
+import { Repository } from "@welshman/relay";
+import { ISigner } from "@welshman/signer";
+import { Tracker } from "@welshman/net";
+import { CreatedAtItem, RequestItem, ListItem, LabelItem, WOTItem, DVMItem, Scope, Feed } from "./core.js";
+export type FeedCompilerOptions = {
+    signer?: ISigner;
+    signal?: AbortSignal;
+    tracker?: Tracker;
+    repository?: Repository;
+    getPubkeysForScope: (scope: Scope) => string[];
+    getPubkeysForWOTRange: (minWOT: number, maxWOT: number) => string[];
+};
 export declare class FeedCompiler {
-    readonly options: FeedOptions;
-    constructor(options: FeedOptions);
+    readonly options: FeedCompilerOptions;
+    constructor(options: FeedCompilerOptions);
     canCompile(feed: Feed): boolean;
     compile(feed: Feed): Promise<RequestItem[]>;
     _compileAddresses(addresses: string[]): {

package/dist/feeds/src/compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../feeds/src/compiler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAExD,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,OAAO,EACP,KAAK,EACL,IAAI,EACJ,WAAW,EACZ,MAAM,WAAW,CAAA;AAIlB,qBAAa,YAAY;IACX,QAAQ,CAAC,OAAO,EAAE,WAAW;gBAApB,OAAO,EAAE,WAAW;IAEzC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAyBzB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0CjD,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE;;;IAIrC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;;;IAItC,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE;iBAmBT,MAAM,EAAE;;IAGvC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE;;;;;IAI9B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE;;;;;IAInC,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;;IAUzB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAqBtD,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0C3D,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA+CpD,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAgC5D,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;CAiCtE"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../feeds/src/compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,MAAM,EAMP,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EACL,aAAa,EACb,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,OAAO,EACP,KAAK,EACL,IAAI,EAEL,MAAM,WAAW,CAAA;AAIlB,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,kBAAkB,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,EAAE,CAAA;IAC9C,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;CACpE,CAAA;AAED,qBAAa,YAAY;IACX,QAAQ,CAAC,OAAO,EAAE,mBAAmB;gBAA5B,OAAO,EAAE,mBAAmB;IAEjD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAyBzB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0CjD,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE;;;IAIrC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;;;IAItC,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE;iBAmBT,MAAM,EAAE;;IAGvC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE;;;;;IAI9B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE;;;;;IAInC,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;;IAUzB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAsBtD,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0C3D,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA+CpD,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAmC5D,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;CAiCtE"}