@welshman/app 0.0.16 → 0.0.17

package/build/src/commands.d.ts

@@ -1,4 +1,29 @@
-export declare const unfollow: (value: string) => Promise<import("./thunk").PublishStatusDataByUrl>;
-export declare const follow: (tag: string[]) => Promise<import("./thunk").PublishStatusDataByUrl>;
-export declare const unmute: (value: string) => Promise<import("./thunk").PublishStatusDataByUrl>;
-export declare const mute: (tag: string[]) => Promise<import("./thunk").PublishStatusDataByUrl>;
+/// <reference types="svelte" />
+export declare const unfollow: (value: string) => Promise<{
+    event: import("@welshman/util").TrustedEvent;
+    request: import("./thunk").ThunkRequest;
+    controller: AbortController;
+    result: import("@welshman/lib").Deferred<import("./thunk").ThunkStatusByUrl>;
+    status: import("svelte/store").Writable<import("./thunk").ThunkStatusByUrl>;
+}>;
+export declare const follow: (tag: string[]) => Promise<{
+    event: import("@welshman/util").TrustedEvent;
+    request: import("./thunk").ThunkRequest;
+    controller: AbortController;
+    result: import("@welshman/lib").Deferred<import("./thunk").ThunkStatusByUrl>;
+    status: import("svelte/store").Writable<import("./thunk").ThunkStatusByUrl>;
+}>;
+export declare const unmute: (value: string) => Promise<{
+    event: import("@welshman/util").TrustedEvent;
+    request: import("./thunk").ThunkRequest;
+    controller: AbortController;
+    result: import("@welshman/lib").Deferred<import("./thunk").ThunkStatusByUrl>;
+    status: import("svelte/store").Writable<import("./thunk").ThunkStatusByUrl>;
+}>;
+export declare const mute: (tag: string[]) => Promise<{
+    event: import("@welshman/util").TrustedEvent;
+    request: import("./thunk").ThunkRequest;
+    controller: AbortController;
+    result: import("@welshman/lib").Deferred<import("./thunk").ThunkStatusByUrl>;
+    status: import("svelte/store").Writable<import("./thunk").ThunkStatusByUrl>;
+}>;

package/build/src/context.cjs

@@ -20,7 +20,6 @@ const getDefaultNetContext = (overrides = {}) => ({
         }
     },
     isDeleted: (url, event) => core_1.repository.isDeleted(event),
-    isValid: (url, event) => (0, session_1.getSession)(event.pubkey) || ((0, util_1.isSignedEvent)(event) && (0, util_1.hasValidSignature)(event)),
     optimizeSubscriptions: (subs) => {
         const [withRelays, withoutRelays] = (0, lib_1.partition)(sub => sub.request.relays.length > 0, subs);
         const filters = (0, util_1.unionFilters)(withoutRelays.flatMap(sub => sub.request.filters));

package/build/src/context.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"context.cjs","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAAgH;AAEhH,yCAAmF;AAEnF,qCAA0C;AAC1C,yCAAwD;AACxD,2CAA4C;AAE5C,6CAAsC;AAW/B,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,GAAG,IAAA,0BAA4B,GAAE;IACjC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE,WAAC,OAAA,MAAA,gBAAM,CAAC,GAAG,EAAE,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA;IAC7D,OAAO,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE;QAC5C,cAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAC5B,iBAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEzB,qDAAqD;QACrD,IAAI,KAAK,CAAC,IAAI,KAAK,WAAI,EAAE;YACvB,IAAA,sBAAW,EAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SAC1B;IACH,CAAC;IACD,SAAS,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE,CAAC,iBAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IAC5E,OAAO,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE,CAC5C,IAAA,oBAAU,EAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,KAAK,CAAC,IAAI,IAAA,wBAAiB,EAAC,KAAK,CAAC,CAAC;IAChF,qBAAqB,EAAE,CAAC,IAAoB,EAAE,EAAE;QAC9C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,eAAS,EAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;QACzF,MAAM,OAAO,GAAG,IAAA,mBAAY,EAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/E,MAAM,UAAU,GAAuB,IAAA,kCAA4B,EAAC,UAAU,CAAC,CAAA;QAE/E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,MAAM,SAAS,IAAK,IAAA,4BAAmB,EAAC,OAAO,CAAC,EAAE;gBACrD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aAC3B;SACF;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IACD,GAAG,SAAS;CACb,CAAC,CAAA;AA7BW,QAAA,oBAAoB,wBA6B/B;AAEK,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,IAAA,mBAAU,GAAE;IACpB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,IAAI;IACpB,GAAG,SAAS;CACb,CAAC,CAAA;AANW,QAAA,oBAAoB,wBAM/B"}
+{"version":3,"file":"context.cjs","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAAgH;AAEhH,yCAAiD;AAEjD,qCAA0C;AAC1C,yCAAwD;AACxD,2CAAgC;AAEhC,6CAAsC;AAW/B,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,GAAG,IAAA,0BAA4B,GAAE;IACjC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE,WAAC,OAAA,MAAA,gBAAM,CAAC,GAAG,EAAE,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA;IAC7D,OAAO,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE;QAC5C,cAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAC5B,iBAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEzB,qDAAqD;QACrD,IAAI,KAAK,CAAC,IAAI,KAAK,WAAI,EAAE;YACvB,IAAA,sBAAW,EAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SAC1B;IACH,CAAC;IACD,SAAS,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE,CAAC,iBAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IAC5E,qBAAqB,EAAE,CAAC,IAAoB,EAAE,EAAE;QAC9C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,eAAS,EAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;QACzF,MAAM,OAAO,GAAG,IAAA,mBAAY,EAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/E,MAAM,UAAU,GAAuB,IAAA,kCAA4B,EAAC,UAAU,CAAC,CAAA;QAE/E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,MAAM,SAAS,IAAK,IAAA,4BAAmB,EAAC,OAAO,CAAC,EAAE;gBACrD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aAC3B;SACF;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IACD,GAAG,SAAS;CACb,CAAC,CAAA;AA3BW,QAAA,oBAAoB,wBA2B/B;AAEK,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,IAAA,mBAAU,GAAE;IACpB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,IAAI;IACpB,GAAG,SAAS;CACb,CAAC,CAAA;AANW,QAAA,oBAAoB,wBAM/B"}

