@welshman/signer 0.12.5 → 0.13.0

package/dist/net/src/util.d.ts

@@ -8,7 +8,8 @@ export declare const WRAP_DRIFT: number;
  * Rewrites a filter so re-sending it picks up where the subscription left off rather than
  * repeating itself. A filter asking for gift wraps reaches further back, since a wrap
  * published after the subscription dropped carries a timestamp from before it. Neither reaches
- * back past the filter's own `since`.
+ * back past the filter's own `since`. A limit sizes the subscription's first page, and `since`
+ * bounds the gap, so the catch-up drops it.
  * @param filter - the filter as originally sent
  * @param since - when the socket last heard from the relay
  * @returns a filter covering the gap

package/dist/net/src/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../net/src/util.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAA;AAErC;;GAEG;AACH,eAAO,MAAM,UAAU,QAAU,CAAA;AAEjC;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAS7D,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../net/src/util.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAA;AAErC;;GAEG;AACH,eAAO,MAAM,UAAU,QAAU,CAAA;AAEjC;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAQ7D,CAAA"}

package/dist/net/src/util.js

@@ -8,7 +8,8 @@ export const WRAP_DRIFT = 2 * DAY;
  * Rewrites a filter so re-sending it picks up where the subscription left off rather than
  * repeating itself. A filter asking for gift wraps reaches further back, since a wrap
  * published after the subscription dropped carries a timestamp from before it. Neither reaches
- * back past the filter's own `since`.
+ * back past the filter's own `since`. A limit sizes the subscription's first page, and `since`
+ * bounds the gap, so the catch-up drops it.
  * @param filter - the filter as originally sent
  * @param since - when the socket last heard from the relay
  * @returns a filter covering the gap
@@ -16,9 +17,9 @@ export const WRAP_DRIFT = 2 * DAY;
 export const catchUpFilter = (filter, since) => {
     // Only a filter that names wraps is widened: one without kinds would fetch days of everything
     const drift = filter.kinds?.includes(WRAP) ? WRAP_DRIFT : 0;
-    if (filter.limit === 0) {
-        filter = omit(["limit"], filter);
-    }
-    return { ...filter, since: Math.max(filter.since || 0, since - drift) };
+    return {
+        ...omit(["limit"], filter),
+        since: Math.max(filter.since || 0, since - drift),
+    };
 };
 //# sourceMappingURL=util.js.map

package/dist/net/src/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../net/src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAKnC;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAG,GAAG,CAAA;AAEjC;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,KAAa,EAAU,EAAE;IACrE,8FAA8F;IAC9F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3D,IAAI,MAAM,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,EAAC,GAAG,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,EAAC,CAAA;AACvE,CAAC,CAAA"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../net/src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAKnC;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAG,GAAG,CAAA;AAEjC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,KAAa,EAAU,EAAE;IACrE,8FAA8F;IAC9F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3D,OAAO;QACL,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAC1B,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;KAClD,CAAA;AACH,CAAC,CAAA"}

package/dist/net/src/wrapManager.d.ts

@@ -29,8 +29,6 @@ export declare class WrapManager extends Emitter {
     remove: (id: string) => void;
     removeByRumorId: (rumorId: string) => void;
     _add: (wrapItem: WrapItem) => void;
-    _addReference: (index: Map<string, WrapReference>, key: string, wrapId: string) => void;
     _remove: (wrapItem: WrapItem) => void;
-    _removeReference: (index: Map<string, WrapReference>, key: string, wrapId: string) => void;
 }
 //# sourceMappingURL=wrapManager.d.ts.map

