@konemono/nostr-login 1.11.21 → 1.11.23

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -54,7 +54,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   private readonly MAX_RECONNECT_ATTEMPTS = 3;
   private currentInfo?: Info;
   private isReconnecting: boolean = false;
-
+  private reconnectTimer?: NodeJS.Timeout; // ★ 追加
 
   nip04: {
     encrypt: (pubkey: string, plaintext: string) => Promise<string>;
@@ -302,24 +302,12 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   public async setConnect(info: Info) {
     this.releaseSigner();
-    if (!this.readyCallback) await this.startAuth();
+    await this.startAuth();
     await this.initSigner(info);
     this.onAuth('login', info);
     await this.endAuth();
   }
 
-  public async authNip46(type: 'login' | 'signup', options: { name?: string; bunkerUrl: string; domain?: string; customRelays?: string[]; sk?: string }) {
-    const { bunkerUrl, sk, domain } = options;
-    const relay = options.customRelays?.[0] || bunkerUrlToInfo(bunkerUrl).relays?.[0];
-    if (!relay) throw new Error('No relay found in bunker URL');
-
-    await this.nostrConnect(relay, {
-      domain,
-      importConnect: true,
-      customRelays: options.customRelays,
-    });
-  }
-
   public async createAccount(nip05: string) {
     const [name, domain] = nip05.split('@');
 
@@ -344,29 +332,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     };
   }
 
-  private releaseSigner() {
-    this.signer = null;
-    this.signerErrCallback?.('cancelled');
-    this.localSigner = null;
-
-    // disconnect from signer relays
-    for (const r of this.ndk.pool.relays.keys()) {
-      this.ndk.pool.removeRelay(r);
-    }
-  }
-
-  public async logout(keepSigner = false) {
-    if (!keepSigner) this.releaseSigner();
-
-    // move current to recent
-    localStorageRemoveCurrentAccount();
-
-    // notify everyone
-    this.onAuth('logout');
-
-    this.emit('updateAccounts');
-  }
-
+ 
   private setUserInfo(userInfo: Info | null) {
     this.params.userInfo = userInfo;
     this.emit('onUserInfo', userInfo);
@@ -454,13 +420,6 @@ class AuthNostrService extends EventEmitter implements Signer {
     } catch (e) {
       console.log('onAuth error', e);
     }
-
-    // ログイン完了後に接続確認を実行
-    if (type === 'login') {
-      setTimeout(() => {
-        this.ensureSigner().catch(e => console.log('Post-login connection check failed', e));
-      }, 1000);
-    }
   }
 
   private async createIframe(iframeUrl?: string) {
@@ -602,23 +561,24 @@ class AuthNostrService extends EventEmitter implements Signer {
       });
     });
 
-    this.signerPromise = new Promise<void>(async (ok, err) => {
-      this.signerErrCallback = err;
-      try {
-        // タイムアウトとキャンセルの両方に対応
-        await Promise.race([this.initSignerInternal(info, listen, connect, eventToAddAccount, ok), abortPromise]);
-      } catch (e) {
-        console.log('initSigner failure', e);
-        // make sure signer isn't set
-        this.signer = null;
-        this.signerAbortController = undefined;
-        err(e);
-      }
-    });
+  this.signerPromise = new Promise<void>(async (ok, err) => {
+  this.signerErrCallback = err;
+  try {
+    await Promise.race([this.initSignerInternal(info, listen, connect, eventToAddAccount, ok), abortPromise]);
+  } catch (e) {
+    console.log('initSigner failure', e);
+    // ★ 追加: 失敗時のクリーンアップ
+    this.cleanup();
+    this.signer = null;
+    this.signerAbortController = undefined;
+    err(e);
+  }
+});
 
     return this.signerPromise;
   }
 
