@konemono/nostr-login 1.7.58 → 1.7.59

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -52,10 +52,28 @@ export class AmberDirectSigner implements Signer {
     sessionStorage.setItem(`amber_pending_${id}`, JSON.stringify({ hash, type }));
   }
 
-  public static resolvePending(id: string, result: string) {
-    const resolve = this.pendingResolves.get(id);
+  public static resolvePending(id: string, type: string, result: string) {
+    // 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 });
+        for (const [pendingId, pendingResolve] of this.pendingResolves.entries()) {
+            const pending = sessionStorage.getItem(`amber_pending_${pendingId}`);
+            if (pending) {
+                const { type: pendingType } = JSON.parse(pending);
+                if (pendingType === type) {
+                    resolve = pendingResolve;
+                    id = pendingId;
+                    break;
+                }
+            }
+        }
+    }
+
     if (resolve) {
-        console.log('Resolving pending Amber promise', id);
+        console.log('Resolving pending Amber promise', { id, type });
         resolve(result);
         this.pendingResolves.delete(id);
         return true;
@@ -142,32 +160,37 @@ 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);
+        }
+    });
+
     callbackUrl.searchParams.set('amberType', type);
     callbackUrl.searchParams.set('amberId', id);
 
-    const action = `com.greenart7c3.nostrsigner.${type.toUpperCase()}`;
     const name = document.title || window.location.hostname || 'Nostr Login';
 
-    const params = [
-        `S.type=${encodeURIComponent(type)}`,
-        `S.name=${encodeURIComponent(name)}`,
-        `S.callbackUrl=${encodeURIComponent(callbackUrl.toString())}`,
-        `S.id=${encodeURIComponent(id)}`
-    ];
+    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
 
     if (recipient) {
-        params.push(`S.pubKey=${encodeURIComponent(recipient)}`);
+        params.set('pubkey', recipient);
+        params.set('pubKey', recipient); // Alias
     } else if (this._pubkey) {
-        params.push(`S.pubKey=${encodeURIComponent(this._pubkey)}`);
+        params.set('pubkey', this._pubkey);
+        params.set('pubKey', this._pubkey); // Alias
     }
 
-    if (type === 'sign_event') {
-        params.push(`S.event=${encodeURIComponent(content)}`);
-    } else {
-        params.push(`S.content=${encodeURIComponent(content)}`);
-    }
-
-    return `intent:#Intent;action=${action};package=com.greenart7c3.nostrsigner;${params.join(';')};end`;
+    const dataPart = content ? encodeURIComponent(content) : '/';
+    return `nostrsigner:${dataPart}?${params.toString()}`;
   }
 
   public static parseResponse(): { type: string; id: string; result: string } | null {
@@ -175,19 +198,25 @@ export class AmberDirectSigner implements Signer {
     const params = new URLSearchParams(url.search);
     const hashParams = new URLSearchParams(url.hash.substring(1));
 
-    const type = params.get('amberType') || hashParams.get('amberType');
-    const id = params.get('amberId') || hashParams.get('amberId');
-    const result = params.get('signature') || params.get('result') || params.get('pubKey') || params.get('pubkey') ||
-        hashParams.get('signature') || hashParams.get('result') || hashParams.get('pubKey') || hashParams.get('pubkey');
+    const getParam = (name: string) => params.get(name) || hashParams.get(name);
+
+    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
+        const finalId = id || '';
 
-    if (type && id && result) {
         // Clean up URL
         const newUrl = new URL(window.location.href);
-        ['amberType', 'amberId', 'signature', 'result', 'pubKey', 'pubkey'].forEach(p => newUrl.searchParams.delete(p));
+        ['amberType', 'amberId', 'signature', 'result', 'pubKey', 'pubkey', 'type', 'id'].forEach(p => {
+            newUrl.searchParams.delete(p);
+        });
         newUrl.hash = ''; 
         window.history.replaceState({}, '', newUrl.toString());
 
-        return { type, id, result };
+        return { type, id: finalId, result };
     }
     return null;
   }

package/src/modules/AuthNostrService.ts

@@ -100,7 +100,7 @@ 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.result);
+      AmberDirectSigner.resolvePending(response.id, response.type, response.result);
 
       if (response.type === 'get_public_key') {
         const info: Info = {