@welshman/app 0.4.1 → 0.4.3

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

@@ -1 +1 @@
-{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EACL,OAAO,EACP,OAAO,EACP,KAAK,EACL,GAAG,EACH,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,GAAG,EACH,GAAG,EACH,IAAI,EACJ,MAAM,GACP,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,IAAI,EAAU,YAAY,EAAE,WAAW,EAA8B,MAAM,eAAe,CAAA;AAClG,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAuBvC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAe,EAAE,CAAC,CAAC;IAC/C,UAAU,EAAE,GAAG,EAAE;IACjB,aAAa,EAAE,EAAE;IACjB,UAAU,EAAE,CAAC;IACb,WAAW,EAAE,CAAC;IACd,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,CAAC;IAChB,WAAW,EAAE,CAAC;IACd,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,CAAC;IACf,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;IACZ,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;IACxB,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,CAAC;CAChB,CAAC,CAAA;AAQF,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAU,EAAE,CAAC,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CACtD,OAAO,CACL,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAChC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CACjD,CACF,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;IACzD,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,CAAA;IAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IAED,MAAM,GAAG,GAAQ,MAAM,QAAQ,CAAC,GAAG,IAAI,aAAa,EAAE,EAAC,IAAI,EAAC,CAAC,CAAA;IAC7D,MAAM,aAAa,GAAG,IAAI,GAAG,EAAwB,CAAA;IAErD,KAAK,MAAM,EAAC,GAAG,EAAE,IAAI,EAAC,IAAI,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;QAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAE,OAAO,GAChB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG;IACnC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,OAAiB,EAAE,EAAE;QAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAC3C,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAClD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAE/B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAE9B,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAC,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,EAAC,CAAC,CAAA;YAC1C,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEtC,OAAO,IAAI,CAAA;IACb,CAAC,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAW,EAAE,EAAE,CAClD,mBAAmB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA;AAEhF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAE,EAAE,CAChD,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAEjG,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE;IAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAExC,2BAA2B;IAC3B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAA;IAE9B,oCAAoC;IACpC,IAAI,KAAK,EAAE,KAAK,EAAE,CAAC;QACjB,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,CAAA;QAC/E,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,CAAA;QAC7E,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE;YAAE,OAAO,CAAC,CAAA;IAC/E,CAAC;IAED,kCAAkC;IAClC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAA;IAEjC,8CAA8C;IAC9C,IAAI,KAAK,EAAE,KAAK;QAAE,OAAO,GAAG,CAAA;IAE5B,4CAA4C;IAC5C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1F,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,2BAA2B;IAC3B,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAMD,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,OAA2B,EAAE,EAAE;IAClE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QACtB,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAEpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,MAAM,MAAM,GAAU,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAC,GAAG,EAAC,CAAA;YAEpD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAClB,MAAM,CAAC,KAAK,GAAG,cAAc,EAAE,CAAA;YACjC,CAAC;iBAAM,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBACnD,yBAAyB;gBACzB,MAAM,CAAC,KAAK,GAAG,EAAC,GAAG,cAAc,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAC,CAAA;YACvD,CAAC;YAED,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBAChC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACtB,CAAC;YAED,qEAAqE;YACrE,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,EAAC,GAAG,MAAM,EAAC,CAAC,CAAA;QACpC,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,CAAgB,EAAE,GAAW,EAAE,EAAE;IAC1D,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,aAAa,EAAE,CAAA;gBACrB,KAAK,CAAC,YAAY,GAAG,GAAG,EAAE,CAAA;YAC5B,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,aAAa,EAAE,CAAA;gBACrB,KAAK,CAAC,YAAY,GAAG,GAAG,EAAE,CAAA;YAC5B,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,CAAe,EAAE,GAAW,EAAE,EAAE;IACtE,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAA;QAErB,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,IAAI,EAAE,EAAE,CAAC;oBACP,KAAK,CAAC,qBAAqB,EAAE,CAAA;gBAC/B,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,qBAAqB,EAAE,CAAA;gBAC/B,CAAC;YACH,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,SAAS,GAAG,GAAG,EAAE,CAAA;YACzB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,WAAW,EAAE,CAAA;gBACnB,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE,CAAA;YAC1B,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,UAAU,EAAE,CAAA;YACpB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,YAAY,EAAE,CAAA;YACtB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,EAAE;IACrD,IAAI,MAAM,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;QACjC,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,SAAS,GAAG,GAAG,EAAE,CAAA;gBACvB,KAAK,CAAC,UAAU,EAAE,CAAA;YACpB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;QACnC,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE,CAAA;gBACxB,KAAK,CAAC,WAAW,EAAE,CAAA;YACrB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,MAAM,KAAK,YAAY,CAAC,KAAK,EAAE,CAAC;QAClC,gBAAgB,CAAC;YACf,GAAG;YACH,KAAK,CAAC,EAAE;gBACN,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE,CAAA;gBACxB,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;YAC1E,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;IACzC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IAC/C,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAE7C,OAAO,GAAG,EAAE;QACV,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QAC1C,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QAChD,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAChD,CAAC,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"relays.js","sourceRoot":"","sources":["../../../src/relays.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,12 @@
-import { Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer } from "@welshman/signer";
+import { Wallet } from "@welshman/util";
+import { WrappedSigner, ISigner } from "@welshman/signer";
 export declare enum SessionMethod {
     Nip01 = "nip01",
     Nip07 = "nip07",
     Nip46 = "nip46",
     Nip55 = "nip55",
-    Pubkey = "pubkey"
+    Pubkey = "pubkey",
+    Anonymous = "anonymous"
 }
 export type SessionNip01 = {
     method: SessionMethod.Nip01;
@@ -33,8 +35,13 @@ export type SessionPubkey = {
     method: SessionMethod.Pubkey;
     pubkey: string;
 };
-export type SessionAnyMethod = SessionNip01 | SessionNip07 | SessionNip46 | SessionNip55 | SessionPubkey;
-export type Session = SessionAnyMethod & Record<string, any>;
+export type SessionAnonymous = {
+    method: SessionMethod.Anonymous;
+};
+export type SessionAnyMethod = SessionNip01 | SessionNip07 | SessionNip46 | SessionNip55 | SessionPubkey | SessionAnonymous;
+export type Session = SessionAnyMethod & {
+    wallet?: Wallet;
+} & Record<string, any>;
 export declare const pubkey: import("@welshman/store").WritableWithGetter<string | undefined>;
 export declare const sessions: import("@welshman/store").WritableWithGetter<Record<string, Session>>;
 export declare const session: import("@welshman/store").ReadableWithGetter<Session | undefined>;
@@ -60,13 +67,26 @@ export declare const loginWithNip46: (pubkey: string, clientSecret: string, sign
 export declare const loginWithNip55: (pubkey: string, signer: string) => void;
 export declare const loginWithPubkey: (pubkey: string) => void;
 export declare const nip46Perms = "sign_event:22242,nip04_encrypt,nip04_decrypt,nip44_encrypt,nip44_decrypt";
+export declare enum SignerLogEntryStatus {
+    Pending = "pending",
+    Success = "success",
+    Failure = "failure"
+}
+export type SignerLogEntry = {
+    id: string;
+    method: string;
+    status: SignerLogEntryStatus;
+    duration: number;
+};
+export declare const signerLog: import("@welshman/store").WritableWithGetter<SignerLogEntry[]>;
+export declare const wrapSigner: (signer: ISigner) => WrappedSigner;
 export declare const getSigner: {
-    (args_0: Session | undefined): NonNullable<Nip01Signer | Nip07Signer | Nip46Signer | Nip55Signer | undefined>;
-    cache: import("@welshman/lib").LRUCache<string, Nip01Signer | Nip07Signer | Nip46Signer | Nip55Signer | undefined>;
+    (args_0: Session | undefined): WrappedSigner;
+    cache: import("@welshman/lib").LRUCache<string, WrappedSigner | undefined>;
     getKey: (args: [Session | undefined]) => string;
-    getValue: (args: [Session | undefined]) => Nip01Signer | Nip07Signer | Nip46Signer | Nip55Signer | undefined;
-    pop: (args_0: Session | undefined) => Nip01Signer | Nip07Signer | Nip46Signer | Nip55Signer | undefined;
+    getValue: (args: [Session | undefined]) => WrappedSigner | undefined;
+    pop: (args_0: Session | undefined) => WrappedSigner | undefined;
 };
-export declare const signer: import("@welshman/store").ReadableWithGetter<NonNullable<Nip01Signer | Nip07Signer | Nip46Signer | Nip55Signer | undefined>>;
+export declare const signer: import("@welshman/store").ReadableWithGetter<WrappedSigner>;
 export declare const nip44EncryptToSelf: (payload: string) => Promise<string>;
 //# sourceMappingURL=session.d.ts.map

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

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

package/dist/app/src/session.js

@@ -1,7 +1,7 @@
 import { derived, writable } from "svelte/store";
-import { cached, omit, equals, assoc } from "@welshman/lib";
+import { cached, randomId, append, omit, equals, assoc } from "@welshman/lib";
 import { withGetter } from "@welshman/store";
-import { Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer, getPubkey, } from "@welshman/signer";
+import { WrappedSigner, Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer, getPubkey, } from "@welshman/signer";
 export var SessionMethod;
 (function (SessionMethod) {
     SessionMethod["Nip01"] = "nip01";
@@ -9,6 +9,7 @@ export var SessionMethod;
     SessionMethod["Nip46"] = "nip46";
     SessionMethod["Nip55"] = "nip55";
     SessionMethod["Pubkey"] = "pubkey";
+    SessionMethod["Anonymous"] = "anonymous";
 })(SessionMethod || (SessionMethod = {}));
 export const pubkey = withGetter(writable(undefined));
 export const sessions = withGetter(writable({}));
@@ -76,21 +77,46 @@ export const loginWithNip55 = (pubkey, signer) => addSession(makeNip55Session(pu
 export const loginWithPubkey = (pubkey) => addSession(makePubkeySession(pubkey));
 // Other stuff
 export const nip46Perms = "sign_event:22242,nip04_encrypt,nip04_decrypt,nip44_encrypt,nip44_decrypt";
+export var SignerLogEntryStatus;
+(function (SignerLogEntryStatus) {
+    SignerLogEntryStatus["Pending"] = "pending";
+    SignerLogEntryStatus["Success"] = "success";
+    SignerLogEntryStatus["Failure"] = "failure";
+})(SignerLogEntryStatus || (SignerLogEntryStatus = {}));
+export const signerLog = withGetter(writable([]));
+export const wrapSigner = (signer) => new WrappedSigner(signer, async (method, thunk) => {
+    const id = randomId();
+    const now = Date.now();
+    signerLog.update(log => append({ id, method, status: SignerLogEntryStatus.Pending, duration: 0 }, log));
+    try {
+        const result = await thunk();
+        signerLog.update(log => log.map(x => x.id === id
+            ? { ...x, status: SignerLogEntryStatus.Success, duration: Date.now() - now }
+            : x));
+        return result;
+    }
+    catch (error) {
+        signerLog.update(log => log.map(x => x.id === id
+            ? { ...x, status: SignerLogEntryStatus.Failure, duration: Date.now() - now }
+            : x));
+        throw error;
+    }
+});
 export const getSigner = cached({
     maxSize: 100,
     getKey: ([session]) => `${session?.method}:${session?.pubkey}`,
     getValue: ([session]) => {
         if (isNip07Session(session))
-            return new Nip07Signer();
+            return wrapSigner(new Nip07Signer());
         if (isNip01Session(session))
-            return new Nip01Signer(session.secret);
+            return wrapSigner(new Nip01Signer(session.secret));
         if (isNip55Session(session))
-            return new Nip55Signer(session.signer);
+            return wrapSigner(new Nip55Signer(session.signer));
         if (isNip46Session(session)) {
             const { secret: clientSecret, handler: { relays, pubkey: signerPubkey }, } = session;
             const broker = new Nip46Broker({ clientSecret, signerPubkey, relays });
             const signer = new Nip46Signer(broker);
-            return signer;
+            return wrapSigner(signer);
         }
     },
 });

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

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

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

@@ -12,11 +12,11 @@ export type StorageAdapter = {
 export declare let db: IDBPDatabase | undefined;
 export declare const ready: import("@welshman/lib").Deferred<void, void>;
 export declare const dead: import("@welshman/store").WritableWithGetter<boolean>;
-export declare const subs: Unsubscriber[];
+export declare const unsubscribers: Unsubscriber[];
 export declare const getAll: (name: string) => Promise<any[]>;
 export declare const bulkPut: (name: string, data: any[]) => Promise<void>;
 export declare const bulkDelete: (name: string, ids: string[]) => Promise<void>;
-export declare const initStorage: (name: string, version: number, adapters: Record<string, StorageAdapter>) => Promise<(() => void) | undefined>;
+export declare const initStorage: (name: string, version: number, adapters: Record<string, StorageAdapter>) => Promise<void>;
 export declare const closeStorage: () => Promise<void>;
 export declare const clearStorage: () => Promise<void>;
 //# sourceMappingURL=storage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/storage.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,KAAK,CAAA;AAEhC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AAIzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,EAAE,MAAM,YAAY,CAAA;CACzB,CAAA;AAED,eAAO,IAAI,EAAE,EAAE,YAAY,GAAG,SAAS,CAAA;AAEvC,eAAO,MAAM,KAAK,8CAAgB,CAAA;AAElC,eAAO,MAAM,IAAI,uDAA8B,CAAA;AAE/C,eAAO,MAAM,IAAI,EAAE,YAAY,EAAO,CAAA;AAEtC,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,mBAUxC,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,kBAiBtD,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAK,MAAM,EAAE,kBAQ3D,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,UAAU,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,sCAqCzC,CAAA;AAED,eAAO,MAAM,YAAY,qBAIxB,CAAA;AAED,eAAO,MAAM,YAAY,qBAMxB,CAAA"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/storage.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,KAAK,CAAA;AAEhC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AAIzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,EAAE,MAAM,YAAY,CAAA;CACzB,CAAA;AAED,eAAO,IAAI,EAAE,EAAE,YAAY,GAAG,SAAS,CAAA;AAEvC,eAAO,MAAM,KAAK,8CAAgB,CAAA;AAElC,eAAO,MAAM,IAAI,uDAA8B,CAAA;AAE/C,eAAO,MAAM,aAAa,EAAE,YAAY,EAAO,CAAA;AAE/C,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,mBAUxC,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,kBAiBtD,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAK,MAAM,EAAE,kBAQ3D,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,UAAU,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,kBAuCzC,CAAA;AAED,eAAO,MAAM,YAAY,qBAIxB,CAAA;AAED,eAAO,MAAM,YAAY,qBAMxB,CAAA"}

package/dist/app/src/storage.js

@@ -5,7 +5,7 @@ import { withGetter } from "@welshman/store";
 export let db;
 export const ready = defer();
 export const dead = withGetter(writable(false));
-export const subs = [];
+export const unsubscribers = [];
 export const getAll = async (name) => {
     await ready;
     const tx = db.transaction(name, "readwrite");
@@ -61,13 +61,14 @@ export const initStorage = async (name, version, adapters) => {
         },
     });
     ready.resolve();
-    await Promise.all(Object.values(adapters).map(adapter => adapter.init()));
-    const unsubscribers = Object.values(adapters).map(adapter => adapter.sync());
-    return () => unsubscribers.forEach(call);
+    await Promise.all(Object.values(adapters).map(async (adapter) => {
+        await adapter.init();
+        unsubscribers.push(adapter.sync());
+    }));
 };
 export const closeStorage = async () => {
     dead.set(true);
-    subs.forEach(unsub => unsub());
+    unsubscribers.forEach(call);
     await db?.close();
 };
 export const clearStorage = async () => {

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

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

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

@@ -19,13 +19,15 @@ export declare class Thunk {
     constructor(options: ThunkOptions);
     _notify(): void;
     _fail(message: string): void;
+    _setPending(relay: string): void;
+    _setTimeout(relay: string): void;
+    _setAborted(relay: 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[]);
@@ -35,17 +37,19 @@ export declare class MergedThunk {
 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 getThunkUrlsWithStatus: (statuses: PublishStatus | PublishStatus[], thunk: AbstractThunk) => string[];
+export declare const getCompleteThunkUrls: (thunk: AbstractThunk) => string[];
+export declare const getIncompleteThunkUrls: (thunk: AbstractThunk) => string[];
+export declare const getFailedThunkUrls: (thunk: AbstractThunk) => string[];
+export declare const thunkHasStatus: (statuses: PublishStatus | PublishStatus[], thunk: AbstractThunk) => boolean;
 export declare const thunkIsComplete: (thunk: AbstractThunk) => boolean;
-export declare const getThunkError: (thunk: Thunk) => Promise<string>;
-export declare const waitForThunkStatus: (thunk: Thunk, status: PublishStatus) => Promise<boolean>;
-export declare const waitForThunkCompletion: (thunk: Thunk) => Promise<void>;
-export declare function walkThunks(thunks: AbstractThunk[]): Iterable<Thunk>;
+export declare const getThunkError: (thunk: Thunk) => string | undefined;
+export declare const waitForThunkError: (thunk: Thunk) => Promise<string>;
 export declare const thunks: import("svelte/store").Writable<Record<string, AbstractThunk>>;
 export declare const thunkQueue: TaskQueue<Thunk>;
+export declare const mergeThunks: (thunks: AbstractThunk[]) => MergedThunk;
+export declare function flattenThunks(thunks: AbstractThunk[]): Iterable<Thunk>;
 export declare const publishThunk: (options: ThunkOptions) => Thunk;
-export declare const abortThunk: (thunk: Thunk) => void;
+export declare const abortThunk: (thunk: AbstractThunk) => void;
+export declare const retryThunk: (thunk: AbstractThunk) => Thunk | MergedThunk;
 //# 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,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,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,oBAatC,CAAA;AAEJ,eAAO,MAAM,kBAAkB,GAAI,OAAO,KAAK,EAAE,QAAQ,aAAa,qBAalE,CAAA;AAEJ,eAAO,MAAM,sBAAsB,GAAI,OAAO,KAAK,kBAO/C,CAAA;AAEJ,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"}
+{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"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"}

package/dist/app/src/thunk.js

@@ -1,5 +1,5 @@
 import { writable, get } from "svelte/store";
-import { TaskQueue, ifLet, dissoc, remove, defer, sleep, assoc, spec, nthEq, nth, } from "@welshman/lib";
+import { TaskQueue, ifLet, ensurePlural, dissoc, remove, defer, sleep, assoc, 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";
@@ -31,6 +31,12 @@ export class Thunk {
         for (const relay of options.relays) {
             this.status[relay] = PublishStatus.Sending;
         }
+        this.controller.signal.addEventListener("abort", () => {
+            console.log("abort");
+            for (const relay of options.relays) {
+                this._setAborted(relay);
+            }
+        });
     }
     _notify() {
         for (const subscriber of this._subs) {
@@ -44,6 +50,23 @@ export class Thunk {
         }
         this._notify();
     }
+    _setPending(relay) {
+        this.options.onPending?.(relay);
+        this.status[relay] = PublishStatus.Pending;
+        this._notify();
+    }
+    _setTimeout(relay) {
+        this.options.onTimeout?.(relay);
+        this.status[relay] = PublishStatus.Timeout;
+        this.details[relay] = "Publish timed out";
+        this._notify();
+    }
+    _setAborted(relay) {
+        this.options.onAborted?.(relay);
+        this.status[relay] = PublishStatus.Aborted;
+        this.details[relay] = "Publish was aborted";
+        this._notify();
+    }
     async publish() {
         let event = this.event;
         // Handle abort immediately if possible
@@ -64,7 +87,7 @@ export class Thunk {
                 event = await signer.sign(event);
             }
             catch (e) {
-                return this._fail(String(e.error || e));
+                return this._fail(`Failed to sign event: ${String(e.error || e)}`);
             }
         }
         // We're guaranteed to have a signed event at this point
@@ -99,21 +122,13 @@ export class Thunk {
                 this._notify();
             },
             onPending: (relay) => {
-                this.options.onPending?.(relay);
-                this.status[relay] = PublishStatus.Pending;
-                this._notify();
+                this._setPending(relay);
             },
             onTimeout: (relay) => {
-                this.options.onTimeout?.(relay);
-                this.status[relay] = PublishStatus.Timeout;
-                this.details[relay] = "Publish timed out";
-                this._notify();
+                this._setTimeout(relay);
             },
             onAborted: (relay) => {
-                this.options.onAborted?.(relay);
-                this.status[relay] = PublishStatus.Aborted;
-                this.details[relay] = "Publish was aborted";
-                this._notify();
+                this._setAborted(relay);
             },
             onComplete: () => {
                 this.options.onComplete?.();
@@ -132,29 +147,28 @@ export class Thunk {
 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)));
+        const { Aborted, Failure, Timeout, Pending, Sending, Success } = PublishStatus;
+        const relays = new Set(thunks.flatMap(thunk => 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 }));
+                    for (const status of [Aborted, Failure, Timeout, Pending, Sending, Success]) {
+                        const thunk = thunks.find(t => t.status[relay] === status);
                         if (thunk) {
                             this.status[relay] = thunk.status[relay];
                             this.details[relay] = thunk.details[relay];
                         }
                     }
                 }
+                console.log(this.status);
                 this._notify();
-                if (thunks.filter(thunkIsComplete).length === thunks.length) {
+                if (thunks.every(thunkIsComplete)) {
                     this._subs = [];
                 }
             });
@@ -175,82 +189,74 @@ export class MergedThunk {
 }
 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];
+// Thunk status urls
+export const getThunkUrlsWithStatus = (statuses, thunk) => {
+    statuses = ensurePlural(statuses);
     return Object.entries(thunk.status)
-        .filter(([_, s]) => incompleteStatuses.includes(s))
-        .map(nth(1));
+        .filter(([_, status]) => statuses.includes(status))
+        .map(nth(0));
 };
-export const thunkIsComplete = (thunk) => thunkCompleteUrls(thunk).length > 0;
-export const getThunkError = (thunk) => new Promise(resolve => {
-    thunk.subscribe($thunk => {
-        for (const [relay, status] of Object.entries($thunk.status)) {
-            if (status === PublishStatus.Failure) {
-                resolve($thunk.details[relay]);
-            }
+export const getCompleteThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
+export const getIncompleteThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
+export const getFailedThunkUrls = (thunk) => getThunkUrlsWithStatus([PublishStatus.Failure, PublishStatus.Timeout], thunk);
+// Thunk status checks
+export const thunkHasStatus = (statuses, thunk) => getThunkUrlsWithStatus(statuses, thunk).length > 0;
+export const thunkIsComplete = (thunk) => !thunkHasStatus([PublishStatus.Sending, PublishStatus.Pending], thunk);
+// Thunk errors
+export const getThunkError = (thunk) => {
+    for (const [relay, status] of Object.entries(thunk.status)) {
+        if (status === PublishStatus.Failure) {
+            return thunk.details[relay];
         }
-        if (thunkIsComplete($thunk)) {
-            resolve("");
-        }
-    });
-});
-export const waitForThunkStatus = (thunk, status) => new Promise(resolve => {
+    }
+    if (thunkIsComplete(thunk)) {
+        return "";
+    }
+};
+// Thunk utilities that return promises
+export const waitForThunkError = (thunk) => new Promise(resolve => {
     thunk.subscribe($thunk => {
-        for (const [_, s] of Object.entries($thunk.status)) {
-            if (s === status) {
-                resolve(true);
-            }
-        }
-        if (thunkIsComplete($thunk)) {
-            resolve(false);
+        const error = getThunkError($thunk);
+        if (error !== undefined) {
+            resolve(error);
         }
     });
 });
-export const waitForThunkCompletion = (thunk) => new Promise(resolve => {
-    thunk.subscribe($thunk => {
-        if (thunkIsComplete($thunk)) {
-            resolve();
-        }
-    });
+// Thunk state
+export const thunks = writable({});
+export const thunkQueue = new TaskQueue({
+    batchSize: 50,
+    processItem: (thunk) => {
+        thunk.publish();
+    },
 });
-export function* walkThunks(thunks) {
+// Other thunk utilities
+export const mergeThunks = (thunks) => new MergedThunk(Array.from(flattenThunks(thunks)));
+export function* flattenThunks(thunks) {
     for (const thunk of thunks) {
-        if (thunk instanceof MergedThunk) {
-            yield* walkThunks(thunk.thunks);
+        if (isMergedThunk(thunk)) {
+            yield* flattenThunks(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);
+    for (const child of flattenThunks([thunk])) {
+        child.controller.abort();
+        thunks.update(dissoc(child.event.id));
+        repository.removeEvent(child.event.id);
+    }
 };
+export const retryThunk = (thunk) => isMergedThunk(thunk)
+    ? mergeThunks(thunk.thunks.map(t => publishThunk(t.options)))
+    : publishThunk(thunk.options);
 //# sourceMappingURL=thunk.js.map