@konemono/nostr-login 1.7.32 → 1.7.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.7.32",
+  "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);
     }
@@ -155,6 +160,7 @@ class NostrRpc extends NDKNostrRpc {
     );
 
     const connectedRelays = relays.filter(r => r.status === 1);
+    console.log('connected relays', connectedRelays);
 
     if (connectedRelays.length === 0) {
       console.log('No connected relays, forcing reconnection...');
@@ -262,6 +268,7 @@ class NostrRpc extends NDKNostrRpc {
 
     const timeoutId = setTimeout(() => {
       if (this.requests.has(id)) {
+        clearTimeout(timeoutId);
         this.requests.delete(id);
         this.requestTimeouts.delete(id);
         console.log('NIP46 request timeout for', id);
@@ -303,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 };
 
@@ -507,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');
 

package/src/modules/ProcessManager.ts

@@ -40,7 +40,7 @@ class ProcessManager extends EventEmitter {
     if (!this.callTimer) {
       this.callTimer = setTimeout(() => {
         console.log('ProcessManager: timeout reached, emitting onCallTimeout');
-        this.callTimer = undefined; // タイムアウト時にタイマーIDをクリア
+        this.callTimer = undefined; // ★ タイムアウト時にタイマーIDをクリア
         this.emit('onCallTimeout');
       }, CALL_TIMEOUT);
       console.log(`Setting up timeout timer for ${CALL_TIMEOUT} ms`);
@@ -52,30 +52,41 @@ class ProcessManager extends EventEmitter {
 
     this.callCount++;
 
-    let error;
-    let result;
+    let error: any; // 型をanyに変更
+    let result: any;
 
+    // 非同期処理の実行
     try {
       result = await cb();
     } catch (e) {
       error = e;
     }
 
+    // ★ 修正後のクリーンアップロジック (finallyブロック相当)
+    // ----------------------------------------------------
+
+    // ProcessManagerの呼び出しカウントをデクリメント
     this.callCount--;
     this.emit('onCallEnd');
 
+    // タイマーがまだ存在していればクリアし、IDもクリア
+    // この処理は、cb()が成功/失敗したどちらの場合でも実行される
     if (this.callTimer) {
       clearTimeout(this.callTimer);
     }
     this.callTimer = undefined; // ProcessManager のタイマーIDもここでクリア
 
+    // ----------------------------------------------------
+
+    // エラーがあればスローし、呼び出し元に伝播させる
     if (error) {
       throw error;
     }
 
     // @ts-ignore
-    return result;
+    return result as T;
   }
+
   public pause() {
     if (this.callTimer) clearTimeout(this.callTimer);
     this.callTimer = undefined;