@konemono/nostr-login 1.7.55 → 1.7.57

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -119,42 +119,40 @@ export class AmberDirectSigner implements Signer {
   }
 
   private generateUrl(content: string, type: string, id: string, recipient?: string): string {
-    const callbackUrl = new URL(window.location.href);
-    callbackUrl.searchParams.set('amberType', type);
-    callbackUrl.searchParams.set('amberId', id);
+    const url = new URL(window.location.origin + window.location.pathname);
+    url.searchParams.set('amberType', type);
+    url.searchParams.set('amberId', id);
 
     const params = new URLSearchParams();
     params.set('type', type);
     params.set('id', id);
-    params.set('callbackUrl', callbackUrl.toString());
-    if (this._pubkey) params.set('pubkey', this._pubkey);
-    if (recipient) params.set('pubkey', recipient); // Amber uses pubkey param for recipient in encrypt/decrypt
+    params.set('callbackUrl', url.toString());
+    params.set('name', document.title || window.location.hostname || 'Nostr Login');
+    if (recipient) {
+      params.set('pubkey', recipient);
+    } else if (this._pubkey) {
+      params.set('pubkey', this._pubkey);
+    }
 
-    return `nostrsigner:${encodeURIComponent(content)}?${params.toString()}`;
+    const dataPart = content ? encodeURIComponent(content) : '/';
+    return `nostrsigner:${dataPart}?${params.toString()}`;
   }
 
   public static parseResponse(): { type: string; id: string; result: string } | null {
-    const params = new URLSearchParams(window.location.search);
-    let type = params.get('amberType');
-    let id = params.get('amberId');
-    let result = params.get('signature') || params.get('result'); // Amber uses signature for events, result for others?
-
-    // Also check hash
-    if (!type || !id || !result) {
-      const hashParams = new URLSearchParams(window.location.hash.substring(1));
-      type = type || hashParams.get('amberType');
-      id = id || hashParams.get('amberId');
-      result = result || hashParams.get('signature') || hashParams.get('result');
-    }
+    const url = new URL(window.location.href);
+    const params = new URLSearchParams(url.search);
+    const hashParams = new URLSearchParams(url.hash.substring(1));
+
+    let type = params.get('amberType') || hashParams.get('amberType');
+    let id = params.get('amberId') || hashParams.get('amberId');
+    let result = params.get('signature') || params.get('result') || params.get('pubKey') ||
+                 hashParams.get('signature') || hashParams.get('result') || hashParams.get('pubKey');
 
     if (type && id && result) {
       // Clean up URL
       const newUrl = new URL(window.location.href);
-      newUrl.searchParams.delete('amberType');
-      newUrl.searchParams.delete('amberId');
-      newUrl.searchParams.delete('signature');
-      newUrl.searchParams.delete('result');
-      newUrl.hash = ''; // Clear hash too
+      ['amberType', 'amberId', 'signature', 'result', 'pubKey'].forEach(p => newUrl.searchParams.delete(p));
+      newUrl.hash = ''; 
       window.history.replaceState({}, '', newUrl.toString());
 
       return { type, id, result };

package/src/modules/AuthNostrService.ts

@@ -86,17 +86,24 @@ class AuthNostrService extends EventEmitter implements Signer {
       decrypt: this.decrypt44.bind(this),
     };
 
-    setTimeout(() => this.checkAmberResponse(), 500);
+    setTimeout(() => this.checkAmberResponse(), 100);
+
+    window.addEventListener('focus', () => {
+      console.log('Window focused, checking Amber response');
+      this.checkAmberResponse();
+    });
   }
 
   private checkAmberResponse() {
     const response = AmberDirectSigner.parseResponse();
     if (response) {
+      console.log('Amber response detected', response);
       if (response.type === 'get_public_key') {
         const info: Info = {
           pubkey: response.result,
           authMethod: 'amber' as any,
         };
+        console.log('Amber login success', info);
         this.onAuth('login', info);
       } else {
         const pendingKey = `amber_pending_${response.id}`;