@konemono/nostr-login 1.7.69 → 1.8.0

package/dist/utils/index.d.ts

@@ -1,12 +1,11 @@
 import { Info, RecentType } from 'nostr-login-components/dist/types/types';
-import NDK, { NDKSigner } from '@nostr-dev-kit/ndk';
 import { NostrLoginOptions } from '../types';
 export declare const localStorageSetItem: (key: string, value: string) => void;
 export declare const localStorageGetItem: (key: string) => any;
 export declare const localStorageRemoveItem: (key: string) => void;
-export declare const fetchProfile: (info: Info, profileNdk: NDK) => Promise<import("@nostr-dev-kit/ndk").NDKUserProfile | null>;
+export declare const fetchProfile: (info: Info, profileNdkOrRelays?: any) => Promise<any>;
 export declare const prepareSignupRelays: (signupRelays?: string) => string[];
-export declare const createProfile: (info: Info, profileNdk: NDK, signer: NDKSigner, signupRelays?: string, outboxRelays?: string[]) => Promise<void>;
+export declare const createProfile: (info: Info, signer: any, signupRelays?: string, outboxRelays?: string[]) => Promise<void>;
 export declare const bunkerUrlToInfo: (bunkerUrl: string, sk?: string) => Info;
 export declare const isBunkerUrl: (value: string) => boolean;
 export declare const getBunkerUrl: (value: string, optionsModal: NostrLoginOptions) => Promise<string>;

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.7.69",
+  "version": "1.8.0",
   "description": "",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
   "type": "module",
   "scripts": {
     "build": "rollup -c",
-    "format": "npx prettier --write src"
+    "format": "npx prettier --write src",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "author": "a-fralou",
   "dependencies": {
-    "@nostr-dev-kit/ndk": "^2.3.1",
     "nostr-tools": "^1.17.0",
     "tseep": "^1.2.1"
   },
@@ -22,7 +23,9 @@
     "nostr-login-components": "^1.0.3",
     "prettier": "^3.2.2",
     "rollup": "^4.9.6",
-    "rollup-plugin-typescript2": "^0.36.0"
+    "rollup-plugin-typescript2": "^0.36.0",
+    "vitest": "^1.0.0",
+    "@types/node": "^18.0.0"
   },
   "license": "MIT"
 }

package/src/index.ts

@@ -149,7 +149,7 @@ export class NostrLoginInitializer {
 
   private openPopup(url: string) {
     if (url.startsWith('nostrsigner:')) {
-      window.location.href = url;
+      window.open(url, '_blank', 'width=400,height=600');
     } else {
       this.popupManager.openPopup(url);
     }

package/src/modules/AmberDirectSigner.ts

@@ -2,170 +2,227 @@ 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),
+  private _pubkey: string;
+  private static pendingResolves: Map<string, { resolve: (result: string) => void; timer: NodeJS.Timeout | null }> = 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(id?: string): Promise<string> {
+    id = id || Math.random().toString(36).substring(7);
+    const url = this.generateUrl('', 'get_public_key', id);
+    console.log('Amber redirecting to:', url);
+    window.open(url, '_blank', 'width=400,height=600');
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        AmberDirectSigner.pendingResolves.delete(id!);
+        reject(new Error('AmberDirectSigner timeout'));
+      }, 20000);
+      AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
+    });
+  }
+
+  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);
+    console.log('Amber redirecting to:', url);
+    window.open(url, '_blank', 'width=400,height=600');
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        AmberDirectSigner.pendingResolves.delete(id!);
+        reject(new Error('AmberDirectSigner timeout'));
+      }, 20000);
+      AmberDirectSigner.pendingResolves.set(id!, {
+        resolve: (result: string) => {
+          try {
+            resolve(JSON.parse(result));
+          } catch (e) {
+            resolve(result as any);
+          }
+        },
+        timer,
+      });
+    });
+  }
+
+  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);
+    console.log('Amber redirecting to:', url);
+    window.open(url, '_blank', 'width=400,height=600');
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        AmberDirectSigner.pendingResolves.delete(id!);
+        reject(new Error('AmberDirectSigner timeout'));
+      }, 20000);
+      AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
+    });
+  }
+
+  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);
+    console.log('Amber redirecting to:', url);
+    window.open(url, '_blank', 'width=400,height=600');
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        AmberDirectSigner.pendingResolves.delete(id!);
+        reject(new Error('AmberDirectSigner timeout'));
+      }, 20000);
+      AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
+    });
+  }
+
+  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);
+    console.log('Amber redirecting to:', url);
+    window.open(url, '_blank', 'width=400,height=600');
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        AmberDirectSigner.pendingResolves.delete(id!);
+        reject(new Error('AmberDirectSigner timeout'));
+      }, 20000);
+      AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
+    });
+  }
+
+  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);
+    console.log('Amber redirecting to:', url);
+    window.open(url, '_blank', 'width=400,height=600');
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        AmberDirectSigner.pendingResolves.delete(id!);
+        reject(new Error('AmberDirectSigner timeout'));
+      }, 20000);
+      AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
+    });
+  }
+
+  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);
+
+    localStorage.setItem('amber_last_type', type);
+    localStorage.setItem('amber_last_id', id);
+    localStorage.setItem('amber_last_timestamp', Date.now().toString());
+
+    // NIP-55準拠: nostrsigner: スキーム
+    let url = `nostrsigner:${encodedContent}`;
+    const params = new URLSearchParams();
+    params.append('compressionType', 'none');
+    params.append('returnType', 'signature');
+    params.append('type', type);
+    params.append('callbackUrl', callbackUrl);
+
+    // 三重の冗長性でアプリ名を渡す
+    const appName = document.title || window.location.hostname;
+    params.append('name', appName);
+    params.append('appName', appName);
+    params.append('app', appName);
+
+    // NIP-46互換のmetadata形式も追加
+    const metadata = {
+      name: appName,
+      url: window.location.origin,
+      description: 'Nostr Login provided by nostr-login library',
     };
