@welshman/signer 0.0.1 → 0.0.3

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)(template, await signer.getPubkey()));
+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,26 @@
+import { UnwrappedEvent, SignedEvent, HashedEvent, StampedEvent } 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: StampedEvent) => Promise<{
+    id: string;
+    tags: string[][];
+    content: string;
+    kind: number;
+    created_at: number;
+    pubkey: string;
+}>;
+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: StampedEvent, 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: StampedEvent, 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(template, await signer.getPubkey()));
+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":"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"}

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)(event, this.pubkey)), 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,KAAmB,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,IAAA,UAAG,EAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEtF,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,16 +1,17 @@
-import { EventTemplate } from '@welshman/util';
+import { StampedEvent } 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<{
+    sign: (event: StampedEvent) => Promise<{
         sig: string;
-        kind: number;
         tags: string[][];
         content: string;
+        kind: number;
         created_at: number;
         pubkey: string;
         id: string;

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

@@ -1,10 +1,9 @@
-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.sign = async (event) => sign(hash(own(event, this.pubkey)), this.secret);
         this.nip04 = {
             encrypt: async (pubkey, message) => nip04.encrypt(pubkey, this.secret, message),
             decrypt: async (pubkey, message) => nip04.decrypt(pubkey, this.secret, message),
@@ -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,KAAmB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEtF,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)(template, await this.getPubkey()));
+            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,QAAsB,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,IAAA,WAAI,EAAC,IAAA,UAAG,EAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,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 { StampedEvent } 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: StampedEvent) => 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(template, await this.getPubkey()));
+            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,QAAsB,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,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,157 @@
+"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;
+class Nip46Broker extends lib_1.Emitter {
+    static get(pubkey, secret, handler, algorithm = "nip04") {
+        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.algorithm) !== algorithm) {
+            singleton === null || singleton === void 0 ? void 0 : singleton.teardown();
+            singleton = new Nip46Broker(pubkey, secret, handler, algorithm);
+        }
+        return singleton;
+    }
+    constructor(pubkey, secret, handler, algorithm) {
+        super();
+        this.pubkey = pubkey;
+        this.secret = secret;
+        this.handler = handler;
+        this.algorithm = algorithm;
+        _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);
+        this.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;
+        };
+        this.request = async (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 crypt = this.algorithm === "nip04" ? util_2.nip04 : util_2.nip44;
+            const content = await crypt.encrypt(pubkey, this.secret, 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.error, "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);
+                    }
+                });
+            });
+        };
+        this.createAccount = (username, perms = "") => {
+            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);
+        };
+        this.connect = async (token = "", perms = "") => {
+            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";
+        };
+        this.signEvent = async (event) => {
+            return JSON.parse(await this.request("sign_event", [JSON.stringify(event)]));
+        };
+        this.nip04Encrypt = (pk, message) => {
+            return this.request("nip04_encrypt", [pk, message]);
+        };
+        this.nip04Decrypt = (pk, message) => {
+            return this.request("nip04_decrypt", [pk, message]);
+        };
+        this.nip44Encrypt = (pk, message) => {
+            return this.request("nip44_encrypt", [pk, message]);
+        };
+        this.nip44Decrypt = (pk, message) => {
+            return this.request("nip44_decrypt", [pk, message]);
+        };
+        this.teardown = () => {
+            var _a;
+            __classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
+            (_a = __classPrivateFieldGet(this, _Nip46Broker_sub, "f")) === null || _a === void 0 ? void 0 : _a.close();
+        };
+        __classPrivateFieldSet(this, _Nip46Broker_signer, new nip01_1.Nip01Signer(secret), "f");
+        __classPrivateFieldSet(this, _Nip46Broker_sub, this.subscribe(), "f");
+    }
+}
+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 = (template) => this.broker.signEvent((0, util_2.hash)((0, util_2.own)(template, this.broker.pubkey)));
+        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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"}