@konemono/nostr-login 1.9.4 → 1.9.6

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -76,31 +76,26 @@ class AuthNostrService extends EventEmitter implements Signer {
       decrypt: this.decrypt44.bind(this),
     };
 
-    // Amberレスポンス検出: ポップアップから戻った時
+    setTimeout(() => this.checkAmberResponse(), 100);
+
     const check = () => {
-      console.log('[AuthNostrService] Checking Amber response');
       this.checkAmberResponse();
     };
 
-    // 主要なイベントで検出（ポーリングは廃止）
     window.addEventListener('focus', check);
     window.addEventListener('visibilitychange', () => {
-      if (document.visibilityState === 'visible') {
-        console.log('[AuthNostrService] Page visible, checking Amber response');
-        check();
-      }
+      if (document.visibilityState === 'visible') check();
     });
     window.addEventListener('popstate', check);
     window.addEventListener('hashchange', check);
 
-    // 初期チェック
-    setTimeout(check, 100);
+    // Periodic check as a safety net
+    setInterval(check, 1000);
 
-    // ポップアップからのメッセージ受信
     window.addEventListener('message', event => {
       if (event.data && event.data.method === 'amberResponse') {
         const { id, type, result } = event.data;
-        console.log('[AuthNostrService] Amber response received via message', { id, type, result });
+        console.log('Amber response received via message', { id, type, result });
         this.handleAmberResponse({ id, type, result });
       }
     });
@@ -109,11 +104,9 @@ class AuthNostrService extends EventEmitter implements Signer {
   private checkAmberResponse() {
     const response = AmberDirectSigner.parseResponse();
     if (response) {
-      console.log('[AuthNostrService] Amber response detected', response);
-
       // If we have an opener and it's not the same window, we are in a popup
       if (window.opener && window.opener !== window) {
-        console.log('[AuthNostrService] In popup, sending response back to opener');
+        console.log('Amber response in popup, sending back to opener');
         window.opener.postMessage({ method: 'amberResponse', ...response }, window.location.origin);
         window.close();
         return;
@@ -126,13 +119,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   private handledAmberIds: Set<string> = new Set();
 
   private handleAmberResponse(response: { id: string; type: string; result: string }) {
-    if (this.handledAmberIds.has(response.id)) {
-      console.log('[AuthNostrService] Amber response already handled:', response.id);
-      return;
-    }
+    if (this.handledAmberIds.has(response.id)) return;
     this.handledAmberIds.add(response.id);
 
-    console.log('[AuthNostrService] Handling Amber response:', response);
+    console.log('Handling Amber response', response);
 
     // Stop the "Connecting..." spinner
     this.emit('onAuthUrl', { url: '' });
@@ -140,21 +130,20 @@ class AuthNostrService extends EventEmitter implements Signer {
     // Resolve pending promises if any (for non-reload cases)
     const resolved = AmberDirectSigner.resolvePending(response.id, response.type, response.result);
     if (resolved) {
-      console.log('[AuthNostrService] Resolved pending Amber promise');
-    } else {
-      // resolvePendingが失敗した場合、ページリロード時などは二度目のログイン
-      console.log('[AuthNostrService] No pending promise, handling as second login');
-      if (response.type === 'get_public_key' || response.type.includes('pub')) {
-        const info: Info = {
-          pubkey: response.result,
-          name: nip19.npubEncode(response.result),
-          authMethod: 'amber' as any,
-          relays: [],
-          signerPubkey: '',
-        };
-        console.log('[AuthNostrService] Amber login success:', info);
-        this.onAuth('login', info);
-      }
+      console.log('Resolved pending Amber promise via resolvePending');
+    }
+
+    if (response.type === 'get_public_key' || response.type.includes('pub')) {
+      const info: Info = {
+        pubkey: response.result,
+        name: nip19.npubEncode(response.result),
+        authMethod: 'amber' as any,
+        relays: [],
+        signerPubkey: '',
+      };
+      console.log('Amber login success', info);
+      this.emit('onUserInfo', info);
+      this.onAuth('login', info);
     }
 
     // URLクリーンアップをより徹底的に
@@ -174,7 +163,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     }
 
     if (changed) {
-      console.log('[AuthNostrService] Cleaning up Amber response URL');
+      console.log('Cleaning up Amber response URL', url.toString());
       window.history.replaceState({}, '', url.toString());
     }
   }
@@ -431,16 +420,8 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async setAmber(info: Info) {
-    console.log('setAmber', info);
-
-    // クリア
     this.releaseSigner();
     this.amberSigner = new AmberDirectSigner(info.pubkey);
-
-    // Amberは署名リクエストをウォレットに投げるだけなので、特別な初期化は不要
-    // signEventなどが直接amberSignerを使用する
-
-    // 認証完了
     this.onAuth('login', info);
   }
 
@@ -676,7 +657,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   private async listen(info: Info) {
-    if (!info.iframeUrl) return this.signer!.listen(this.nostrConnectSecret, 60000);
+    if (!info.iframeUrl) return this.signer!.listen(this.nostrConnectSecret);
     const r = await this.starterReady!.wait();
     if (r[0] === 'starterError') throw new Error(r[1]);
     return this.signer!.setListenReply(r[1], this.nostrConnectSecret);
@@ -737,11 +718,6 @@ class AuthNostrService extends EventEmitter implements Signer {
             remotePubkey: info.signerPubkey!,
             relays: info.relays || [],
             timeoutMs: 30000,
-            useNip44: true,
-            retryConfig: {
-              maxRetries: 3,
-              retryDelayMs: 1000,
-            },
           });
 
           const adapter = new Nip46Adapter(client, localSigner);
@@ -798,44 +774,24 @@ class AuthNostrService extends EventEmitter implements Signer {
       if (domain) info.domain = domain;
       if (iframeUrl) info.iframeUrl = iframeUrl;
 
-      console.log('authNip46', type, info);
-
+      // console.log('nostr login auth info', info);
       if (!info.signerPubkey || !info.sk || !info.relays || info.relays.length === 0) {
-        throw new Error(`Invalid bunker URL format`);
+        throw new Error(`Bad bunker url ${bunkerUrl}`);
       }
 
       const eventToAddAccount = Boolean(this.params.userInfo);
-
-      // 接続モードに応じた処理
-      const connectMode = type === 'login' && !info.token ? 'listen' : 'connect';
-      console.log('authNip46 connection mode:', connectMode);
+      console.log('authNip46', type, info);
 
       // updates the info
-      await this.initSigner(info, {
-        listen: connectMode === 'listen',
-        connect: connectMode === 'connect',
-        eventToAddAccount,
-      });
+      await this.initSigner(info, { connect: true, eventToAddAccount });
 
       // callback
       this.onAuth(type, info);
-    } catch (error: any) {
-      console.error('nostr-login auth failed:', {
-        type,
-        error: error.message,
-        stack: error.stack,
-      });
-
-      // エラーの種類に応じた処理
-      if (error.message.includes('timeout') || error.message.includes('timed out')) {
-        throw new Error('接続がタイムアウトしました。ネットワークを確認してください。');
-      } else if (error.message.includes('Invalid bunker URL')) {
-        throw new Error('無効なbunker URL形式です。');
-      } else if (error.message.includes('publish')) {
-        throw new Error('リレーへの接続に失敗しました。再度お試しください。');
-      } else {
-        throw new Error(`認証に失敗しました: ${error.message}`);
-      }
+    } catch (e) {
+      console.log('nostr login auth failed', e);
+      // make ure it's closed
+      // this.popupManager.closePopup();
+      throw e;
     }
   }