@welshman/signer 0.0.16 → 0.0.18

package/README.md

@@ -1,3 +1,93 @@
-# @welshman/store [![version](https://badgen.net/npm/v/@welshman/store)](https://npmjs.com/package/@welshman/store)
+# @welshman/signer [![version](https://badgen.net/npm/v/@welshman/signer)](https://npmjs.com/package/@welshman/signer)
 
-Utilities for dealing with svelte stores when using welshman.
+Implementations of signer utilities and classes.
+
+## Nips supported
+
+- NIP 01 (private key login)
+- NIP 07
+- NIP 46
+- NIP 55
+- NIP 59 (gift wrapping, works with any signer that supports encryption)
+
+## Examples
+
+### NIP 01
+
+```typescript
+import {makeSecret, Nip01Signer} from '@welshman/signer'
+
+const signer = Nip01Signer.fromSecret(makeSecret())
+```
+
+### NIP 07
+
+```typescript
+import {getNip07, Nip07Signer} from '@welshman/signer'
+
+if (getNip07()) {
+  const signer = new Nip07Signer()
+}
+```
+
+### NIP 55
+
+```typescript
+import {getNip07, Nip07Signer} from '@welshman/signer'
+
+if (getNip07()) {
+  const signer = new Nip07Signer()
+}
+```
+
+### NIP 46
+
+```typescript
+import {createEvent, NOTE} from '@welshman/util'
+import {makeSecret, Nip46Broker, Nip46Signer} from '@welshman/signer'
+
+const clientSecret = makeSecret()
+const relays = ['wss://relay.signer.example/']
+const broker = Nip46Broker.get({relays, clientSecret})
+const signer = new Nip46Signer(broker)
+const ncUrl = broker.makeNostrconnectUrl({name: "My app"})
+const abortController = new AbortController()
+
+let response
+try {
+  response = await broker.waitForNostrconnect(url, abortController)
+} catch (e: any) {
+  if (e?.error) {
+    showWarning(`Received error from signer: ${e.error}`)
+  } else if (e) {
+    console.error(e)
+  }
+}
+
+if (response) {
+  // Now we know the bunker's pubkey and can do stuff with the signer
+  const signerPubkey = response.event.pubkey
+
+  // Next time we want to use our signer, we can instantiate it like so:
+  const newBroker = Nip46Broker.get({relays, clientSecret, signerPubkey})
+  const newSigner = new Nip46Signer(newBroker)
+}
+```
+
+### Using signers
+
+```typescript
+import {createEvent, NOTE, DIRECT_MESSAGE} from '@welshman/util'
+
+const signer = // Create your signer...
+const nip59 = Nip59.fromSigner(signer)
+
+// Sign an event
+const event = await signer.sign(createEvent(NOTE, {content: "hi"}))
+
+// Wrap a NIP 17 DM
+const rumor = await nip59.wrap(recipientPubkey, createEvent(DIRECT_MESSAGE, {content: "hi"}))
+
+// Note that it returns a rumor; be sure to publish the `wrap`
+const wrap = rumor.wrap
+```

package/build/src/index.d.ts

@@ -1,6 +1,6 @@
-export * from './util';
-export * from './nip59';
-export * from './signers/nip01';
-export * from './signers/nip07';
-export * from './signers/nip46';
-export * from './signers/nip55';
+export * from "./util.js";
+export * from "./nip59.js";
+export * from "./signers/nip01.js";
+export * from "./signers/nip07.js";
+export * from "./signers/nip46.js";
+export * from "./signers/nip55.js";

package/build/src/index.js

@@ -0,0 +1,7 @@
+export * from "./util.js";
+export * from "./nip59.js";
+export * from "./signers/nip01.js";
+export * from "./signers/nip07.js";
+export * from "./signers/nip46.js";
+export * from "./signers/nip55.js";
+//# sourceMappingURL=index.js.map

package/build/src/index.js.map

@@ -0,0 +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"}

package/build/src/nip59.d.ts

