@welshman/app 0.12.6 → 0.13.0

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

@@ -1,6 +1,5 @@
-import { noop } from "@welshman/lib";
 import { hash, own, Pubkey } from "@welshman/util";
-import { signWithOptions } from "../util.js";
+import { SignerQueue } from "../queue.js";
 let plugin;
 /**
  * Register the NIP-55 plugin. Capacitor apps should call this once at startup:
@@ -25,62 +24,56 @@ const makeRequestId = () => `${Date.now()}-${Math.random().toString(36).slice(2)
 export class Nip55Signer {
     packageName;
     #pubkey;
-    #lock = Promise.resolve();
+    #queue = new SignerQueue();
     #setup;
     constructor(packageName, pubkey) {
         this.packageName = packageName;
         this.#pubkey = pubkey;
     }
-    #then = async (f) => {
-        const promise = this.#lock.then(async () => {
-            const nip55 = plugin;
-            if (!nip55)
-                throw new Error("Nip55 is not enabled");
-            if (!this.#setup) {
-                this.#setup = nip55.setPackageName(this.packageName);
-                this.#setup.catch(() => {
-                    this.#setup = undefined;
-                });
-            }
-            await this.#setup;
-            return f(nip55);
-        });
-        // Swallow the result either way — a failed call must not poison the lock
-        this.#lock = promise.then(noop, noop);
-        return promise;
-    };
-    #crypt = async (method, pubkey, message) => {
+    #then = (f, options) => this.#queue.push(async () => {
+        const nip55 = plugin;
+        if (!nip55)
+            throw new Error("Nip55 is not enabled");
+        if (!this.#setup) {
+            this.#setup = nip55.setPackageName(this.packageName);
+            this.#setup.catch(() => {
+                this.#setup = undefined;
+            });
+        }
+        await this.#setup;
+        return f(nip55);
+    }, options);
+    #crypt = async (method, pubkey, message, options) => {
         if (!this.#pubkey) {
-            await this.getPubkey();
+            await this.getPubkey(options);
         }
         return this.#then(async (plugin) => {
             const { result } = await plugin[method](this.packageName, message, makeRequestId(), pubkey, this.#pubkey);
             return result;
-        });
-    };
-    getPubkey = async () => {
-        return this.#then(async (plugin) => {
-            if (!this.#pubkey) {
-                const { npub } = await plugin.getPublicKey(this.packageName);
-                this.#pubkey = Pubkey.from(npub).toString();
-            }
-            return this.#pubkey;
-        });
+        }, options);
     };
-    sign = (template, options = {}) => signWithOptions(this.getPubkey().then(pubkey => {
+    // The pubkey is a request of its own, so it inherits the options of whatever asked for it
+    getPubkey = (options = {}) => this.#then(async (plugin) => {
+        if (!this.#pubkey) {
+            const { npub } = await plugin.getPublicKey(this.packageName);
+            this.#pubkey = Pubkey.from(npub).toString();
+        }
+        return this.#pubkey;
+    }, options);
+    sign = (template, options = {}) => this.getPubkey(options).then(pubkey => {
         const hashedEvent = hash(own(template, pubkey));
         return this.#then(async (plugin) => {
             const { event: json } = await plugin.signEvent(this.packageName, JSON.stringify({ sig: "", ...hashedEvent }), hashedEvent.id, this.#pubkey);
             return JSON.parse(json);
-        });
-    }), options);
+        }, options);
+    });
     nip04 = {
-        encrypt: (pubkey, message) => this.#crypt("nip04Encrypt", pubkey, message),
-        decrypt: (pubkey, message) => this.#crypt("nip04Decrypt", pubkey, message),
+        encrypt: (pubkey, message, options = {}) => this.#crypt("nip04Encrypt", pubkey, message, options),
+        decrypt: (pubkey, message, options = {}) => this.#crypt("nip04Decrypt", pubkey, message, options),
     };
     nip44 = {
-        encrypt: (pubkey, message) => this.#crypt("nip44Encrypt", pubkey, message),
-        decrypt: (pubkey, message) => this.#crypt("nip44Decrypt", pubkey, message),
+        encrypt: (pubkey, message, options = {}) => this.#crypt("nip44Encrypt", pubkey, message, options),
+        decrypt: (pubkey, message, options = {}) => this.#crypt("nip44Decrypt", pubkey, message, options),
     };
 }
 //# sourceMappingURL=nip55.js.map

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

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

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

@@ -16,41 +16,53 @@ export declare const nip44: {
     encrypt: (pubkey: string, secret: string, m: string) => string;
     decrypt: (pubkey: string, secret: string, m: string) => string;
 };
-export type Sign = (event: StampedEvent) => Promise<SignedEvent>;
-export type SignOptions = {
+export type SignerOptions = {
     signal?: AbortSignal;
+    /** Requests to one signer are answered highest first, 0 by default, so bulk work behind the
+     * user can ask for a negative one and leave the user's own requests ahead of it. */
+    priority?: number;
 };
