@konemono/nostr-login 1.7.33 → 1.7.34

package/package.json

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

package/src/modules/Nip46.ts

@@ -13,6 +13,11 @@ class NostrRpc extends NDKNostrRpc {
   private sub?: NDKSubscription;
   protected _useNip44: boolean = false;
 
+  public cleanupTimersAndRequests() {
+    this.clearAllTimeouts(); // private/protected なメソッドを呼び出す
+    this.requests.clear(); // requests Setをクリア
+  }
+
   public constructor(ndk: NDK, signer: PrivateKeySigner, processManager?: ProcessManager) {
     super(ndk, signer, ndk.debug.extend('nip46:signer:rpc'));
     this._ndk = ndk;
@@ -34,7 +39,7 @@ class NostrRpc extends NDKNostrRpc {
     }
   }
 
-  private clearAllTimeouts() {
+  protected clearAllTimeouts() {
     for (const timeout of this.requestTimeouts.values()) {
       clearTimeout(timeout);
     }
@@ -305,6 +310,14 @@ class NostrRpc extends NDKNostrRpc {
   protected async createRequestEvent(id: string, remotePubkey: string, method: string, params: string[] = [], kind = 24133) {
     this.requests.add(id);
     const localUser = await this._signer.user();
+
+    if (!localUser.pubkey) {
+      throw new Error('CORRUPTION: Missing local pubkey. Signer state compromised.');
+    }
+    if (!remotePubkey) {
+      throw new Error('CORRUPTION: Missing remote pubkey. Signer state compromised.');
+    }
+
     const remoteUser = this._ndk.getUser({ pubkey: remotePubkey });
     const request = { id, method, params };
 
@@ -509,6 +522,18 @@ export class Nip46Signer extends NDKNip46Signer {
     await this.initUserPubkey(sameAsUser ? signerPubkey : '');
   }
 
+  public forceResetState() {
+    console.log('Nip46Signer state reset due to connection failure or timeout.');
+
+    // 1. ユーザー公開鍵をクリア
+    this._userPubkey = '';
+
+    // 2. リモート公開鍵をクリア
+    this.remotePubkey = ''; // 親クラスのプロパティをクリア
+
+    // 3. RPC側のタイマーとリクエストを、公開メソッド経由でクリア
+    (this._rpc as NostrRpc).cleanupTimersAndRequests();
+  }
   public async initUserPubkey(hintPubkey?: string) {
     if (this._userPubkey) throw new Error('Already called initUserPubkey');