@konemono/nostr-login 1.9.6 → 1.9.8

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -11,7 +11,6 @@ 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/'];
@@ -41,7 +40,6 @@ 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>;
@@ -75,97 +73,6 @@ 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.emit('onUserInfo', 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() {
@@ -219,44 +126,16 @@ class AuthNostrService extends EventEmitter implements Signer {
 
     console.log('nostrconnect info', info, link);
 
-    // non-iframe flow
+    // non-iframe flow - Amber も NIP-46 経由（nostrsigner:// の代わりに nostrconnect:// を使用）
     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);
-          });
-        }
+        // Amber に nostrconnect:// URL を渡す
+        const nostrconnectUrl = await this.createNostrConnect(relays);
+        console.log('Amber flow via NIP-46, opening:', nostrconnectUrl);
+        window.location.href = nostrconnectUrl;
+      } else {
+        window.open(link, '_blank', 'width=400,height=700');
       }
-      window.open(link, '_blank', 'width=400,height=700');
     }
 
     // init nip46 signer
@@ -420,9 +299,12 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async setAmber(info: Info) {
+    // Amber now uses NIP-46 (nostrconnect) like other signers
     this.releaseSigner();
-    this.amberSigner = new AmberDirectSigner(info.pubkey);
+    await this.startAuth();
+    await this.initSigner(info);
     this.onAuth('login', info);
+    await this.endAuth();
   }
 
   public async createAccount(nip05: string) {
@@ -453,7 +335,6 @@ class AuthNostrService extends EventEmitter implements Signer {
     this.signer = null;
     this.signerErrCallback?.('cancelled');
     this.localSigner = null;
-    this.amberSigner = null;
   }
 
   public async logout(keepSigner = false) {
@@ -803,10 +684,6 @@ 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);
@@ -839,10 +716,6 @@ 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') {
@@ -856,10 +729,6 @@ 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') {
@@ -874,10 +743,6 @@ 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);
@@ -887,10 +752,6 @@ 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);