@konemono/nostr-login 1.9.1 → 1.9.3

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -123,8 +123,12 @@ export class AmberDirectSigner implements Signer {
   }
 
   public generateUrl(content: string, type: string, id: string, pubkey?: string): string {
-    const callbackUrl = window.location.href.split('#')[0].split('?')[0];
+    const baseUrl = window.location.href.split('#')[0].split('?')[0];
     const encodedContent = encodeURIComponent(content || '');
+
+    // callbackUrl にはベースURLに結果パラメータのプレースホルダーを含める
+    // Amberが戻ってくる時に ?event=<result> が追加される
+    const callbackUrl = `${baseUrl}?event={result}`;
     const encodedCallback = encodeURIComponent(callbackUrl);
 
     localStorage.setItem('amber_last_type', type);

package/src/modules/AuthNostrService.ts

@@ -141,18 +141,20 @@ class AuthNostrService extends EventEmitter implements Signer {
     const resolved = AmberDirectSigner.resolvePending(response.id, response.type, response.result);
     if (resolved) {
       console.log('[AuthNostrService] Resolved pending Amber promise');
-    }
-
-    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);
+    } 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クリーンアップをより徹底的に