@konemono/nostr-login 1.9.12 → 1.9.14

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -30,14 +30,12 @@ export class AmberDirectSigner implements Signer {
   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('[AmberDirectSigner] Requesting public key, URL:', url.substring(0, 100) + '...');
+    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!);
-        const error = new Error('[AmberDirectSigner] getPublicKey timeout after 20s');
-        console.error(error.message);
-        reject(error);
+        reject(new Error('AmberDirectSigner timeout'));
       }, 20000);
       AmberDirectSigner.pendingResolves.set(id!, { resolve, timer });
     });
@@ -123,12 +121,9 @@ export class AmberDirectSigner implements Signer {
   }
 
   public generateUrl(content: string, type: string, id: string, pubkey?: string): string {
-    const baseUrl = window.location.href.split('#')[0].split('?')[0];
+    const callbackUrl = window.location.href.split('#')[0].split('?')[0];
     const encodedContent = encodeURIComponent(content || '');
-
-    // callbackUrl にはベースURLだけを渡す
-    // Amberが自動的に ?event=<result> を追加する (NIP-55)
-    const callbackUrl = baseUrl;
+    const encodedCallback = encodeURIComponent(callbackUrl);
 
     localStorage.setItem('amber_last_type', type);
     localStorage.setItem('amber_last_id', id);
@@ -170,13 +165,6 @@ export class AmberDirectSigner implements Signer {
     // パターン1: NIP-55標準 (?event=...)
     let result = url.searchParams.get('event');
 
-    // Amberが壊れた{result}プレースホルダーを返した場合のクリーンアップ
-    // 例: ?event=result}5650178... → 5650178...
-    if (result && result.includes('result}')) {
-      result = result.replace(/^result\}/, '');
-      console.log('[AmberDirectSigner] Cleaned up malformed result:', result);
-    }
-
     // パターン2: パス末尾にhexId (/<hexId>)
     if (!result) {
       const pathParts = url.pathname.split('/').filter(Boolean);
@@ -220,11 +208,9 @@ export class AmberDirectSigner implements Signer {
     if (entry) {
       this.pendingResolves.delete(id);
       if (entry.timer) clearTimeout(entry.timer);
-      console.log('[AmberDirectSigner] Resolving pending:', { id, type, resultLen: result.length });
       entry.resolve(result);
       return true;
     }
-    console.warn('[AmberDirectSigner] No pending resolve found for:', id);
     return false;
   }
 

package/src/modules/AuthNostrService.ts

@@ -11,6 +11,7 @@ import { IframeNostrRpc, Nip46Signer, ReadyListener, RpcResponse } from './Nip46
 import { Nip46Client } from './nip46/Nip46Client';
 import { Nip46Adapter } from './nip46/Nip46Adapter';
 import { PrivateKeySigner } from './Signer';
+import { AmberDirectSigner } from './AmberDirectSigner';
 
 const OUTBOX_RELAYS = ['wss://user.kindpag.es', 'wss://purplepag.es', 'wss://relay.nos.social'];
 const DEFAULT_NOSTRCONNECT_RELAYS = ['wss://relay.nsec.app/', 'wss://ephemeral.snowflare.cc/'];
@@ -27,7 +28,7 @@ const NOSTRCONNECT_APPS: ConnectionString[] = [
   {
     name: 'Amber',
     img: 'https://raw.githubusercontent.com/greenart7c3/Amber/refs/heads/master/assets/android-icon.svg',
-    link: '<nostrconnect>',
+    link: 'amber',
     relays: DEFAULT_NOSTRCONNECT_RELAYS,
   },
   {
@@ -40,6 +41,7 @@ const NOSTRCONNECT_APPS: ConnectionString[] = [
 
 class AuthNostrService extends EventEmitter implements Signer {
   private signer: any = null;
+  private amberSigner: AmberDirectSigner | null = null;
   private localSigner: PrivateKeySigner | null = null;
   private params: NostrParams;
   private signerPromise?: Promise<void>;
@@ -73,6 +75,96 @@ class AuthNostrService extends EventEmitter implements Signer {
       encrypt: this.encrypt44.bind(this),
       decrypt: this.decrypt44.bind(this),
     };
+
+    setTimeout(() => this.checkAmberResponse(), 100);
+
+    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);
+
+    window.addEventListener('message', event => {
+      if (event.data && event.data.method === 'amberResponse') {
+        const { id, type, result } = event.data;
+        console.log('Amber response received via message', { id, type, result });
+        this.handleAmberResponse({ id, type, result });
+      }
+    });
+  }
+
+  private checkAmberResponse() {
+    const response = AmberDirectSigner.parseResponse();
+    if (response) {
+      // If we have an opener and it's not the same window, we are in a popup
+      if (window.opener && window.opener !== window) {
+        console.log('Amber response in popup, sending back to opener');
+        window.opener.postMessage({ method: 'amberResponse', ...response }, window.location.origin);
+        window.close();
+        return;
+      }
+
+      this.handleAmberResponse(response);
+    }
+  }
+
+  private handledAmberIds: Set<string> = new Set();
+
+  private handleAmberResponse(response: { id: string; type: string; result: string }) {
+    if (this.handledAmberIds.has(response.id)) return;
+    this.handledAmberIds.add(response.id);
+
+    console.log('Handling Amber response', response);
+
+    // Stop the "Connecting..." spinner
+    this.emit('onAuthUrl', { url: '' });
+
+    // Resolve pending promises if any (for non-reload cases)
+    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' || response.type.includes('pub')) {
+      const info: Info = {
+        pubkey: response.result,
+        name: nip19.npubEncode(response.result),
+        authMethod: 'amber' as any,
+        relays: [],
+        signerPubkey: '',
+      };
+      console.log('Amber login success', info);
+      this.onAuth('login', info);
+    }
+
+    // URLクリーンアップをより徹底的に
+    const url = new URL(window.location.href);
+    let changed = false;
+    if (url.searchParams.has('event')) {
+      url.searchParams.delete('event');
+      changed = true;
+    }
+
+    // パス末尾が結果と一致する場合はパスもクリア
+    const pathParts = url.pathname.split('/');
+    if (pathParts.length > 0 && pathParts[pathParts.length - 1] === response.result) {
+      pathParts.pop();
+      url.pathname = pathParts.join('/') || '/';
+      changed = true;
+    }
+
+    if (changed) {
+      console.log('Cleaning up Amber response URL', url.toString());
+      window.history.replaceState({}, '', url.toString());
+    }
   }
 
   public isIframe() {
@@ -128,6 +220,41 @@ class AuthNostrService extends EventEmitter implements Signer {
 
     // non-iframe flow
     if (link && !iframeUrl) {
+      if (link === 'amber') {
+        const signer = new AmberDirectSigner();
+        this.amberSigner = signer;
+
+        const id = Math.random().toString(36).substring(7);
+        const url = signer.generateUrl('', 'get_public_key', id);
+
+        // Emit for the "Connecting..." spinner
+        this.emit('onAuthUrl', { url });
+
+        try {
+          const pubkey = await signer.getPublicKey(id);
+          const info: Info = {
+            pubkey,
+            name: nip19.npubEncode(pubkey),
+            authMethod: 'amber' as any,
+            relays: [],
+            signerPubkey: '',
+          };
+          this.onAuth('login', info);
+          return info;
+        } catch (e) {
+          console.log('Amber getPublicKey failed or was blocked', e);
+          // Fallback: wait for onAuth to be called (e.g. via user clicking Continue)
+          return new Promise(resolve => {
+            const handler = (info: Info | null) => {
+              if (info && info.authMethod === ('amber' as any)) {
+                this.off('onUserInfo', handler); // Use onUserInfo as a proxy for onAuth
+                resolve(info);
+              }
+            };
+            this.on('onUserInfo', handler);
+          });
+        }
+      }
       window.open(link, '_blank', 'width=400,height=700');
     }
 
@@ -164,7 +291,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       perms: encodeURIComponent(this.params.optionsModal.perms || ''),
     };
 
-    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${(relays || []).length > 0 ? (relays || []).map((r, i) => `&relay=${r}`).join('') : ''}`;
+    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${(relays || []).length > 0 ? (relays || []).map((r, i) => `&relay=${r}`) : ''}`;
   }
 
   public async getNostrConnectServices(): Promise<[string, ConnectionString[]]> {
@@ -292,12 +419,9 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async setAmber(info: Info) {
-    // Amber now uses NIP-46 (nostrconnect) like other signers
     this.releaseSigner();
-    await this.startAuth();
-    await this.initSigner(info);
+    this.amberSigner = new AmberDirectSigner(info.pubkey);
     this.onAuth('login', info);
-    await this.endAuth();
   }
 
   public async createAccount(nip05: string) {
@@ -328,6 +452,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     this.signer = null;
     this.signerErrCallback?.('cancelled');
     this.localSigner = null;
+    this.amberSigner = null;
   }
 
   public async logout(keepSigner = false) {
@@ -677,6 +802,10 @@ class AuthNostrService extends EventEmitter implements Signer {
         event.pubkey = getPublicKey(this.localSigner.privateKey!);
         event.id = getEventHash(event);
         event.sig = await this.localSigner.sign(event);
+      } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+        const userInfo = this.params.userInfo!;
+        if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+        return this.amberSigner.signEvent(event);
       } else {
         event.pubkey = this.signer?.remotePubkey;
         event.id = getEventHash(event);
@@ -709,6 +838,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async encrypt04(pubkey: string, plaintext: string) {
     if (this.localSigner) {
       return this.localSigner.encrypt(pubkey, plaintext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.encrypt04(pubkey, plaintext);
     } else {
       // adapter supports encrypt(pubkey, plaintext)
       if (this.signer && typeof this.signer.encrypt === 'function') {
@@ -722,6 +855,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async decrypt04(pubkey: string, ciphertext: string) {
     if (this.localSigner) {
       return this.localSigner.decrypt(pubkey, ciphertext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.decrypt04(pubkey, ciphertext);
     } else {
       // If signer supports direct decrypt(pubkey, ciphertext), use it
       if (this.signer && typeof this.signer.decrypt === 'function') {
@@ -736,6 +873,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async encrypt44(pubkey: string, plaintext: string) {
     if (this.localSigner) {
       return this.nip44Codec.encrypt(this.localSigner.privateKey!, pubkey, plaintext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.encrypt44(pubkey, plaintext);
     } else {
       // no support of nip44 in legacy signer implementation
       return this.codec_call('nip44_encrypt', pubkey, plaintext);
@@ -745,6 +886,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async decrypt44(pubkey: string, ciphertext: string) {
     if (this.localSigner) {
       return this.nip44Codec.decrypt(this.localSigner.privateKey!, pubkey, ciphertext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.decrypt44(pubkey, ciphertext);
     } else {
       // no support of nip44 in legacy signer implementation
       return this.codec_call('nip44_decrypt', pubkey, ciphertext);

package/src/modules/nip46/Nip46Adapter.ts

@@ -27,83 +27,38 @@ export class Nip46Adapter extends EventEmitter {
     if (this.userPubkey) throw new Error('Already called initUserPubkey');
     if (hintPubkey) {
       this.userPubkey = hintPubkey;
-      console.log('[Nip46Adapter] User pubkey set from hint:', hintPubkey);
       return;
     }
 
-    console.log('[Nip46Adapter] Fetching user pubkey');
-    try {
-      const res = await this.client.sendRequest('get_public_key', []);
-      if (!res) throw new Error('No public key returned');
-      this.userPubkey = res;
-      console.log('[Nip46Adapter] User pubkey fetched:', res);
-    } catch (error: any) {
-      console.error('[Nip46Adapter] Failed to get user pubkey:', error.message);
-      throw error;
-    }
+    const res = await this.client.sendRequest('get_public_key', []);
+    if (!res) throw new Error('No public key returned');
+    this.userPubkey = res;
   }
 
-  /**
-   * nostrconnect:// フロー - 受信待機
-   * サイナーからの接続を待つ
-   */
-  async listen(nostrConnectSecret: string, timeoutMs: number = 60000): Promise<string> {
-    console.log('[Nip46Adapter] Starting listen mode, timeout:', timeoutMs);
-
-    return new Promise<string>((resolve, reject) => {
-      const timer = setTimeout(() => {
-        cleanup();
-        const error = new Error(`Listen timeout after ${timeoutMs}ms`);
-        console.error('[Nip46Adapter]', error.message);
-        reject(error);
-      }, timeoutMs);
-
-      const cleanup = () => {
-        clearTimeout(timer);
-        this.client.off('response', onResponse);
-      };
-
+  async listen(nostrConnectSecret: string): Promise<string> {
+    return new Promise<string>((ok, err) => {
       const onResponse = ({ response, pubkey }: any) => {
         if (!response) return;
-
-        // auth_urlは無視（別のハンドラが処理）
         if (response.result === 'auth_url') return;
-
-        // 成功: ack または secret が返される
         if (response.result === 'ack' || response.result === nostrConnectSecret) {
-          cleanup();
-          console.log('[Nip46Adapter] Listen succeeded, signer pubkey:', pubkey);
-          resolve(pubkey);
-        } else if (response.error) {
-          cleanup();
-          console.error('[Nip46Adapter] Listen failed:', response.error);
-          reject(new Error(response.error));
+          this.client.off('response', onResponse);
+          ok(pubkey);
         }
       };
 
       this.client.on('response', onResponse);
+
+      // also add a timeout
+      setTimeout(() => {
+        this.client.off('response', onResponse);
+        err(new Error('Listen timeout'));
+      }, 30000);
     });
   }
 
-  /**
-   * bunker:// フロー - 能動的接続
-   * サイナーに接続リクエストを送る
-   */
-  async connect(token?: string, perms?: string, timeoutMs: number = 30000): Promise<void> {
-    console.log('[Nip46Adapter] Connecting with token, timeout:', timeoutMs);
-
-    try {
-      const result = await this.client.sendRequest('connect', [this.localSigner.pubkey, token || '', perms || ''], timeoutMs);
-
-      if (result !== 'ack') {
-        throw new Error(`Connect failed: ${result || 'unknown error'}`);
-      }
-
-      console.log('[Nip46Adapter] Connected successfully');
-    } catch (error: any) {
-      console.error('[Nip46Adapter] Connect failed:', error.message);
-      throw error;
-    }
+  async connect(token?: string, perms?: string) {
+    const result = await this.client.sendRequest('connect', [this.localSigner.pubkey, token || '', perms || '']);
+    if (result !== 'ack') throw new Error(result || 'connect failed');
   }
 
   async setListenReply(reply: any, nostrConnectSecret: string) {
@@ -125,17 +80,10 @@ export class Nip46Adapter extends EventEmitter {
   async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
     const params = [name, domain, '', perms];
 
-    console.log('[Nip46Adapter] Creating account:', { name, domain });
-    try {
-      const r = await this.client.sendRequest('create_account', params);
-      if (!r) throw new Error('create_account returned empty result');
-      if (r === 'error') throw new Error('create_account failed');
-      console.log('[Nip46Adapter] Account created successfully');
-      return r;
-    } catch (error: any) {
-      console.error('[Nip46Adapter] Failed to create account:', error.message);
-      throw error;
-    }
+    const r = await this.client.sendRequest('create_account', params);
+    if (!r) throw new Error('create_account failed');
+    if (r === 'error') throw new Error('create_account error');
+    return r;
   }
 
   async encrypt(recipientPubkey: string, plaintext: string) {
@@ -149,19 +97,14 @@ export class Nip46Adapter extends EventEmitter {
   }
 
   async sign(event: any) {
+    const r = await this.client.sendRequest('sign_event', [JSON.stringify(event)]);
     try {
-      const r = await this.client.sendRequest('sign_event', [JSON.stringify(event)]);
-      try {
-        const parsed = typeof r === 'string' ? JSON.parse(r) : r;
-        if (parsed && parsed.sig) return parsed.sig;
-      } catch (e) {
-        // not JSON
-      }
-      return r;
-    } catch (error: any) {
-      console.error('[Nip46Adapter] Failed to sign event:', error.message);
-      throw error;
+      const parsed = typeof r === 'string' ? JSON.parse(r) : r;
+      if (parsed && parsed.sig) return parsed.sig;
+    } catch (e) {
+      // not JSON
     }
+    return r;
   }
 
   // provide rpc compatibility

package/src/modules/nip46/Nip46Client.ts

@@ -15,9 +15,6 @@ export class Nip46Client extends EventEmitter {
   private subscription: any = null;
   private isSubscribed: boolean = false;
   private nip44Codec: Nip44 = new Nip44();
-  private iframeConfig?: { origin: string; port?: MessagePort };
-  private retryConfig: { maxRetries: number; retryDelayMs: number };
-  private iframeKeepaliveInterval?: NodeJS.Timeout;
 
   constructor(options: Nip46ClientOptions) {
     super();
@@ -27,13 +24,6 @@ export class Nip46Client extends EventEmitter {
     this.relays = options.relays;
     this.defaultTimeoutMs = options.timeoutMs || 30000;
     this.useNip44 = options.useNip44 || false;
-    this.iframeConfig = options.iframeConfig;
-    this.retryConfig = options.retryConfig || { maxRetries: 3, retryDelayMs: 1000 };
-
-    // iframe用のメッセージハンドラを設定
-    if (this.iframeConfig?.port) {
-      this.setupIframePort(this.iframeConfig.port);
-    }
   }
 
   get localPubkey(): string {
@@ -41,40 +31,9 @@ export class Nip46Client extends EventEmitter {
   }
 
   /**
-   * NIP-46リクエストを送信（リトライ機能付き）
+   * NIP-46リクエストを送信
    */
   async sendRequest(method: string, params: string[] = [], timeoutMs?: number): Promise<string> {
-    let lastError: Error | null = null;
-
-    for (let attempt = 0; attempt <= this.retryConfig.maxRetries; attempt++) {
-      try {
-        if (attempt > 0) {
-          const delay = this.retryConfig.retryDelayMs * attempt;
-          console.log(`[Nip46Client] Retry attempt ${attempt}/${this.retryConfig.maxRetries} for ${method} after ${delay}ms`);
-          await new Promise(resolve => setTimeout(resolve, delay));
-        }
-
-        return await this.sendRequestInternal(method, params, timeoutMs);
-      } catch (error: any) {
-        lastError = error;
-
-        // タイムアウトまたはネットワークエラーの場合のみリトライ
-        const shouldRetry = error.message.includes('timed out') || error.message.includes('network') || error.message.includes('publish');
-
-        if (!shouldRetry || attempt === this.retryConfig.maxRetries) {
-          console.error(`[Nip46Client] Request failed after ${attempt + 1} attempts:`, error.message);
-          throw error;
-        }
-      }
-    }
-
-    throw lastError || new Error('Request failed after retries');
-  }
-
-  /**
-   * NIP-46リクエストを送信（内部実装）
-   */
-  private async sendRequestInternal(method: string, params: string[] = [], timeoutMs?: number): Promise<string> {
     const timeout = timeoutMs || this.defaultTimeoutMs;
     const id = this.generateId();
     const request: Nip46Request = { id, method, params };
@@ -135,25 +94,9 @@ export class Nip46Client extends EventEmitter {
     // 署名
     event.sig = getSignature(event, this.localPrivateKey);
 
-    // iframeがある場合は優先的に使用
-    if (this.iframeConfig?.port) {
-      try {
-        this.iframeConfig.port.postMessage(event);
-        console.log('[Nip46Client] Request sent via iframe:', request.id);
-        return;
-      } catch (e) {
-        console.warn('[Nip46Client] Iframe send failed, falling back to relays:', e);
-      }
-    }
-
     // リレーに送信
-    try {
-      await Promise.any(this.pool.publish(this.relays, event));
-      console.log('[Nip46Client] Request published to relays:', request.id);
-    } catch (e) {
-      console.error('[Nip46Client] Failed to publish to relays:', e);
-      throw new Error('Failed to publish request to relays');
-    }
+    await Promise.any(this.pool.publish(this.relays, event));
+    console.log('[Nip46Client] Request published:', request.id);
   }
 
   /**
@@ -203,12 +146,10 @@ export class Nip46Client extends EventEmitter {
       // Emit response event for consumers (include sender pubkey)
       this.emit('response', { response, pubkey: event.pubkey });
 
-      // auth_urlの特別処理: OAuth完了後に実際のレスポンスが来るまで待つ
+      // auth_urlの特別処理
       if (response.result === 'auth_url') {
         console.log('[Nip46Client] Auth URL received:', response.error);
         this.emit('authUrl', response.error);
-        // 注意: pendingRequestsは削除しない
-        // OAuth完了後に同じIDで実際のレスポンスが返ってくる
         return;
       }
 
@@ -291,12 +232,6 @@ export class Nip46Client extends EventEmitter {
       this.isSubscribed = false;
     }
 
-    // iframeのkeepaliveをクリア
-    if (this.iframeKeepaliveInterval) {
-      clearInterval(this.iframeKeepaliveInterval);
-      this.iframeKeepaliveInterval = undefined;
-    }
-
     // リレー接続を閉じる
     this.pool.close(this.relays);
 
@@ -310,47 +245,4 @@ export class Nip46Client extends EventEmitter {
   isConnected(): boolean {
     return this.isSubscribed;
   }
-
-  /**
-   * iframeポートを設定
-   */
-  setIframePort(port: MessagePort): void {
-    if (!this.iframeConfig) {
-      throw new Error('Iframe config not set');
-    }
-    this.iframeConfig.port = port;
-    this.setupIframePort(port);
-  }
-
-  /**
-   * iframe用のメッセージハンドラを設定
-   */
-  private setupIframePort(port: MessagePort): void {
-    port.onmessage = async (ev: MessageEvent) => {
-      if (ev.data === 'ping') return;
-
-      try {
-        const event = ev.data;
-        // validate and handle event
-        if (!event || typeof event !== 'object') {
-          console.warn('[Nip46Client] Invalid message from iframe');
-          return;
-        }
-        await this.handleResponseEvent(event);
-      } catch (e) {
-        console.error('[Nip46Client] Iframe message error:', e);
-      }
-    };
-
-    // Keep alive
-    this.iframeKeepaliveInterval = setInterval(() => {
-      try {
-        port.postMessage('ping');
-      } catch (e) {
-        console.warn('[Nip46Client] Failed to send keepalive ping:', e);
-      }
-    }, 5000);
-
-    console.log('[Nip46Client] Iframe port setup complete');
-  }
 }

package/src/modules/nip46/types.ts

@@ -1,34 +1,26 @@
 export interface Nip46Request {
-  id: string;
-  method: string;
-  params: string[];
+    id: string;
+    method: string;
+    params: string[];
 }
 
 export interface Nip46Response {
-  id: string;
-  result?: string;
-  error?: string;
+    id: string;
+    result?: string;
+    error?: string;
 }
 
 export interface PendingRequest {
-  resolve: (result: string) => void;
-  reject: (error: Error) => void;
-  timer: NodeJS.Timeout;
-  method: string;
+    resolve: (result: string) => void;
+    reject: (error: Error) => void;
+    timer: NodeJS.Timeout;
+    method: string;
 }
 
 export interface Nip46ClientOptions {
-  localPrivateKey: string;
-  remotePubkey: string;
-  relays: string[];
-  timeoutMs?: number;
-  useNip44?: boolean;
-  iframeConfig?: {
-    origin: string;
-    port?: MessagePort;
-  };
-  retryConfig?: {
-    maxRetries: number;
-    retryDelayMs: number;
-  };
+    localPrivateKey: string;
+    remotePubkey: string;
+    relays: string[];
+    timeoutMs?: number;
+    useNip44?: boolean;
 }

package/tsconfig.json

@@ -12,4 +12,4 @@
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.test.ts", "**/*.spec.ts"],
-}
+}