applesauce-signers 0.0.0-next-20250323173930 → 0.0.0-next-20250327153627

package/dist/signers/nostr-connect-signer.d.ts

@@ -66,6 +66,10 @@ export type NostrConnectSignerOptions = {
     pubkey?: string;
     /** A method for handling "auth" requests */
     onAuth?: (url: string) => Promise<void>;
+    /** A method for subscribing to relays */
+    subscriptionMethod?: NostrSubscriptionMethod;
+    /** A method for publishing events */
+    publishMethod?: NostrPublishMethod;
 };
 interface Unsubscribable {
     unsubscribe(): void;
@@ -88,9 +92,9 @@ export type NostrConnectAppMetadata = {
 };
 export declare class NostrConnectSigner implements Nip07Interface {
     /** A method that is called when an event needs to be published */
-    protected publish: NostrPublishMethod;
+    protected publishMethod: NostrPublishMethod;
     /** The active nostr subscription */
-    protected subscription: NostrSubscriptionMethod;
+    protected subscriptionMethod: NostrSubscriptionMethod;
     protected log: import("debug").Debugger;
     /** The local client signer */
     signer: SimpleSigner;
@@ -118,7 +122,9 @@ export declare class NostrConnectSigner implements Nip07Interface {
         encrypt: (pubkey: string, plaintext: string) => Promise<string> | string;
         decrypt: (pubkey: string, ciphertext: string) => Promise<string> | string;
     } | undefined;
-    constructor(subscription: NostrSubscriptionMethod, publish: NostrPublishMethod, opts: NostrConnectSignerOptions);
+    static subscriptionMethod: NostrSubscriptionMethod | undefined;
+    static publishMethod: NostrPublishMethod | undefined;
+    constructor(opts: NostrConnectSignerOptions);
     /** The currently active REQ subscription */
     protected req?: Unsubscribable;
     /** Open the connection */
@@ -161,7 +167,7 @@ export declare class NostrConnectSigner implements Nip07Interface {
     /** Builds an array of signing permissions for event kinds */
     static buildSigningPermissions(kinds: number[]): string[];
     /** Create a {@link NostrConnectSigner} from a bunker:// URI */
-    static fromBunkerURI(uri: string, subscription: NostrSubscriptionMethod, publish: NostrPublishMethod, options: Omit<NostrConnectSignerOptions, "relays"> & {
+    static fromBunkerURI(uri: string, options: Omit<NostrConnectSignerOptions, "relays"> & {
         permissions?: string[];
         signer?: SimpleSigner;
     }): Promise<NostrConnectSigner>;

package/dist/signers/nostr-connect-signer.js

@@ -34,9 +34,9 @@ async function defaultHandleAuth(url) {
 }
 export class NostrConnectSigner {
     /** A method that is called when an event needs to be published */
-    publish;
+    publishMethod;
     /** The active nostr subscription */
-    subscription;
+    subscriptionMethod;
     log = logger.extend("NostrConnectSigner");
     /** The local client signer */
     signer;
@@ -60,12 +60,20 @@ export class NostrConnectSigner {
     clientSecret = nanoid(12);
     nip04;
     nip44;
-    constructor(subscription, publish, opts) {
+    static subscriptionMethod = undefined;
+    static publishMethod = undefined;
+    constructor(opts) {
         this.relays = opts.relays;
         this.pubkey = opts.pubkey;
         this.remote = opts.remote;
-        this.subscription = subscription;
-        this.publish = publish;
+        const subscriptionMethod = opts.subscriptionMethod || NostrConnectSigner.subscriptionMethod;
+        if (!subscriptionMethod)
+            throw new Error("Missing subscriptionMethod, either pass a method or set NostrConnectSigner.subscriptionMethod");
+        const publishMethod = opts.publishMethod || NostrConnectSigner.publishMethod;
+        if (!publishMethod)
+            throw new Error("Missing publishMethod, either pass a method or set NostrConnectSigner.publishMethod");
+        this.subscriptionMethod = subscriptionMethod;
+        this.publishMethod = publishMethod;
         if (opts.onAuth)
             this.onAuth = opts.onAuth;
         this.signer = opts?.signer || new SimpleSigner();
@@ -87,7 +95,7 @@ export class NostrConnectSigner {
         this.subscriptionOpen = true;
         const pubkey = await this.signer.getPublicKey();
         // Setup subscription
-        this.req = this.subscription([
+        this.req = this.subscriptionMethod([
             {
                 kinds: [kinds.NostrConnect],
                 "#p": [pubkey],
@@ -178,7 +186,7 @@ export class NostrConnectSigner {
         this.log(`Sending request ${id} (${method}) ${JSON.stringify(params)}`);
         const p = createDefer();
         this.requests.set(id, p);
-        await this.publish?.(event, this.relays);
+        await this.publishMethod?.(event, this.relays);
         return p;
     }
     /** Connect to remote signer */
@@ -318,9 +326,9 @@ export class NostrConnectSigner {
         return [Permission.GetPublicKey, ...kinds.map((k) => `${Permission.SignEvent}:${k}`)];
     }
     /** Create a {@link NostrConnectSigner} from a bunker:// URI */
-    static async fromBunkerURI(uri, subscription, publish, options) {
+    static async fromBunkerURI(uri, options) {
         const { remote, relays, secret } = NostrConnectSigner.parseBunkerURI(uri);
-        const client = new NostrConnectSigner(subscription, publish, { relays, remote, ...options });
+        const client = new NostrConnectSigner({ relays, remote, ...options });
         await client.connect(secret, options.permissions);
         return client;
     }

package/dist/signers/nostr-connect-signer.test.js

@@ -9,10 +9,12 @@ describe("NostrConnectSigner", () => {
             const publish = vi.fn(async () => { });
             const client = new SimpleSigner();
             const remote = new SimpleSigner();
-            const signer = new NostrConnectSigner(subscription, publish, {
+            const signer = new NostrConnectSigner({
                 relays,
                 remote: await remote.getPublicKey(),
                 signer: client,
+                subscriptionMethod: subscription,
+                publishMethod: publish,
             });
             signer.connect();
             expect(subscription).toHaveBeenCalledWith([{ "#p": [await client.getPublicKey()], kinds: [24133] }], relays);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-signers",
-  "version": "0.0.0-next-20250323173930",
+  "version": "0.0.0-next-20250327153627",
   "description": "Signer classes for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     "@noble/hashes": "^1.7.1",
     "@noble/secp256k1": "^1.7.1",
     "@scure/base": "^1.2.4",
-    "applesauce-core": "^0.12.0",
+    "applesauce-core": "0.0.0-next-20250327153627",
     "debug": "^4.4.0",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.4"