@welshman/signer 0.0.1 → 0.0.2

package/build/src/index.cjs

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./util.cjs"), exports);
+__exportStar(require("./nip59.cjs"), exports);
+__exportStar(require("./signers/nip01.cjs"), exports);
+__exportStar(require("./signers/nip07.cjs"), exports);
+__exportStar(require("./signers/nip46.cjs"), exports);
+//# sourceMappingURL=index.cjs.map

package/build/src/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAAsB;AACtB,8CAAuB;AACvB,sDAA+B;AAC/B,sDAA+B;AAC/B,sDAA+B"}

package/build/src/index.d.ts

@@ -1,5 +1,5 @@
 export * from './util';
-export * from './wrapper';
-export * from './signers/secret';
-export * from './signers/connect';
-export * from './signers/extension';
+export * from './nip59';
+export * from './signers/nip01';
+export * from './signers/nip07';
+export * from './signers/nip46';

package/build/src/index.mjs

@@ -1,6 +1,6 @@
 export * from "./util.mjs";
-export * from "./wrapper.mjs";
-export * from "./signers/secret.mjs";
-export * from "./signers/connect.mjs";
-export * from "./signers/extension.mjs";
+export * from "./nip59.mjs";
+export * from "./signers/nip01.mjs";
+export * from "./signers/nip07.mjs";
+export * from "./signers/nip46.mjs";
 //# sourceMappingURL=index.mjs.map

package/build/src/nip59.cjs

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Nip59 = exports.unwrap = exports.wrap = exports.getWrap = exports.getSeal = exports.getRumor = exports.now = exports.seen = void 0;
+const util_1 = require("@welshman/util");
+const util_2 = require("./util.cjs");
+const nip01_1 = require("./signers/nip01.cjs");
+exports.seen = new Map();
+const now = (drift = 0) => Math.round(Date.now() / 1000 - Math.random() * Math.pow(10, drift));
+exports.now = now;
+const getRumor = async (signer, template) => (0, util_2.hash)((0, util_2.own)(await signer.getPubkey(), template));
+exports.getRumor = getRumor;
+const getSeal = async (signer, pubkey, rumor) => signer.sign((0, util_2.hash)({
+    kind: util_1.SEAL,
+    pubkey: await signer.getPubkey(),
+    content: await signer.nip44.encrypt(pubkey, JSON.stringify(rumor)),
+    created_at: (0, exports.now)(5),
+    tags: [],
+}));
+exports.getSeal = getSeal;
+const getWrap = async (wrapper, pubkey, seal, tags) => wrapper.sign((0, util_2.hash)({
+    kind: util_1.WRAP,
+    pubkey: await wrapper.getPubkey(),
+    content: await wrapper.nip44.encrypt(pubkey, JSON.stringify(seal)),
+    created_at: (0, exports.now)(5),
+    tags: [...tags, ["p", pubkey]],
+}));
+exports.getWrap = getWrap;
+const wrap = async (signer, wrapper, pubkey, template, tags = []) => {
+    const rumor = await (0, exports.getRumor)(signer, template);
+    const seal = await (0, exports.getSeal)(signer, pubkey, rumor);
+    const wrap = await (0, exports.getWrap)(wrapper, pubkey, seal, tags);
+    return Object.assign(rumor, { wrap });
+};
+exports.wrap = wrap;
+const unwrap = async (signer, wrap) => {
+    // Avoid decrypting the same event multiple times
+    if (exports.seen.has(wrap.id)) {
+        const rumorOrError = exports.seen.get(wrap.id);
+        if (rumorOrError instanceof Error) {
+            throw rumorOrError;
+        }
+        else {
+            return rumorOrError;
+        }
+    }
+    try {
+        const seal = JSON.parse(await (0, util_2.decrypt)(signer, wrap.pubkey, wrap.content));
+        const rumor = JSON.parse(await (0, util_2.decrypt)(signer, seal.pubkey, seal.content));
+        if (seal.pubkey !== rumor.pubkey)
+            throw new Error("Seal pubkey does not match rumor pubkey");
+        exports.seen.set(wrap.id, rumor);
+        return Object.assign(rumor, { wrap });
+    }
+    catch (error) {
+        exports.seen.set(wrap.id, error);
+        throw error;
+    }
+};
+exports.unwrap = unwrap;
+// This is a utility that makes it harder to re-use wrapper signers, since that can result in
+// leaked metadata. It simultaneously makes it easier to wrap stuff, because it allows for
+// 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.
+class Nip59 {
+    constructor(signer, wrapper) {
+        this.signer = signer;
+        this.wrapper = wrapper;
+        this.withWrapper = (wrapper) => new Nip59(this.signer, wrapper);
+        this.wrap = (pubkey, template, tags = []) => (0, exports.wrap)(this.signer, this.wrapper || nip01_1.Nip01Signer.ephemeral(), pubkey, template, tags);
+        this.unwrap = (event) => (0, exports.unwrap)(this.signer, event);
+    }
+}
+exports.Nip59 = Nip59;
+Nip59.fromSigner = (signer) => new Nip59(signer);
+Nip59.fromSecret = (secret) => new Nip59(new nip01_1.Nip01Signer(secret));
+//# sourceMappingURL=nip59.cjs.map

package/build/src/nip59.cjs.map

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

package/build/src/nip59.d.ts

@@ -0,0 +1,19 @@
+import { UnwrappedEvent, SignedEvent, HashedEvent, EventTemplate } from '@welshman/util';
+import { ISigner } from './util';
+export declare const seen: Map<string, UnwrappedEvent | Error>;
+export declare const now: (drift?: number) => number;
+export declare const getRumor: (signer: ISigner, template: EventTemplate) => Promise<HashedEvent>;
+export declare const getSeal: (signer: ISigner, pubkey: string, rumor: HashedEvent) => Promise<SignedEvent>;
+export declare const getWrap: (wrapper: ISigner, pubkey: string, seal: SignedEvent, tags: string[][]) => Promise<SignedEvent>;
+export declare const wrap: (signer: ISigner, wrapper: ISigner, pubkey: string, template: EventTemplate, tags?: string[][]) => Promise<UnwrappedEvent>;
+export declare const unwrap: (signer: ISigner, wrap: SignedEvent) => Promise<UnwrappedEvent | undefined>;
+export declare class Nip59 {
+    private signer;
+    private wrapper?;
+    constructor(signer: ISigner, wrapper?: ISigner | undefined);
+    static fromSigner: (signer: ISigner) => Nip59;
+    static fromSecret: (secret: string) => Nip59;
+    withWrapper: (wrapper: ISigner) => Nip59;
+    wrap: (pubkey: string, template: EventTemplate, tags?: string[][]) => Promise<UnwrappedEvent>;
+    unwrap: (event: SignedEvent) => Promise<UnwrappedEvent | undefined>;
+}

package/build/src/nip59.mjs