-export type SignWithOptions = (event: StampedEvent, options?: SignOptions) => Promise<SignedEvent>;
-export type Encrypt = (pubkey: string, message: string) => Promise<string>;
-export type Decrypt = (pubkey: string, message: string) => Promise<string>;
+export type Sign = (event: StampedEvent, options?: SignerOptions) => Promise<SignedEvent>;
+export type Encrypt = (pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
+export type Decrypt = (pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
 export type EncryptionImplementation = {
     encrypt: Encrypt;
     decrypt: Decrypt;
 };
 export interface ISigner {
-    sign: SignWithOptions;
+    sign: Sign;
     nip04: EncryptionImplementation;
     nip44: EncryptionImplementation;
-    getPubkey: () => Promise<string>;
+    getPubkey: (options?: SignerOptions) => Promise<string>;
     cleanup?: () => Promise<void>;
 }
-export declare const decrypt: (signer: ISigner, pubkey: string, message: string) => Promise<string>;
+export declare const decrypt: (signer: ISigner, pubkey: string, message: string, options?: SignerOptions) => Promise<string>;
 export type SignerMethodWrapper = <T>(method: string, thunk: () => Promise<T>, args: unknown[]) => Promise<T>;
 export declare class WrappedSigner extends Emitter implements ISigner {
     readonly signer: ISigner;
     readonly wrapMethod: SignerMethodWrapper;
     constructor(signer: ISigner, wrapMethod: SignerMethodWrapper);
-    sign: (event: StampedEvent, options?: SignOptions) => Promise<SignedEvent>;
-    getPubkey: () => Promise<string>;
+    sign: (event: StampedEvent, options?: SignerOptions) => Promise<SignedEvent>;
+    getPubkey: (options?: SignerOptions) => Promise<string>;
     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>;
     };
     cleanup(): Promise<void>;
 }
-export declare const signWithOptions: (promise: Promise<SignedEvent> | SignedEvent, options: SignOptions) => Promise<SignedEvent>;
+export declare const SIGNER_TIMEOUT = 30000;
+/**
+ * How long welshman waits for one request to a signer, rather than how long that request
+ * runs — an extension, a native app and a bunker all answer when they answer, and offer
+ * no way to recall a request. The caller's `AbortSignal` and `SIGNER_TIMEOUT` each give up
+ * on it, so the signer may still answer afterwards with nobody listening.
+ *
+ * It starts `request` itself, so a request whose signal is already aborted is never sent, and
+ * one that throws rather than rejecting still settles.
+ */
+export declare const signerCall: <T>(request: () => Promise<T>, { signal }?: SignerOptions) => Promise<T>;
 //# sourceMappingURL=util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../signer/src/util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAS,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAExD,eAAO,MAAM,KAAK;gBACJ,MAAM;sBACA,MAAM,UAAU,MAAM,KAAK,MAAM;sBACjC,MAAM,UAAU,MAAM,KAAK,MAAM;CACpD,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;sBAOE,MAAM,UAAU,MAAM,KAAK,MAAM;sBAEjC,MAAM,UAAU,MAAM,KAAK,MAAM;CAEpD,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;AAEhE,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;AAElG,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAE1E,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAE1E,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,eAAe,CAAA;IACrB,KAAK,EAAE,wBAAwB,CAAA;IAC/B,KAAK,EAAE,wBAAwB,CAAA;IAC/B,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IAChC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B;AAED,eAAO,MAAM,OAAO,GAAU,QAAQ,OAAO,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,oBAGnC,CAAA;AAK3C,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAClC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACvB,IAAI,EAAE,OAAO,EAAE,KACZ,OAAO,CAAC,CAAC,CAAC,CAAA;AAEf,qBAAa,aAAc,SAAQ,OAAQ,YAAW,OAAO;IAEzD,QAAQ,CAAC,MAAM,EAAE,OAAO;IACxB,QAAQ,CAAC,UAAU,EAAE,mBAAmB;gBAD/B,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,mBAAmB;IAK1C,IAAI,GAAI,OAAO,YAAY,EAAE,UAAS,WAAgB,0BAC6B;IAEnF,SAAS,wBAAwE;IAEjF,KAAK;0BACqB,MAAM,WAAW,MAAM;0BAKvB,MAAM,WAAW,MAAM;MAKhD;IAED,KAAK;0BACqB,MAAM,WAAW,MAAM;0BAKvB,MAAM,WAAW,MAAM;MAKhD;IAEK,OAAO;CAGd;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,EAC3C,SAAS,WAAW,yBAMlB,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../signer/src/util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAsB,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAExD,eAAO,MAAM,KAAK;gBACJ,MAAM;sBACA,MAAM,UAAU,MAAM,KAAK,MAAM;sBACjC,MAAM,UAAU,MAAM,KAAK,MAAM;CACpD,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;sBAOE,MAAM,UAAU,MAAM,KAAK,MAAM;sBAEjC,MAAM,UAAU,MAAM,KAAK,MAAM;CAEpD,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;wFACoF;IACpF,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;AAEzF,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAEnG,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAEnG,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,wBAAwB,CAAA;IAC/B,KAAK,EAAE,wBAAwB,CAAA;IAC/B,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACvD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B;AAED,eAAO,MAAM,OAAO,GAClB,QAAQ,OAAO,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,UAAU,aAAa,oBAI2B,CAAA;AAKpD,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAClC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACvB,IAAI,EAAE,OAAO,EAAE,KACZ,OAAO,CAAC,CAAC,CAAC,CAAA;AAEf,qBAAa,aAAc,SAAQ,OAAQ,YAAW,OAAO;IAEzD,QAAQ,CAAC,MAAM,EAAE,OAAO;IACxB,QAAQ,CAAC,UAAU,EAAE,mBAAmB;gBAD/B,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,mBAAmB;IAK1C,IAAI,GAAI,OAAO,YAAY,EAAE,UAAS,aAAkB,0BAC2B;IAEnF,SAAS,GAAI,UAAS,aAAkB,qBACuC;IAE/E,KAAK;0BACqB,MAAM,WAAW,MAAM,YAAW,aAAa;0BAM/C,MAAM,WAAW,MAAM,YAAW,aAAa;MAMxE;IAED,KAAK;0BACqB,MAAM,WAAW,MAAM,YAAW,aAAa;0BAM/C,MAAM,WAAW,MAAM,YAAW,aAAa;MAMxE;IAEK,OAAO;CAGd;AAGD,eAAO,MAAM,cAAc,QAAS,CAAA;AAEpC;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,SAAS,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,aAAU,aAAkB,KA0BlE,OAAO,CAAC,CAAC,CAC3B,CAAA"}

package/dist/signer/src/util.js

@@ -1,7 +1,7 @@
 import { hexToBytes } from "@noble/hashes/utils.js";
 import * as nt04 from "nostr-tools/nip04";
 import * as nt44 from "nostr-tools/nip44";
-import { Emitter, cached } from "@welshman/lib";
+import { Emitter, cached, defer, noop } from "@welshman/lib";
 export const nip04 = {
     detect: (m) => m.includes("?iv="),
     encrypt: (pubkey, secret, m) => nt04.encrypt(secret, pubkey, m),
@@ -16,9 +16,9 @@ export const nip44 = {
     encrypt: (pubkey, secret, m) => nt44.v2.encrypt(m, nip44.getSharedSecret(secret, pubkey)),
     decrypt: (pubkey, secret, m) => nt44.v2.decrypt(m, nip44.getSharedSecret(secret, pubkey)),
 };
-export const decrypt = async (signer, pubkey, message) => nip04.detect(message)
-    ? signer.nip04.decrypt(pubkey, message)
-    : signer.nip44.decrypt(pubkey, message);
+export const decrypt = async (signer, pubkey, message, options) => nip04.detect(message)
+    ? signer.nip04.decrypt(pubkey, message, options)
+    : signer.nip44.decrypt(pubkey, message, options);
 export class WrappedSigner extends Emitter {
     signer;
     wrapMethod;
@@ -28,34 +28,67 @@ export class WrappedSigner extends Emitter {
         this.wrapMethod = wrapMethod;
     }
     sign = (event, options = {}) => this.wrapMethod("sign", () => this.signer.sign(event, options), [event, options]);
-    getPubkey = () => this.wrapMethod("getPubkey", () => this.signer.getPubkey(), []);
+    getPubkey = (options = {}) => this.wrapMethod("getPubkey", () => this.signer.getPubkey(options), [options]);
     nip04 = {
-        encrypt: async (pubkey, message) => this.wrapMethod("nip04.encrypt", () => this.signer.nip04.encrypt(pubkey, message), [
+        encrypt: async (pubkey, message, options = {}) => this.wrapMethod("nip04.encrypt", () => this.signer.nip04.encrypt(pubkey, message, options), [
             pubkey,
             message,
+            options,
         ]),
-        decrypt: async (pubkey, message) => this.wrapMethod("nip04.decrypt", () => this.signer.nip04.decrypt(pubkey, message), [
+        decrypt: async (pubkey, message, options = {}) => this.wrapMethod("nip04.decrypt", () => this.signer.nip04.decrypt(pubkey, message, options), [
             pubkey,
             message,
+            options,
         ]),
     };
     nip44 = {
-        encrypt: async (pubkey, message) => this.wrapMethod("nip44.encrypt", () => this.signer.nip44.encrypt(pubkey, message), [
+        encrypt: async (pubkey, message, options = {}) => this.wrapMethod("nip44.encrypt", () => this.signer.nip44.encrypt(pubkey, message, options), [
             pubkey,
             message,
+            options,
         ]),
-        decrypt: async (pubkey, message) => this.wrapMethod("nip44.decrypt", () => this.signer.nip44.decrypt(pubkey, message), [
+        decrypt: async (pubkey, message, options = {}) => this.wrapMethod("nip44.decrypt", () => this.signer.nip44.decrypt(pubkey, message, options), [
             pubkey,
             message,
+            options,
         ]),
     };
     async cleanup() {
         await this.signer.cleanup?.();
     }
 }
-export const signWithOptions = (promise, options) => new Promise((resolve, reject) => {
-    Promise.resolve(promise).then(resolve).catch(reject);
-    setTimeout(() => reject("Signing timed out"), 30_000);
-    options.signal?.addEventListener("abort", () => reject("Signing was aborted"));
-});
+// A signer that never answers would otherwise hold its caller open forever
+export const SIGNER_TIMEOUT = 30_000;
+/**
+ * How long welshman waits for one request to a signer, rather than how long that request
+ * runs — an extension, a native app and a bunker all answer when they answer, and offer
+ * no way to recall a request. The caller's `AbortSignal` and `SIGNER_TIMEOUT` each give up
+ * on it, so the signer may still answer afterwards with nobody listening.
+ *
+ * It starts `request` itself, so a request whose signal is already aborted is never sent, and
+ * one that throws rather than rejecting still settles.
+ */
+export const signerCall = (request, { signal } = {}) => {
+    const result = defer();
+    const abort = () => result.reject(new Error("Signer request was aborted"));
+    const timer = setTimeout(() => result.reject(new Error("Signer request timed out")), SIGNER_TIMEOUT);
+    signal?.addEventListener("abort", abort);
+    result.then(noop, noop).then(() => {
+        clearTimeout(timer);
+        signal?.removeEventListener("abort", abort);
+    });
+    // A signal that is already aborted never fires "abort"
+    if (signal?.aborted) {
+        abort();
+    }
+    else {
+        try {
+            request().then(result.resolve, result.reject);
+        }
+        catch (error) {
+            result.reject(error);
+        }
+    }
+    return result;
+};
 //# sourceMappingURL=util.js.map

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

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

package/dist/store/src/repository.d.ts

@@ -31,6 +31,11 @@ export type EventsByIdForUrlOptions = EventsByIdOptions & {
     url: string;
     tracker: Tracker;
 };
+/**
+ * The events one relay has been seen to hold, narrowed by the filters. The filters choose the
+ * index and the tracker answers provenance per event, so the cost tracks what the caller asked
+ * for, and a limit counts only events on the relay.
+ */
 export declare const getEventsByIdForUrl: ({ url, filters, tracker, repository, includeDeleted, }: EventsByIdForUrlOptions) => EventsById;
 export declare const deriveEventsByIdForUrl: (options: EventsByIdForUrlOptions) => Projection<EventsById>;
 export type ItemsByKey<T> = Map<string, T>;

package/dist/store/src/repository.d.ts.map

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