@konemono/nostr-login 1.10.12 → 1.10.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.10.12",
+  "version": "1.10.14",
   "description": "",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",

package/src/modules/AuthNostrService.ts

@@ -703,20 +703,34 @@ class AuthNostrService extends EventEmitter implements Signer {
       event.id = getEventHash(event);
       event.sig = await this.localSigner.sign(event);
     } else {
-      // リレー接続を確認・再接続
-      if (this.ndk.pool.stats().connected === 0) {
-        console.log('NDK relays disconnected, reconnecting...');
-        await this.ndk.connect();
-      }
+      await this.ensureSigner();
 
-      event.pubkey = this.signer?.remotePubkey;
+      event.pubkey = this.signer!.remotePubkey;
       event.id = getEventHash(event);
-      event.sig = await this.signer?.sign(event);
+      event.sig = await this.signer!.sign(event);
     }
     console.log('signed', { event });
     return event;
   }
 
+  private async ensureSigner() {
+    // signerがキャンセル等で破棄されている場合は再初期化
+    if (!this.signer && this.params.userInfo) {
+      console.log('Signer was destroyed, reinitializing...');
+      await this.initSigner(this.params.userInfo);
+    }
+
+    if (!this.signer) {
+      throw new Error('No signer available');
+    }
+
+    // リレー接続を確認・再接続
+    if (this.ndk.pool.stats().connected === 0) {
+      console.log('NDK relays disconnected, reconnecting...');
+      await this.ndk.connect();
+    }
+  }
+
   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) => {
@@ -733,6 +747,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (this.localSigner) {
       return this.localSigner.encrypt(new NDKUser({ pubkey }), plaintext);
     } else {
+      await this.ensureSigner();
       return this.signer!.encrypt(new NDKUser({ pubkey }), plaintext);
     }
   }
@@ -744,7 +759,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       // decrypt is broken in ndk v2.3.1, and latest
       // ndk v2.8.1 doesn't allow to override connect easily,
       // so we reimplement and fix decrypt here as a temporary fix
-
+      await this.ensureSigner();
       return this.codec_call('nip04_decrypt', pubkey, ciphertext);
     }
   }
@@ -754,6 +769,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       return this.nip44Codec.encrypt(this.localSigner.privateKey!, pubkey, plaintext);
     } else {
       // no support of nip44 in ndk yet
+      await this.ensureSigner();
       return this.codec_call('nip44_encrypt', pubkey, plaintext);
     }
   }
@@ -763,6 +779,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       return this.nip44Codec.decrypt(this.localSigner.privateKey!, pubkey, ciphertext);
     } else {
       // no support of nip44 in ndk yet
+      await this.ensureSigner();
       return this.codec_call('nip44_decrypt', pubkey, ciphertext);
     }
   }

package/src/modules/ProcessManager.ts

@@ -16,6 +16,13 @@ class ProcessManager extends EventEmitter {
       reject(new Error('Cancelled by user'));
     }
     this.pendingCalls.clear();
+
+    // タイマーとカウントをリセットして次の署名要求に備える
+    if (this.callTimer) {
+      clearTimeout(this.callTimer);
+      this.callTimer = undefined;
+    }
+    this.callCount = 0;
   }
 
   public onAuthUrl() {