@konemono/nostr-login 1.7.63 → 1.7.65

package/package.json

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

package/src/index.ts

@@ -148,7 +148,11 @@ export class NostrLoginInitializer {
   }
 
   private openPopup(url: string) {
-    this.popupManager.openPopup(url);
+    if (url.startsWith('nostrsigner:')) {
+      window.location.href = url;
+    } else {
+      this.popupManager.openPopup(url);
+    }
   }
 
   private async switchAccount(info: Info, signup = false) {

package/src/modules/AmberDirectSigner.ts

@@ -27,83 +27,89 @@ export class AmberDirectSigner implements Signer {
         decrypt: (pubkey: string, ciphertext: string) => this.decrypt44(pubkey, ciphertext),
     };
 
-    public async getPublicKey(): Promise<string> {
-        const id = Math.random().toString(36).substring(7);
+    public async getPublicKey(id?: string): Promise<string> {
+        id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl('', 'get_public_key', id);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id, resolve);
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
     }
 
-    public async signEvent(event: any): Promise<any> {
-        const id = Math.random().toString(36).substring(7);
+    public async signEvent(event: any, id?: string): Promise<any> {
+        id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(JSON.stringify(event), 'sign_event', id);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id, (result: string) => {
+            AmberDirectSigner.pendingResolves.set(id!, (result: string) => {
                 resolve(JSON.parse(result));
             });
         });
     }
 
-    public async encrypt04(pubkey: string, plaintext: string): Promise<string> {
-        const id = Math.random().toString(36).substring(7);
+    public async encrypt04(pubkey: string, plaintext: string, id?: string): Promise<string> {
+        id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(plaintext, 'nip04_encrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id, resolve);
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
     }
 
-    public async decrypt04(pubkey: string, ciphertext: string): Promise<string> {
-        const id = Math.random().toString(36).substring(7);
+    public async decrypt04(pubkey: string, ciphertext: string, id?: string): Promise<string> {
+        id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(ciphertext, 'nip04_decrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id, resolve);
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
     }
 
-    public async encrypt44(pubkey: string, plaintext: string): Promise<string> {
-        const id = Math.random().toString(36).substring(7);
+    public async encrypt44(pubkey: string, plaintext: string, id?: string): Promise<string> {
+        id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(plaintext, 'nip44_encrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id, resolve);
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
     }
 
-    public async decrypt44(pubkey: string, ciphertext: string): Promise<string> {
-        const id = Math.random().toString(36).substring(7);
+    public async decrypt44(pubkey: string, ciphertext: string, id?: string): Promise<string> {
+        id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(ciphertext, 'nip44_decrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id, resolve);
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
     }
 
 
-    private generateUrl(content: string, type: string, id: string, pubkey?: string): string {
+    public generateUrl(content: string, type: string, id: string, pubkey?: string): string {
         const callbackUrl = window.location.href.split('#')[0].split('?')[0];
         const encodedContent = encodeURIComponent(content || '');
         const encodedCallback = encodeURIComponent(callbackUrl);
 
-        // ★ 追加: sessionStorageに保存（これが無い）
         sessionStorage.setItem('amber_last_type', type);
         sessionStorage.setItem('amber_last_id', id);
         sessionStorage.setItem('amber_last_timestamp', Date.now().toString());
 
         // NIP-55準拠: nostrsigner: スキーム
         let url = `nostrsigner:${encodedContent}`;
-        url += `?compressionType=none`;
-        url += `&returnType=signature`;
-        url += `&type=${type}`;
-        url += `&callbackUrl=${encodedCallback}`;
-        if (pubkey) url += `&pubkey=${pubkey}`;
-        if (this._pubkey) url += `&current_user=${this._pubkey}`; // ★ 追加
-
-        return url;
+        const params = new URLSearchParams();
+        params.append('compressionType', 'none');
+        params.append('returnType', 'signature');
+        params.append('type', type);
+        params.append('callbackUrl', callbackUrl);
+        if (pubkey) params.append('pubkey', pubkey);
+        if (this._pubkey) params.append('current_user', this._pubkey);
+
+        return `${url}?${params.toString()}`;
     }
 
     // AmberDirectSigner.ts の parseResponse を拡張

package/src/modules/AuthNostrService.ts

@@ -193,9 +193,21 @@ 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.amberSigner = signer;
+
+        const id = Math.random().toString(36).substring(7);
+        const url = signer.generateUrl('', 'get_public_key', id);
         this.emit('onAuthUrl', { url });
-        return (signer as any).getPublicKey(); // will redirect
+
+        const pubkey = await signer.getPublicKey(id);
+
+        const info: Info = {
+          pubkey,
+          authMethod: 'amber' as any,
+        };
+
+        this.onAuth('login', info);
+        return info;
       }
       window.open(link, '_blank', 'width=400,height=700');
     }
@@ -575,7 +587,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     return !!this.readyCallback;
   }
 
-  public async startAuth() {
+  public startAuth() {
     console.log("startAuth");
     if (this.readyCallback) throw new Error('Already started');
 

package/src/modules/ModalManager.ts

@@ -27,7 +27,7 @@ class ModalManager extends EventEmitter {
     if (this.launcherPromise) {
       try {
         await this.launcherPromise;
-      } catch {}
+      } catch { }
       this.launcherPromise = undefined;
     }
   }
@@ -141,7 +141,7 @@ class ModalManager extends EventEmitter {
         }
 
         try {
-          if (!options || options.start) await this.authNostrService.startAuth();
+          if (!options || options.start) this.authNostrService.startAuth();
           await body();
           if (!options || options.end) await done(ok);
         } catch (e: any) {