@welshman/signer 0.0.15 → 0.0.16

package/build/src/signers/nip46.cjs

@@ -1,234 +1,303 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Nip46Broker_signer, _Nip46Broker_handler, _Nip46Broker_algorithm, _Nip46Broker_closed, _Nip46Broker_processing, _Nip46Broker_connectResponse, _Nip46Broker_queue, _Nip46Broker_window, _Nip46Broker_sub, _Nip46Broker_subscribe, _Nip46Broker_processQueue, _Nip46Broker_getResult, _Nip46Signer_pubkey;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Nip46Signer = exports.Nip46Broker = void 0;
+exports.Nip46Signer = exports.Nip46Broker = exports.Nip46Request = exports.Nip46Sender = exports.Nip46Receiver = exports.Nip46Event = void 0;
+const throttle_debounce_1 = require("throttle-debounce");
 const lib_1 = require("@welshman/lib");
 const util_1 = require("@welshman/util");
 const net_1 = require("@welshman/net");
 const util_2 = require("../util.cjs");
 const nip01_1 = require("./nip01.cjs");
+var Nip46Event;
+(function (Nip46Event) {
+    Nip46Event["Send"] = "send";
+    Nip46Event["Receive"] = "receive";
+})(Nip46Event || (exports.Nip46Event = Nip46Event = {}));
 let singleton;
