applesauce-signers 0.0.0-next-20250315140539 → 0.0.0-next-20250323173930

package/dist/signers/extension-signer.d.ts

@@ -13,6 +13,7 @@ export declare class ExtensionSigner implements Nip07Interface {
         encrypt: (pubkey: string, plaintext: string) => Promise<string> | string;
         decrypt: (pubkey: string, ciphertext: string) => Promise<string> | string;
     } | undefined;
+    protected pubkey: string | undefined;
     getPublicKey(): string | Promise<string>;
     getRelays(): Record<string, {
         read: boolean;

package/dist/signers/extension-signer.js

@@ -9,10 +9,22 @@ export class ExtensionSigner {
     get nip44() {
         return window.nostr?.nip44;
     }
+    pubkey = undefined;
     getPublicKey() {
         if (!window.nostr)
             throw new ExtensionMissingError("Signer extension missing");
-        return window.nostr.getPublicKey();
+        if (this.pubkey)
+            return this.pubkey;
+        const p = window.nostr.getPublicKey();
+        if (p instanceof Promise)
+            return p.then((pubkey) => {
+                this.pubkey = pubkey;
+                return pubkey;
+            });
+        else {
+            this.pubkey = p;
+            return p;
+        }
     }
     getRelays() {
         if (!window.nostr)

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

@@ -64,17 +64,22 @@ export type NostrConnectSignerOptions = {
     remote?: string;
     /** Users pubkey */
     pubkey?: string;
-};
-export type NostrConnectConnectionMethods = {
-    /** A method that is called when the subscription needs to be updated */
-    onSubOpen: (filters: Filter[], relays: string[], onEvent: (event: NostrEvent) => void) => Promise<void>;
-    /** A method called when the subscription should be closed */
-    onSubClose: () => Promise<void>;
-    /** A method that is called when an event needs to be published */
-    onPublishEvent: (event: NostrEvent, relays: string[]) => Promise<void>;
     /** A method for handling "auth" requests */
     onAuth?: (url: string) => Promise<void>;
 };
+interface Unsubscribable {
+    unsubscribe(): void;
+}
+interface Observer<T> {
+    next: (value: T) => void;
+    error: (err: any) => void;
+    complete: () => void;
+}
+type Subscribable<T extends unknown> = {
+    subscribe: (observer: Partial<Observer<T>>) => Unsubscribable;
+};
+export type NostrSubscriptionMethod = (filters: Filter[], relays: string[]) => Subscribable<NostrEvent>;
+export type NostrPublishMethod = (event: NostrEvent, relays: string[]) => void | Promise<void>;
 export type NostrConnectAppMetadata = {
     name?: string;
     image?: string;
@@ -82,12 +87,10 @@ export type NostrConnectAppMetadata = {
     permissions?: string[];
 };
 export declare class NostrConnectSigner implements Nip07Interface {
-    /** A method that is called when the subscription needs to be updated */
-    onSubOpen?: (filters: Filter[], relays: string[], onEvent: (event: NostrEvent) => void) => Promise<void>;
-    /** A method called when the subscription should be closed */
-    onSubClose?: () => Promise<void>;
     /** A method that is called when an event needs to be published */
-    onPublishEvent?: (event: NostrEvent, relays: string[]) => Promise<void>;
+    protected publish: NostrPublishMethod;
+    /** The active nostr subscription */
+    protected subscription: NostrSubscriptionMethod;
     protected log: import("debug").Debugger;
     /** The local client signer */
     signer: SimpleSigner;
@@ -102,6 +105,7 @@ export declare class NostrConnectSigner implements Nip07Interface {
     remote?: string;
     /** Client pubkey */
     get clientPubkey(): string;
+    /** A method for handling "auth" requests */
     onAuth: (url: string) => Promise<void>;
     verifyEvent: typeof verifyEvent;
     /** A secret used when initiating a connection from the client side */
@@ -114,7 +118,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(opts: NostrConnectConnectionMethods & NostrConnectSignerOptions);
+    constructor(subscription: NostrSubscriptionMethod, publish: NostrPublishMethod, opts: NostrConnectSignerOptions);
+    /** The currently active REQ subscription */
+    protected req?: Unsubscribable;
     /** Open the connection */
     open(): Promise<void>;
     /** Close the connection */
@@ -155,7 +161,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, options: NostrConnectConnectionMethods & {
+    static fromBunkerURI(uri: string, subscription: NostrSubscriptionMethod, publish: NostrPublishMethod, options: Omit<NostrConnectSignerOptions, "relays"> & {
         permissions?: string[];
         signer?: SimpleSigner;
     }): Promise<NostrConnectSigner>;

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

@@ -33,14 +33,10 @@ async function defaultHandleAuth(url) {
     window.open(url, "auth", "width=400,height=600,resizable=no,status=no,location=no,toolbar=no,menubar=no");
 }
 export class NostrConnectSigner {
-    /** A method that is called when the subscription needs to be updated */
-    onSubOpen;
-    /** A method called when the subscription should be closed */
-    onSubClose;
     /** A method that is called when an event needs to be published */
-    onPublishEvent;
-    // protected pool: IConnectionPool;
-    // protected sub: MultiSubscription;
+    publish;
+    /** The active nostr subscription */
+    subscription;
     log = logger.extend("NostrConnectSigner");
     /** The local client signer */
     signer;
@@ -57,19 +53,19 @@ export class NostrConnectSigner {
     get clientPubkey() {
         return getPublicKey(this.signer.key);
     }
+    /** A method for handling "auth" requests */
     onAuth = defaultHandleAuth;
     verifyEvent = verifyEvent;
     /** A secret used when initiating a connection from the client side */
     clientSecret = nanoid(12);
     nip04;
     nip44;
-    constructor(opts) {
+    constructor(subscription, publish, opts) {
         this.relays = opts.relays;
         this.pubkey = opts.pubkey;
         this.remote = opts.remote;
-        this.onSubOpen = opts.onSubOpen;
-        this.onSubClose = opts.onSubClose;
-        this.onPublishEvent = opts.onPublishEvent;
+        this.subscription = subscription;
+        this.publish = publish;
         if (opts.onAuth)
             this.onAuth = opts.onAuth;
         this.signer = opts?.signer || new SimpleSigner();
@@ -82,6 +78,8 @@ export class NostrConnectSigner {
             decrypt: this.nip44Decrypt.bind(this),
         };
     }
+    /** The currently active REQ subscription */
+    req;
     /** Open the connection */
     async open() {
         if (this.subscriptionOpen)
@@ -89,19 +87,21 @@ export class NostrConnectSigner {
         this.subscriptionOpen = true;
         const pubkey = await this.signer.getPublicKey();
         // Setup subscription
-        await this.onSubOpen?.([
+        this.req = this.subscription([
             {
                 kinds: [kinds.NostrConnect],
                 "#p": [pubkey],
             },
-        ], this.relays, this.handleEvent.bind(this));
+        ], this.relays).subscribe({
+            next: (event) => this.handleEvent(event),
+        });
         this.log("Opened", this.relays);
     }
     /** Close the connection */
     async close() {
         this.subscriptionOpen = false;
         this.isConnected = false;
-        await this.onSubClose?.();
+        this.req?.unsubscribe();
         this.log("Closed");
     }
     requests = new Map();
@@ -178,7 +178,7 @@ export class NostrConnectSigner {
         this.log(`Sending request ${id} (${method}) ${JSON.stringify(params)}`);
         const p = createDefer();
         this.requests.set(id, p);
-        await this.onPublishEvent?.(event, this.relays);
+        await this.publish?.(event, this.relays);
         return p;
     }
     /** Connect to remote signer */
@@ -318,9 +318,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, options) {
+    static async fromBunkerURI(uri, subscription, publish, options) {
         const { remote, relays, secret } = NostrConnectSigner.parseBunkerURI(uri);
-        const client = new NostrConnectSigner({ relays, remote, ...options });
+        const client = new NostrConnectSigner(subscription, publish, { relays, remote, ...options });
         await client.connect(secret, options.permissions);
         return client;
     }

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

@@ -3,23 +3,19 @@ import { NostrConnectSigner } from "./nostr-connect-signer.js";
 import { SimpleSigner } from "./simple-signer.js";
 describe("NostrConnectSigner", () => {
     describe("connection", () => {
-        it("should call onSubOpen with filters", async () => {
+        it("should call subscription method with filters", async () => {
             const relays = ["wss://relay.signer.com"];
-            const onSubOpen = vi.fn(async () => { });
-            const onSubClose = vi.fn(async () => { });
-            const onPublishEvent = vi.fn(async () => { });
+            const subscription = vi.fn().mockReturnValue({ subscribe: vi.fn() });
+            const publish = vi.fn(async () => { });
             const client = new SimpleSigner();
             const remote = new SimpleSigner();
-            const signer = new NostrConnectSigner({
-                onSubOpen,
-                onSubClose,
-                onPublishEvent,
+            const signer = new NostrConnectSigner(subscription, publish, {
                 relays,
                 remote: await remote.getPublicKey(),
                 signer: client,
             });
             signer.connect();
-            expect(onSubOpen).toHaveBeenCalledWith([{ "#p": [await client.getPublicKey()], kinds: [24133] }], relays, expect.any(Function));
+            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-20250315140539",
+  "version": "0.0.0-next-20250323173930",
   "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.0.0-next-20250315140539",
+    "applesauce-core": "^0.12.0",
     "debug": "^4.4.0",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.4"