@@ -0,0 +1,66 @@
+import { WRAP, SEAL } from '@welshman/util';
+import { own, hash, decrypt } from "./util.mjs";
+import { Nip01Signer } from "./signers/nip01.mjs";
+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(await signer.getPubkey(), template));
+export const getSeal = async (signer, pubkey, rumor) => signer.sign(hash({
+    kind: SEAL,
+    pubkey: await signer.getPubkey(),
+    content: await signer.nip44.encrypt(pubkey, JSON.stringify(rumor)),
+    created_at: now(5),
+    tags: [],
+}));
+export const getWrap = async (wrapper, pubkey, seal, tags) => wrapper.sign(hash({
+    kind: WRAP,
+    pubkey: await wrapper.getPubkey(),
+    content: await wrapper.nip44.encrypt(pubkey, JSON.stringify(seal)),
+    created_at: now(5),
+    tags: [...tags, ["p", pubkey]],
+}));
+export const wrap = async (signer, wrapper, pubkey, template, tags = []) => {
+    const rumor = await getRumor(signer, template);
+    const seal = await getSeal(signer, pubkey, rumor);
+    const wrap = await getWrap(wrapper, pubkey, seal, tags);
+    return Object.assign(rumor, { wrap });
+};
+export const unwrap = async (signer, wrap) => {
+    // Avoid decrypting the same event multiple times
+    if (seen.has(wrap.id)) {
+        const rumorOrError = seen.get(wrap.id);
+        if (rumorOrError instanceof Error) {
+            throw rumorOrError;
+        }
+        else {
+            return rumorOrError;
+        }
+    }
+    try {
+        const seal = JSON.parse(await decrypt(signer, wrap.pubkey, wrap.content));
+        const rumor = JSON.parse(await decrypt(signer, seal.pubkey, seal.content));
+        if (seal.pubkey !== rumor.pubkey)
+            throw new Error("Seal pubkey does not match rumor pubkey");
+        seen.set(wrap.id, rumor);
+        return Object.assign(rumor, { wrap });
+    }
+    catch (error) {
+        seen.set(wrap.id, error);
+        throw error;
+    }
+};
+// This is a utility that makes it harder to re-use wrapper signers, since that can result in
+// leaked metadata. It simultaneously makes it easier to wrap stuff, because it allows for
+// 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 {
+    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);
+    }
+}
+Nip59.fromSigner = (signer) => new Nip59(signer);
+Nip59.fromSecret = (secret) => new Nip59(new Nip01Signer(secret));
+//# sourceMappingURL=nip59.mjs.map

package/build/src/nip59.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"nip59.mjs","sourceRoot":"","sources":["../../src/nip59.ts"],"names":[],"mappings":"OAAO,EAA0D,IAAI,EAAE,IAAI,EAAC,MAAM,gBAAgB;OAC3F,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAU;OAC7B,EAAC,WAAW,EAAC;AAEpB,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkC,CAAA;AAE7D,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;AAErE,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAe,EAAE,QAAuB,EAAE,EAAE,CACzE,IAAI,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;AAE/C,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,MAAe,EAAE,MAAc,EAAE,KAAkB,EAAE,EAAE,CACnF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IACf,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,MAAM,MAAM,CAAC,SAAS,EAAE;IAChC,OAAO,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;IAClB,IAAI,EAAE,EAAE;CACT,CAAC,CAAC,CAAA;AAEL,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,OAAgB,EAAE,MAAc,EAAE,IAAiB,EAAE,IAAgB,EAAE,EAAE,CACrG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IAChB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE;IACjC,OAAO,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;IAClB,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC,CAAC,CAAA;AAEL,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,MAAe,EAAE,OAAgB,EAAE,MAAc,EAAE,QAAuB,EAAE,OAAmB,EAAE,EAAE,EAAE;IAC9H,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC9C,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACjD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAEvD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,IAAI,EAAC,CAAmB,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,MAAe,EAAE,IAAiB,EAAE,EAAE;IACjE,iDAAiD;IACjD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QACrB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEtC,IAAI,YAAY,YAAY,KAAK,EAAE;YACjC,MAAM,YAAY,CAAA;SACnB;aAAM;YACL,OAAO,YAAY,CAAA;SACpB;KACF;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACzE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QAE1E,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAE5F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAExB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,IAAI,EAAC,CAAmB,CAAA;KACtD;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,KAAc,CAAC,CAAA;QAEjC,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA;AAED,6FAA6F;AAC7F,0FAA0F;AAC1F,0FAA0F;AAC1F,0DAA0D;AAC1D,MAAM,OAAO,KAAK;IAChB,YAAoB,MAAe,EAAU,OAAiB;QAA1C,WAAM,GAAN,MAAM,CAAS;QAAU,YAAO,GAAP,OAAO,CAAU;QAM9D,gBAAW,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAEnE,SAAI,GAAG,CAAC,MAAc,EAAE,QAAuB,EAAE,OAAmB,EAAE,EAAE,EAAE,CACxE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;QAEpF,WAAM,GAAG,CAAC,KAAkB,EAAE,EAAE,CAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAZqC,CAAC;;AAE3D,gBAAU,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,AAAzC,CAAyC;AAEnD,gBAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,AAAzD,CAAyD"}

package/build/src/signers/nip01.cjs

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Nip01Signer = void 0;
+const util_1 = require("../util.cjs");
+class Nip01Signer {
+    constructor(secret) {
+        this.secret = secret;
+        this.getPubkey = async () => this.pubkey;
+        this.sign = async (event) => (0, util_1.sign)((0, util_1.hash)((0, util_1.own)(this.pubkey, event)), this.secret);
+        this.nip04 = {
+            encrypt: async (pubkey, message) => util_1.nip04.encrypt(pubkey, this.secret, message),
+            decrypt: async (pubkey, message) => util_1.nip04.decrypt(pubkey, this.secret, message),
+        };
+        this.nip44 = {
+            encrypt: async (pubkey, message) => util_1.nip44.encrypt(pubkey, this.secret, message),
+            decrypt: async (pubkey, message) => util_1.nip44.decrypt(pubkey, this.secret, message),
+        };
+        this.pubkey = (0, util_1.getPubkey)(this.secret);
+    }
+}
+exports.Nip01Signer = Nip01Signer;
+Nip01Signer.fromSecret = (secret) => new Nip01Signer(secret);
+Nip01Signer.ephemeral = () => new Nip01Signer((0, util_1.makeSecret)());
+//# sourceMappingURL=nip01.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nip01.cjs","sourceRoot":"","sources":["../../../src/signers/nip01.ts"],"names":[],"mappings":";;;AACA,sCAAqF;AAErF,MAAa,WAAW;IAGtB,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAQlC,cAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAA;QAEnC,SAAI,GAAG,KAAK,EAAE,KAAoB,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,IAAA,UAAG,EAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEvF,UAAK,GAAG;YACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,YAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;YAC7C,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,YAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SAC9C,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,YAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;YAC7C,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,YAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SAC9C,CAAA;QAvBC,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;;AALH,kCA4BC;AArBQ,sBAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,AAA9C,CAA8C;AAExD,qBAAS,GAAG,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,IAAA,iBAAU,GAAE,CAAC,AAAtC,CAAsC"}