@@ -1,6 +1,6 @@
-import { UnwrappedEvent, SignedEvent, HashedEvent, StampedEvent } from '@welshman/util';
-import { ISigner } from './util';
-export declare const seen: Map<string, UnwrappedEvent | Error>;
+import { UnwrappedEvent, SignedEvent, HashedEvent, StampedEvent } from "@welshman/util";
+import { ISigner } from "./util.js";
+export declare const seen: Map<string, Error | UnwrappedEvent>;
 export declare const now: (drift?: number) => number;
 export declare const getRumor: (signer: ISigner, template: StampedEvent) => Promise<{
     id: string;

package/build/src/{nip59.mjs → nip59.js}

@@ -1,6 +1,6 @@
-import { WRAP, SEAL } from '@welshman/util';
-import { own, hash, decrypt } from "./util.mjs";
-import { Nip01Signer } from "./signers/nip01.mjs";
+import { WRAP, SEAL } from "@welshman/util";
+import { own, hash, decrypt } from "./util.js";
+import { Nip01Signer } from "./signers/nip01.js";
 export const seen = new Map();
 export const now = (drift = 0) => Math.round(Date.now() / 1000 - Math.random() * Math.pow(10, drift));
 export const getRumor = async (signer, template) => hash(own(template, await signer.getPubkey()));
@@ -53,14 +53,16 @@ export const unwrap = async (signer, wrap) => {
 // wrapping a single user signer and omit the wrapper signer argument to wrap, while still
 // making it possible to pass a wrapper signer if desired.
 export class Nip59 {
+    signer;
+    wrapper;
     constructor(signer, wrapper) {
         this.signer = signer;
         this.wrapper = wrapper;
-        this.withWrapper = (wrapper) => new Nip59(this.signer, wrapper);
-        this.wrap = (pubkey, template, tags = []) => wrap(this.signer, this.wrapper || Nip01Signer.ephemeral(), pubkey, template, tags);
-        this.unwrap = (event) => unwrap(this.signer, event);
     }
+    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 = (event) => unwrap(this.signer, event);
 }
-Nip59.fromSigner = (signer) => new Nip59(signer);
-Nip59.fromSecret = (secret) => new Nip59(new Nip01Signer(secret));
-//# sourceMappingURL=nip59.mjs.map
+//# sourceMappingURL=nip59.js.map

package/build/src/nip59.js.map

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

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

@@ -1,5 +1,5 @@
-import { StampedEvent } from '@welshman/util';
-import { ISigner } from "../util";
+import { StampedEvent } from "@welshman/util";
+import { ISigner } from "../util.js";
 export declare class Nip01Signer implements ISigner {
     #private;
     private secret;

package/build/src/signers/nip01.js

@@ -0,0 +1,22 @@
+import { nip04, nip44, own, hash, sign, getPubkey, makeSecret } from "../util.js";
+export class Nip01Signer {
+    secret;
+    #pubkey;
+    constructor(secret) {
+        this.secret = secret;
+        this.#pubkey = getPubkey(this.secret);
+    }
+    static fromSecret = (secret) => new Nip01Signer(secret);
+    static ephemeral = () => new Nip01Signer(makeSecret());
+    getPubkey = async () => this.#pubkey;
+    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),
+    };
+    nip44 = {
+        encrypt: async (pubkey, message) => nip44.encrypt(pubkey, this.secret, message),
+        decrypt: async (pubkey, message) => nip44.decrypt(pubkey, this.secret, message),
+    };
+}
+//# sourceMappingURL=nip01.js.map

package/build/src/signers/nip01.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nip01.js","sourceRoot":"","sources":["../../../src/signers/nip01.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAW,UAAU,EAAC,MAAM,YAAY,CAAA;AAExF,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/build/src/signers/nip07.d.ts

@@ -1,5 +1,5 @@
-import { StampedEvent } from '@welshman/util';
-import { Sign, ISigner, EncryptionImplementation } from '../util';
+import { StampedEvent } from "@welshman/util";
+import { Sign, ISigner, EncryptionImplementation } from "../util.js";
 export type Nip07 = {
     signEvent: Sign;
     nip04: EncryptionImplementation;

package/build/src/signers/nip07.js

@@ -0,0 +1,30 @@
+import { hash, own } from "../util.js";
+export const getNip07 = () => window.nostr;
+export class Nip07Signer {
+    #lock = Promise.resolve();
+    #then = async (f) => {
+        const promise = this.#lock.then(() => {
+            const ext = getNip07();
+            if (!ext)
+                throw new Error("Nip07 is not enabled");
+            return f(ext);
+        });
+        // Recover from errors
+        this.#lock = promise.then(() => undefined, () => undefined);
+        return promise;
+    };
+    getPubkey = async () => getNip07().getPublicKey();
+    sign = async (template) => {
+        const event = hash(own(template, await this.getPubkey()));
+        return this.#then(ext => ext.signEvent(event));
+    };
+    nip04 = {
+        encrypt: (pubkey, message) => this.#then(ext => ext.nip04.encrypt(pubkey, message)),
+        decrypt: (pubkey, message) => this.#then(ext => ext.nip04.decrypt(pubkey, message)),
+    };
+    nip44 = {
+        encrypt: (pubkey, message) => this.#then(ext => ext.nip44.encrypt(pubkey, message)),
+        decrypt: (pubkey, message) => this.#then(ext => ext.nip44.decrypt(pubkey, message)),
+    };
+}
+//# sourceMappingURL=nip07.js.map

