@konemono/nostr-login 1.13.0 → 1.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Extended fork of nostr-login with multi-relay support, QR scanner, and improved stability",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@konemono/nostr-login-components": "^1.2.0",
+    "@konemono/nostr-login-components": "^1.2.2",
     "prettier": "^3.2.2",
     "rollup": "^4.9.6",
     "rollup-plugin-typescript2": "^0.36.0"

package/src/modules/AuthNostrService.ts

@@ -676,8 +676,8 @@ class AuthNostrService extends EventEmitter implements Signer {
           await this.signer!.initUserPubkey(info.pubkey);
         }
 
-        info.pubkey = this.signer!.userPubkey;
-        info.signerPubkey = this.signer!.remotePubkey;
+        info.pubkey = this.signer!.userPubkey as string;
+        info.signerPubkey = this.signer!.bunkerPubkey;
 
         console.log('Signer initialized successfully. User pubkey:', info.pubkey, 'Signer pubkey:', info.signerPubkey);
 
@@ -756,7 +756,7 @@ class AuthNostrService extends EventEmitter implements Signer {
           throw new Error('Signer is not initialized. Please reconnect.');
         }
         await this.ensureRelayConnection();
-        event.pubkey = this.signer.remotePubkey;
+        event.pubkey = this.signer.bunkerPubkey;
         event.id = getEventHash(event);
         event.sig = await this.signer?.sign(event);
         console.log('signed', { event, attempt });
@@ -903,7 +903,7 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   private async codec_call(method: string, pubkey: string, param: string) {
     return new Promise<string>((resolve, reject) => {
-      this.signer!.rpc.sendRequest(this.signer!.remotePubkey!, method, [pubkey, param], 24133, (response: NDKRpcResponse) => {
+      this.signer!.rpc.sendRequest(this.signer!.bunkerPubkey!, method, [pubkey, param], 24133, (response: NDKRpcResponse) => {
         if (!response.error) {
           resolve(response.result);
         } else {

package/src/modules/Nip46.ts

@@ -445,11 +445,13 @@ export class ReadyListener {
 }
 
 export class Nip46Signer extends NDKNip46Signer {
-  private _userPubkey: string = '';
   private _rpc: IframeNostrRpc;
 
   constructor(ndk: NDK, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
-    super(ndk, signerPubkey, localSigner);
+    // Pass `false` to skip NDK's built-in init (nip05Init/bunkerFlowInit/nostrconnectFlowInit)
+    // because we manage bunkerPubkey and RPC ourselves.
+    super(ndk, false as any, localSigner);
+    this.bunkerPubkey = signerPubkey;
 
     this._rpc = new IframeNostrRpc(ndk, localSigner, iframeOrigin);
     this._rpc.setUseNip44(true);
@@ -460,14 +462,10 @@ export class Nip46Signer extends NDKNip46Signer {
     this.rpc = this._rpc;
   }
 
-  get userPubkey() {
-    return this._userPubkey;
-  }
-
   private async setSignerPubkey(signerPubkey: string, sameAsUser: boolean = false) {
     console.log('setSignerPubkey', signerPubkey);
 
-    this.remotePubkey = signerPubkey;
+    this.bunkerPubkey = signerPubkey;
 
     this._rpc.on(`iframeRestart-${signerPubkey}`, () => {
       this.emit('iframeRestart');
@@ -477,28 +475,28 @@ export class Nip46Signer extends NDKNip46Signer {
   }
 
   public async initUserPubkey(hintPubkey?: string) {
-    if (this._userPubkey) {
-      console.warn('initUserPubkey already called, pubkey:', this._userPubkey);
+    if (this.userPubkey) {
+      console.warn('initUserPubkey already called, pubkey:', this.userPubkey);
       return;
     }
 
     if (hintPubkey) {
-      this._userPubkey = hintPubkey;
-      console.log('User pubkey set from hint:', this._userPubkey);
+      this.userPubkey = hintPubkey;
+      console.log('User pubkey set from hint:', this.userPubkey);
       return;
     }
 
-    console.log('Requesting user pubkey from signer:', this.remotePubkey);
+    console.log('Requesting user pubkey from signer:', this.bunkerPubkey);
 
-    this._userPubkey = await new Promise<string>((ok, err) => {
-      if (!this.remotePubkey) throw new Error('Signer pubkey not set');
+    this.userPubkey = await new Promise<string>((ok, err) => {
+      if (!this.bunkerPubkey) throw new Error('Signer pubkey not set');
 
       const timeout = setTimeout(() => {
         err(new Error('Timeout getting user pubkey'));
       }, 30000);
 
-      console.log('get_public_key', this.remotePubkey);
-      this._rpc.sendRequest(this.remotePubkey, 'get_public_key', [], 24133, (response: NDKRpcResponse) => {
+      console.log('get_public_key', this.bunkerPubkey);
+      this._rpc.sendRequest(this.bunkerPubkey, 'get_public_key', [], 24133, (response: NDKRpcResponse) => {
         clearTimeout(timeout);
 
         if (response.error) {
@@ -517,9 +515,9 @@ export class Nip46Signer extends NDKNip46Signer {
   }
 
   public async connect(token?: string, perms?: string) {
-    if (!this.remotePubkey) throw new Error('No signer pubkey');
-    await this._rpc.connect(this.remotePubkey, token, perms);
-    await this.setSignerPubkey(this.remotePubkey);
+    if (!this.bunkerPubkey) throw new Error('No signer pubkey');
+    await this._rpc.connect(this.bunkerPubkey, token, perms);
+    await this.setSignerPubkey(this.bunkerPubkey);
   }
 
   public async setListenReply(reply: any, nostrConnectSecret: string) {

package/src/modules/Signer.ts

@@ -4,15 +4,15 @@ import { getPublicKey } from 'nostr-tools';
 
 export class PrivateKeySigner extends NDKPrivateKeySigner {
   private nip44: Nip44 = new Nip44();
-  private _pubkey: string;
+  private _derivedPubkey: string;
 
   constructor(privateKey: string) {
     super(privateKey);
-    this._pubkey = getPublicKey(privateKey);
+    this._derivedPubkey = getPublicKey(privateKey);
   }
 
-  get pubkey() {
-    return this._pubkey;
+  override get pubkey() {
+    return this._derivedPubkey;
   }
 
   encryptNip44(recipient: NDKUser, value: string): Promise<string> {