package/build/src/context.d.ts

@@ -16,7 +16,7 @@ export declare const getDefaultNetContext: (overrides?: Partial<NetContext>) =>
     signEvent: (event: StampedEvent) => Promise<any> | undefined;
     getExecutor: (relays: string[]) => import("@welshman/net").Executor;
     isDeleted: (url: string, event: TrustedEvent) => boolean;
-    isValid: ((url: string, event: TrustedEvent) => import("./session").Session) | ((url: string, event: TrustedEvent) => boolean);
+    isValid: (url: string, event: TrustedEvent) => boolean;
     matchFilters: (url: string, filters: import("@welshman/util").Filter[], event: TrustedEvent) => boolean;
     optimizeSubscriptions: (subs: Subscription[]) => RelaysAndFilters[];
 };

package/build/src/context.mjs

@@ -1,9 +1,9 @@
 import { partition } from "@welshman/lib";
 import { defaultOptimizeSubscriptions, getDefaultNetContext as originalGetDefaultNetContext } from "@welshman/net";
-import { WRAP, unionFilters, isSignedEvent, hasValidSignature } from "@welshman/util";
+import { WRAP, unionFilters } from "@welshman/util";
 import { tracker, repository } from "./core.mjs";
 import { makeRouter, getFilterSelections } from "./router.mjs";