-class Nip46Broker extends lib_1.Emitter {
-    static initiate({ url, name, image, perms, relays, abortController }) {
-        const secret = Math.random().toString(36).substring(7);
-        const clientSecret = (0, util_2.makeSecret)();
-        const clientPubkey = (0, util_2.getPubkey)(clientSecret);
-        const clientSigner = new nip01_1.Nip01Signer(clientSecret);
-        const params = new URLSearchParams({ secret, url, name, image, perms });
-        for (const relay of relays) {
-            params.append('relay', relay);
+const popupManager = (() => {
+    let pendingUrl = "";
+    let pendingSince = 0;
+    let currentWindow;
+    const openPending = (0, throttle_debounce_1.throttle)(1000, () => {
+        // If it's been a while since they asked for it, drop the request
+        if (Date.now() - pendingSince > 10000)
+            return;
+        // If we have an active, open window, continue to wait
+        if (currentWindow && !currentWindow.closed) {
+            setTimeout(() => openPending(), 100);
         }
-        const nostrconnect = `nostrconnect://${clientPubkey}?${params.toString()}`;
-        const result = new Promise(resolve => {
-            const complete = (pubkey) => {
-                sub.close();
-                resolve(pubkey);
-            };
-            const sub = (0, net_1.subscribe)({
-                relays,
-                filters: [{ kinds: [util_1.NOSTR_CONNECT], "#p": [clientPubkey] }],
-                onEvent: async ({ pubkey, content }) => {
-                    const response = await (0, lib_1.tryCatch)(async () => JSON.parse(await (0, util_2.decrypt)(clientSigner, pubkey, content)));
-                    if ((response === null || response === void 0 ? void 0 : response.result) === secret) {
-                        complete(pubkey);
-                    }
-                    if ((response === null || response === void 0 ? void 0 : response.result) === 'ack') {
-                        console.warn("Bunker responded to nostrconnect with 'ack', which can lead to session hijacking");
-                        complete(pubkey);
-                    }
-                },
-            });
-            abortController === null || abortController === void 0 ? void 0 : abortController.signal.addEventListener('abort', () => complete());
-        });
-        return { result, params, nostrconnect, clientSecret, clientPubkey };
-    }
-    static parseBunkerLink(link) {
-        let token = "";
-        let pubkey = "";
-        let relays = [];
-        try {
-            const url = new URL(link);
-            pubkey = url.hostname || url.pathname.replace(/\//g, '');
-            relays = url.searchParams.getAll("relay") || [];
-            token = url.searchParams.get("secret") || "";
-        }
-        catch (_a) {
-            // pass
-        }
-        return { token, pubkey, relays };
-    }
-    static get(params) {
-        if (!(singleton === null || singleton === void 0 ? void 0 : singleton.hasParams(params))) {
-            singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
-            singleton = new Nip46Broker(params);
+        else {
+            // Attempt to open the window
+            const w = window.open(pendingUrl, "", "width=600,height=800,popup=yes");
+            // If open was successful, keep track of our window
+            if (w) {
+                currentWindow = w;
+            }
+            // In any case, this url has been handled
+            pendingUrl = "";
+            pendingSince = 0;
         }
-        return singleton;
-    }
-    constructor(params) {
+    });
+    return {
+        open: (url) => {
+            pendingUrl = url;
+            pendingSince = Date.now();
+            openPending();
+        },
+    };
+})();
+class Nip46Receiver extends lib_1.Emitter {
+    constructor(signer, params) {
         super();
+        this.signer = signer;
         this.params = params;
-        _Nip46Broker_signer.set(this, void 0);
-        _Nip46Broker_handler.set(this, void 0);
-        _Nip46Broker_algorithm.set(this, void 0);
-        _Nip46Broker_closed.set(this, false);
-        _Nip46Broker_processing.set(this, false);
-        _Nip46Broker_connectResponse.set(this, void 0);
-        _Nip46Broker_queue.set(this, []);
-        _Nip46Broker_window.set(this, void 0);
-        _Nip46Broker_sub.set(this, void 0);
-        _Nip46Broker_subscribe.set(this, async () => {
-            const pubkey = await __classPrivateFieldGet(this, _Nip46Broker_signer, "f").getPubkey();
+        this.start = async () => {
+            if (this.sub)
+                return;
+            const userPubkey = await this.signer.getPubkey();
+            const filters = [{ kinds: [util_1.NOSTR_CONNECT], "#p": [userPubkey] }];
+            this.sub = (0, net_1.subscribe)({ relays: this.params.relays, filters });
             return new Promise(resolve => {
-                if (__classPrivateFieldGet(this, _Nip46Broker_sub, "f")) {
-                    __classPrivateFieldGet(this, _Nip46Broker_sub, "f").close();
-                }
-                __classPrivateFieldSet(this, _Nip46Broker_sub, (0, net_1.subscribe)({
-                    relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
-                    filters: [{ kinds: [util_1.NOSTR_CONNECT], "#p": [pubkey] }],
-                }), "f");
-                __classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(net_1.SubscriptionEvent.Send, resolve);
-                __classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(net_1.SubscriptionEvent.Event, async (url, event) => {
-                    const json = await (0, util_2.decrypt)(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"), event.pubkey, event.content);
+                this.sub.emitter.on(net_1.SubscriptionEvent.Send, resolve);
+                this.sub.emitter.on(net_1.SubscriptionEvent.Event, async (url, event) => {
+                    const json = await (0, util_2.decrypt)(this.signer, event.pubkey, event.content);
                     const response = (0, lib_1.tryCatch)(() => JSON.parse(json)) || {};
-                    if (!response.id) {
-                        console.error(`Invalid nostr-connect response: ${json}`);
-                    }
                     // Delay errors in case there's a zombie signer out there clogging things up
                     if (response.error) {
                         await (0, lib_1.sleep)(3000);
                     }
-                    if (response.result === "auth_url") {
-                        this.emit(`auth-${response.id}`, response);
-                    }
-                    else {
-                        this.emit(`res-${response.id}`, response);
+                    if (response.id) {
+                        this.emit(Nip46Event.Receive, { ...response, url, event });
                     }
                 });
-                __classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on("complete", () => {
-                    __classPrivateFieldSet(this, _Nip46Broker_sub, undefined, "f");
+                this.sub.emitter.on(net_1.SubscriptionEvent.Complete, () => {
+                    this.sub = undefined;
                 });
             });
-        });
-        _Nip46Broker_processQueue.set(this, async () => {
-            if (__classPrivateFieldGet(this, _Nip46Broker_processing, "f")) {
+        };
+        this.stop = () => {
+            var _a;
+            (_a = this.sub) === null || _a === void 0 ? void 0 : _a.close();
+            this.removeAllListeners();
+        };
+    }
+}
+exports.Nip46Receiver = Nip46Receiver;
+class Nip46Sender extends lib_1.Emitter {
+    constructor(signer, params) {
+        super();
+        this.signer = signer;
+        this.params = params;
+        this.processing = false;
+        this.queue = [];
+        this.send = async (request) => {
+            const { id, method, params } = request;
+            const { relays, signerPubkey, algorithm = "nip44" } = this.params;
+            if (!signerPubkey) {
+                throw new Error("Unable to send nip46 request without a signer pubkey");
+            }
+            const payload = JSON.stringify({ id, method, params });
+            const content = await this.signer[algorithm].encrypt(signerPubkey, payload);
+            const template = (0, util_1.createEvent)(util_1.NOSTR_CONNECT, { content, tags: [["p", signerPubkey]] });
+            const event = await this.signer.sign(template);
+            const pub = (0, net_1.publish)({ relays, event });
+            this.emit(Nip46Event.Send, { ...request, pub });
+        };
+        this.process = async () => {
+            if (this.processing) {
                 return;
             }
-            __classPrivateFieldSet(this, _Nip46Broker_processing, true, "f");
+            this.processing = true;
             try {
-                while (__classPrivateFieldGet(this, _Nip46Broker_queue, "f").length > 0) {
-                    const [{ method, params, resolve }] = __classPrivateFieldGet(this, _Nip46Broker_queue, "f").splice(0, 1);
+                while (this.queue.length > 0) {
+                    const [request] = this.queue.splice(0, 1);
                     try {
-                        const response = await this.request(method, params);
-                        console.log('nip46 response:', { method, params, ...response });
-                        resolve(response);
+                        await this.send(request);
                     }
                     catch (error) {
-                        console.error(`nip46 error:`, { method, params, ...error });
+                        console.error(`nip46 error:`, error, request);
                     }
                 }
             }
             finally {
-                __classPrivateFieldSet(this, _Nip46Broker_processing, false, "f");
+                this.processing = false;
             }
-        });
-        _Nip46Broker_getResult.set(this, async (promise) => {
-            const { result } = await promise;
-            return result;
-        });
-        this.request = async (method, params) => {
-            if (__classPrivateFieldGet(this, _Nip46Broker_closed, "f")) {
-                throw new Error("Attempted to make a nip46 request with a closed broker");
-            }
-            if (!__classPrivateFieldGet(this, _Nip46Broker_sub, "f")) {
-                await __classPrivateFieldGet(this, _Nip46Broker_subscribe, "f").call(this);
-            }
-            const id = (0, lib_1.randomId)();
-            const recipient = __classPrivateFieldGet(this, _Nip46Broker_handler, "f").pubkey;
-            const payload = JSON.stringify({ id, method, params });
-            const content = await __classPrivateFieldGet(this, _Nip46Broker_signer, "f")[__classPrivateFieldGet(this, _Nip46Broker_algorithm, "f")].encrypt(recipient, payload);
-            const template = (0, util_1.createEvent)(util_1.NOSTR_CONNECT, { content, tags: [["p", recipient]] });
-            console.log('nip46 request:', { id, method, params });
-            (0, net_1.publish)({
-                relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
-                event: await __classPrivateFieldGet(this, _Nip46Broker_signer, "f").sign(template),
-            });
-            this.once(`auth-${id}`, response => {
-                if (!__classPrivateFieldGet(this, _Nip46Broker_window, "f") || __classPrivateFieldGet(this, _Nip46Broker_window, "f").closed) {
-                    const w = window.open(response.error, "", "width=600,height=800,popup=yes");
-                    if (w) {
-                        __classPrivateFieldSet(this, _Nip46Broker_window, w, "f");
-                    }
+        };
+        this.enqueue = (request) => {
+            this.queue.push(request);
+            this.process();
+        };
+        this.stop = () => {
+            this.removeAllListeners();
+        };
+    }
+}
+exports.Nip46Sender = Nip46Sender;
+class Nip46Request {
+    constructor(method, params) {
+        this.method = method;
+        this.params = params;
+        this.id = (0, lib_1.randomId)();
+        this.promise = (0, lib_1.defer)();
+        this.listen = async (receiver) => {
+            await receiver.start();
+            const onReceive = (response) => {
+                if (response.id !== this.id) {
+                    return;
                 }
-            });
-            return new Promise((resolve, reject) => {
-                this.once(`res-${id}`, (response) => {
+                if (response.result === "auth_url") {
+                    popupManager.open(response.error);
+                }
+                else {
                     if (response.error) {
-                        reject(response);
+                        this.promise.reject(response);
                     }
                     else {
-                        resolve(response);
+                        this.promise.resolve(response);
                     }
-                });
+                    receiver.off(Nip46Event.Receive, onReceive);
+                }
+            };
+            receiver.on(Nip46Event.Receive, onReceive);
+        };
+        this.send = async (sender) => {
+            sender.enqueue(this);
+        };
+    }
+}
+exports.Nip46Request = Nip46Request;
+class Nip46Broker extends lib_1.Emitter {
+    constructor(params) {
+        super();
+        this.params = params;
+        // Getters for helper objects
+        this.makeSigner = () => new nip01_1.Nip01Signer(this.params.clientSecret);
+        this.makeSender = () => {
+            const sender = new Nip46Sender(this.signer, this.params);
+            sender.on(Nip46Event.Send, (data) => {
+                console.log('nip46 send:', data);
             });
+            return sender;
+        };
+        this.makeReceiver = () => {
+            const receiver = new Nip46Receiver(this.signer, this.params);
+            receiver.on(Nip46Event.Receive, (data) => {
+                console.log('nip46 receive:', data);
+            });
+            return receiver;
+        };
+        // Lifecycle methods
+        this.setParams = (params) => {
+            this.params = { ...this.params, ...params };
+            // Stop everything that's stateful
+            this.teardown();
+            // Set it back up again
+            this.sender = this.makeSender();
+            this.receiver = this.makeReceiver();
+        };
+        this.teardown = () => {
+            this.sender.stop();
+            this.receiver.stop();
         };
-        this.enqueue = (method, params) => new Promise(resolve => {
-            __classPrivateFieldGet(this, _Nip46Broker_queue, "f").push({ method, params, resolve });
-            __classPrivateFieldGet(this, _Nip46Broker_processQueue, "f").call(this);
-        });
-        this.createAccount = (username, perms = "") => {
-            if (!__classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain) {
-                throw new Error("Unable to create an account without a handler domain");
+        // General purpose utility methods
+        this.enqueue = async (method, params) => {
+            const request = new Nip46Request(method, params);
+            await request.listen(this.receiver);
+            await request.send(this.sender);
+            return request;
+        };
+        this.send = async (method, params) => {
+            const request = await this.enqueue(method, params);
+            const response = await request.promise;
+            return response.result;
+        };
+        // Methods for initiating a connection
+        this.parseBunkerUrl = (url) => {
+            let connectSecret = "";
+            let signerPubkey = "";
+            let relays = [];
+            try {
+                const _url = new URL(url);
+                relays = _url.searchParams.getAll("relay") || [];
+                signerPubkey = _url.hostname || _url.pathname.replace(/\//g, '');
+                connectSecret = _url.searchParams.get("secret") || "";
             }
-            return __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("create_account", [username, __classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain, "", perms]));
+            catch (_a) {
+                // pass
+            }
+            return { signerPubkey, connectSecret, relays: relays.map(util_1.normalizeRelayUrl) };
         };
-        this.connect = async (token = "", perms = "", secret = "") => {
-            if (!__classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f")) {
-                const params = ["", token, perms];
-                __classPrivateFieldSet(this, _Nip46Broker_connectResponse, await this.enqueue("connect", params), "f");
+        this.makeNostrconnectUrl = async (meta = {}) => {
+            const clientPubkey = await this.signer.getPubkey();
+            const secret = Math.random().toString(36).substring(7);
+            const params = new URLSearchParams({ ...meta, secret });
+            for (const relay of this.params.relays) {
+                params.append('relay', relay);
             }
-            return __classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f").result === 'ack';
-        };
-        this.getPublicKey = () => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("get_public_key", []));
-        this.signEvent = async (event) => JSON.parse(await __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("sign_event", [JSON.stringify(event)])));
-        this.nip04Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_encrypt", [pk, message]));
-        this.nip04Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_decrypt", [pk, message]));
-        this.nip44Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_encrypt", [pk, message]));
-        this.nip44Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_decrypt", [pk, message]));
-        this.teardown = () => {
-            var _a;
-            __classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
-            (_a = __classPrivateFieldGet(this, _Nip46Broker_sub, "f")) === null || _a === void 0 ? void 0 : _a.close();
+            return `nostrconnect://${clientPubkey}?${params.toString()}`;
         };
-        __classPrivateFieldSet(this, _Nip46Broker_handler, params.handler, "f");
-        __classPrivateFieldSet(this, _Nip46Broker_algorithm, params.algorithm || 'nip44', "f");
-        __classPrivateFieldSet(this, _Nip46Broker_signer, new nip01_1.Nip01Signer(params.secret), "f");
+        this.waitForNostrconnect = (url, abort) => {
+            const secret = new URL(url).searchParams.get('secret');
+            return (0, lib_1.makePromise)((resolve, reject) => {
+                const onReceive = (response) => {
+                    if (["ack", secret].includes(response.result)) {
+                        this.setParams({ signerPubkey: response.event.pubkey });
+                        if (response.result === 'ack') {
+                            console.warn("Bunker responded to nostrconnect with 'ack', which can lead to session hijacking");
+                        }
+                        resolve(response);
+                    }
+                    else {
+                        reject(response);
+                    }
+                    cleanup();
+                };
+                const cleanup = () => {
+                    this.receiver.off(Nip46Event.Receive, onReceive);
+                };
+                this.receiver.on(Nip46Event.Receive, onReceive);
+                this.receiver.start();
+                abort === null || abort === void 0 ? void 0 : abort.signal.addEventListener('abort', () => {
+                    reject(undefined);
+                    cleanup();
+                });
+            });
+        };
+        // Normal NIP 46 methods
+        this.ping = () => this.send("ping", []);
+        this.getPublicKey = () => this.send("get_public_key", []);
+        this.createAccount = (username, domain, perms = "") => this.send("create_account", [username, domain, "", perms]);
+        this.connect = async (signerPubkey, connectSecret = "", perms = "") => this.send("connect", [signerPubkey, connectSecret, perms]);
+        this.signEvent = async (event) => JSON.parse(await this.send("sign_event", [JSON.stringify(event)]));
+        this.nip04Encrypt = (pk, message) => this.send("nip04_encrypt", [pk, message]);
+        this.nip04Decrypt = (pk, message) => this.send("nip04_decrypt", [pk, message]);
+        this.nip44Encrypt = (pk, message) => this.send("nip44_encrypt", [pk, message]);
+        this.nip44Decrypt = (pk, message) => this.send("nip44_decrypt", [pk, message]);
+        this.signer = this.makeSigner();
+        this.sender = this.makeSender();
+        this.receiver = this.makeReceiver();
+    }
+    // Use a static getter to avoid duplicate connections
+    static get(params) {
+        if (!(singleton === null || singleton === void 0 ? void 0 : singleton.hasParams(params))) {
+            singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
+            singleton = new Nip46Broker(params);
+        }
+        return singleton;
     }
+    // Expose params without exposing params
     hasParams(params) {
         return (0, lib_1.equals)(this.params, params);
     }
 }
 exports.Nip46Broker = Nip46Broker;
-_Nip46Broker_signer = new WeakMap(), _Nip46Broker_handler = new WeakMap(), _Nip46Broker_algorithm = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_processing = new WeakMap(), _Nip46Broker_connectResponse = new WeakMap(), _Nip46Broker_queue = new WeakMap(), _Nip46Broker_window = new WeakMap(), _Nip46Broker_sub = new WeakMap(), _Nip46Broker_subscribe = new WeakMap(), _Nip46Broker_processQueue = new WeakMap(), _Nip46Broker_getResult = new WeakMap();
 class Nip46Signer {
     constructor(broker) {
         this.broker = broker;
-        _Nip46Signer_pubkey.set(this, void 0);
         this.getPubkey = async () => {
-            if (!__classPrivateFieldGet(this, _Nip46Signer_pubkey, "f")) {
-                __classPrivateFieldSet(this, _Nip46Signer_pubkey, await this.broker.getPublicKey(), "f");
+            if (!this.pubkey) {
+                this.pubkey = await this.broker.getPublicKey();
             }
-            return __classPrivateFieldGet(this, _Nip46Signer_pubkey, "f");
+            return this.pubkey;
         };
         this.sign = async (template) => this.broker.signEvent((0, util_2.hash)((0, util_2.own)(template, await this.getPubkey())));
         this.nip04 = {
@@ -242,5 +311,4 @@ class Nip46Signer {
     }
 }
 exports.Nip46Signer = Nip46Signer;
-_Nip46Signer_pubkey = new WeakMap();
 //# sourceMappingURL=nip46.cjs.map

package/build/src/signers/nip46.cjs.map

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

package/build/src/signers/nip46.d.ts

@@ -1,30 +1,19 @@
 import { Emitter } from "@welshman/lib";
 import { TrustedEvent, StampedEvent } from "@welshman/util";
+import { Subscription } from "@welshman/net";
 import { ISigner } from '../util';
+import { Nip01Signer } from './nip01';
 export type Nip46Algorithm = "nip04" | "nip44";
-export type Nip46Handler = {
-    relays: string[];
-    pubkey: string;
-    domain?: string;
-};
-export type Nip46InitiateParams = {
-    url: string;
-    name: string;
-    image: string;
-    perms: string;
-    relays: string[];
-    abortController?: AbortController;
-};
+export declare enum Nip46Event {
+    Send = "send",
+    Receive = "receive"
+}
 export type Nip46BrokerParams = {
-    secret: string;
-    handler: Nip46Handler;
+    relays: string[];
+    clientSecret: string;
+    signerPubkey?: string;
     algorithm?: Nip46Algorithm;
 };
-export type Nip46Request = {
-    method: string;
-    params: string[];
-    resolve: (result: Nip46ResponseWithResult) => void;
-};
 export type Nip46Response = {
     id: string;
     url: string;
@@ -44,39 +33,69 @@ export type Nip46ResponseWithError = {
     event: TrustedEvent;
     error: string;
 };
+export declare class Nip46Receiver extends Emitter {
+    signer: ISigner;
+    params: Nip46BrokerParams;
+    sub?: Subscription;
+    constructor(signer: ISigner, params: Nip46BrokerParams);
+    start: () => Promise<void>;
+    stop: () => void;
+}
+export declare class Nip46Sender extends Emitter {
+    signer: ISigner;
+    params: Nip46BrokerParams;
+    processing: boolean;
+    queue: Nip46Request[];
+    constructor(signer: ISigner, params: Nip46BrokerParams);
+    send: (request: Nip46Request) => Promise<void>;
+    process: () => Promise<void>;
+    enqueue: (request: Nip46Request) => void;
+    stop: () => void;
+}
+export declare class Nip46Request {
+    readonly method: string;
+    readonly params: string[];
+    id: string;
+    promise: import("@welshman/lib").Deferred<Nip46ResponseWithResult, Nip46ResponseWithError>;
+    constructor(method: string, params: string[]);
+    listen: (receiver: Nip46Receiver) => Promise<void>;
+    send: (sender: Nip46Sender) => Promise<void>;
+}
 export declare class Nip46Broker extends Emitter {
-    #private;
-    private params;
-    static initiate({ url, name, image, perms, relays, abortController }: Nip46InitiateParams): {
-        result: Promise<string | undefined>;
-        params: URLSearchParams;
-        nostrconnect: string;
-        clientSecret: string;
-        clientPubkey: string;
-    };
-    static parseBunkerLink(link: string): {
-        token: string;
-        pubkey: string;
-        relays: string[];
-    };
-    static get(params: Nip46BrokerParams): Nip46Broker;
+    params: Nip46BrokerParams;
+    signer: ISigner;
+    sender: Nip46Sender;
+    receiver: Nip46Receiver;
     constructor(params: Nip46BrokerParams);
+    static get(params: Nip46BrokerParams): Nip46Broker;
     hasParams(params: Nip46BrokerParams): boolean;
-    request: (method: string, params: string[]) => Promise<Nip46ResponseWithResult>;
-    enqueue: (method: string, params: string[]) => Promise<Nip46ResponseWithResult>;
-    createAccount: (username: string, perms?: string) => Promise<string>;
-    connect: (token?: string, perms?: string, secret?: string) => Promise<boolean>;
+    makeSigner: () => Nip01Signer;
+    makeSender: () => Nip46Sender;
+    makeReceiver: () => Nip46Receiver;
+    setParams: (params: Partial<Nip46BrokerParams>) => void;
+    teardown: () => void;
+    enqueue: (method: string, params: string[]) => Promise<Nip46Request>;
+    send: (method: string, params: string[]) => Promise<string>;
+    parseBunkerUrl: (url: string) => {
+        signerPubkey: string;
+        connectSecret: string;
+        relays: string[];
+    };
+    makeNostrconnectUrl: (meta?: Record<string, string>) => Promise<string>;
+    waitForNostrconnect: (url: string, abort?: AbortController) => import("@welshman/lib").CustomPromise<Nip46ResponseWithResult, Nip46Response | undefined>;
+    ping: () => Promise<string>;
     getPublicKey: () => Promise<string>;
+    createAccount: (username: string, domain: string, perms?: string) => Promise<string>;
+    connect: (signerPubkey: string, connectSecret?: string, perms?: string) => Promise<string>;
     signEvent: (event: StampedEvent) => Promise<any>;
     nip04Encrypt: (pk: string, message: string) => Promise<string>;
     nip04Decrypt: (pk: string, message: string) => Promise<string>;
     nip44Encrypt: (pk: string, message: string) => Promise<string>;
     nip44Decrypt: (pk: string, message: string) => Promise<string>;
-    teardown: () => void;
 }
 export declare class Nip46Signer implements ISigner {
-    #private;
-    private broker;
+    broker: Nip46Broker;
+    pubkey?: string;
     constructor(broker: Nip46Broker);
     getPubkey: () => Promise<string>;
     sign: (template: StampedEvent) => Promise<any>;

package/build/src/signers/nip46.mjs

@@ -1,230 +1,296 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Nip46Broker_signer, _Nip46Broker_handler, _Nip46Broker_algorithm, _Nip46Broker_closed, _Nip46Broker_processing, _Nip46Broker_connectResponse, _Nip46Broker_queue, _Nip46Broker_window, _Nip46Broker_sub, _Nip46Broker_subscribe, _Nip46Broker_processQueue, _Nip46Broker_getResult, _Nip46Signer_pubkey;
-import { Emitter, sleep, tryCatch, randomId, equals } from "@welshman/lib";
-import { createEvent, NOSTR_CONNECT } from "@welshman/util";
+import { throttle } from 'throttle-debounce';
+import { Emitter, makePromise, defer, sleep, tryCatch, randomId, equals } from "@welshman/lib";
+import { createEvent, normalizeRelayUrl, NOSTR_CONNECT } from "@welshman/util";
 import { subscribe, publish, SubscriptionEvent } from "@welshman/net";
-import { decrypt, hash, own, makeSecret, getPubkey } from "../util.mjs";
+import { decrypt, hash, own } from "../util.mjs";
 import { Nip01Signer } from "./nip01.mjs";
+export var Nip46Event;
+(function (Nip46Event) {
+    Nip46Event["Send"] = "send";
+    Nip46Event["Receive"] = "receive";
+})(Nip46Event || (Nip46Event = {}));
 let singleton;
-export class Nip46Broker extends Emitter {
-    static initiate({ url, name, image, perms, relays, abortController }) {
-        const secret = Math.random().toString(36).substring(7);
-        const clientSecret = makeSecret();
-        const clientPubkey = getPubkey(clientSecret);
-        const clientSigner = new Nip01Signer(clientSecret);
-        const params = new URLSearchParams({ secret, url, name, image, perms });
-        for (const relay of relays) {
-            params.append('relay', relay);
+const popupManager = (() => {
+    let pendingUrl = "";
+    let pendingSince = 0;
+    let currentWindow;
+    const openPending = throttle(1000, () => {
+        // If it's been a while since they asked for it, drop the request
+        if (Date.now() - pendingSince > 10000)
+            return;
+        // If we have an active, open window, continue to wait
+        if (currentWindow && !currentWindow.closed) {
+            setTimeout(() => openPending(), 100);
         }
-        const nostrconnect = `nostrconnect://${clientPubkey}?${params.toString()}`;
-        const result = new Promise(resolve => {
-            const complete = (pubkey) => {
-                sub.close();
-                resolve(pubkey);
-            };
-            const sub = subscribe({
-                relays,
-                filters: [{ kinds: [NOSTR_CONNECT], "#p": [clientPubkey] }],
-                onEvent: async ({ pubkey, content }) => {
-                    const response = await tryCatch(async () => JSON.parse(await decrypt(clientSigner, pubkey, content)));
-                    if ((response === null || response === void 0 ? void 0 : response.result) === secret) {
-                        complete(pubkey);
-                    }
-                    if ((response === null || response === void 0 ? void 0 : response.result) === 'ack') {
-                        console.warn("Bunker responded to nostrconnect with 'ack', which can lead to session hijacking");
-                        complete(pubkey);
-                    }
-                },
-            });
-            abortController === null || abortController === void 0 ? void 0 : abortController.signal.addEventListener('abort', () => complete());
-        });
-        return { result, params, nostrconnect, clientSecret, clientPubkey };
-    }
-    static parseBunkerLink(link) {
-        let token = "";
-        let pubkey = "";
-        let relays = [];
-        try {
-            const url = new URL(link);
-            pubkey = url.hostname || url.pathname.replace(/\//g, '');
-            relays = url.searchParams.getAll("relay") || [];
-            token = url.searchParams.get("secret") || "";
-        }
-        catch (_a) {
-            // pass
-        }
-        return { token, pubkey, relays };
-    }
-    static get(params) {
-        if (!(singleton === null || singleton === void 0 ? void 0 : singleton.hasParams(params))) {
-            singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
-            singleton = new Nip46Broker(params);
+        else {
+            // Attempt to open the window
+            const w = window.open(pendingUrl, "", "width=600,height=800,popup=yes");
+            // If open was successful, keep track of our window
+            if (w) {
+                currentWindow = w;
+            }
+            // In any case, this url has been handled
+            pendingUrl = "";
+            pendingSince = 0;
         }
-        return singleton;
-    }
-    constructor(params) {
+    });
+    return {
+        open: (url) => {
+            pendingUrl = url;
+            pendingSince = Date.now();
+            openPending();
+        },
+    };
+})();
+export class Nip46Receiver extends Emitter {
+    constructor(signer, params) {
         super();
+        this.signer = signer;
         this.params = params;
-        _Nip46Broker_signer.set(this, void 0);
-        _Nip46Broker_handler.set(this, void 0);
-        _Nip46Broker_algorithm.set(this, void 0);
-        _Nip46Broker_closed.set(this, false);
-        _Nip46Broker_processing.set(this, false);
-        _Nip46Broker_connectResponse.set(this, void 0);
-        _Nip46Broker_queue.set(this, []);
-        _Nip46Broker_window.set(this, void 0);
-        _Nip46Broker_sub.set(this, void 0);
-        _Nip46Broker_subscribe.set(this, async () => {
-            const pubkey = await __classPrivateFieldGet(this, _Nip46Broker_signer, "f").getPubkey();
+        this.start = async () => {
+            if (this.sub)
+                return;
+            const userPubkey = await this.signer.getPubkey();
+            const filters = [{ kinds: [NOSTR_CONNECT], "#p": [userPubkey] }];
+            this.sub = subscribe({ relays: this.params.relays, filters });
             return new Promise(resolve => {
-                if (__classPrivateFieldGet(this, _Nip46Broker_sub, "f")) {
-                    __classPrivateFieldGet(this, _Nip46Broker_sub, "f").close();
-                }
-                __classPrivateFieldSet(this, _Nip46Broker_sub, subscribe({
-                    relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
-                    filters: [{ kinds: [NOSTR_CONNECT], "#p": [pubkey] }],
-                }), "f");
-                __classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(SubscriptionEvent.Send, resolve);
-                __classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(SubscriptionEvent.Event, async (url, event) => {
-                    const json = await decrypt(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"), event.pubkey, event.content);
+                this.sub.emitter.on(SubscriptionEvent.Send, resolve);
+                this.sub.emitter.on(SubscriptionEvent.Event, async (url, event) => {
+                    const json = await decrypt(this.signer, event.pubkey, event.content);
                     const response = tryCatch(() => JSON.parse(json)) || {};
-                    if (!response.id) {
-                        console.error(`Invalid nostr-connect response: ${json}`);
-                    }
                     // Delay errors in case there's a zombie signer out there clogging things up
                     if (response.error) {
                         await sleep(3000);
                     }
-                    if (response.result === "auth_url") {
-                        this.emit(`auth-${response.id}`, response);
-                    }
-                    else {
-                        this.emit(`res-${response.id}`, response);
+                    if (response.id) {
+                        this.emit(Nip46Event.Receive, { ...response, url, event });
                     }
                 });
-                __classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on("complete", () => {
-                    __classPrivateFieldSet(this, _Nip46Broker_sub, undefined, "f");
+                this.sub.emitter.on(SubscriptionEvent.Complete, () => {
+                    this.sub = undefined;
                 });
             });
-        });
-        _Nip46Broker_processQueue.set(this, async () => {
-            if (__classPrivateFieldGet(this, _Nip46Broker_processing, "f")) {
+        };
+        this.stop = () => {
+            var _a;
+            (_a = this.sub) === null || _a === void 0 ? void 0 : _a.close();
+            this.removeAllListeners();
+        };
+    }
+}
+export class Nip46Sender extends Emitter {
+    constructor(signer, params) {
+        super();
+        this.signer = signer;
+        this.params = params;
+        this.processing = false;
+        this.queue = [];
+        this.send = async (request) => {
+            const { id, method, params } = request;
+            const { relays, signerPubkey, algorithm = "nip44" } = this.params;
+            if (!signerPubkey) {
+                throw new Error("Unable to send nip46 request without a signer pubkey");
+            }
+            const payload = JSON.stringify({ id, method, params });
+            const content = await this.signer[algorithm].encrypt(signerPubkey, payload);
+            const template = createEvent(NOSTR_CONNECT, { content, tags: [["p", signerPubkey]] });
+            const event = await this.signer.sign(template);
+            const pub = publish({ relays, event });
+            this.emit(Nip46Event.Send, { ...request, pub });
+        };
+        this.process = async () => {
+            if (this.processing) {
                 return;
             }
-            __classPrivateFieldSet(this, _Nip46Broker_processing, true, "f");
+            this.processing = true;
             try {
-                while (__classPrivateFieldGet(this, _Nip46Broker_queue, "f").length > 0) {
-                    const [{ method, params, resolve }] = __classPrivateFieldGet(this, _Nip46Broker_queue, "f").splice(0, 1);
+                while (this.queue.length > 0) {
+                    const [request] = this.queue.splice(0, 1);
                     try {
-                        const response = await this.request(method, params);
-                        console.log('nip46 response:', { method, params, ...response });
-                        resolve(response);
+                        await this.send(request);
                     }
                     catch (error) {
-                        console.error(`nip46 error:`, { method, params, ...error });
+                        console.error(`nip46 error:`, error, request);
                     }
                 }
             }
             finally {
-                __classPrivateFieldSet(this, _Nip46Broker_processing, false, "f");
+                this.processing = false;
             }
-        });
-        _Nip46Broker_getResult.set(this, async (promise) => {
-            const { result } = await promise;
-            return result;
-        });
-        this.request = async (method, params) => {
-            if (__classPrivateFieldGet(this, _Nip46Broker_closed, "f")) {
-                throw new Error("Attempted to make a nip46 request with a closed broker");
-            }
-            if (!__classPrivateFieldGet(this, _Nip46Broker_sub, "f")) {
-                await __classPrivateFieldGet(this, _Nip46Broker_subscribe, "f").call(this);
-            }
-            const id = randomId();
-            const recipient = __classPrivateFieldGet(this, _Nip46Broker_handler, "f").pubkey;
-            const payload = JSON.stringify({ id, method, params });
-            const content = await __classPrivateFieldGet(this, _Nip46Broker_signer, "f")[__classPrivateFieldGet(this, _Nip46Broker_algorithm, "f")].encrypt(recipient, payload);
-            const template = createEvent(NOSTR_CONNECT, { content, tags: [["p", recipient]] });
-            console.log('nip46 request:', { id, method, params });
-            publish({
-                relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
-                event: await __classPrivateFieldGet(this, _Nip46Broker_signer, "f").sign(template),
-            });
-            this.once(`auth-${id}`, response => {
-                if (!__classPrivateFieldGet(this, _Nip46Broker_window, "f") || __classPrivateFieldGet(this, _Nip46Broker_window, "f").closed) {
-                    const w = window.open(response.error, "", "width=600,height=800,popup=yes");
-                    if (w) {
-                        __classPrivateFieldSet(this, _Nip46Broker_window, w, "f");
-                    }
+        };
+        this.enqueue = (request) => {
+            this.queue.push(request);
+            this.process();
+        };
+        this.stop = () => {
+            this.removeAllListeners();
+        };
+    }
+}
+export class Nip46Request {
+    constructor(method, params) {
+        this.method = method;
+        this.params = params;
+        this.id = randomId();
+        this.promise = defer();
+        this.listen = async (receiver) => {
+            await receiver.start();
+            const onReceive = (response) => {
+                if (response.id !== this.id) {
+                    return;
                 }
-            });
-            return new Promise((resolve, reject) => {
-                this.once(`res-${id}`, (response) => {
+                if (response.result === "auth_url") {
+                    popupManager.open(response.error);
+                }
+                else {
                     if (response.error) {
-                        reject(response);
+                        this.promise.reject(response);
                     }
                     else {
-                        resolve(response);
+                        this.promise.resolve(response);
                     }
-                });
+                    receiver.off(Nip46Event.Receive, onReceive);
+                }
+            };
+            receiver.on(Nip46Event.Receive, onReceive);
+        };
+        this.send = async (sender) => {
+            sender.enqueue(this);
+        };
+    }
+}
+export class Nip46Broker extends Emitter {
+    constructor(params) {
+        super();
+        this.params = params;
+        // Getters for helper objects
+        this.makeSigner = () => new Nip01Signer(this.params.clientSecret);
+        this.makeSender = () => {
+            const sender = new Nip46Sender(this.signer, this.params);
+            sender.on(Nip46Event.Send, (data) => {
+                console.log('nip46 send:', data);
             });
+            return sender;
+        };
+        this.makeReceiver = () => {
+            const receiver = new Nip46Receiver(this.signer, this.params);
+            receiver.on(Nip46Event.Receive, (data) => {
+                console.log('nip46 receive:', data);
+            });
+            return receiver;
+        };
+        // Lifecycle methods
+        this.setParams = (params) => {
+            this.params = { ...this.params, ...params };
+            // Stop everything that's stateful
+            this.teardown();
+            // Set it back up again
+            this.sender = this.makeSender();
+            this.receiver = this.makeReceiver();
+        };
+        this.teardown = () => {
+            this.sender.stop();
+            this.receiver.stop();
         };
-        this.enqueue = (method, params) => new Promise(resolve => {
-            __classPrivateFieldGet(this, _Nip46Broker_queue, "f").push({ method, params, resolve });
-            __classPrivateFieldGet(this, _Nip46Broker_processQueue, "f").call(this);
-        });
-        this.createAccount = (username, perms = "") => {
-            if (!__classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain) {
-                throw new Error("Unable to create an account without a handler domain");
+        // General purpose utility methods
+        this.enqueue = async (method, params) => {
+            const request = new Nip46Request(method, params);
+            await request.listen(this.receiver);
+            await request.send(this.sender);
+            return request;
+        };
+        this.send = async (method, params) => {
+            const request = await this.enqueue(method, params);
+            const response = await request.promise;
+            return response.result;
+        };
+        // Methods for initiating a connection
+        this.parseBunkerUrl = (url) => {
+            let connectSecret = "";
+            let signerPubkey = "";
+            let relays = [];
+            try {
+                const _url = new URL(url);
+                relays = _url.searchParams.getAll("relay") || [];
+                signerPubkey = _url.hostname || _url.pathname.replace(/\//g, '');
+                connectSecret = _url.searchParams.get("secret") || "";
             }
-            return __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("create_account", [username, __classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain, "", perms]));
+            catch (_a) {
+                // pass
+            }
+            return { signerPubkey, connectSecret, relays: relays.map(normalizeRelayUrl) };
         };
-        this.connect = async (token = "", perms = "", secret = "") => {
-            if (!__classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f")) {
-                const params = ["", token, perms];
-                __classPrivateFieldSet(this, _Nip46Broker_connectResponse, await this.enqueue("connect", params), "f");
+        this.makeNostrconnectUrl = async (meta = {}) => {
+            const clientPubkey = await this.signer.getPubkey();
+            const secret = Math.random().toString(36).substring(7);
+            const params = new URLSearchParams({ ...meta, secret });
+            for (const relay of this.params.relays) {
+                params.append('relay', relay);
             }
-            return __classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f").result === 'ack';
-        };
-        this.getPublicKey = () => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("get_public_key", []));
-        this.signEvent = async (event) => JSON.parse(await __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("sign_event", [JSON.stringify(event)])));
-        this.nip04Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_encrypt", [pk, message]));
-        this.nip04Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_decrypt", [pk, message]));
-        this.nip44Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_encrypt", [pk, message]));
-        this.nip44Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_decrypt", [pk, message]));
-        this.teardown = () => {
-            var _a;
-            __classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
-            (_a = __classPrivateFieldGet(this, _Nip46Broker_sub, "f")) === null || _a === void 0 ? void 0 : _a.close();
+            return `nostrconnect://${clientPubkey}?${params.toString()}`;
         };
-        __classPrivateFieldSet(this, _Nip46Broker_handler, params.handler, "f");
-        __classPrivateFieldSet(this, _Nip46Broker_algorithm, params.algorithm || 'nip44', "f");
-        __classPrivateFieldSet(this, _Nip46Broker_signer, new Nip01Signer(params.secret), "f");
+        this.waitForNostrconnect = (url, abort) => {
+            const secret = new URL(url).searchParams.get('secret');
+            return makePromise((resolve, reject) => {
+                const onReceive = (response) => {
+                    if (["ack", secret].includes(response.result)) {
+                        this.setParams({ signerPubkey: response.event.pubkey });
+                        if (response.result === 'ack') {
+                            console.warn("Bunker responded to nostrconnect with 'ack', which can lead to session hijacking");
+                        }
+                        resolve(response);
+                    }
+                    else {
+                        reject(response);
+                    }
+                    cleanup();
+                };
+                const cleanup = () => {
+                    this.receiver.off(Nip46Event.Receive, onReceive);
+                };
+                this.receiver.on(Nip46Event.Receive, onReceive);
+                this.receiver.start();
+                abort === null || abort === void 0 ? void 0 : abort.signal.addEventListener('abort', () => {
+                    reject(undefined);
+                    cleanup();
+                });
+            });
+        };
+        // Normal NIP 46 methods
+        this.ping = () => this.send("ping", []);
+        this.getPublicKey = () => this.send("get_public_key", []);
+        this.createAccount = (username, domain, perms = "") => this.send("create_account", [username, domain, "", perms]);
+        this.connect = async (signerPubkey, connectSecret = "", perms = "") => this.send("connect", [signerPubkey, connectSecret, perms]);
+        this.signEvent = async (event) => JSON.parse(await this.send("sign_event", [JSON.stringify(event)]));
+        this.nip04Encrypt = (pk, message) => this.send("nip04_encrypt", [pk, message]);
+        this.nip04Decrypt = (pk, message) => this.send("nip04_decrypt", [pk, message]);
+        this.nip44Encrypt = (pk, message) => this.send("nip44_encrypt", [pk, message]);
+        this.nip44Decrypt = (pk, message) => this.send("nip44_decrypt", [pk, message]);
+        this.signer = this.makeSigner();
+        this.sender = this.makeSender();
+        this.receiver = this.makeReceiver();
+    }
+    // Use a static getter to avoid duplicate connections
+    static get(params) {
+        if (!(singleton === null || singleton === void 0 ? void 0 : singleton.hasParams(params))) {
+            singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
+            singleton = new Nip46Broker(params);
+        }
+        return singleton;
     }
+    // Expose params without exposing params
     hasParams(params) {
         return equals(this.params, params);
     }
 }
-_Nip46Broker_signer = new WeakMap(), _Nip46Broker_handler = new WeakMap(), _Nip46Broker_algorithm = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_processing = new WeakMap(), _Nip46Broker_connectResponse = new WeakMap(), _Nip46Broker_queue = new WeakMap(), _Nip46Broker_window = new WeakMap(), _Nip46Broker_sub = new WeakMap(), _Nip46Broker_subscribe = new WeakMap(), _Nip46Broker_processQueue = new WeakMap(), _Nip46Broker_getResult = new WeakMap();
 export class Nip46Signer {
     constructor(broker) {
         this.broker = broker;
-        _Nip46Signer_pubkey.set(this, void 0);
         this.getPubkey = async () => {
-            if (!__classPrivateFieldGet(this, _Nip46Signer_pubkey, "f")) {
-                __classPrivateFieldSet(this, _Nip46Signer_pubkey, await this.broker.getPublicKey(), "f");
+            if (!this.pubkey) {
+                this.pubkey = await this.broker.getPublicKey();
             }
-            return __classPrivateFieldGet(this, _Nip46Signer_pubkey, "f");
+            return this.pubkey;
         };
         this.sign = async (template) => this.broker.signEvent(hash(own(template, await this.getPubkey())));
         this.nip04 = {
@@ -237,5 +303,4 @@ export class Nip46Signer {
         };
     }
 }
-_Nip46Signer_pubkey = new WeakMap();
 //# sourceMappingURL=nip46.mjs.map

package/build/src/signers/nip46.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/signer",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A nostr signer implemenation supporting several login methods.",
@@ -31,7 +31,7 @@
     "typescript": "~5.1.6"
   },
   "dependencies": {
-    "@welshman/lib": "~0.0.27",
+    "@welshman/lib": "~0.0.28",
     "@welshman/net": "~0.0.39",
     "@welshman/util": "~0.0.46",
     "nostr-tools": "^2.7.2"