@konemono/nostr-login 1.9.0 → 1.9.2

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -30,12 +30,14 @@ export class AmberDirectSigner implements Signer {
   public async getPublicKey(id?: string): Promise<string> {
     id = id || Math.random().toString(36).substring(7);
     const url = this.generateUrl('', 'get_public_key', id);
-    console.log('Amber redirecting to:', url);
+    console.log('[AmberDirectSigner] Requesting public key, URL:', url.substring(0, 100) + '...');
     window.open(url, '_blank', 'width=400,height=600');
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         AmberDirectSigner.pendingResolves.delete(id!);
-        reject(new Error('AmberDirectSigner timeout'));
+        const error = new Error('[AmberDirectSigner] getPublicKey timeout after 20s');
+        console.error(error.message);
+        reject(error);
       }, 20000);
       AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
     });
@@ -208,9 +210,11 @@ export class AmberDirectSigner implements Signer {
     if (entry) {
       this.pendingResolves.delete(id);
       if (entry.timer) clearTimeout(entry.timer);
+      console.log('[AmberDirectSigner] Resolving pending:', { id, type, resultLen: result.length });
       entry.resolve(result);
       return true;
     }
+    console.warn('[AmberDirectSigner] No pending resolve found for:', id);
     return false;
   }
 

package/src/modules/AuthNostrService.ts

@@ -76,26 +76,31 @@ class AuthNostrService extends EventEmitter implements Signer {
       decrypt: this.decrypt44.bind(this),
     };
 
-    setTimeout(() => this.checkAmberResponse(), 100);
-
+    // Amberレスポンス検出: ポップアップから戻った時
     const check = () => {
+      console.log('[AuthNostrService] Checking Amber response');
       this.checkAmberResponse();
     };
 
+    // 主要なイベントで検出（ポーリングは廃止）
     window.addEventListener('focus', check);
     window.addEventListener('visibilitychange', () => {
-      if (document.visibilityState === 'visible') check();
+      if (document.visibilityState === 'visible') {
+        console.log('[AuthNostrService] Page visible, checking Amber response');
+        check();
+      }
     });
     window.addEventListener('popstate', check);
     window.addEventListener('hashchange', check);
 
-    // Periodic check as a safety net
-    setInterval(check, 1000);
+    // 初期チェック
+    setTimeout(check, 100);
 
+    // ポップアップからのメッセージ受信
     window.addEventListener('message', event => {
       if (event.data && event.data.method === 'amberResponse') {
         const { id, type, result } = event.data;
-        console.log('Amber response received via message', { id, type, result });
+        console.log('[AuthNostrService] Amber response received via message', { id, type, result });
         this.handleAmberResponse({ id, type, result });
       }
     });
@@ -104,9 +109,11 @@ 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('Amber response in popup, sending back to opener');
+        console.log('[AuthNostrService] In popup, sending response back to opener');
         window.opener.postMessage({ method: 'amberResponse', ...response }, window.location.origin);
         window.close();
         return;
@@ -119,10 +126,13 @@ 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)) return;
+    if (this.handledAmberIds.has(response.id)) {
+      console.log('[AuthNostrService] Amber response already handled:', response.id);
+      return;
+    }
     this.handledAmberIds.add(response.id);
 
-    console.log('Handling Amber response', response);
+    console.log('[AuthNostrService] Handling Amber response:', response);
 
     // Stop the "Connecting..." spinner
     this.emit('onAuthUrl', { url: '' });
@@ -130,19 +140,21 @@ 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('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.onAuth('login', info);
+      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);
+      }
     }
 
     // URLクリーンアップをより徹底的に
@@ -162,7 +174,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     }
 
     if (changed) {
-      console.log('Cleaning up Amber response URL', url.toString());
+      console.log('[AuthNostrService] Cleaning up Amber response URL');
       window.history.replaceState({}, '', url.toString());
     }
   }
@@ -419,8 +431,16 @@ 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);
   }