package/build/src/signers/{secret.d.ts → nip01.d.ts}

@@ -1,10 +1,11 @@
 import { EventTemplate } from '@welshman/util';
 import { ISigner } from "../util";
-export declare class SecretSigner implements ISigner {
+export declare class Nip01Signer implements ISigner {
     private secret;
     private pubkey;
     constructor(secret: string);
-    isEnabled: () => boolean;
+    static fromSecret: (secret: string) => Nip01Signer;
+    static ephemeral: () => Nip01Signer;
     getPubkey: () => Promise<string>;
     sign: (event: EventTemplate) => Promise<{
         sig: string;

package/build/src/signers/{secret.mjs → nip01.mjs}

@@ -1,8 +1,7 @@
-import { nip04, nip44, own, hash, sign, getPubkey } from "../util.mjs";
-export class SecretSigner {
+import { nip04, nip44, own, hash, sign, getPubkey, makeSecret } from "../util.mjs";
+export class Nip01Signer {
     constructor(secret) {
         this.secret = secret;
-        this.isEnabled = () => true;
         this.getPubkey = async () => this.pubkey;
         this.sign = async (event) => sign(hash(own(this.pubkey, event)), this.secret);
         this.nip04 = {
@@ -16,4 +15,6 @@ export class SecretSigner {
         this.pubkey = getPubkey(this.secret);
     }
 }
-//# sourceMappingURL=secret.mjs.map
+Nip01Signer.fromSecret = (secret) => new Nip01Signer(secret);
+Nip01Signer.ephemeral = () => new Nip01Signer(makeSecret());
+//# sourceMappingURL=nip01.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nip01.mjs","sourceRoot":"","sources":["../../../src/signers/nip01.ts"],"names":[],"mappings":"OACO,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAW,UAAU,EAAC;AAEtE,MAAM,OAAO,WAAW;IAGtB,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAQlC,cAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAA;QAEnC,SAAI,GAAG,KAAK,EAAE,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEvF,UAAK,GAAG;YACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;YAC7C,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SAC9C,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;YAC7C,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SAC9C,CAAA;QAvBC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;;AAEM,sBAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,AAA9C,CAA8C;AAExD,qBAAS,GAAG,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC,AAAtC,CAAsC"}

package/build/src/signers/nip07.cjs

@@ -0,0 +1,50 @@
+"use strict";
+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 __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 _Nip07Signer_lock, _Nip07Signer_then;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Nip07Signer = exports.getNip07 = void 0;
+const util_1 = require("../util.cjs");
+const getNip07 = () => window.nostr;
+exports.getNip07 = getNip07;
+class Nip07Signer {
+    constructor() {
+        _Nip07Signer_lock.set(this, Promise.resolve());
+        _Nip07Signer_then.set(this, async (f) => {
+            const promise = __classPrivateFieldGet(this, _Nip07Signer_lock, "f").then(() => {
+                const ext = (0, exports.getNip07)();
+                if (!ext)
+                    throw new Error("Nip07 is not enabled");
+                return f(ext);
+            });
+            // Recover from errors
+            __classPrivateFieldSet(this, _Nip07Signer_lock, promise.then(() => undefined, () => undefined), "f");
+            return promise;
+        });
+        this.getPubkey = async () => (0, exports.getNip07)().getPublicKey();
+        this.sign = async (template) => {
+            const event = (0, util_1.hash)((0, util_1.own)(await this.getPubkey(), template));
+            return __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.signEvent(event));
+        };
+        this.nip04 = {
+            encrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip04.encrypt(pubkey, message)),
+            decrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip04.decrypt(pubkey, message)),
+        };
+        this.nip44 = {
+            encrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip44.encrypt(pubkey, message)),
+            decrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip44.decrypt(pubkey, message)),
+        };
+    }
+}
+exports.Nip07Signer = Nip07Signer;
+_Nip07Signer_lock = new WeakMap(), _Nip07Signer_then = new WeakMap();
+//# sourceMappingURL=nip07.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nip07.cjs","sourceRoot":"","sources":["../../../src/signers/nip07.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,sCAA0E;AASnE,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAE,MAA0B,CAAC,KAAK,CAAA;AAAlD,QAAA,QAAQ,YAA0C;AAE/D,MAAa,WAAW;IAAxB;QACE,4BAAQ,OAAO,CAAC,OAAO,EAAE,EAAA;QAEzB,4BAAQ,KAAK,EAAK,CAAiC,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,uBAAA,IAAI,yBAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnC,MAAM,GAAG,GAAG,IAAA,gBAAQ,GAAE,CAAA;gBAEtB,IAAI,CAAC,GAAG;oBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBAEjD,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;YACf,CAAC,CAAC,CAAA;YAEF,sBAAsB;YACtB,uBAAA,IAAI,qBAAS,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAA,CAAA;YAE3D,OAAO,OAAO,CAAA;QAChB,CAAC,EAAA;QAED,cAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAA,gBAAQ,GAAG,CAAC,YAAY,EAAG,CAAA;QAEnD,SAAI,GAAG,KAAK,EAAE,QAAuB,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,IAAA,WAAI,EAAC,IAAA,UAAG,EAAC,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;YAEzD,OAAO,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAChD,CAAC,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACxD,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACxD,CAAA;IACH,CAAC;CAAA;AAvCD,kCAuCC"}

package/build/src/signers/{extension.d.ts → nip07.d.ts}

@@ -1,16 +1,16 @@
 import { EventTemplate } from '@welshman/util';
 import { Sign, ISigner, EncryptionImplementation } from '../util';
-export type Extension = {
-    sign: Sign;
+export type Nip07 = {
+    signEvent: Sign;
     nip04: EncryptionImplementation;
     nip44: EncryptionImplementation;
     getPublicKey: () => string | undefined;
 };
-export declare class ExtensionSigner implements ISigner {
+export declare const getNip07: () => Nip07 | undefined;
+export declare class Nip07Signer implements ISigner {
     #private;
-    isEnabled: () => boolean;
     getPubkey: () => Promise<string>;
-    sign: (event: EventTemplate) => Promise<import("@welshman/util").SignedEvent>;
+    sign: (template: EventTemplate) => Promise<import("@welshman/util").SignedEvent>;
     nip04: {
         encrypt: (pubkey: string, message: string) => Promise<string>;
         decrypt: (pubkey: string, message: string) => Promise<string>;

package/build/src/signers/nip07.mjs

@@ -0,0 +1,45 @@
+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 __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 _Nip07Signer_lock, _Nip07Signer_then;
+import { hash, own } from "../util.mjs";
+export const getNip07 = () => window.nostr;
+export class Nip07Signer {
+    constructor() {
+        _Nip07Signer_lock.set(this, Promise.resolve());
+        _Nip07Signer_then.set(this, async (f) => {
+            const promise = __classPrivateFieldGet(this, _Nip07Signer_lock, "f").then(() => {
+                const ext = getNip07();
+                if (!ext)
+                    throw new Error("Nip07 is not enabled");
+                return f(ext);
+            });
+            // Recover from errors
+            __classPrivateFieldSet(this, _Nip07Signer_lock, promise.then(() => undefined, () => undefined), "f");
+            return promise;
+        });
+        this.getPubkey = async () => getNip07().getPublicKey();
+        this.sign = async (template) => {
+            const event = hash(own(await this.getPubkey(), template));
+            return __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.signEvent(event));
+        };
+        this.nip04 = {
+            encrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip04.encrypt(pubkey, message)),
+            decrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip04.decrypt(pubkey, message)),
+        };
+        this.nip44 = {
+            encrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip44.encrypt(pubkey, message)),
+            decrypt: (pubkey, message) => __classPrivateFieldGet(this, _Nip07Signer_then, "f").call(this, ext => ext.nip44.decrypt(pubkey, message)),
+        };
+    }
+}
+_Nip07Signer_lock = new WeakMap(), _Nip07Signer_then = new WeakMap();
+//# sourceMappingURL=nip07.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nip07.mjs","sourceRoot":"","sources":["../../../src/signers/nip07.ts"],"names":[],"mappings":";;;;;;;;;;;;OACO,EAAC,IAAI,EAAE,GAAG,EAA0C;AAS3D,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAE,MAA0B,CAAC,KAAK,CAAA;AAE/D,MAAM,OAAO,WAAW;IAAxB;QACE,4BAAQ,OAAO,CAAC,OAAO,EAAE,EAAA;QAEzB,4BAAQ,KAAK,EAAK,CAAiC,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,uBAAA,IAAI,yBAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnC,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAA;gBAEtB,IAAI,CAAC,GAAG;oBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBAEjD,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;YACf,CAAC,CAAC,CAAA;YAEF,sBAAsB;YACtB,uBAAA,IAAI,qBAAS,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAA,CAAA;YAE3D,OAAO,OAAO,CAAA;QAChB,CAAC,EAAA;QAED,cAAS,GAAG,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAG,CAAC,YAAY,EAAG,CAAA;QAEnD,SAAI,GAAG,KAAK,EAAE,QAAuB,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;YAEzD,OAAO,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAChD,CAAC,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACxD,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,yBAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACxD,CAAA;IACH,CAAC;CAAA"}

package/build/src/signers/nip46.cjs

@@ -0,0 +1,156 @@
+"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_sub, _Nip46Broker_signer, _Nip46Broker_ready, _Nip46Broker_closed, _Nip46Broker_connectResult;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Nip46Signer = exports.Nip46Broker = void 0;
+const nostr_tools_1 = require("nostr-tools");
+const utils_1 = require("@noble/hashes/utils");
+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");
+let singleton;
+// FIXME set the full list of requested perms
+const Perms = "nip04_encrypt,nip04_decrypt,sign_event:0,sign_event:1,sign_event:4,sign_event:6,sign_event:7";
+class Nip46Broker extends lib_1.Emitter {
+    static get(pubkey, secret, handler) {
+        if ((singleton === null || singleton === void 0 ? void 0 : singleton.pubkey) !== pubkey ||
+            (singleton === null || singleton === void 0 ? void 0 : singleton.secret) !== secret ||
+            !(0, lib_1.equals)(singleton === null || singleton === void 0 ? void 0 : singleton.handler, handler)) {
+            singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
+            singleton = new Nip46Broker(pubkey, secret, handler);
+        }
+        return singleton;
+    }
+    constructor(pubkey, secret, handler) {
+        super();
+        this.pubkey = pubkey;
+        this.secret = secret;
+        this.handler = handler;
+        _Nip46Broker_sub.set(this, void 0);
+        _Nip46Broker_signer.set(this, void 0);
+        _Nip46Broker_ready.set(this, (0, lib_1.sleep)(500));
+        _Nip46Broker_closed.set(this, false);
+        _Nip46Broker_connectResult.set(this, void 0);
+        __classPrivateFieldSet(this, _Nip46Broker_signer, new nip01_1.Nip01Signer(secret), "f");
+        __classPrivateFieldSet(this, _Nip46Broker_sub, this.subscribe(), "f");
+    }
+    subscribe() {
+        const sub = (0, net_1.subscribe)({
+            relays: this.handler.relays,
+            filters: [
+                {
+                    since: (0, lib_1.now)() - 30,
+                    kinds: [util_1.NOSTR_CONNECT],
+                    "#p": [(0, nostr_tools_1.getPublicKey)((0, utils_1.hexToBytes)(this.secret))],
+                },
+            ],
+        });
+        sub.emitter.on("event", async (url, e) => {
+            const json = await (0, util_2.decrypt)(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"), e.pubkey, e.content);
+            const res = await (0, lib_1.tryCatch)(() => JSON.parse(json));
+            if (!res.id) {
+                console.error(`Invalid nostr-connect response: ${json}`);
+            }
+            if (res.result === "auth_url") {
+                this.emit(`auth-${res.id}`, res);
+            }
+            else {
+                this.emit(`res-${res.id}`, res);
+            }
+        });
+        sub.emitter.on("complete", () => {
+            if (!__classPrivateFieldGet(this, _Nip46Broker_closed, "f")) {
+                __classPrivateFieldSet(this, _Nip46Broker_sub, this.subscribe(), "f");
+            }
+        });
+        return sub;
+    }
+    async request(method, params, admin = false) {
+        // nsecbunker has a race condition
+        await __classPrivateFieldGet(this, _Nip46Broker_ready, "f");
+        const id = (0, lib_1.randomId)();
+        const pubkey = admin ? this.handler.pubkey : this.pubkey;
+        const payload = JSON.stringify({ id, method, params });
+        const content = await nostr_tools_1.nip04.encrypt(this.secret, pubkey, payload);
+        const template = (0, util_1.createEvent)(util_1.NOSTR_CONNECT, { content, tags: [["p", pubkey]] });
+        const event = (0, nostr_tools_1.finalizeEvent)(template, this.secret);
+        (0, net_1.publish)({ event, relays: this.handler.relays });
+        this.once(`auth-${id}`, res => {
+            window.open(res.result, "Coracle", "width=600,height=800,popup=yes");
+        });
+        return new Promise((resolve, reject) => {
+            this.once(`res-${id}`, ({ result, error }) => {
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    resolve(result);
+                }
+            });
+        });
+    }
+    createAccount(username) {
+        if (!this.handler.domain) {
+            throw new Error("Unable to create an account without a handler domain");
+        }
+        return this.request("create_account", [username, this.handler.domain, "", Perms], true);
+    }
+    async connect(token = "") {
+        if (!__classPrivateFieldGet(this, _Nip46Broker_connectResult, "f")) {
+            const params = [this.pubkey, token, Perms];
+            __classPrivateFieldSet(this, _Nip46Broker_connectResult, await this.request("connect", params), "f");
+        }
+        return __classPrivateFieldGet(this, _Nip46Broker_connectResult, "f") === "ack";
+    }
+    async signEvent(event) {
+        return JSON.parse(await this.request("sign_event", [JSON.stringify(event)]));
+    }
+    nip04Encrypt(pk, message) {
+        return this.request("nip04_encrypt", [pk, message]);
+    }
+    nip04Decrypt(pk, message) {
+        return this.request("nip04_decrypt", [pk, message]);
+    }
+    nip44Encrypt(pk, message) {
+        return this.request("nip44_encrypt", [pk, message]);
+    }
+    nip44Decrypt(pk, message) {
+        return this.request("nip44_decrypt", [pk, message]);
+    }
+    teardown() {
+        var _a;
+        __classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
+        (_a = __classPrivateFieldGet(this, _Nip46Broker_sub, "f")) === null || _a === void 0 ? void 0 : _a.close();
+    }
+}
+exports.Nip46Broker = Nip46Broker;
+_Nip46Broker_sub = new WeakMap(), _Nip46Broker_signer = new WeakMap(), _Nip46Broker_ready = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_connectResult = new WeakMap();
+class Nip46Signer {
+    constructor(broker) {
+        this.broker = broker;
+        this.getPubkey = async () => this.broker.pubkey;
+        this.sign = (event) => this.broker.signEvent(event);
+        this.nip04 = {
+            encrypt: this.broker.nip04Encrypt,
+            decrypt: this.broker.nip04Decrypt,
+        };
+        this.nip44 = {
+            encrypt: this.broker.nip44Encrypt,
+            decrypt: this.broker.nip44Decrypt,
+        };
+    }
+}
+exports.Nip46Signer = Nip46Signer;
+//# sourceMappingURL=nip46.cjs.map

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

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

package/build/src/signers/{connect.d.ts → nip46.d.ts}

@@ -2,23 +2,23 @@ import { Emitter } from "@welshman/lib";
 import { EventTemplate } from "@welshman/util";
 import { Subscription } from "@welshman/net";
 import { ISigner } from '../util';
-export type NostrConnectHandler = {
-    pubkey: string;
+export type Nip46Handler = {
     relays: string[];
+    pubkey?: string;
     domain?: string;
 };
-export type ConnectResponse = {
+export type Nip46Response = {
     id: string;
     error?: string;
     result?: string;
 };
-export declare class NostrConnectBroker extends Emitter {
+export declare class Nip46Broker extends Emitter {
     #private;
     readonly pubkey: string;
     readonly secret: string;
-    readonly handler: NostrConnectHandler;
-    static get(pubkey: string, secret: string, handler: NostrConnectHandler): NostrConnectBroker;
-    constructor(pubkey: string, secret: string, handler: NostrConnectHandler);
+    readonly handler: Nip46Handler;
+    static get(pubkey: string, secret: string, handler: Nip46Handler): Nip46Broker;
+    constructor(pubkey: string, secret: string, handler: Nip46Handler);
     subscribe(): Subscription;
     request(method: string, params: string[], admin?: boolean): Promise<string>;
     createAccount(username: string): Promise<string>;
@@ -30,10 +30,9 @@ export declare class NostrConnectBroker extends Emitter {
     nip44Decrypt(pk: string, message: string): Promise<string>;
     teardown(): void;
 }
-export declare class ConnectSigner implements ISigner {
+export declare class Nip46Signer implements ISigner {
     private broker;
-    constructor(broker: NostrConnectBroker);
-    isEnabled: () => boolean;
+    constructor(broker: Nip46Broker);
     getPubkey: () => Promise<string>;
     sign: (event: EventTemplate) => Promise<any>;
     nip04: {

package/build/src/signers/{connect.mjs → nip46.mjs}

@@ -9,24 +9,24 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _NostrConnectBroker_sub, _NostrConnectBroker_signer, _NostrConnectBroker_ready, _NostrConnectBroker_closed, _NostrConnectBroker_connectResult;
+var _Nip46Broker_sub, _Nip46Broker_signer, _Nip46Broker_ready, _Nip46Broker_closed, _Nip46Broker_connectResult;
 import { nip04, finalizeEvent, getPublicKey } from "nostr-tools";
 import { hexToBytes } from '@noble/hashes/utils';
 import { Emitter, tryCatch, randomId, sleep, equals, now } from "@welshman/lib";
 import { createEvent, NOSTR_CONNECT } from "@welshman/util";
 import { subscribe, publish } from "@welshman/net";
 import { decrypt } from "../util.mjs";
-import { SecretSigner } from "./secret.mjs";
+import { Nip01Signer } from "./nip01.mjs";
 let singleton;
 // FIXME set the full list of requested perms
 const Perms = "nip04_encrypt,nip04_decrypt,sign_event:0,sign_event:1,sign_event:4,sign_event:6,sign_event:7";
-export class NostrConnectBroker extends Emitter {
+export class Nip46Broker extends Emitter {
     static get(pubkey, secret, handler) {
         if ((singleton === null || singleton === void 0 ? void 0 : singleton.pubkey) !== pubkey ||
             (singleton === null || singleton === void 0 ? void 0 : singleton.secret) !== secret ||
             !equals(singleton === null || singleton === void 0 ? void 0 : singleton.handler, handler)) {
             singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
-            singleton = new NostrConnectBroker(pubkey, secret, handler);
+            singleton = new Nip46Broker(pubkey, secret, handler);
         }
         return singleton;
     }
@@ -35,13 +35,13 @@ export class NostrConnectBroker extends Emitter {
         this.pubkey = pubkey;
         this.secret = secret;
         this.handler = handler;
-        _NostrConnectBroker_sub.set(this, void 0);
-        _NostrConnectBroker_signer.set(this, void 0);
-        _NostrConnectBroker_ready.set(this, sleep(500));
-        _NostrConnectBroker_closed.set(this, false);
-        _NostrConnectBroker_connectResult.set(this, void 0);
-        __classPrivateFieldSet(this, _NostrConnectBroker_signer, new SecretSigner(secret), "f");
-        __classPrivateFieldSet(this, _NostrConnectBroker_sub, this.subscribe(), "f");
+        _Nip46Broker_sub.set(this, void 0);
+        _Nip46Broker_signer.set(this, void 0);
+        _Nip46Broker_ready.set(this, sleep(500));
+        _Nip46Broker_closed.set(this, false);
+        _Nip46Broker_connectResult.set(this, void 0);
+        __classPrivateFieldSet(this, _Nip46Broker_signer, new Nip01Signer(secret), "f");
+        __classPrivateFieldSet(this, _Nip46Broker_sub, this.subscribe(), "f");
     }
     subscribe() {
         const sub = subscribe({
@@ -55,7 +55,7 @@ export class NostrConnectBroker extends Emitter {
             ],
         });
         sub.emitter.on("event", async (url, e) => {
-            const json = await decrypt(__classPrivateFieldGet(this, _NostrConnectBroker_signer, "f"), e.pubkey, e.content);
+            const json = await decrypt(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"), e.pubkey, e.content);
             const res = await tryCatch(() => JSON.parse(json));
             if (!res.id) {
                 console.error(`Invalid nostr-connect response: ${json}`);
@@ -68,15 +68,15 @@ export class NostrConnectBroker extends Emitter {
             }
         });
         sub.emitter.on("complete", () => {
-            if (!__classPrivateFieldGet(this, _NostrConnectBroker_closed, "f")) {
-                __classPrivateFieldSet(this, _NostrConnectBroker_sub, this.subscribe(), "f");
+            if (!__classPrivateFieldGet(this, _Nip46Broker_closed, "f")) {
+                __classPrivateFieldSet(this, _Nip46Broker_sub, this.subscribe(), "f");
             }
         });
         return sub;
     }
     async request(method, params, admin = false) {
         // nsecbunker has a race condition
-        await __classPrivateFieldGet(this, _NostrConnectBroker_ready, "f");
+        await __classPrivateFieldGet(this, _Nip46Broker_ready, "f");
         const id = randomId();
         const pubkey = admin ? this.handler.pubkey : this.pubkey;
         const payload = JSON.stringify({ id, method, params });
@@ -105,11 +105,11 @@ export class NostrConnectBroker extends Emitter {
         return this.request("create_account", [username, this.handler.domain, "", Perms], true);
     }
     async connect(token = "") {
-        if (!__classPrivateFieldGet(this, _NostrConnectBroker_connectResult, "f")) {
+        if (!__classPrivateFieldGet(this, _Nip46Broker_connectResult, "f")) {
             const params = [this.pubkey, token, Perms];
-            __classPrivateFieldSet(this, _NostrConnectBroker_connectResult, await this.request("connect", params), "f");
+            __classPrivateFieldSet(this, _Nip46Broker_connectResult, await this.request("connect", params), "f");
         }
-        return __classPrivateFieldGet(this, _NostrConnectBroker_connectResult, "f") === "ack";
+        return __classPrivateFieldGet(this, _Nip46Broker_connectResult, "f") === "ack";
     }
     async signEvent(event) {
         return JSON.parse(await this.request("sign_event", [JSON.stringify(event)]));
@@ -128,15 +128,14 @@ export class NostrConnectBroker extends Emitter {
     }
     teardown() {
         var _a;
-        __classPrivateFieldSet(this, _NostrConnectBroker_closed, true, "f");
-        (_a = __classPrivateFieldGet(this, _NostrConnectBroker_sub, "f")) === null || _a === void 0 ? void 0 : _a.close();
+        __classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
+        (_a = __classPrivateFieldGet(this, _Nip46Broker_sub, "f")) === null || _a === void 0 ? void 0 : _a.close();
     }
 }
-_NostrConnectBroker_sub = new WeakMap(), _NostrConnectBroker_signer = new WeakMap(), _NostrConnectBroker_ready = new WeakMap(), _NostrConnectBroker_closed = new WeakMap(), _NostrConnectBroker_connectResult = new WeakMap();
-export class ConnectSigner {
+_Nip46Broker_sub = new WeakMap(), _Nip46Broker_signer = new WeakMap(), _Nip46Broker_ready = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_connectResult = new WeakMap();
+export class Nip46Signer {
     constructor(broker) {
         this.broker = broker;
-        this.isEnabled = () => true;
         this.getPubkey = async () => this.broker.pubkey;
         this.sign = (event) => this.broker.signEvent(event);
         this.nip04 = {
@@ -149,4 +148,4 @@ export class ConnectSigner {
         };
     }
 }
-//# sourceMappingURL=connect.mjs.map
+//# sourceMappingURL=nip46.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nip46.mjs","sourceRoot":"","sources":["../../../src/signers/nip46.ts"],"names":[],"mappings":";;;;;;;;;;;;OAAO,EAAC,KAAK,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,aAAa;OACvD,EAAC,UAAU,EAAC,MAAM,qBAAqB;OACvC,EAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAC,MAAM,eAAe;OACtE,EAAC,WAAW,EAA+B,aAAa,EAAC,MAAM,gBAAgB;OAC/E,EAAC,SAAS,EAAE,OAAO,EAAe,MAAM,eAAe;OACvD,EAAU,OAAO,EAAC;OAClB,EAAC,WAAW,EAAC;AAcpB,IAAI,SAAsB,CAAA;AAE1B,6CAA6C;AAC7C,MAAM,KAAK,GACT,8FAA8F,CAAA;AAEhG,MAAM,OAAO,WAAY,SAAQ,OAAO;IAOtC,MAAM,CAAC,GAAG,CAAC,MAAc,EAAE,MAAc,EAAE,OAAqB;QAC9D,IACE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,MAAK,MAAM;YAC5B,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,MAAK,MAAM;YAC5B,CAAC,MAAM,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,EAAE,OAAO,CAAC,EACpC;YACA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAE,CAAA;YACrB,SAAS,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;SACrD;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,YACW,MAAc,EACd,MAAc,EACd,OAAqB;QAE9B,KAAK,EAAE,CAAA;QAJE,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAc;QAtBhC,mCAAkB;QAClB,sCAAgB;QAChB,6BAAS,KAAK,CAAC,GAAG,CAAC,EAAA;QACnB,8BAAU,KAAK,EAAA;QACf,6CAAmB;QAsBjB,uBAAA,IAAI,uBAAW,IAAI,WAAW,CAAC,MAAM,CAAC,MAAA,CAAA;QACtC,uBAAA,IAAI,oBAAQ,IAAI,CAAC,SAAS,EAAE,MAAA,CAAA;IAC9B,CAAC;IAED,SAAS;QACP,MAAM,GAAG,GAAG,SAAS,CAAC;YACpB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE;oBACjB,KAAK,EAAE,CAAC,aAAa,CAAC;oBACtB,IAAI,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;iBAC9C;aACF;SACF,CAAC,CAAA;QAEF,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,GAAW,EAAE,CAAe,EAAE,EAAE;YAC7D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,uBAAA,IAAI,2BAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;YAC7D,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;YAElD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;gBACX,OAAO,CAAC,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAA;aACzD;YAED,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;aACjC;iBAAM;gBACL,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;aAChC;QACH,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;YAC9B,IAAI,CAAC,uBAAA,IAAI,2BAAQ,EAAE;gBACjB,uBAAA,IAAI,oBAAQ,IAAI,CAAC,SAAS,EAAE,MAAA,CAAA;aAC7B;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,MAAgB,EAAE,KAAK,GAAG,KAAK;QAC3D,kCAAkC;QAClC,MAAM,uBAAA,IAAI,0BAAO,CAAA;QAEjB,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAA;QACrB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAA;QACpD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QACjE,MAAM,QAAQ,GAAG,WAAW,CAAC,aAAa,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,EAAC,CAAC,CAAA;QAC7E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAa,CAAC,CAAA;QAEzD,OAAO,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAC,CAAC,CAAA;QAE7C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,gCAAgC,CAAC,CAAA;QACtE,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,EAAC,MAAM,EAAE,KAAK,EAAgB,EAAE,EAAE;gBACxD,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAe,CAAC,CAAA;iBACxB;qBAAM;oBACL,OAAO,CAAC,MAAgB,CAAC,CAAA;iBAC1B;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAC,QAAgB;QAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;SACxE;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAA;IACzF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACtB,IAAI,CAAC,uBAAA,IAAI,kCAAe,EAAE;YACxB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YAE1C,uBAAA,IAAI,8BAAkB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,MAAA,CAAA;SAC5D;QAED,OAAO,uBAAA,IAAI,kCAAe,KAAK,KAAK,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAoB;QAClC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC,CAAA;IACxF,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,OAAe;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,OAAe;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,OAAe;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,OAAe;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,QAAQ;;QACN,uBAAA,IAAI,uBAAW,IAAI,MAAA,CAAA;QACnB,MAAA,uBAAA,IAAI,wBAAK,0CAAE,KAAK,EAAE,CAAA;IACpB,CAAC;CACF;;AAED,MAAM,OAAO,WAAW;IACtB,YAAoB,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAEvC,cAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QAE1C,SAAI,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAE7D,UAAK,GAAG;YACN,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;SAClC,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;SAClC,CAAA;IAdyC,CAAC;CAe5C"}

package/build/src/util.cjs

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decrypt = exports.nip44 = exports.nip04 = exports.sign = exports.hash = exports.own = exports.getSig = exports.getHash = exports.getPubkey = exports.makeSecret = void 0;
+const secp256k1_1 = require("@noble/curves/secp256k1");
+const utils_1 = require("@noble/hashes/utils");
+const nostr_tools_1 = require("nostr-tools");
+const lib_1 = require("@welshman/lib");
+const makeSecret = () => (0, utils_1.bytesToHex)((0, nostr_tools_1.generateSecretKey)());
+exports.makeSecret = makeSecret;
+const getPubkey = (secret) => (0, nostr_tools_1.getPublicKey)((0, utils_1.hexToBytes)(secret));
+exports.getPubkey = getPubkey;
+const getHash = (event) => (0, nostr_tools_1.getEventHash)(event);
+exports.getHash = getHash;
+const getSig = (event, secret) => (0, utils_1.bytesToHex)(secp256k1_1.schnorr.sign(event.id, secret));
+exports.getSig = getSig;
+const own = (pubkey, event) => ({ ...event, pubkey });
+exports.own = own;
+const hash = (event) => ({ ...event, id: (0, exports.getHash)(event) });
+exports.hash = hash;
+const sign = (event, secret) => ({ ...event, sig: (0, exports.getSig)(event, secret) });
+exports.sign = sign;
+exports.nip04 = {
+    detect: (m) => m.includes("?iv="),
+    encrypt: (pubkey, secret, m) => nostr_tools_1.nip04.encrypt(secret, pubkey, m),
+    decrypt: (pubkey, secret, m) => nostr_tools_1.nip04.decrypt(secret, pubkey, m),
+};
+exports.nip44 = {
+    getSharedSecret: (0, lib_1.cached)({
+        maxSize: 10000,
+        getKey: ([secret, pubkey]) => [secret, pubkey].join(":"),
+        getValue: ([secret, pubkey]) => nostr_tools_1.nip44.v2.utils.getConversationKey((0, utils_1.hexToBytes)(secret), pubkey),
+    }),
+    encrypt: (pubkey, secret, m) => nostr_tools_1.nip44.v2.encrypt(m, exports.nip44.getSharedSecret(secret, pubkey)),
+    decrypt: (pubkey, secret, m) => nostr_tools_1.nip44.v2.decrypt(m, exports.nip44.getSharedSecret(secret, pubkey)),
+};
+const decrypt = async (signer, pubkey, message) => exports.nip04.detect(message)
+    ? signer.nip04.decrypt(pubkey, message)
+    : signer.nip44.decrypt(pubkey, message);
+exports.decrypt = decrypt;
+//# sourceMappingURL=util.cjs.map

package/build/src/util.cjs.map

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

package/build/src/util.d.ts

@@ -1,5 +1,5 @@
 import { SignedEvent, HashedEvent, EventTemplate, OwnedEvent } from '@welshman/util';
-export declare const getSecret: () => string;
+export declare const makeSecret: () => string;
 export declare const getPubkey: (secret: string) => string;
 export declare const getHash: (event: OwnedEvent) => string;
 export declare const getSig: (event: HashedEvent, secret: string) => string;
@@ -43,10 +43,9 @@ export type EncryptionImplementation = {
     decrypt: Decrypt;
 };
 export interface ISigner {
-    isEnabled: () => boolean;
-    getPubkey: () => Promise<string>;
     sign: Sign;
     nip04: EncryptionImplementation;
     nip44: EncryptionImplementation;
+    getPubkey: () => Promise<string>;
 }
 export declare const decrypt: (signer: ISigner, pubkey: string, message: string) => Promise<string>;

package/build/src/util.mjs

@@ -2,7 +2,7 @@ import { schnorr } from '@noble/curves/secp256k1';
 import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
 import { nip04 as nt04, nip44 as nt44, generateSecretKey, getPublicKey, getEventHash } from "nostr-tools";
 import { cached } from '@welshman/lib';
-export const getSecret = () => bytesToHex(generateSecretKey());
+export const makeSecret = () => bytesToHex(generateSecretKey());
 export const getPubkey = (secret) => getPublicKey(hexToBytes(secret));
 export const getHash = (event) => getEventHash(event);
 export const getSig = (event, secret) => bytesToHex(schnorr.sign(event.id, secret));

package/build/src/util.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/signer",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A nostr signer implemenation supporting several login methods.",

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

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

package/build/src/signers/extension.mjs

@@ -1,48 +0,0 @@
-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 __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 _ExtensionSigner_lock, _ExtensionSigner_ext, _ExtensionSigner_then;
-import { hash, own } from "../util.mjs";
-export class ExtensionSigner {
-    constructor() {
-        _ExtensionSigner_lock.set(this, Promise.resolve());
-        _ExtensionSigner_ext.set(this, () => window.nostr);
-        _ExtensionSigner_then.set(this, async (f) => {
-            const promise = __classPrivateFieldGet(this, _ExtensionSigner_lock, "f").then(() => {
-                const ext = __classPrivateFieldGet(this, _ExtensionSigner_ext, "f").call(this);
-                if (!ext)
-                    throw new Error("Extension is not enabled");
-                return f(ext);
-            });
-            // Recover from errors
-            __classPrivateFieldSet(this, _ExtensionSigner_lock, promise.then(() => undefined, () => undefined), "f");
-            return promise;
-        });
-        this.isEnabled = () => Boolean(__classPrivateFieldGet(this, _ExtensionSigner_ext, "f").call(this));
-        this.getPubkey = () => __classPrivateFieldGet(this, _ExtensionSigner_then, "f").call(this, ext => {
-            const pubkey = ext.getPublicKey();
-            if (!pubkey)
-                throw new Error("Failed to retrieve pubkey");
-            return pubkey;
-        });
-        this.sign = (event) => __classPrivateFieldGet(this, _ExtensionSigner_then, "f").call(this, ext => ext.sign(hash(own(ext.getPublicKey(), event))));
-        this.nip04 = {
-            encrypt: (pubkey, message) => __classPrivateFieldGet(this, _ExtensionSigner_then, "f").call(this, ext => ext.nip04.encrypt(pubkey, message)),
-            decrypt: (pubkey, message) => __classPrivateFieldGet(this, _ExtensionSigner_then, "f").call(this, ext => ext.nip04.decrypt(pubkey, message)),
-        };
-        this.nip44 = {
-            encrypt: (pubkey, message) => __classPrivateFieldGet(this, _ExtensionSigner_then, "f").call(this, ext => ext.nip44.encrypt(pubkey, message)),
-            decrypt: (pubkey, message) => __classPrivateFieldGet(this, _ExtensionSigner_then, "f").call(this, ext => ext.nip44.decrypt(pubkey, message)),
-        };
-    }
-}
-_ExtensionSigner_lock = new WeakMap(), _ExtensionSigner_ext = new WeakMap(), _ExtensionSigner_then = new WeakMap();
-//# sourceMappingURL=extension.mjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"extension.mjs","sourceRoot":"","sources":["../../../src/signers/extension.ts"],"names":[],"mappings":";;;;;;;;;;;;OACO,EAAC,IAAI,EAAE,GAAG,EAA0C;AAS3D,MAAM,OAAO,eAAe;IAA5B;QACE,gCAAQ,OAAO,CAAC,OAAO,EAAE,EAAA;QAEzB,+BAAO,GAAG,EAAE,CAAE,MAA8B,CAAC,KAAK,EAAA;QAElD,gCAAQ,KAAK,EAAK,CAAqC,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,uBAAA,IAAI,6BAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnC,MAAM,GAAG,GAAG,uBAAA,IAAI,4BAAK,MAAT,IAAI,CAAO,CAAA;gBAEvB,IAAI,CAAC,GAAG;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;gBAErD,OAAO,CAAC,CAAC,GAAG,CAAC,CAAA;YACf,CAAC,CAAC,CAAA;YAEF,sBAAsB;YACtB,uBAAA,IAAI,yBAAS,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAA,CAAA;YAE3D,OAAO,OAAO,CAAA;QAChB,CAAC,EAAA;QAED,cAAS,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,uBAAA,IAAI,4BAAK,MAAT,IAAI,CAAO,CAAC,CAAA;QAEtC,cAAS,GAAG,GAAG,EAAE,CACf,uBAAA,IAAI,6BAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE;YACf,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;YAEjC,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;YAEzD,OAAO,MAAgB,CAAA;QACzB,CAAC,CAAC,CAAA;QAEJ,SAAI,GAAG,CAAC,KAAoB,EAAE,EAAE,CAC9B,uBAAA,IAAI,6BAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAY,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAE7E,UAAK,GAAG;YACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,6BAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,6BAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACxD,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,6BAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,OAAO,EAAE,CAAC,MAAc,EAAE,OAAe,EAAE,EAAE,CAC3C,uBAAA,IAAI,6BAAM,MAAV,IAAI,EAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACxD,CAAA;IACH,CAAC;CAAA"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"secret.mjs","sourceRoot":"","sources":["../../../src/signers/secret.ts"],"names":[],"mappings":"OACO,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAU;AAE1D,MAAM,OAAO,YAAY;IAGvB,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAIlC,cAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;QAEtB,cAAS,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAA;QAEnC,SAAI,GAAG,KAAK,EAAE,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEvF,UAAK,GAAG;YACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;YAC7C,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SAC9C,CAAA;QAED,UAAK,GAAG;YACN,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;YAC7C,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SAC9C,CAAA;QArBC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;CAqBF"}

package/build/src/wrapper.d.ts

@@ -1,21 +0,0 @@
-import { UnwrappedEvent, SignedEvent, HashedEvent, EventTemplate } from '@welshman/util';
-import { ISigner } from './util';
-export type WrapperParams = {
-    author?: string;
-    wrap?: {
-        author: string;
-        recipient: string;
-        tags?: string[][];
-    };
-};
-export declare class Wrapper {
-    readonly userSigner: ISigner;
-    readonly wrapSigner: ISigner;
-    seen: Map<string, UnwrappedEvent | Error>;
-    constructor(userSigner: ISigner, wrapSigner: ISigner);
-    now: (drift?: number) => number;
-    getSeal: (pk: string, rumor: HashedEvent) => Promise<SignedEvent>;
-    getWrap: (pk: string, seal: SignedEvent) => Promise<SignedEvent>;
-    wrap: (pk: string, template: EventTemplate) => Promise<SignedEvent>;
-    unwrap: (wrap: SignedEvent) => Promise<any>;
-}

package/build/src/wrapper.mjs

@@ -1,56 +0,0 @@
-import { WRAP, SEAL } from '@welshman/util';
-import { own, hash, decrypt } from "./util.mjs";
-export class Wrapper {
-    constructor(userSigner, wrapSigner) {
-        this.userSigner = userSigner;
-        this.wrapSigner = wrapSigner;
-        this.seen = new Map();
-        this.now = (drift = 0) => Math.round(Date.now() / 1000 - Math.random() * Math.pow(10, drift));
-        this.getSeal = async (pk, rumor) => this.userSigner.sign(hash({
-            kind: SEAL,
-            pubkey: await this.userSigner.getPubkey(),
-            content: await this.userSigner.nip44.encrypt(pk, JSON.stringify(rumor)),
-            created_at: this.now(5),
-            tags: [],
-        }));
-        this.getWrap = async (pk, seal) => this.wrapSigner.sign(hash({
-            kind: WRAP,
-            pubkey: await this.wrapSigner.getPubkey(),
-            content: await this.wrapSigner.nip44.encrypt(pk, JSON.stringify(seal)),
-            created_at: this.now(5),
-            tags: [["p", pk]],
-        }));
-        this.wrap = async (pk, template) => {
-            const pubkey = await this.userSigner.getPubkey();
-            const rumor = hash(own(pubkey, template));
-            const seal = await this.getSeal(pk, rumor);
-            const wrap = await this.getWrap(pk, seal);
-            return wrap;
-        };
-        this.unwrap = async (wrap) => {
-            // Avoid decrypting the same event multiple times
-            if (this.seen.has(wrap.id)) {
-                const rumorOrError = this.seen.get(wrap.id);
-                if (rumorOrError instanceof Error) {
-                    throw rumorOrError;
-                }
-                else {
-                    return rumorOrError;
-                }
-            }
-            try {
-                const seal = JSON.parse(await decrypt(this.wrapSigner, wrap.pubkey, wrap.content));
-                const rumor = JSON.parse(await decrypt(this.wrapSigner, seal.pubkey, seal.content));
-                if (seal.pubkey !== rumor.pubkey)
-                    throw new Error("Seal pubkey does not match rumor pubkey");
-                this.seen.set(wrap.id, rumor);
-                return rumor;
-            }
-            catch (error) {
-                this.seen.set(wrap.id, error);
-                throw error;
-            }
-        };
-    }
-}
-//# sourceMappingURL=wrapper.mjs.map

package/build/src/wrapper.mjs.map

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