@konemono/nostr-login 1.7.59 → 1.7.60

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -53,12 +53,14 @@ export class AmberDirectSigner implements Signer {
   }
 
   public static resolvePending(id: string, type: string, result: string) {
+    console.log('AmberDirectSigner: resolvePending called', { id, type, pendingCount: this.pendingResolves.size });
+
     // Try resolving by ID first
     let resolve = this.pendingResolves.get(id);
     
     // Fallback: If no ID match, try resolving by type if only one is pending of that type
     if (!resolve) {
-        console.log('No direct ID match for Amber resolve, searching by type', { id, type });
+        console.log('AmberDirectSigner: No direct ID match for resolve, searching by type', { id, type });
         for (const [pendingId, pendingResolve] of this.pendingResolves.entries()) {
             const pending = sessionStorage.getItem(`amber_pending_${pendingId}`);
             if (pending) {
@@ -66,6 +68,7 @@ export class AmberDirectSigner implements Signer {
                 if (pendingType === type) {
                     resolve = pendingResolve;
                     id = pendingId;
+                    console.log('AmberDirectSigner: Found match by type', { id, type });
                     break;
                 }
             }
@@ -73,11 +76,13 @@ export class AmberDirectSigner implements Signer {
     }
 
     if (resolve) {
-        console.log('Resolving pending Amber promise', { id, type });
+        console.log('AmberDirectSigner: Resolving pending promise', { id, type });
         resolve(result);
         this.pendingResolves.delete(id);
         return true;
     }
+    
+    console.log('AmberDirectSigner: No pending promise found to resolve', { id, type });
     return false;
   }
 
@@ -161,36 +166,36 @@ export class AmberDirectSigner implements Signer {
   private generateUrl(content: string, type: string, id: string, recipient?: string): string {
     const callbackUrl = new URL(window.location.origin + window.location.pathname);
     
-    // Preserve other relevant current URL params if necessary, but avoid amber internal ones
-    const currentParams = new URLSearchParams(window.location.search);
-    currentParams.forEach((value, key) => {
-        if (!['amberType', 'amberId', 'signature', 'result', 'pubKey', 'pubkey'].includes(key)) {
-            callbackUrl.searchParams.set(key, value);
-        }
-    });
-
+    // Amber parameters we want to carry back
     callbackUrl.searchParams.set('amberType', type);
     callbackUrl.searchParams.set('amberId', id);
 
     const name = document.title || window.location.hostname || 'Nostr Login';
 
-    const params = new URLSearchParams();
-    params.set('type', type);
-    params.set('id', id);
-    params.set('callbackUrl', callbackUrl.toString());
-    params.set('name', name);
-    params.set('app_name', name); // Alias just in case
+    // NIP-55 standard and some common extensions
+    const params: string[] = [];
+    params.push(`type=${encodeURIComponent(type)}`);
+    params.push(`id=${encodeURIComponent(id)}`);
+    params.push(`callbackUrl=${encodeURIComponent(callbackUrl.toString())}`);
+    
+    // Multi-alias for app name to fix the "null" issue
+    params.push(`name=${encodeURIComponent(name)}`);
+    params.push(`app_name=${encodeURIComponent(name)}`);
+    params.push(`title=${encodeURIComponent(name)}`);
 
     if (recipient) {
-        params.set('pubkey', recipient);
-        params.set('pubKey', recipient); // Alias
+        params.push(`pubkey=${encodeURIComponent(recipient)}`);
+        params.push(`pubKey=${encodeURIComponent(recipient)}`);
+        params.push(`current_user=${encodeURIComponent(recipient)}`);
     } else if (this._pubkey) {
-        params.set('pubkey', this._pubkey);
-        params.set('pubKey', this._pubkey); // Alias
+        params.push(`pubkey=${encodeURIComponent(this._pubkey)}`);
+        params.push(`pubKey=${encodeURIComponent(this._pubkey)}`);
+        params.push(`current_user=${encodeURIComponent(this._pubkey)}`);
     }
 
-    const dataPart = content ? encodeURIComponent(content) : '/';
-    return `nostrsigner:${dataPart}?${params.toString()}`;
+    const dataPart = content ? encodeURIComponent(content) : '';
+    // Format: nostrsigner:<content>?<params>
+    return `nostrsigner:${dataPart}?${params.join('&')}`;
   }
 
   public static parseResponse(): { type: string; id: string; result: string } | null {
@@ -198,14 +203,23 @@ export class AmberDirectSigner implements Signer {
     const params = new URLSearchParams(url.search);
     const hashParams = new URLSearchParams(url.hash.substring(1));
 
+    if (url.search || url.hash) {
+        console.log('AmberDirectSigner: Checking URL for response', { 
+            search: url.search, 
+            hash: url.hash 
+        });
+    }
+
     const getParam = (name: string) => params.get(name) || hashParams.get(name);
 
+    // Support both our custom names and original intent names
     const type = getParam('amberType') || getParam('type');
     const id = getParam('amberId') || getParam('id');
     const result = getParam('signature') || getParam('result') || getParam('pubKey') || getParam('pubkey');
 
     if (type && result) {
-        // ID might be missing in some older redirect cases, but we need it for precise resolution
+        console.log('AmberDirectSigner: Response params detected', { type, id, resultLength: result.length });
+        
         const finalId = id || '';
 
         // Clean up URL

package/src/modules/AuthNostrService.ts

@@ -88,10 +88,19 @@ class AuthNostrService extends EventEmitter implements Signer {
 
     setTimeout(() => this.checkAmberResponse(), 100);
 
-    window.addEventListener('focus', () => {
-      console.log('Window focused, checking Amber response');
+    const check = () => {
       this.checkAmberResponse();
+    };
+
+    window.addEventListener('focus', check);
+    window.addEventListener('visibilitychange', () => {
+        if (document.visibilityState === 'visible') check();
     });
+    window.addEventListener('popstate', check);
+    window.addEventListener('hashchange', check);
+
+    // Periodic check as a safety net
+    setInterval(check, 1000);
   }
 
   private checkAmberResponse() {
@@ -100,7 +109,10 @@ class AuthNostrService extends EventEmitter implements Signer {
       console.log('Amber response detected', response);
 
       // Resolve pending promises if any (for non-reload cases)
-      AmberDirectSigner.resolvePending(response.id, response.type, response.result);
+      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') {
         const info: Info = {
@@ -181,6 +193,8 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (link && !iframeUrl) {
       if (link === 'amber') {
         const signer = new AmberDirectSigner();
+        const url = (signer as any).generateUrl('', 'get_public_key', Math.random().toString(36).substring(7));
+        this.emit('onAuthUrl', { url });
         return (signer as any).getPublicKey(); // will redirect
       }
       window.open(link, '_blank', 'width=400,height=700');