+    params.append('metadata', JSON.stringify(metadata));
 
-    public nip44 = {
-        encrypt: (pubkey: string, plaintext: string) => this.encrypt44(pubkey, plaintext),
-        decrypt: (pubkey: string, ciphertext: string) => this.decrypt44(pubkey, ciphertext),
-    };
+    if (pubkey) params.append('pubkey', pubkey);
+    if (this._pubkey) params.append('current_user', this._pubkey);
 
-    public async getPublicKey(id?: string): Promise<string> {
-        id = id || Math.random().toString(36).substring(7);
-        const url = this.generateUrl('', 'get_public_key', id);
-        console.log('Amber redirecting to:', url);
-        window.location.assign(url);
-        return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id!, resolve);
-        });
-    }
+    return `${url}?${params.toString()}`;
+  }
 
-    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);
-        console.log('Amber redirecting to:', url);
-        window.location.assign(url);
-        return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id!, (result: string) => {
-                resolve(JSON.parse(result));
-            });
-        });
-    }
+  // AmberDirectSigner.ts の parseResponse を拡張
 
-    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);
-        console.log('Amber redirecting to:', url);
-        window.location.assign(url);
-        return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id!, resolve);
-        });
-    }
+  static parseResponse(): AmberResponse | null {
+    const url = new URL(window.location.href);
 
-    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);
-        console.log('Amber redirecting to:', url);
-        window.location.assign(url);
-        return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id!, resolve);
-        });
-    }
+    // パターン1: NIP-55標準 (?event=...)
+    let result = url.searchParams.get('event');
 
-    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);
-        console.log('Amber redirecting to:', url);
-        window.location.assign(url);
-        return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id!, resolve);
-        });
+    // パターン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;
+        }
+      }
     }
 
-    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);
-        console.log('Amber redirecting to:', url);
-        window.location.assign(url);
-        return new Promise((resolve) => {
-            AmberDirectSigner.pendingResolves.set(id!, resolve);
-        });
+    if (result) {
+      console.log('Amber response detection:', {
+        href: window.location.href,
+        eventParam: url.searchParams.get('event'),
+        pathResult: result,
+        sessionId: localStorage.getItem('amber_last_id'),
+        sessionType: localStorage.getItem('amber_last_type'),
+      });
     }
 
+    if (!result) return null;
 
-    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);
-
-        localStorage.setItem('amber_last_type', type);
-        localStorage.setItem('amber_last_id', id);
-        localStorage.setItem('amber_last_timestamp', Date.now().toString());
+    const id = localStorage.getItem('amber_last_id');
+    const type = localStorage.getItem('amber_last_type');
 
-        // NIP-55準拠: nostrsigner: スキーム
-        let url = `nostrsigner:${encodedContent}`;
-        const params = new URLSearchParams();
-        params.append('compressionType', 'none');
-        params.append('returnType', 'signature');
-        params.append('type', type);
-        params.append('callbackUrl', callbackUrl);
-        params.append('name', window.location.hostname);
-        if (pubkey) params.append('pubkey', pubkey);
-        if (this._pubkey) params.append('current_user', this._pubkey);
+    localStorage.removeItem('amber_last_id');
+    localStorage.removeItem('amber_last_type');
+    localStorage.removeItem('amber_last_timestamp');
 
-        return `${url}?${params.toString()}`;
+    if (id && type) {
+      return { id, type, result };
     }
 
-    // AmberDirectSigner.ts の parseResponse を拡張
+    return null;
+  }
 
-    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;
-                }
-            }
-        }
-
-        if (result) {
-            console.log('Amber response detection:', {
-                href: window.location.href,
-                eventParam: url.searchParams.get('event'),
-                pathResult: result,
-                sessionId: localStorage.getItem('amber_last_id'),
-                sessionType: localStorage.getItem('amber_last_type')
-            });
-        }
-
-        if (!result) return null;
-
-        const id = localStorage.getItem('amber_last_id');
-        const type = localStorage.getItem('amber_last_type');
-
-        localStorage.removeItem('amber_last_id');
-        localStorage.removeItem('amber_last_type');
-        localStorage.removeItem('amber_last_timestamp');
-
-        if (id && type) {
-            return { id, type, result };
-        }
-
-        return null;
+  static resolvePending(id: string, type: string, result: string): boolean {
+    const entry = this.pendingResolves.get(id);
+    if (entry) {
+      this.pendingResolves.delete(id);
+      if (entry.timer) clearTimeout(entry.timer);
+      entry.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;
+  }
+
+  static cleanupPending() {
+    for (const [id, entry] of this.pendingResolves) {
+      try {
+        if (entry.timer) clearTimeout(entry.timer);
+        entry.resolve('');
+      } catch (e) {
+        // ignore
+      }
     }
+    this.pendingResolves.clear();
+  }
 }