@konemono/nostr-login 1.7.62 → 1.7.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.7.62",
+  "version": "1.7.64",
   "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

@@ -2,141 +2,161 @@ import { AmberResponse } from '../types';
 import { Signer } from './Nostr';
 
 export class AmberDirectSigner implements Signer {
-  private _pubkey: string;
-  private static pendingResolves: Map<string, (result: string) => void> = new Map();
-
-  constructor(pubkey: string = '') {
-    this._pubkey = pubkey;
-  }
-
-  get pubkey() {
-    return this._pubkey;
-  }
-
-  set pubkey(v: string) {
-    this._pubkey = v;
-  }
-
-  public nip04 = {
-    encrypt: (pubkey: string, plaintext: string) => this.encrypt04(pubkey, plaintext),
-    decrypt: (pubkey: string, ciphertext: string) => this.decrypt04(pubkey, ciphertext),
-  };
-
-  public nip44 = {
-    encrypt: (pubkey: string, plaintext: string) => this.encrypt44(pubkey, plaintext),
-    decrypt: (pubkey: string, ciphertext: string) => this.decrypt44(pubkey, ciphertext),
-  };
-
-  public async getPublicKey(): Promise<string> {
-    const id = Math.random().toString(36).substring(7);
-    const url = this.generateUrl('', 'get_public_key', id);
-    window.location.href = url;
-    return new Promise((resolve) => {
-      AmberDirectSigner.pendingResolves.set(id, resolve);
-    });
-  }
-
-  public async signEvent(event: any): Promise<any> {
-    const id = Math.random().toString(36).substring(7);
-    const url = this.generateUrl(JSON.stringify(event), 'sign_event', id);
-    window.location.href = url;
-    return new Promise((resolve) => {
-      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);
-    const url = this.generateUrl(plaintext, 'nip04_encrypt', id, pubkey);
-    window.location.href = url;
-    return new Promise((resolve) => {
-      AmberDirectSigner.pendingResolves.set(id, resolve);
-    });
-  }
-
-  public async decrypt04(pubkey: string, ciphertext: string): Promise<string> {
-    const id = Math.random().toString(36).substring(7);
-    const url = this.generateUrl(ciphertext, 'nip04_decrypt', id, pubkey);
-    window.location.href = url;
-    return new Promise((resolve) => {
-      AmberDirectSigner.pendingResolves.set(id, resolve);
-    });
-  }
-
-  public async encrypt44(pubkey: string, plaintext: string): Promise<string> {
-    const id = Math.random().toString(36).substring(7);
-    const url = this.generateUrl(plaintext, 'nip44_encrypt', id, pubkey);
-    window.location.href = url;
-    return new Promise((resolve) => {
-      AmberDirectSigner.pendingResolves.set(id, resolve);
-    });
-  }
-
-  public async decrypt44(pubkey: string, ciphertext: string): Promise<string> {
-    const id = Math.random().toString(36).substring(7);
-    const url = this.generateUrl(ciphertext, 'nip44_decrypt', id, pubkey);
-    window.location.href = url;
-    return new Promise((resolve) => {
-      AmberDirectSigner.pendingResolves.set(id, resolve);
-    });
-  }
-
-
-private 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;
-}
+    private _pubkey: string;
+    private static pendingResolves: Map<string, (result: string) => void> = new Map();
 
-static parseResponse(): AmberResponse | null  {
-  // NIP-55準拠: クエリパラメータから取得
-  const url = new URL(window.location.href);
-  const result = url.searchParams.get('event');
-  
-  if (!result) return null;
-  
-  // ★ sessionStorageから id と type を取得
-  const id = sessionStorage.getItem('amber_last_id');
-  const type = sessionStorage.getItem('amber_last_type');
-  
-  // ★ sessionStorage をクリーンアップ
-  sessionStorage.removeItem('amber_last_id');
-  sessionStorage.removeItem('amber_last_type');
-  sessionStorage.removeItem('amber_last_timestamp');
-  
-  // ★ id と type が存在する場合のみ返す
-  if (id && type) {
-    return { id, type, result };
-  }
-  
-  return null;
-}
+    constructor(pubkey: string = '') {
+        this._pubkey = pubkey;
+    }
+
+    get pubkey() {
+        return this._pubkey;
+    }
+
+    set pubkey(v: string) {
+        this._pubkey = v;
+    }
+
+    public nip04 = {
+        encrypt: (pubkey: string, plaintext: string) => this.encrypt04(pubkey, plaintext),
+        decrypt: (pubkey: string, ciphertext: string) => this.decrypt04(pubkey, ciphertext),
+    };
+
+    public nip44 = {
+        encrypt: (pubkey: string, plaintext: string) => this.encrypt44(pubkey, plaintext),
+        decrypt: (pubkey: string, ciphertext: string) => this.decrypt44(pubkey, ciphertext),
+    };
+
+    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;
+        return new Promise((resolve) => {
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
+        });
+    }
+
+    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;
+        return new Promise((resolve) => {
+            AmberDirectSigner.pendingResolves.set(id!, (result: string) => {
+                resolve(JSON.parse(result));
+            });
+        });
+    }
+
+    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;
+        return new Promise((resolve) => {
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
+        });
+    }
+
+    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;
+        return new Promise((resolve) => {
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
+        });
+    }
+
+    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;
+        return new Promise((resolve) => {
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
+        });
+    }
+
+    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;
+        return new Promise((resolve) => {
+            AmberDirectSigner.pendingResolves.set(id!, resolve);
+        });
+    }
+
+
+    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;
+    }
+
+    // AmberDirectSigner.ts の parseResponse を拡張
+
+    static parseResponse(): AmberResponse | null {
+        const url = new URL(window.location.href);
+
+        // パターン1: NIP-55標準 (?event=...)
+        let result = url.searchParams.get('event');
+
+        // パターン2: パス末尾にhexId (/<hexId>)
+        if (!result) {
+            const pathParts = url.pathname.split('/').filter(Boolean);
+            if (pathParts.length > 0) {
+                const lastPart = pathParts[pathParts.length - 1];
+                // hexIdっぽい（64文字の16進数）
+                if (/^[0-9a-f]{64}$/i.test(lastPart)) {
+                    result = lastPart;
+                }
+            }
+        }
+
+        console.log('Amber response detection:', {
+            href: window.location.href,
+            eventParam: url.searchParams.get('event'),
+            pathResult: result,
+            sessionId: sessionStorage.getItem('amber_last_id'),
+            sessionType: sessionStorage.getItem('amber_last_type')
+        });
+
+        if (!result) return null;
+
+        const id = sessionStorage.getItem('amber_last_id');
+        const type = sessionStorage.getItem('amber_last_type');
+
+        sessionStorage.removeItem('amber_last_id');
+        sessionStorage.removeItem('amber_last_type');
+        sessionStorage.removeItem('amber_last_timestamp');
+
+        if (id && type) {
+            return { id, type, result };
+        }
+
+        return null;
+    }
 
-  static resolvePending(id: string, type: string, result: string): boolean {
-    const resolve = this.pendingResolves.get(id);
-    if (resolve) {
-      this.pendingResolves.delete(id);
-      resolve(result);
-      return true;
+    static resolvePending(id: string, type: string, result: string): boolean {
+        const resolve = this.pendingResolves.get(id);
+        if (resolve) {
+            this.pendingResolves.delete(id);
+            resolve(result);
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 }

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');
     }