package/dist/net/src/wrapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapManager.d.ts","sourceRoot":"","sources":["../../../../net/src/wrapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAA;AACnD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE1C,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG;IACpD,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAA;AAEpC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,qBAAa,WAAY,SAAQ,OAAO;IAI1B,QAAQ,CAAC,OAAO,EAAE,kBAAkB;IAHhD,UAAU,wBAA8B;IACxC,WAAW,6BAAmC;gBAEzB,OAAO,EAAE,kBAAkB;IAMhD,IAAI,mBAA6C;IAEjD,QAAQ,GAAI,SAAS,MAAM,gBACwD;IAEnF,QAAQ,GAAI,QAAQ,MAAM,uDAMzB;IAID,KAAK,aAIJ;IAED,IAAI,GAAI,WAAW,QAAQ,EAAE,UAS5B;IAED,GAAG,GAAI,4BAA0B;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAC,UAgB1F;IAID,MAAM,GAAI,IAAI,MAAM,UAanB;IAED,eAAe,GAAI,SAAS,MAAM,UAIjC;IAID,IAAI,GAAI,UAAU,QAAQ,UAGzB;IAED,aAAa,GAAI,OAAO,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,MAAM,EAAE,QAAQ,MAAM,UAQ9E;IAED,OAAO,GAAI,UAAU,QAAQ,UAG5B;IAED,gBAAgB,GAAI,OAAO,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,MAAM,EAAE,QAAQ,MAAM,UAYjF;CACF"}
+{"version":3,"file":"wrapManager.d.ts","sourceRoot":"","sources":["../../../../net/src/wrapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAA6B,MAAM,eAAe,CAAA;AACjE,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE1C,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG;IACpD,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAA;AAEpC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,qBAAa,WAAY,SAAQ,OAAO;IAI1B,QAAQ,CAAC,OAAO,EAAE,kBAAkB;IAHhD,UAAU,wBAA8B;IACxC,WAAW,6BAAmC;gBAEzB,OAAO,EAAE,kBAAkB;IAMhD,IAAI,mBAA6C;IAEjD,QAAQ,GAAI,SAAS,MAAM,gBACwD;IAEnF,QAAQ,GAAI,QAAQ,MAAM,uDAMzB;IAID,KAAK,aAIJ;IAED,IAAI,GAAI,WAAW,QAAQ,EAAE,UAS5B;IAED,GAAG,GAAI,4BAA0B;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAC,UAgB1F;IAID,MAAM,GAAI,IAAI,MAAM,UAanB;IAED,eAAe,GAAI,SAAS,MAAM,UAIjC;IAID,IAAI,GAAI,UAAU,QAAQ,UAGzB;IAED,OAAO,GAAI,UAAU,QAAQ,UAU5B;CACF"}

package/dist/net/src/wrapManager.js

@@ -1,4 +1,4 @@
-import { Emitter, remove, omit } from "@welshman/lib";
+import { Emitter, remove, omit, pushToMapKey } from "@welshman/lib";
 export class WrapManager extends Emitter {
     options;
     _wrapIndex = new Map();
@@ -63,31 +63,16 @@ export class WrapManager extends Emitter {
     // Utils
     _add = (wrapItem) => {
         this._wrapIndex.set(wrapItem.id, wrapItem);
-        this._addReference(this._rumorIndex, wrapItem.rumorId, wrapItem.id);
-    };
-    _addReference = (index, key, wrapId) => {
-        const reference = index.get(key);
-        if (reference) {
-            reference.push(wrapId);
-        }
-        else {
-            index.set(key, [wrapId]);
-        }
+        pushToMapKey(this._rumorIndex, wrapItem.rumorId, wrapItem.id);
     };
     _remove = (wrapItem) => {
+        const wrapIds = remove(wrapItem.id, this._rumorIndex.get(wrapItem.rumorId) || []);
         this._wrapIndex.delete(wrapItem.id);
-        this._removeReference(this._rumorIndex, wrapItem.rumorId, wrapItem.id);
-    };
-    _removeReference = (index, key, wrapId) => {
-        const reference = index.get(key);
-        if (reference) {
-            const wraps = remove(wrapId, reference);
-            if (wraps.length > 0) {
-                index.set(key, wraps);
-            }
-            else {
-                index.delete(key);
-            }
+        if (wrapIds.length > 0) {
+            this._rumorIndex.set(wrapItem.rumorId, wrapIds);
+        }
+        else {
+            this._rumorIndex.delete(wrapItem.rumorId);
         }
     };
 }

package/dist/net/src/wrapManager.js.map

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

package/dist/signer/src/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./util.js";
+export * from "./queue.js";
 export * from "./nip59.js";
 export * from "./signers/nip01.js";
 export * from "./signers/nip07.js";

package/dist/signer/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}

package/dist/signer/src/index.js

@@ -1,4 +1,5 @@
 export * from "./util.js";
+export * from "./queue.js";
 export * from "./nip59.js";
 export * from "./signers/nip01.js";
 export * from "./signers/nip07.js";

package/dist/signer/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}

package/dist/signer/src/nip59.d.ts

@@ -1,10 +1,17 @@
 import { SignedEvent, HashedEvent, StampedEvent } from "@welshman/util";
-import { ISigner } from "./util.js";
+import { ISigner, SignerOptions } from "./util.js";
 export declare const now: (drift?: number) => number;
-export declare const getSeal: (signer: ISigner, pubkey: string, rumor: HashedEvent) => Promise<SignedEvent>;
+export declare const getSeal: (signer: ISigner, pubkey: string, rumor: HashedEvent, options?: SignerOptions) => Promise<SignedEvent>;
 export declare const getWrap: (wrapper: ISigner, pubkey: string, seal: SignedEvent, tags: string[][]) => Promise<SignedEvent>;
-export declare const wrap: (signer: ISigner, wrapper: ISigner, pubkey: string, template: StampedEvent, tags?: string[][]) => Promise<SignedEvent>;
-export declare const unwrap: (signer: ISigner, wrap: SignedEvent) => Promise<HashedEvent>;
+export declare const wrap: (signer: ISigner, wrapper: ISigner, pubkey: string, template: StampedEvent, tags?: string[][], options?: SignerOptions) => Promise<SignedEvent>;
+/**
+ * A decision about the wrap itself rather than a failure to reach the signer. The wrap will
+ * read the same way every time it is tried, so a caller is free to remember the verdict;
+ * anything the signer throws is about the signer and may answer next time.
+ */
+export declare class InvalidWrapError extends Error {
+}
+export declare const unwrap: (signer: ISigner, wrap: SignedEvent, options?: SignerOptions) => Promise<HashedEvent>;
 export declare class Nip59 {
     private signer;
     private wrapper?;
@@ -13,7 +20,7 @@ export declare class Nip59 {
     static fromSigner: (signer: ISigner) => Nip59;
     static fromSecret: (secret: string) => Nip59;
     withWrapper: (wrapper: ISigner) => Nip59;
-    wrap: (pubkey: string, template: StampedEvent, tags?: string[][]) => Promise<SignedEvent>;
-    unwrap: (event: SignedEvent) => Promise<HashedEvent>;
+    wrap: (pubkey: string, template: StampedEvent, tags?: string[][], options?: SignerOptions) => Promise<SignedEvent>;
+    unwrap: (event: SignedEvent, options?: SignerOptions) => Promise<HashedEvent>;
 }
 //# sourceMappingURL=nip59.d.ts.map

package/dist/signer/src/nip59.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nip59.d.ts","sourceRoot":"","sources":["../../../src/nip59.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,WAAW,EACX,YAAY,EAKb,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAU,OAAO,EAAC,MAAM,WAAW,CAAA;AAG1C,eAAO,MAAM,GAAG,GAAI,cAAS,WACwC,CAAA;AAErE,eAAO,MAAM,OAAO,GAAU,QAAQ,OAAO,EAAE,QAAQ,MAAM,EAAE,OAAO,WAAW,yBAS9E,CAAA;AAEH,eAAO,MAAM,OAAO,GAClB,SAAS,OAAO,EAChB,QAAQ,MAAM,EACd,MAAM,WAAW,EACjB,MAAM,MAAM,EAAE,EAAE,yBAUf,CAAA;AAEH,eAAO,MAAM,IAAI,GACf,QAAQ,OAAO,EACf,SAAS,OAAO,EAChB,QAAQ,MAAM,EACd,UAAU,YAAY,EACtB,OAAM,MAAM,EAAE,EAAO,yBAQtB,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,QAAQ,OAAO,EAAE,MAAM,WAAW,KAAG,OAAO,CAAC,WAAW,CAQpF,CAAA;AAED,qBAAa,KAAK;IAId,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO,CAAC;IAJlB,OAAO,CAAC,KAAK,CAAyC;gBAG5C,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,OAAO,YAAA;IAG3B,MAAM,CAAC,UAAU,GAAI,QAAQ,OAAO,WAAsB;IAE1D,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,WAAuC;IAE1E,WAAW,GAAI,SAAS,OAAO,WAAoC;IAEnE,IAAI,GAAI,QAAQ,MAAM,EAAE,UAAU,YAAY,EAAE,OAAM,MAAM,EAAE,EAAO,0BACe;IAEpF,MAAM,GAAU,OAAO,WAAW,KAAG,OAAO,CAAC,WAAW,CAAC,CAsBxD;CACF"}
+{"version":3,"file":"nip59.d.ts","sourceRoot":"","sources":["../../../src/nip59.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,WAAW,EACX,WAAW,EACX,YAAY,EAKb,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAU,OAAO,EAAE,aAAa,EAAC,MAAM,WAAW,CAAA;AAGzD,eAAO,MAAM,GAAG,GAAI,cAAS,WACwC,CAAA;AAErE,eAAO,MAAM,OAAO,GAClB,QAAQ,OAAO,EACf,QAAQ,MAAM,EACd,OAAO,WAAW,EAClB,UAAU,aAAa,yBAWtB,CAAA;AAEH,eAAO,MAAM,OAAO,GAClB,SAAS,OAAO,EAChB,QAAQ,MAAM,EACd,MAAM,WAAW,EACjB,MAAM,MAAM,EAAE,EAAE,yBAUf,CAAA;AAEH,eAAO,MAAM,IAAI,GACf,QAAQ,OAAO,EACf,SAAS,OAAO,EAChB,QAAQ,MAAM,EACd,UAAU,YAAY,EACtB,OAAM,MAAM,EAAE,EAAO,EACrB,UAAU,aAAa,yBAQxB,CAAA;AAED;;;;GAIG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAa9C,eAAO,MAAM,MAAM,GACjB,QAAQ,OAAO,EACf,MAAM,WAAW,EACjB,UAAU,aAAa,KACtB,OAAO,CAAC,WAAW,CAWrB,CAAA;AAED,qBAAa,KAAK;IAId,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO,CAAC;IAJlB,OAAO,CAAC,KAAK,CAAoD;gBAGvD,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,OAAO,YAAA;IAG3B,MAAM,CAAC,UAAU,GAAI,QAAQ,OAAO,WAAsB;IAE1D,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,WAAuC;IAE1E,WAAW,GAAI,SAAS,OAAO,WAAoC;IAEnE,IAAI,GAAI,QAAQ,MAAM,EAAE,UAAU,YAAY,EAAE,OAAM,MAAM,EAAE,EAAO,EAAE,UAAU,aAAa,0BACD;IAE7F,MAAM,GAAU,OAAO,WAAW,EAAE,UAAU,aAAa,KAAG,OAAO,CAAC,WAAW,CAAC,CAwBjF;CACF"}

package/dist/signer/src/nip59.js

@@ -1,14 +1,15 @@
-import { isHashedEvent, WRAP, SEAL, prep, hash, } from "@welshman/util";
+import { isHashedEvent, isSignedEvent, WRAP, SEAL, prep, hash, } from "@welshman/util";
+import { isPojo, tryCatch } from "@welshman/lib";
 import { decrypt } from "./util.js";
 import { Nip01Signer } from "./signers/nip01.js";
 export const now = (drift = 0) => Math.round(Date.now() / 1000 - Math.random() * Math.pow(10, drift));
-export const getSeal = async (signer, pubkey, rumor) => signer.sign(hash({
+export const getSeal = async (signer, pubkey, rumor, options) => signer.sign(hash({
     kind: SEAL,
-    pubkey: await signer.getPubkey(),
-    content: await signer.nip44.encrypt(pubkey, JSON.stringify(rumor)),
+    pubkey: await signer.getPubkey(options),
+    content: await signer.nip44.encrypt(pubkey, JSON.stringify(rumor), options),
     created_at: now(5),
     tags: [],
-}));
+}), options);
 export const getWrap = async (wrapper, pubkey, seal, tags) => wrapper.sign(hash({
     kind: WRAP,
     pubkey: await wrapper.getPubkey(),
@@ -16,20 +17,36 @@ export const getWrap = async (wrapper, pubkey, seal, tags) => wrapper.sign(hash(
     created_at: now(5),
     tags: [...tags, ["p", pubkey]],
 }));
-export const wrap = async (signer, wrapper, pubkey, template, tags = []) => {
-    const author = await signer.getPubkey();
+export const wrap = async (signer, wrapper, pubkey, template, tags = [], options) => {
+    const author = await signer.getPubkey(options);
     const rumor = await prep(template, author);
-    const seal = await getSeal(signer, pubkey, rumor);
+    const seal = await getSeal(signer, pubkey, rumor, options);
     const wrap = await getWrap(wrapper, pubkey, seal, tags);
     return wrap;
 };
-export const unwrap = async (signer, wrap) => {
-    const seal = JSON.parse(await decrypt(signer, wrap.pubkey, wrap.content));
-    const rumor = JSON.parse(await decrypt(signer, seal.pubkey, seal.content));
-    if (seal.pubkey !== rumor.pubkey)
-        throw new Error("Seal pubkey does not match rumor pubkey");
-    if (!isHashedEvent(rumor))
-        throw new Error("Unwrapped object was not a hashed event");
+/**
+ * A decision about the wrap itself rather than a failure to reach the signer. The wrap will
+ * read the same way every time it is tried, so a caller is free to remember the verdict;
+ * anything the signer throws is about the signer and may answer next time.
+ */
+export class InvalidWrapError extends Error {
+}
+// Each layer must decrypt to the event that layer carries, or the wrap is malformed
+const parseLayer = (json, isLayer, layer) => {
+    const value = tryCatch(() => JSON.parse(json));
+    if (!isPojo(value) || !isLayer(value)) {
+        throw new InvalidWrapError(`Decrypted ${layer} was not a valid event`);
+    }
+    return value;
+};
+export const unwrap = async (signer, wrap, options) => {
+    const sealJson = await decrypt(signer, wrap.pubkey, wrap.content, options);
+    const seal = parseLayer(sealJson, isSignedEvent, "seal");
+    const rumorJson = await decrypt(signer, seal.pubkey, seal.content, options);
+    const rumor = parseLayer(rumorJson, isHashedEvent, "rumor");
+    if (seal.pubkey !== rumor.pubkey) {
+        throw new InvalidWrapError("Seal pubkey does not match rumor pubkey");
+    }
     return rumor;
 };
 export class Nip59 {
@@ -43,8 +60,8 @@ export class Nip59 {
     static fromSigner = (signer) => new Nip59(signer);
     static fromSecret = (secret) => new Nip59(new Nip01Signer(secret));
     withWrapper = (wrapper) => new Nip59(this.signer, wrapper);
-    wrap = (pubkey, template, tags = []) => wrap(this.signer, this.wrapper || Nip01Signer.ephemeral(), pubkey, template, tags);
-    unwrap = async (event) => {
+    wrap = (pubkey, template, tags = [], options) => wrap(this.signer, this.wrapper || Nip01Signer.ephemeral(), pubkey, template, tags, options);
+    unwrap = async (event, options) => {
         const cached = this.cache.get(event.id);
         if (cached) {
             if (cached instanceof Error) {
@@ -53,12 +70,14 @@ export class Nip59 {
             return cached;
         }
         try {
-            const rumor = await unwrap(this.signer, event);
+            const rumor = await unwrap(this.signer, event, options);
             this.cache.set(event.id, rumor);
             return rumor;
         }
         catch (error) {
-            this.cache.set(event.id, error);
+            if (error instanceof InvalidWrapError) {
+                this.cache.set(event.id, error);
+            }
             throw error;
         }
     };

package/dist/signer/src/nip59.js.map

@@ -1 +1 @@
-{"version":3,"file":"nip59.js","sourceRoot":"","sources":["../../../src/nip59.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAIb,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,GACL,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,OAAO,EAAU,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAA;AAE9C,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;AAErE,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,MAAe,EAAE,MAAc,EAAE,KAAkB,EAAE,EAAE,CACnF,MAAM,CAAC,IAAI,CACT,IAAI,CAAC;IACH,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,MAAM,MAAM,CAAC,SAAS,EAAE;IAChC,OAAO,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;IAClB,IAAI,EAAE,EAAE;CACT,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,OAAgB,EAChB,MAAc,EACd,IAAiB,EACjB,IAAgB,EAChB,EAAE,CACF,OAAO,CAAC,IAAI,CACV,IAAI,CAAC;IACH,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE;IACjC,OAAO,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;IAClB,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EACvB,MAAe,EACf,OAAgB,EAChB,MAAc,EACd,QAAsB,EACtB,OAAmB,EAAE,EACrB,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAA;IACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC1C,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACjD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAEvD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,MAAe,EAAE,IAAiB,EAAwB,EAAE;IACvF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IACzE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IAE1E,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAC5F,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAErF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,OAAO,KAAK;IAIN;IACA;IAJF,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAA;IAEtD,YACU,MAAe,EACf,OAAiB;QADjB,WAAM,GAAN,MAAM,CAAS;QACf,YAAO,GAAP,OAAO,CAAU;IACxB,CAAC;IAEJ,MAAM,CAAC,UAAU,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;IAE1D,MAAM,CAAC,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;IAE1E,WAAW,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAEnE,IAAI,GAAG,CAAC,MAAc,EAAE,QAAsB,EAAE,OAAmB,EAAE,EAAE,EAAE,CACvE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;IAEpF,MAAM,GAAG,KAAK,EAAE,KAAkB,EAAwB,EAAE;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAEvC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;gBAC5B,MAAM,MAAM,CAAA;YACd,CAAC;YAED,OAAO,MAAM,CAAA;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YAE9C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAE/B,OAAO,KAAK,CAAA;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAc,CAAC,CAAA;YAExC,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAA"}
+{"version":3,"file":"nip59.js","sourceRoot":"","sources":["../../../src/nip59.ts"],"names":[],"mappings":"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"}

package/dist/signer/src/queue.d.ts

@@ -0,0 +1,21 @@
+import { TaskQueue } from "@welshman/lib";
+import type { SignerOptions } from "./util.js";
+export type SignerRequest = {
+    priority: number;
+    run: () => Promise<void>;
+};
+/**
+ * The lane every request to one signer goes down. A browser extension and a native signer
+ * app each answer one request at a time, so a caller is already queueing; making the queue
+ * explicit is what lets a signature the user is waiting on overtake a backlog of
+ * decryptions, and what keeps one request that never answers from blocking the rest.
+ *
+ * `batchSize` is 1, since a batch is fixed once it starts and a request arriving mid-batch
+ * would otherwise wait out the whole of it however urgent it is. A `batchDelay` of 0 then
+ * costs no timer per request, since `TaskQueue` drains a zero delay in a microtask.
+ */
+export declare class SignerQueue {
+    queue: TaskQueue<SignerRequest>;
+    push: <T>(thunk: () => Promise<T>, options?: SignerOptions) => Promise<T>;
+}
+//# sourceMappingURL=queue.d.ts.map

package/dist/signer/src/queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAc,MAAM,eAAe,CAAA;AAEpD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,WAAW,CAAA;AAE5C,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB,CAAA;AAED;;;;;;;;;GASG;AACH,qBAAa,WAAW;IACtB,KAAK,2BAKH;IAEF,IAAI,GAAI,CAAC,EAAE,OAAO,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,UAAS,aAAkB,KAAG,OAAO,CAAC,CAAC,CAAC,CAsB3E;CACF"}

package/dist/signer/src/queue.js

@@ -0,0 +1,40 @@
+import { TaskQueue, defer, noop } from "@welshman/lib";
+import { signerCall } from "./util.js";
+/**
+ * The lane every request to one signer goes down. A browser extension and a native signer
+ * app each answer one request at a time, so a caller is already queueing; making the queue
+ * explicit is what lets a signature the user is waiting on overtake a backlog of
+ * decryptions, and what keeps one request that never answers from blocking the rest.
+ *
+ * `batchSize` is 1, since a batch is fixed once it starts and a request arriving mid-batch
+ * would otherwise wait out the whole of it however urgent it is. A `batchDelay` of 0 then
+ * costs no timer per request, since `TaskQueue` drains a zero delay in a microtask.
+ */
+export class SignerQueue {
+    queue = new TaskQueue({
+        batchSize: 1,
+        batchDelay: 0,
+        getPriority: (request) => request.priority,
+        processItem: (request) => request.run(),
+    });
+    push = (thunk, options = {}) => {
+        const result = defer();
+        const settled = result.then(noop, noop);
+        const abort = () => result.reject(new Error("Signer request was aborted"));
+        // A signal that is already aborted never fires "abort", so refuse the request here.
+        if (options.signal?.aborted)
+            abort();
+        options.signal?.addEventListener("abort", abort);
+        settled.then(() => options.signal?.removeEventListener("abort", abort));
+        this.queue.push({
+            priority: options.priority ?? 0,
+            run: () => {
+                signerCall(thunk, options).then(result.resolve, result.reject);
+                // The lane is given back when welshman stops waiting, not always when the signer answered
+                return settled;
+            },
+        });
+        return result;
+    };
+}
+//# sourceMappingURL=queue.js.map

package/dist/signer/src/queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACpD,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAQpC;;;;;;;;;GASG;AACH,MAAM,OAAO,WAAW;IACtB,KAAK,GAAG,IAAI,SAAS,CAAgB;QACnC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC,OAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ;QACzD,WAAW,EAAE,CAAC,OAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;KACvD,CAAC,CAAA;IAEF,IAAI,GAAG,CAAI,KAAuB,EAAE,UAAyB,EAAE,EAAc,EAAE;QAC7E,MAAM,MAAM,GAAG,KAAK,EAAY,CAAA;QAChC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACvC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAA;QAE1E,oFAAoF;QACpF,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO;YAAE,KAAK,EAAE,CAAA;QAEpC,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAChD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;QAEvE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC;YAC/B,GAAG,EAAE,GAAG,EAAE;gBACR,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;gBAE9D,0FAA0F;gBAC1F,OAAO,OAAO,CAAA;YAChB,CAAC;SACF,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;CACF"}

package/dist/signer/src/signers/nip01.d.ts

@@ -1,5 +1,9 @@
 import { StampedEvent } from "@welshman/util";
-import { ISigner, SignOptions } from "../util.js";
+import { ISigner } from "../util.js";
+/**
+ * A local key, so every request is answered synchronously. Nothing here can hang or be
+ * worth reordering, which is why it takes no `SignerOptions`.
+ */
 export declare class Nip01Signer implements ISigner {
     #private;
     private secret;
@@ -7,7 +11,15 @@ export declare class Nip01Signer implements ISigner {
     static fromSecret: (secret: string) => Nip01Signer;
     static ephemeral: () => Nip01Signer;
     getPubkey: () => Promise<string>;
-    sign: (event: StampedEvent, options?: SignOptions) => Promise<import("@welshman/util").SignedEvent>;
+    sign: (event: StampedEvent) => Promise<{
+        sig: string;
+        tags: string[][];
+        content: string;
+        kind: number;
+        created_at: number;
+        pubkey: string;
+        id: string;
+    }>;
     nip04: {
         encrypt: (pubkey: string, message: string) => Promise<string>;
         decrypt: (pubkey: string, message: string) => Promise<string>;

package/dist/signer/src/signers/nip01.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nip01.d.ts","sourceRoot":"","sources":["../../../../src/signers/nip01.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAyC,MAAM,gBAAgB,CAAA;AACnF,OAAO,EAAe,OAAO,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAA;AAE9E,qBAAa,WAAY,YAAW,OAAO;;IAG7B,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,iBAA4B;IAE/D,MAAM,CAAC,SAAS,oBAAsC;IAEtD,SAAS,wBAA2B;IAEpC,IAAI,GAAI,OAAO,YAAY,EAAE,UAAS,WAAgB,mDACuB;IAE7E,KAAK;0BACqB,MAAM,WAAW,MAAM;0BACvB,MAAM,WAAW,MAAM;MAChD;IAED,KAAK;0BACqB,MAAM,WAAW,MAAM;0BACvB,MAAM,WAAW,MAAM;MAChD;CACF"}
+{"version":3,"file":"nip01.d.ts","sourceRoot":"","sources":["../../../../src/signers/nip01.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAyC,MAAM,gBAAgB,CAAA;AACnF,OAAO,EAAe,OAAO,EAAC,MAAM,YAAY,CAAA;AAEhD;;;GAGG;AACH,qBAAa,WAAY,YAAW,OAAO;;IAG7B,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,iBAA4B;IAE/D,MAAM,CAAC,SAAS,oBAAsC;IAEtD,SAAS,wBAA2B;IAEpC,IAAI,GAAU,OAAO,YAAY;;;;;;;;OAAsD;IAEvF,KAAK;0BACqB,MAAM,WAAW,MAAM;0BACvB,MAAM,WAAW,MAAM;MAChD;IAED,KAAK;0BACqB,MAAM,WAAW,MAAM;0BACvB,MAAM,WAAW,MAAM;MAChD;CACF"}

package/dist/signer/src/signers/nip01.js

@@ -1,5 +1,9 @@
 import { own, hash, sign, getPubkey, makeSecret } from "@welshman/util";
-import { nip04, nip44, signWithOptions } from "../util.js";
+import { nip04, nip44 } from "../util.js";
+/**
+ * A local key, so every request is answered synchronously. Nothing here can hang or be
+ * worth reordering, which is why it takes no `SignerOptions`.
+ */
 export class Nip01Signer {
     secret;
     #pubkey;
@@ -10,7 +14,7 @@ export class Nip01Signer {
     static fromSecret = (secret) => new Nip01Signer(secret);
     static ephemeral = () => new Nip01Signer(makeSecret());
     getPubkey = async () => this.#pubkey;
-    sign = (event, options = {}) => signWithOptions(sign(hash(own(event, this.#pubkey)), this.secret), options);
+    sign = async (event) => sign(hash(own(event, this.#pubkey)), this.secret);
     nip04 = {
         encrypt: async (pubkey, message) => nip04.encrypt(pubkey, this.secret, message),
         decrypt: async (pubkey, message) => nip04.decrypt(pubkey, this.secret, message),

package/dist/signer/src/signers/nip01.js.map

@@ -1 +1 @@
-{"version":3,"file":"nip01.js","sourceRoot":"","sources":["../../../../src/signers/nip01.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACnF,OAAO,EAAC,KAAK,EAAE,KAAK,EAAwB,eAAe,EAAC,MAAM,YAAY,CAAA;AAE9E,MAAM,OAAO,WAAW;IAGF;IAFpB,OAAO,CAAQ;IAEf,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAChC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;IAE/D,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC,CAAA;IAEtD,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAA;IAEpC,IAAI,GAAG,CAAC,KAAmB,EAAE,UAAuB,EAAE,EAAE,EAAE,CACxD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA;IAE7E,KAAK,GAAG;QACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/F,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;KAChG,CAAA;IAED,KAAK,GAAG;QACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/F,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;KAChG,CAAA"}
+{"version":3,"file":"nip01.js","sourceRoot":"","sources":["../../../../src/signers/nip01.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACnF,OAAO,EAAC,KAAK,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAEhD;;;GAGG;AACH,MAAM,OAAO,WAAW;IAGF;IAFpB,OAAO,CAAQ;IAEf,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAChC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;IAE/D,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC,CAAA;IAEtD,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAA;IAEpC,IAAI,GAAG,KAAK,EAAE,KAAmB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAEvF,KAAK,GAAG;QACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/F,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;KAChG,CAAA;IAED,KAAK,GAAG;QACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/F,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;KAChG,CAAA"}

package/dist/signer/src/signers/nip07.d.ts

@@ -1,7 +1,7 @@
-import { StampedEvent } from "@welshman/util";
-import { SignOptions, Sign, ISigner, EncryptionImplementation } from "../util.js";
+import { SignedEvent, StampedEvent } from "@welshman/util";
+import { SignerOptions, ISigner, EncryptionImplementation } from "../util.js";
 export type Nip07 = {
-    signEvent: Sign;
+    signEvent: (event: StampedEvent) => Promise<SignedEvent>;
     nip04: EncryptionImplementation;
     nip44: EncryptionImplementation;
     getPublicKey: () => string | undefined;
@@ -9,15 +9,15 @@ export type Nip07 = {
 export declare const getNip07: () => Nip07 | undefined;
 export declare class Nip07Signer implements ISigner {
     #private;
-    getPubkey: () => Promise<string>;
-    sign: (template: StampedEvent, options?: SignOptions) => Promise<import("@welshman/util").SignedEvent>;
+    getPubkey: (options?: SignerOptions) => Promise<string>;
+    sign: (template: StampedEvent, options?: SignerOptions) => Promise<SignedEvent>;
     nip04: {
-        encrypt: (pubkey: string, message: string) => Promise<string>;
-        decrypt: (pubkey: string, message: string) => Promise<string>;
+        encrypt: (pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
+        decrypt: (pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
     };
     nip44: {
-        encrypt: (pubkey: string, message: string) => Promise<string>;
-        decrypt: (pubkey: string, message: string) => Promise<string>;
+        encrypt: (pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
+        decrypt: (pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
     };
 }
 //# sourceMappingURL=nip07.d.ts.map

package/dist/signer/src/signers/nip07.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nip07.d.ts","sourceRoot":"","sources":["../../../../src/signers/nip07.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAkB,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,wBAAwB,EAAC,MAAM,YAAY,CAAA;AAEhG,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,IAAI,CAAA;IACf,KAAK,EAAE,wBAAwB,CAAA;IAC/B,KAAK,EAAE,wBAAwB,CAAA;IAC/B,YAAY,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CACvC,CAAA;AAED,eAAO,MAAM,QAAQ,yBAA0C,CAAA;AAY/D,qBAAa,WAAY,YAAW,OAAO;;IAkBzC,SAAS,wBASR;IAED,IAAI,GAAI,UAAU,YAAY,EAAE,UAAS,WAAgB,mDAItD;IAEH,KAAK;0BACe,MAAM,WAAW,MAAM;0BAEvB,MAAM,WAAW,MAAM;MAE1C;IAED,KAAK;0BACe,MAAM,WAAW,MAAM;0BAEvB,MAAM,WAAW,MAAM;MAE1C;CACF"}
+{"version":3,"file":"nip07.d.ts","sourceRoot":"","sources":["../../../../src/signers/nip07.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,wBAAwB,EAAC,MAAM,YAAY,CAAA;AAE3E,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IACxD,KAAK,EAAE,wBAAwB,CAAA;IAC/B,KAAK,EAAE,wBAAwB,CAAA;IAC/B,YAAY,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CACvC,CAAA;AAED,eAAO,MAAM,QAAQ,yBAA0C,CAAA;AAE/D,qBAAa,WAAY,YAAW,OAAO;;IAazC,SAAS,GAAI,UAAS,aAAkB,qBASvC;IAED,IAAI,GAAI,UAAU,YAAY,EAAE,UAAS,aAAkB,0BACN;IAErD,KAAK;0BACe,MAAM,WAAW,MAAM,YAAW,aAAa;0BAE/C,MAAM,WAAW,MAAM,YAAW,aAAa;MAElE;IAED,KAAK;0BACe,MAAM,WAAW,MAAM,YAAW,aAAa;0BAE/C,MAAM,WAAW,MAAM,YAAW,aAAa;MAElE;CACF"}

package/dist/signer/src/signers/nip07.js

@@ -1,43 +1,31 @@
-import { noop } from "@welshman/lib";
-import { signWithOptions } from "../util.js";
+import { SignerQueue } from "../queue.js";
 export const getNip07 = () => window.nostr;
-const release = (promise) => new Promise(resolve => {
-    const timeout = setTimeout(resolve, 30_000);
-    promise.catch(noop).then(() => {
-        clearTimeout(timeout);
-        resolve();
-    });
-});
 export class Nip07Signer {
-    #lock = Promise.resolve();
+    #queue = new SignerQueue();
     #pubkey;
-    #then = async (f) => {
-        const promise = this.#lock.then(() => {
-            const ext = getNip07();
-            if (!ext)
-                throw new Error("Nip07 is not enabled");
-            return f(ext);
-        });
-        this.#lock = release(promise);
-        return promise;
-    };
-    getPubkey = () => {
+    #then = (f, options) => this.#queue.push(async () => {
+        const ext = getNip07();
+        if (!ext)
+            throw new Error("Nip07 is not enabled");
+        return f(ext);
+    }, options);
+    getPubkey = (options = {}) => {
         if (!this.#pubkey) {
-            this.#pubkey = this.#then(ext => ext.getPublicKey());
+            this.#pubkey = this.#then(ext => ext.getPublicKey(), options);
             this.#pubkey.catch(() => {
                 this.#pubkey = undefined;
             });
         }
         return this.#pubkey;
     };
-    sign = (template, options = {}) => signWithOptions(this.#then(ext => ext.signEvent(template)), options);
+    sign = (template, options = {}) => this.#then(ext => ext.signEvent(template), options);
     nip04 = {
-        encrypt: (pubkey, message) => this.#then(ext => ext.nip04.encrypt(pubkey, message)),
-        decrypt: (pubkey, message) => this.#then(ext => ext.nip04.decrypt(pubkey, message)),
+        encrypt: (pubkey, message, options = {}) => this.#then(ext => ext.nip04.encrypt(pubkey, message), options),
+        decrypt: (pubkey, message, options = {}) => this.#then(ext => ext.nip04.decrypt(pubkey, message), options),
     };
     nip44 = {
-        encrypt: (pubkey, message) => this.#then(ext => ext.nip44.encrypt(pubkey, message)),
-        decrypt: (pubkey, message) => this.#then(ext => ext.nip44.decrypt(pubkey, message)),
+        encrypt: (pubkey, message, options = {}) => this.#then(ext => ext.nip44.encrypt(pubkey, message), options),
+        decrypt: (pubkey, message, options = {}) => this.#then(ext => ext.nip44.decrypt(pubkey, message), options),
     };
 }
 //# sourceMappingURL=nip07.js.map

package/dist/signer/src/signers/nip07.js.map

@@ -1 +1 @@
-{"version":3,"file":"nip07.js","sourceRoot":"","sources":["../../../../src/signers/nip07.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAElC,OAAO,EAAC,eAAe,EAAuD,MAAM,YAAY,CAAA;AAShG,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAE,MAA0B,CAAC,KAAK,CAAA;AAE/D,MAAM,OAAO,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC5C,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;IAC1B,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAE3C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAC5B,YAAY,CAAC,OAAO,CAAC,CAAA;QACrB,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEJ,MAAM,OAAO,WAAW;IACtB,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;IACzB,OAAO,CAAkB;IAEzB,KAAK,GAAG,KAAK,EAAK,CAAiC,EAAE,EAAE;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACnC,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAA;YAEtB,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;YAEjD,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;QAE7B,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;IAED,SAAS,GAAG,GAAG,EAAE;QACf,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAS,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,EAAY,CAAC,CAAA;YACtE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACtB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC,CAAA;IAED,IAAI,GAAG,CAAC,QAAsB,EAAE,UAAuB,EAAE,EAAE,EAAE,CAC3D,eAAe,CACb,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EAC1C,OAAO,CACR,CAAA;IAEH,KAAK,GAAG;QACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACxD,CAAA;IAED,KAAK,GAAG;QACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACxD,CAAA;CACF"}
+{"version":3,"file":"nip07.js","sourceRoot":"","sources":["../../../../src/signers/nip07.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAA;AAUvC,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAE,MAA0B,CAAC,KAAK,CAAA;AAE/D,MAAM,OAAO,WAAW;IACtB,MAAM,GAAG,IAAI,WAAW,EAAE,CAAA;IAC1B,OAAO,CAAkB;IAEzB,KAAK,GAAG,CAAI,CAAiC,EAAE,OAAsB,EAAE,EAAE,CACvE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;QAC1B,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAA;QAEtB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAEjD,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;IACf,CAAC,EAAE,OAAO,CAAC,CAAA;IAEb,SAAS,GAAG,CAAC,UAAyB,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAS,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,EAAY,EAAE,OAAO,CAAC,CAAA;YAC/E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACtB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC,CAAA;IAED,IAAI,GAAG,CAAC,QAAsB,EAAE,UAAyB,EAAE,EAAE,EAAE,CAC7D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;IAErD,KAAK,GAAG;QACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,UAAyB,EAAE,EAAE,EAAE,CACxE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAChE,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,UAAyB,EAAE,EAAE,EAAE,CACxE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC;KACjE,CAAA;IAED,KAAK,GAAG;QACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,UAAyB,EAAE,EAAE,EAAE,CACxE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAChE,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,UAAyB,EAAE,EAAE,EAAE,CACxE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC;KACjE,CAAA;CACF"}

package/dist/signer/src/signers/nip46.d.ts

@@ -1,7 +1,7 @@
 import { Emitter, MaybeAsync } from "@welshman/lib";
 import { HashedEvent, StampedEvent, TrustedEvent } from "@welshman/util";
 import { AdapterContext } from "@welshman/net";
-import { ISigner, EncryptionImplementation, SignOptions } from "../util.js";
+import { ISigner, EncryptionImplementation, SignerOptions } from "../util.js";
 import { Nip01Signer } from "./nip01.js";
 export type Nip46Context = {
     debug: boolean;
@@ -116,14 +116,18 @@ export declare class Nip46Broker extends Emitter {
     nip44Decrypt: (pk: string, message: string) => Promise<string>;
     switchRelays: () => Promise<string[]>;
 }
+/**
+ * A bunker answers over relays rather than one at a time, so requests here are not queued
+ * and a priority would order nothing. Each one still carries its own deadline.
+ */
 export declare class Nip46Signer implements ISigner {
     broker: Nip46Broker;
     pubkey?: string;
     nip04: EncryptionImplementation;
     nip44: EncryptionImplementation;
     constructor(broker: Nip46Broker);
-    getPubkey: () => Promise<string>;
-    sign: (template: StampedEvent, options?: SignOptions) => Promise<import("@welshman/util").SignedEvent>;
+    getPubkey: (options?: SignerOptions) => Promise<string>;
+    sign: (template: StampedEvent, options?: SignerOptions) => Promise<any>;
     cleanup: () => Promise<void>;
 }
 //# sourceMappingURL=nip46.d.ts.map