-import { getSession, signer } from "./session.mjs";
+import { signer } from "./session.mjs";
 import { loadProfile } from "./profiles.mjs";
 export const getDefaultNetContext = (overrides = {}) => ({
     ...originalGetDefaultNetContext(),
@@ -17,7 +17,6 @@ export const getDefaultNetContext = (overrides = {}) => ({
         }
     },
     isDeleted: (url, event) => repository.isDeleted(event),
-    isValid: (url, event) => getSession(event.pubkey) || (isSignedEvent(event) && hasValidSignature(event)),
     optimizeSubscriptions: (subs) => {
         const [withRelays, withoutRelays] = partition(sub => sub.request.relays.length > 0, subs);
         const filters = unionFilters(withoutRelays.flatMap(sub => sub.request.filters));

package/build/src/context.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"context.mjs","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"OAAO,EAAC,SAAS,EAAC,MAAM,eAAe;OAChC,EAAC,4BAA4B,EAAE,oBAAoB,IAAI,4BAA4B,EAAC,MAAM,eAAe;OAEzG,EAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAC,MAAM,gBAAgB;OAE5E,EAAC,OAAO,EAAE,UAAU,EAAC;OACrB,EAAC,UAAU,EAAE,mBAAmB,EAAC;OACjC,EAAC,UAAU,EAAE,MAAM,EAAC;OAEpB,EAAC,WAAW,EAAC;AAWpB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,GAAG,4BAA4B,EAAE;IACjC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE,WAAC,OAAA,MAAA,MAAM,CAAC,GAAG,EAAE,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA;IAC7D,OAAO,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE;QAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAC5B,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEzB,qDAAqD;QACrD,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;YACvB,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SAC1B;IACH,CAAC;IACD,SAAS,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IAC5E,OAAO,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE,CAC5C,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChF,qBAAqB,EAAE,CAAC,IAAoB,EAAE,EAAE;QAC9C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;QACzF,MAAM,OAAO,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/E,MAAM,UAAU,GAAuB,4BAA4B,CAAC,UAAU,CAAC,CAAA;QAE/E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,MAAM,SAAS,IAAK,mBAAmB,CAAC,OAAO,CAAC,EAAE;gBACrD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aAC3B;SACF;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IACD,GAAG,SAAS;CACb,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,UAAU,EAAE;IACpB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,IAAI;IACpB,GAAG,SAAS;CACb,CAAC,CAAA"}
+{"version":3,"file":"context.mjs","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"OAAO,EAAC,SAAS,EAAC,MAAM,eAAe;OAChC,EAAC,4BAA4B,EAAE,oBAAoB,IAAI,4BAA4B,EAAC,MAAM,eAAe;OAEzG,EAAC,IAAI,EAAE,YAAY,EAAC,MAAM,gBAAgB;OAE1C,EAAC,OAAO,EAAE,UAAU,EAAC;OACrB,EAAC,UAAU,EAAE,mBAAmB,EAAC;OACjC,EAAC,MAAM,EAAC;OAER,EAAC,WAAW,EAAC;AAWpB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,GAAG,4BAA4B,EAAE;IACjC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE,WAAC,OAAA,MAAA,MAAM,CAAC,GAAG,EAAE,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA;IAC7D,OAAO,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE;QAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAC5B,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEzB,qDAAqD;QACrD,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;YACvB,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SAC1B;IACH,CAAC;IACD,SAAS,EAAE,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC;IAC5E,qBAAqB,EAAE,CAAC,IAAoB,EAAE,EAAE;QAC9C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;QACzF,MAAM,OAAO,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/E,MAAM,UAAU,GAAuB,4BAA4B,CAAC,UAAU,CAAC,CAAA;QAE/E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,MAAM,SAAS,IAAK,mBAAmB,CAAC,OAAO,CAAC,EAAE;gBACrD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aAC3B;SACF;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IACD,GAAG,SAAS;CACb,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,UAAU,EAAE;IACpB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,IAAI;IACpB,GAAG,SAAS;CACb,CAAC,CAAA"}

package/build/src/thunk.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publishThunk = exports.prepEvent = exports.thunkWorker = exports.publishStatusData = void 0;
+exports.thunkWorker = exports.publishThunk = exports.makeThunk = exports.prepEvent = void 0;
 const store_1 = require("svelte/store");
 const lib_1 = require("@welshman/lib");
 const signer_1 = require("@welshman/signer");
@@ -8,9 +8,43 @@ const util_1 = require("@welshman/util");
 const net_1 = require("@welshman/net");
 const core_1 = require("./core.cjs");
 const session_1 = require("./session.cjs");
-exports.publishStatusData = (0, store_1.writable)({});
+const prepEvent = (event) => {
+    if (!(0, util_1.isStampedEvent)(event)) {
+        event = (0, signer_1.stamp)(event);
+    }
+    if (!(0, util_1.isOwnedEvent)(event)) {
+        event = (0, signer_1.own)(event, (0, store_1.get)(session_1.pubkey));
+    }
+    if (!(0, util_1.isHashedEvent)(event)) {
+        event = (0, signer_1.hash)(event);
+    }
+    return event;
+};
+exports.prepEvent = prepEvent;
+const makeThunk = (request) => {
+    const event = (0, exports.prepEvent)(request.event);
+    const controller = new AbortController();
+    const result = (0, lib_1.defer)();
+    const status = (0, store_1.writable)({});
+    return { event, request, controller, result, status };
+};
+exports.makeThunk = makeThunk;
+const publishThunk = (request) => {
+    const thunk = (0, exports.makeThunk)(request);
+    exports.thunkWorker.push(thunk);
+    core_1.repository.publish(thunk.event);
+    thunk.controller.signal.addEventListener('abort', () => {
+        core_1.repository.removeEvent(thunk.event.id);
+    });
+    return thunk;
+};
+exports.publishThunk = publishThunk;
 exports.thunkWorker = new lib_1.Worker();
-exports.thunkWorker.addGlobalHandler(async ({ event, relays, resolve }) => {
+exports.thunkWorker.addGlobalHandler(async (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 ((0, util_1.isUnwrappedEvent)(event)) {
         event = event.wrap;
@@ -26,46 +60,34 @@ exports.thunkWorker.addGlobalHandler(async ({ event, relays, resolve }) => {
     }
     // We're guaranteed to have a signed event at this point
     const signedEvent = event;
-    const { id, sig } = signedEvent;
+    // Wait if the thunk is to be delayed
+    if (thunk.request.delay) {
+        await (0, lib_1.sleep)(thunk.request.delay);
+    }
+    // Skip publishing if aborted
+    if (thunk.controller.signal.aborted) {
+        return;
+    }
     // Send it off
-    const pub = (0, net_1.publish)({ event: signedEvent, relays });
+    const pub = (0, net_1.publish)({ event: signedEvent, relays: thunk.request.relays });
     // Copy the signature over since we had deferred it
-    const savedEvent = core_1.repository.getEvent(id);
+    const savedEvent = core_1.repository.getEvent(signedEvent.id);
     // The event may already be replaced or deleted
     if (savedEvent) {
-        savedEvent.sig = sig;
+        savedEvent.sig = signedEvent.sig;
     }
-    // Track publish success
-    const statusByUrl = {};
-    pub.emitter.on("*", (status, url, message) => {
-        Object.assign(statusByUrl, { [url]: { id, url, status, message } });
-        exports.publishStatusData.update((0, lib_1.assoc)(id, statusByUrl));
+    const completed = new Set();
+    pub.emitter.on("*", async (status, url, message) => {
+        thunk.status.update((0, lib_1.assoc)(url, { status, message }));
+        if (status !== net_1.PublishStatus.Pending) {
+            completed.add(url);
+        }
         if (status === net_1.PublishStatus.Success) {
-            core_1.tracker.track(id, url);
+            core_1.tracker.track(signedEvent.id, url);
         }
-        if (Object.values(statusByUrl).filter(s => s.status !== net_1.PublishStatus.Pending).length ===
-            relays.length) {
-            resolve(statusByUrl);
+        if (completed.size === thunk.request.relays.length) {
+            thunk.result.resolve((0, store_1.get)(thunk.status));
         }
     });
 });
-const prepEvent = (event) => {
-    if (!(0, util_1.isStampedEvent)(event)) {
-        event = (0, signer_1.stamp)(event);
-    }
-    if (!(0, util_1.isOwnedEvent)(event)) {
-        event = (0, signer_1.own)(event, (0, store_1.get)(session_1.pubkey));
-    }
-    if (!(0, util_1.isHashedEvent)(event)) {
-        event = (0, signer_1.hash)(event);
-    }
-    return event;
-};
-exports.prepEvent = prepEvent;
-const publishThunk = (params) => new Promise(resolve => {
-    const event = (0, exports.prepEvent)(params.event);
-    exports.thunkWorker.push({ ...params, event, resolve });
-    core_1.repository.publish(event);
-});
-exports.publishThunk = publishThunk;
 //# sourceMappingURL=thunk.cjs.map

package/build/src/thunk.cjs.map

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

package/build/src/thunk.d.ts

@@ -1,26 +1,40 @@
 /// <reference types="svelte" />
+import type { Writable } from 'svelte/store';
 import { Worker } from '@welshman/lib';
+import type { Deferred } from '@welshman/lib';
 import type { TrustedEvent, EventTemplate, StampedEvent, OwnedEvent } from '@welshman/util';
 import { PublishStatus } from "@welshman/net";
-export type PublishStatusData = {
-    id: string;
-    url: string;
+export type ThunkEvent = EventTemplate | StampedEvent | OwnedEvent | TrustedEvent;
+export type ThunkRequest = {
+    event: ThunkEvent;
+    relays: string[];
+    delay?: number;
+};
+export type ThunkStatus = {
     message: string;
     status: PublishStatus;
 };
-export type PublishStatusDataByUrl = Record<string, PublishStatusData>;
-export type PublishStatusDataByUrlById = Record<string, PublishStatusDataByUrl>;
-export declare const publishStatusData: import("svelte/store").Writable<PublishStatusDataByUrlById>;
-export type ThunkWithResolve = {
+export type ThunkStatusByUrl = Record<string, ThunkStatus>;
+export type Thunk = {
     event: TrustedEvent;
-    relays: string[];
-    resolve: (data: PublishStatusDataByUrl) => void;
+    request: ThunkRequest;
+    controller: AbortController;
+    result: Deferred<ThunkStatusByUrl>;
+    status: Writable<ThunkStatusByUrl>;
 };
-export declare const thunkWorker: Worker<ThunkWithResolve>;
-export type ThunkEvent = EventTemplate | StampedEvent | OwnedEvent | TrustedEvent;
 export declare const prepEvent: (event: ThunkEvent) => TrustedEvent;
-export type ThunkParams = {
-    event: ThunkEvent;
-    relays: string[];
+export declare const makeThunk: (request: ThunkRequest) => {
+    event: TrustedEvent;
+    request: ThunkRequest;
+    controller: AbortController;
+    result: Deferred<ThunkStatusByUrl>;
+    status: Writable<ThunkStatusByUrl>;
+};
+export declare const publishThunk: (request: ThunkRequest) => {
+    event: TrustedEvent;
+    request: ThunkRequest;
+    controller: AbortController;
+    result: Deferred<ThunkStatusByUrl>;
+    status: Writable<ThunkStatusByUrl>;
 };
-export declare const publishThunk: (params: ThunkParams) => Promise<PublishStatusDataByUrl>;
+export declare const thunkWorker: Worker<Thunk>;

package/build/src/thunk.mjs

@@ -1,13 +1,44 @@
 import { writable, get } from 'svelte/store';
-import { Worker, assoc } from '@welshman/lib';
+import { Worker, defer, sleep, assoc } 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.mjs";
 import { pubkey, getSession, getSigner } from "./session.mjs";
-export const publishStatusData = writable({});
+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 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 publishThunk = (request) => {
+    const thunk = makeThunk(request);
+    thunkWorker.push(thunk);
+    repository.publish(thunk.event);
+    thunk.controller.signal.addEventListener('abort', () => {
+        repository.removeEvent(thunk.event.id);
+    });
+    return thunk;
+};
 export const thunkWorker = new Worker();
-thunkWorker.addGlobalHandler(async ({ event, relays, resolve }) => {
+thunkWorker.addGlobalHandler(async (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;
@@ -23,44 +54,34 @@ thunkWorker.addGlobalHandler(async ({ event, relays, resolve }) => {
     }
     // We're guaranteed to have a signed event at this point
     const signedEvent = event;
-    const { id, sig } = signedEvent;
+    // 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;
+    }
     // Send it off
-    const pub = publish({ event: signedEvent, relays });
+    const pub = publish({ event: signedEvent, relays: thunk.request.relays });
     // Copy the signature over since we had deferred it
-    const savedEvent = repository.getEvent(id);
+    const savedEvent = repository.getEvent(signedEvent.id);
     // The event may already be replaced or deleted
     if (savedEvent) {
-        savedEvent.sig = sig;
+        savedEvent.sig = signedEvent.sig;
     }
-    // Track publish success
-    const statusByUrl = {};
-    pub.emitter.on("*", (status, url, message) => {
-        Object.assign(statusByUrl, { [url]: { id, url, status, message } });
-        publishStatusData.update(assoc(id, statusByUrl));
+    const completed = new Set();
+    pub.emitter.on("*", async (status, url, message) => {
+        thunk.status.update(assoc(url, { status, message }));
+        if (status !== PublishStatus.Pending) {
+            completed.add(url);
+        }
         if (status === PublishStatus.Success) {
-            tracker.track(id, url);
+            tracker.track(signedEvent.id, url);
         }
-        if (Object.values(statusByUrl).filter(s => s.status !== PublishStatus.Pending).length ===
-            relays.length) {
-            resolve(statusByUrl);
+        if (completed.size === thunk.request.relays.length) {
+            thunk.result.resolve(get(thunk.status));
         }
     });
 });
-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 const publishThunk = (params) => new Promise(resolve => {
-    const event = prepEvent(params.event);
-    thunkWorker.push({ ...params, event, resolve });
-    repository.publish(event);
-});
 //# sourceMappingURL=thunk.mjs.map

package/build/src/thunk.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/app",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of svelte stores for use in building nostr client applications.",
@@ -34,10 +34,10 @@
     "@welshman/lib": "~0.0.22",
     "@welshman/feeds": "~0.0.20",
     "@welshman/dvm": "~0.0.10",
-    "@welshman/net": "~0.0.27",
-    "@welshman/signer": "~0.0.8",
+    "@welshman/net": "~0.0.28",
+    "@welshman/signer": "~0.0.9",
     "@welshman/store": "~0.0.10",
-    "@welshman/util": "~0.0.38",
+    "@welshman/util": "~0.0.39",
     "fuse.js": "^7.0.0",
     "idb": "^8.0.0",
     "svelte": "^4.2.18",