+  // ★ 修正: initSignerInternal
   private async initSignerInternal(info: Info, listen: boolean, connect: boolean, eventToAddAccount: boolean, resolve: () => void) {
     // リレー接続
     if (info.relays && !info.iframeUrl) {
@@ -637,39 +597,8 @@ class AuthNostrService extends EventEmitter implements Signer {
       info.iframeUrl ? new URL(info.iframeUrl!).origin : undefined
     );
 
-    // ★ 修正: connectionLost イベントハンドリングを統一
-    this.signer.removeAllListeners?.('connectionLost');
-    this.signer.on('connectionLost', () => {
-      console.log('Connection lost detected');
-
-      // ログイン処理中は再接続をスキップ
-      if (this.isAuthing()) {
-        console.log('Skipping reconnection during authentication');
-        return;
-      }
-
-      // ★ 再接続処理を呼び出す（非同期で実行、エラーは握りつぶさない）
-      this.handleReconnection(info).catch(err => {
-        console.error('Reconnection handling failed:', err);
-        this.emit('reconnectFailed', err);
-      });
-    });
-
-    // iframe restart は既存のまま
-    this.signer.removeAllListeners?.('iframeRestart');
-    this.signer.on('iframeRestart', async () => {
-      const iframeUrl = info.iframeUrl +
-        (info.iframeUrl!.includes('?') ? '&' : '?') +
-        'pubkey=' + info.pubkey + '&rebind=' + localSigner.pubkey;
-      this.emit('iframeRestart', { pubkey: info.pubkey, iframeUrl });
-    });
-
-    // authUrl は既存のまま
-    this.signer.removeAllListeners?.('authUrl');
-    this.signer.on('authUrl', (url: string) => {
-      console.log('nostr login auth url', url);
-      this.emit('onAuthUrl', { url, iframeUrl: info.iframeUrl, eventToAddAccount });
-    });
+    // ★ イベントハンドラー登録
+    this.setupSignerEventHandlers(info);
 
     // 認証フロー
     if (listen) {
@@ -683,25 +612,66 @@ class AuthNostrService extends EventEmitter implements Signer {
     info.pubkey = this.signer!.userPubkey;
     info.signerPubkey = this.signer!.remotePubkey;
 
-    // ★ 追加: 接続情報を保持
+    // ★ 接続情報を保持
     this.currentInfo = info;
 
     this.signerAbortController = undefined;
     resolve();
   }
 
-  // ★ 新規追加: 再接続処理の一元化
-  private async handleReconnection(info: Info): Promise<void> {
+
+  // ★ 修正: イベントハンドラーを一度だけ登録
+  private setupSignerEventHandlers(info: Info) {
+    if (!this.signer) return;
+
+    // 既存のリスナーをすべて削除
+    this.signer.removeAllListeners('connectionLost');
+    this.signer.removeAllListeners('iframeRestart');
+    this.signer.removeAllListeners('authUrl');
+
+    // connectionLost: 一度だけ処理
+    this.signer.once('connectionLost', () => {
+      console.log('Connection lost detected');
+      this.scheduleReconnection(info);
+    });
+
+    // iframeRestart
+    this.signer.on('iframeRestart', async () => {
+      const localSigner = this.signer?.['_rpc']?.['_signer'];
+      if (!localSigner) return;
+
+      const iframeUrl = info.iframeUrl +
+        (info.iframeUrl!.includes('?') ? '&' : '?') +
+        'pubkey=' + info.pubkey + '&rebind=' + localSigner.pubkey;
+      this.emit('iframeRestart', { pubkey: info.pubkey, iframeUrl });
+    });
+
+    // authUrl
+    this.signer.on('authUrl', (url: string) => {
+      console.log('nostr login auth url', url);
+      this.emit('onAuthUrl', { url, iframeUrl: info.iframeUrl, eventToAddAccount: false });
+    });
+  }
+
+  // ★ 新規追加: 再接続スケジューリング
+  private scheduleReconnection(info: Info) {
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+    }
+
+    // 認証中はスキップ
     if (this.isAuthing()) {
       console.log('Authentication in progress, skipping reconnection...');
       return;
     }
 
+    // 既に再接続中
     if (this.isReconnecting) {
       console.log('Already reconnecting, skipping...');
       return;
     }
 
+    // 最大試行回数超過
     if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
       console.error('Max reconnection attempts reached');
       this.emit('reconnectFailed');
@@ -709,6 +679,24 @@ class AuthNostrService extends EventEmitter implements Signer {
       return;
     }
 
+    const delay = 2000 * (this.reconnectAttempts + 1); // 2秒, 4秒, 6秒
+    console.log(`Scheduling reconnection in ${delay}ms (attempt ${this.reconnectAttempts + 1}/${this.MAX_RECONNECT_ATTEMPTS})`);
+
+    this.reconnectTimer = setTimeout(() => {
+      this.handleReconnection(info).catch(err => {
+        console.error('Reconnection failed:', err);
+        // 失敗したら再スケジュール
+        this.scheduleReconnection(info);
+      });
+    }, delay);
+  }
+  // ★ 修正: 再接続処理の簡素化
+  private async handleReconnection(info: Info): Promise<void> {
+    if (this.isReconnecting) {
+      console.log('Already reconnecting, skipping...');
+      return;
+    }
+
     this.isReconnecting = true;
     this.reconnectAttempts++;
 
@@ -736,12 +724,13 @@ class AuthNostrService extends EventEmitter implements Signer {
           }
         }
 
-        // 接続待機
         await this.ndk.connect();
       }
 
-      // 2. Signer ping確認はensureSignerで別途行う
-      // await this.signer.reconnect(info);
+      // 2. Signer再接続
+      if (this.signer) {
+        await this.signer.reconnect(info);
+      }
 
       // 成功
       this.reconnectAttempts = 0;
@@ -749,29 +738,18 @@ class AuthNostrService extends EventEmitter implements Signer {
       console.log('Reconnection successful');
       this.emit('reconnected');
 
+      // ★ イベントハンドラーを再登録
+      this.setupSignerEventHandlers(info);
+
     } catch (error) {
       console.error(`Reconnection attempt ${this.reconnectAttempts} failed:`, error);
       this.isReconnecting = false;
-
-      // リトライ
-      if (this.reconnectAttempts < this.MAX_RECONNECT_ATTEMPTS) {
-        const delay = 2000 * this.reconnectAttempts; // 2秒, 4秒, 6秒
-        console.log(`Retrying in ${delay}ms...`);
-
-        setTimeout(() => {
-          this.handleReconnection(info).catch(err => {
-            console.error('Retry failed:', err);
-          });
-        }, delay);
-      } else {
-        this.emit('reconnectFailed');
-        this.reconnectAttempts = 0;
-      }
+      throw error; // ★ エラーを上位に伝播
     }
   }
 
 
-  // ★ 修正: ensureSigner - 再接続処理を同期的に実行
+  // ★ 修正: ensureSigner - ping失敗時は警告のみ
   private async ensureSigner() {
     // signerがnullの場合のみ再初期化
     if (!this.signer && this.currentInfo) {
@@ -784,37 +762,42 @@ class AuthNostrService extends EventEmitter implements Signer {
       throw new Error('No signer available');
     }
 
-    // リレー接続確認（切断されていれば再接続を同期的に実行）
+    // リレー接続確認（切断時は警告のみ、署名処理は続行）
     const stats = this.ndk.pool.stats();
     if (stats.connected === 0 && this.currentInfo) {
-      console.log('NDK relays disconnected, attempting reconnection...');
-      await this.handleReconnection(this.currentInfo);
+      console.warn('NDK relays disconnected, attempting background reconnection');
+      this.scheduleReconnection(this.currentInfo);
+      // ★ エラーを投げずに続行（署名時にNIP-46が接続チェックする）
+    }
+
+    // Signer接続確認（オプショナル）
+    const now = Date.now();
+    const signer = this.signer as any;
+    
+    // キャッシュ期間内ならスキップ
+    if (signer.lastPingTime && now - signer.lastPingTime < signer.pingCacheDuration) {
       return;
     }
 
-    // Signer接続確認（失敗したら再接続を同期的に実行）
-    try {
-      // キャッシュ期間内ならスキップ
-      const now = Date.now();
-      if (this.signer['lastPingTime'] &&
-        now - this.signer['lastPingTime'] < this.signer['pingCacheDuration']) {
-        return;
-      }
+    // ログイン処理中はpingをスキップ
+    if (this.isAuthing()) {
+      console.log('Skipping ping during authentication');
+      return;
+    }
 
-      // ping確認
-      if (this.signer.remotePubkey) {
-        await this.signer['_rpc'].pingWithTimeout(this.signer.remotePubkey, 2000);
-        this.signer['lastPingTime'] = now;
+    // ★ ping確認（失敗しても署名処理は続行）
+    if (this.signer.remotePubkey) {
+      try {
+        await signer._rpc.pingWithTimeout(this.signer.remotePubkey, 2000);
+        signer.lastPingTime = now;
+      } catch (error) {
+        console.warn('Ping failed in ensureSigner, but continuing with sign operation', error);
+        // ★ エラーを投げない：Nip46Signer.sign()内のensureConnection()で再チェックされる
       }
-    } catch (error) {
-      // ping失敗 = 接続切断
-      console.log('Connection lost during ensureSigner, but ignoring during auth');
-      // ログイン処理中はエラーを無視
     }
   }
 
-
-  public async signEvent(event: any) {
+ public async signEvent(event: any) {
     if (this.localSigner) {
       event.pubkey = getPublicKey(this.localSigner.privateKey!);
       event.id = getEventHash(event);
@@ -830,20 +813,67 @@ class AuthNostrService extends EventEmitter implements Signer {
     return event;
   }
 
+   // ★ 追加: クリーンアップ
+  public cleanup() {
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = undefined;
+    }
+    this.reconnectAttempts = 0;
+    this.isReconnecting = false;
+    
+    // ★ 追加: signerのイベントリスナーもクリア
+    if (this.signer) {
+      this.signer.removeAllListeners('connectionLost');
+      this.signer.removeAllListeners('iframeRestart');
+      this.signer.removeAllListeners('authUrl');
+    }
+  }
 
+  private releaseSigner() {
+    this.cleanup(); // ★ 追加: クリーンアップ実行
+    
+    this.signer = null;
+    this.signerErrCallback?.('cancelled');
+    this.localSigner = null;
 
-  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) => {
-        if (!response.error) {
-          resolve(response.result);
-        } else {
-          reject(response.error);
-        }
-      });
-    });
+    // disconnect from signer relays
+    for (const r of this.ndk.pool.relays.keys()) {
+      this.ndk.pool.removeRelay(r);
+    }
   }
 
+  public async logout(keepSigner = false) {
+    if (!keepSigner) this.releaseSigner();
+    else this.cleanup(); // ★ keepSigner時もクリーンアップ
+
+    localStorageRemoveCurrentAccount();
+    this.onAuth('logout');
+    this.emit('updateAccounts');
+  }
+
+
+  // ★ 修正: RPC呼び出し前に接続確認を追加
+private async codec_call(method: string, pubkey: string, param: string) {
+  // Nip46Signerの接続確認を明示的に実行
+  if (this.signer) {
+    const signer = this.signer as any;
+    if (signer.ensureConnection) {
+      await signer.ensureConnection();
+    }
+  }
+  
+  return new Promise<string>((resolve, reject) => {
+    this.signer!.rpc.sendRequest(this.signer!.remotePubkey!, method, [pubkey, param], 24133, (response: NDKRpcResponse) => {
+      if (!response.error) {
+        resolve(response.result);
+      } else {
+        reject(response.error);
+      }
+    });
+  });
+}
+
   public async encrypt04(pubkey: string, plaintext: string) {
     if (this.localSigner) {
       return this.localSigner.encrypt(new NDKUser({ pubkey }), plaintext);

package/src/modules/Nip46.ts

@@ -380,19 +380,17 @@ export class ReadyListener {
     return r;
   }
 }
-
 export class Nip46Signer extends NDKNip46Signer {
   private _userPubkey: string = '';
   private _rpc: IframeNostrRpc;
   private lastPingTime: number = 0;
-  private pingCacheDuration: number = 30000; // 30秒
-  // ★ 追加: 再接続中フラグ
+  private pingCacheDuration: number = 30000;
   private isReconnecting: boolean = false;
+  private connectionLostEmitted: boolean = false; // ★ 追加
 
   constructor(ndk: NDK, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
     super(ndk, signerPubkey, localSigner);
 
-    // override with our own rpc implementation
     this._rpc = new IframeNostrRpc(ndk, localSigner, iframeOrigin);
     this._rpc.setUseNip44(true);
     this._rpc.on('authUrl', (url: string) => {
@@ -406,10 +404,9 @@ export class Nip46Signer extends NDKNip46Signer {
     return this._userPubkey;
   }
 
-
-
-   // ★ 既存メソッドを修正: リトライロジックを削除
-  private async ensureConnection(): Promise<void> {
+ // ★ 修正: 接続確認のみ実施、再接続は行わない
+  // ★ public化して外部から呼び出し可能にする
+  public async ensureConnection(): Promise<void> {
     if (!this.remotePubkey) return;
 
     const now = Date.now();
@@ -422,17 +419,22 @@ export class Nip46Signer extends NDKNip46Signer {
     try {
       await this._rpc.pingWithTimeout(this.remotePubkey, 2000);
       this.lastPingTime = now;
+      this.connectionLostEmitted = false; // ★ リセット
       console.log('Connection check OK');
     } catch (error) {
       console.error('Connection check failed', error);
-      // ★ 修正: リトライは行わず、接続喪失イベントのみ発火
-      this.emit('connectionLost');
+      
+      // ★ 修正: 一度だけイベント発火
+      if (!this.connectionLostEmitted) {
+        this.connectionLostEmitted = true;
+        this.emit('connectionLost');
+      }
+      
       throw new Error('NIP-46 connection lost');
     }
   }
 
-
-  // ★ 新規追加: 再接続メソッド（外部から呼ばれる）
+  // ★ 修正: 再接続メソッド - イベント発火を抑制
   public async reconnect(info: any): Promise<void> {
     if (this.isReconnecting) {
       console.log('Already reconnecting, skipping...');
@@ -444,12 +446,20 @@ export class Nip46Signer extends NDKNip46Signer {
     try {
       console.log('Reconnecting signer...');
       
-      // リレー再接続は AuthNostrService 側で実施済みと仮定
-      // ここでは ping のみ実施
       if (this.remotePubkey) {
-        await this._rpc.pingWithTimeout(this.remotePubkey, 2000);
-        this.lastPingTime = Date.now();
-        console.log('Reconnection successful');
+        // ★ 修正: 再接続中はイベント発火を抑制
+        const prevFlag = this.connectionLostEmitted;
+        this.connectionLostEmitted = true;
+        
+        try {
+          await this._rpc.pingWithTimeout(this.remotePubkey, 2000);
+          this.lastPingTime = Date.now();
+          this.connectionLostEmitted = false; // ★ 成功時のみリセット
+          console.log('Reconnection successful');
+        } catch (error) {
+          this.connectionLostEmitted = prevFlag; // ★ 失敗時は元に戻す
+          throw error;
+        }
       }
       
       this.isReconnecting = false;
@@ -462,15 +472,12 @@ export class Nip46Signer extends NDKNip46Signer {
   private async setSignerPubkey(signerPubkey: string, sameAsUser: boolean = false) {
     console.log('setSignerPubkey', signerPubkey);
 
-    // ensure it's set
     this.remotePubkey = signerPubkey;
 
-    // when we're sure it's known
     this._rpc.on(`iframeRestart-${signerPubkey}`, () => {
       this.emit('iframeRestart');
     });
 
-    // now call getPublicKey and swap remotePubkey w/ that
     await this.initUserPubkey(sameAsUser ? signerPubkey : '');
   }
 
@@ -503,29 +510,26 @@ export class Nip46Signer extends NDKNip46Signer {
   public async listen(nostrConnectSecret: string) {
     const signerPubkey = await (this.rpc as IframeNostrRpc).listen(nostrConnectSecret);
     await this.setSignerPubkey(signerPubkey);
-
-    // ログイン完了後に接続確認
-    await this.ensureConnection();
+    // ★ 削除: ログイン直後の接続確認は不要
+    // await this.ensureConnection();
   }
 
   public async connect(token?: string, perms?: string) {
     if (!this.remotePubkey) throw new Error('No signer pubkey');
     await this._rpc.connectWithTimeout(this.remotePubkey, token, perms, NIP46_CONNECT_TIMEOUT);
     await this.setSignerPubkey(this.remotePubkey);
-
-    // ログイン完了後に接続確認
-    await this.ensureConnection();
+    // ★ 削除: ログイン直後の接続確認は不要
+    // await this.ensureConnection();
   }
 
   public async setListenReply(reply: any, nostrConnectSecret: string) {
     const signerPubkey = await this._rpc.parseNostrConnectReply(reply, nostrConnectSecret);
     await this.setSignerPubkey(signerPubkey, true);
-
-    // ログイン完了後に接続確認
-    await this.ensureConnection();
+    // ★ 削除: ログイン直後の接続確認は不要
+    // await this.ensureConnection();
   }
 
-  // 署名メソッドのオーバーライド - 署名前に接続確認
+  // ★ 修正: 署名前に接続確認
   async sign(event: NostrEvent): Promise<string> {
     await this.ensureConnection();
     return super.sign(event);
@@ -541,17 +545,17 @@ export class Nip46Signer extends NDKNip46Signer {
     return super.decrypt(sender, value);
   }
 
-  public async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
-    const params = [
-      name,
-      domain,
-      '', // email
-      perms,
-    ];
+public async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
+    const params = [name, domain, '', perms];
 
-    const r = await new Promise<NDKRpcResponse>(ok => {
-      this.rpc.sendRequest(bunkerPubkey, 'create_account', params, undefined, ok);
-    });
+  // ★ 追加: 接続確認
+  if (this.remotePubkey === bunkerPubkey) {
+    await this.ensureConnection();
+  }
+
+  const r = await new Promise<NDKRpcResponse>(ok => {
+    this.rpc.sendRequest(bunkerPubkey, 'create_account', params, undefined, ok);
+  });
 
     console.log('create_account pubkey', r);
     if (r.result === 'error') {
@@ -561,7 +565,6 @@ export class Nip46Signer extends NDKNip46Signer {
     return r.result;
   }
 
-  // ★ 追加: removeAllListeners メソッド
   public removeAllListeners = (event?: string | symbol): this => {
     if (event) {
       this._rpc.eventEmitter.removeAllListeners(event as string);
@@ -571,9 +574,6 @@ export class Nip46Signer extends NDKNip46Signer {
     return this;
   }
 
-
-  // EventEmitter互換メソッド
-    // ★ ここに once を追加 ★
   public override on = <EventKey extends string | symbol = string>(
     event: EventKey,
     listener: (...args: any[]) => void