package/build/src/signers/nip07.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nip07.js","sourceRoot":"","sources":["../../../src/signers/nip07.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,GAAG,EAA0C,MAAM,YAAY,CAAA;AAS7E,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAE,MAA0B,CAAC,KAAK,CAAA;AAE/D,MAAM,OAAO,WAAW;IACtB,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;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,sBAAsB;QACtB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CACvB,GAAG,EAAE,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,SAAS,CAChB,CAAA;QAED,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;IAED,SAAS,GAAG,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAG,CAAC,YAAY,EAAG,CAAA;IAEnD,IAAI,GAAG,KAAK,EAAE,QAAsB,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;QAEzD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;IAChD,CAAC,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;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"}

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

@@ -1,8 +1,8 @@
 import { Emitter } from "@welshman/lib";
 import { TrustedEvent, StampedEvent } from "@welshman/util";
 import { Subscription } from "@welshman/net";
-import { ISigner } from '../util';
-import { Nip01Signer } from './nip01';
+import { ISigner, EncryptionImplementation } from "../util.js";
+import { Nip01Signer } from "./nip01.js";
 export type Nip46Algorithm = "nip04" | "nip44";
 export declare enum Nip46Event {
     Send = "send",
@@ -86,7 +86,7 @@ export declare class Nip46Broker extends Emitter {
     ping: () => Promise<string>;
     getPublicKey: () => Promise<string>;
     createAccount: (username: string, domain: string, perms?: string) => Promise<string>;
-    connect: (signerPubkey: string, connectSecret?: string, perms?: string) => Promise<string>;
+    connect: (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>;
@@ -96,15 +96,9 @@ export declare class Nip46Broker extends Emitter {
 export declare class Nip46Signer implements ISigner {
     broker: Nip46Broker;
     pubkey?: string;
+    nip04: EncryptionImplementation;
+    nip44: EncryptionImplementation;
     constructor(broker: Nip46Broker);
     getPubkey: () => Promise<string>;
     sign: (template: StampedEvent) => Promise<any>;
-    nip04: {
-        encrypt: (pk: string, message: string) => Promise<string>;
-        decrypt: (pk: string, message: string) => Promise<string>;
-    };
-    nip44: {
-        encrypt: (pk: string, message: string) => Promise<string>;
-        decrypt: (pk: string, message: string) => Promise<string>;
-    };
 }

package/build/src/signers/nip46.js

@@ -0,0 +1,317 @@
+import { Emitter, throttle, 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 } from "../util.js";
+import { Nip01Signer } from "./nip01.js";
+export var Nip46Event;
+(function (Nip46Event) {
+    Nip46Event["Send"] = "send";
+    Nip46Event["Receive"] = "receive";
+})(Nip46Event || (Nip46Event = {}));
+let singleton;
+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 > 10_000)
+            return;
+        // If we have an active, open window, continue to wait
+        if (currentWindow && !currentWindow.closed) {
+            setTimeout(() => openPending(), 100);
+        }
+        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 {
+        open: (url) => {
+            pendingUrl = url;
+            pendingSince = Date.now();
+            openPending();
+        },
+    };
+})();
+export class Nip46Receiver extends Emitter {
+    signer;
+    params;
+    sub;
+    constructor(signer, params) {
+        super();
+        this.signer = signer;
+        this.params = params;
+    }
+    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 => {
+            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)) || {};
+                // Delay errors in case there's a zombie signer out there clogging things up
+                if (response.error) {
+                    await sleep(3000);
+                }
+                this.emit(Nip46Event.Receive, { ...response, url, event });
+            });
+            this.sub.emitter.on(SubscriptionEvent.Complete, () => {
+                this.sub = undefined;
+            });
+        });
+    };
+    stop = () => {
+        this.sub?.close();
+        this.removeAllListeners();
+    };
+}
+export class Nip46Sender extends Emitter {
+    signer;
+    params;
+    processing = false;
+    queue = [];
+    constructor(signer, params) {
+        super();
+        this.signer = signer;
+        this.params = params;
+    }
+    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 });
+    };
+    process = async () => {
+        if (this.processing) {
+            return;
+        }
+        this.processing = true;
+        try {
+            while (this.queue.length > 0) {
+                const [request] = this.queue.splice(0, 1);
+                try {
+                    await this.send(request);
+                }
+                catch (error) {
+                    console.error("nip46 error:", error, request);
+                }
+            }
+        }
+        finally {
+            this.processing = false;
+        }
+    };
+    enqueue = (request) => {
+        this.queue.push(request);
+        this.process();
+    };
+    stop = () => {
+        this.removeAllListeners();
+    };
+}
+export class Nip46Request {
+    method;
+    params;
+    id = randomId();
+    promise = defer();
+    constructor(method, params) {
+        this.method = method;
+        this.params = params;
+    }
+    listen = async (receiver) => {
+        await receiver.start();
+        const onReceive = (response) => {
+            if (response.id !== this.id) {
+                return;
+            }
+            if (response.result === "auth_url") {
+                popupManager.open(response.error);
+            }
+            else {
+                if (response.error) {
+                    this.promise.reject(response);
+                }
+                else {
+                    this.promise.resolve(response);
+                }
+                receiver.off(Nip46Event.Receive, onReceive);
+            }
+        };
+        receiver.on(Nip46Event.Receive, onReceive);
+    };
+    send = async (sender) => {
+        sender.enqueue(this);
+    };
+}
+export class Nip46Broker extends Emitter {
+    params;
+    signer;
+    sender;
+    receiver;
+    constructor(params) {
+        super();
+        this.params = params;
+        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?.hasParams(params)) {
+            singleton?.teardown();
+            singleton = new Nip46Broker(params);
+        }
+        return singleton;
+    }
+    // Expose params without exposing params
+    hasParams(params) {
+        return equals(this.params, params);
+    }
+    // Getters for helper objects
+    makeSigner = () => new Nip01Signer(this.params.clientSecret);
+    makeSender = () => {
+        const sender = new Nip46Sender(this.signer, this.params);
+        sender.on(Nip46Event.Send, (data) => {
+            console.log("nip46 send:", data);
+        });
+        return sender;
+    };
+    makeReceiver = () => {
+        const receiver = new Nip46Receiver(this.signer, this.params);
+        receiver.on(Nip46Event.Receive, (data) => {
+            console.log("nip46 receive:", data);
+        });
+        return receiver;
+    };
+    // Lifecycle methods
+    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();
+    };
+    teardown = () => {
+        this.sender.stop();
+        this.receiver.stop();
+    };
+    // General purpose utility methods
+    enqueue = async (method, params) => {
+        const request = new Nip46Request(method, params);
+        await request.listen(this.receiver);
+        await request.send(this.sender);
+        return request;
+    };
+    send = async (method, params) => {
+        const request = await this.enqueue(method, params);
+        const response = await request.promise;
+        return response.result;
+    };
+    // Methods for initiating a connection
+    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") || "";
+        }
+        catch {
+            // pass
+        }
+        return { signerPubkey, connectSecret, relays: relays.map(normalizeRelayUrl) };
+    };
+    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 `nostrconnect://${clientPubkey}?${params.toString()}`;
+    };
+    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?.signal.addEventListener("abort", () => {
+                reject(undefined);
+                cleanup();
+            });
+        });
+    };
+    // Normal NIP 46 methods
+    ping = () => this.send("ping", []);
+    getPublicKey = () => this.send("get_public_key", []);
+    createAccount = (username, domain, perms = "") => this.send("create_account", [username, domain, "", perms]);
+    connect = async (connectSecret = "", perms = "") => this.send("connect", [await this.signer.getPubkey(), connectSecret, perms]);
+    signEvent = async (event) => JSON.parse(await this.send("sign_event", [JSON.stringify(event)]));
+    nip04Encrypt = (pk, message) => this.send("nip04_encrypt", [pk, message]);
+    nip04Decrypt = (pk, message) => this.send("nip04_decrypt", [pk, message]);
+    nip44Encrypt = (pk, message) => this.send("nip44_encrypt", [pk, message]);
+    nip44Decrypt = (pk, message) => this.send("nip44_decrypt", [pk, message]);
+}
+export class Nip46Signer {
+    broker;
+    pubkey;
+    nip04;
+    nip44;
+    constructor(broker) {
+        this.broker = broker;
+        this.nip04 = {
+            encrypt: this.broker.nip04Encrypt,
+            decrypt: this.broker.nip04Decrypt,
+        };
+        this.nip44 = {
+            encrypt: this.broker.nip44Encrypt,
+            decrypt: this.broker.nip44Decrypt,
+        };
+    }
+    getPubkey = async () => {
+        if (!this.pubkey) {
+            this.pubkey = await this.broker.getPublicKey();
+        }
+        return this.pubkey;
+    };
+    sign = async (template) => this.broker.signEvent(hash(own(template, await this.getPubkey())));
+}
+//# sourceMappingURL=nip46.js.map

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

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

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

@@ -1,6 +1,6 @@
-import { SignedEvent, StampedEvent } from "@welshman/util";
-import { ISigner } from "../util";
 import { AppInfo } from "nostr-signer-capacitor-plugin";
+import { SignedEvent, StampedEvent } from "@welshman/util";
+import { ISigner } from "../util.js";
 export declare const getNip55: () => Promise<AppInfo[]>;
 export declare class Nip55Signer implements ISigner {
     #private;