@konemono/nostr-login 1.7.49 → 1.7.51

package/src/modules/Nip46.ts

@@ -1,27 +1,15 @@
-//Nip46.ts
-import NDK, {
-  NDKEvent,
-  NDKFilter,
-  NDKNip46Signer,
-  NDKNostrRpc,
-  NDKPrivateKeySigner,
-  NDKRpcRequest,
-  NDKRpcResponse,
-  NDKSubscription,
-  NDKSubscriptionCacheUsage,
-  NostrEvent,
-} from '@nostr-dev-kit/ndk';
+import NDK, { NDKEvent, NDKFilter, NDKNip46Signer, NDKNostrRpc, NDKRpcRequest, NDKRpcResponse, NDKSubscription, NDKSubscriptionCacheUsage, NostrEvent } from '@nostr-dev-kit/ndk';
 import { validateEvent, verifySignature } from 'nostr-tools';
-//import { PrivateKeySigner } from './Signer';
+import { PrivateKeySigner } from './Signer';
 
 class NostrRpc extends NDKNostrRpc {
   protected _ndk: NDK;
-  protected _signer: NDKPrivateKeySigner;
+  protected _signer: PrivateKeySigner;
   protected requests: Set<string> = new Set();
   private sub?: NDKSubscription;
   protected _useNip44: boolean = false;
 
-  public constructor(ndk: NDK, signer: NDKPrivateKeySigner) {
+  public constructor(ndk: NDK, signer: PrivateKeySigner) {
     super(ndk, signer, ndk.debug.extend('nip46:signer:rpc'));
     this._ndk = ndk;
     this._signer = signer;
@@ -55,10 +43,8 @@ class NostrRpc extends NDKNostrRpc {
   public async parseEvent(event: NDKEvent): Promise<NDKRpcRequest | NDKRpcResponse> {
     const remoteUser = this._ndk.getUser({ pubkey: event.pubkey });
     remoteUser.ndk = this._ndk;
-    const decryptedContent = this.isNip04(event.content)
-      ? await this._signer.decrypt(remoteUser, event.content, 'nip04')
-      : await this._signer.decrypt(remoteUser, event.content, 'nip44');
-    //const decryptedContent = await decrypt.call(this._signer, remoteUser, event.content);
+    const decrypt = this.isNip04(event.content) ? this._signer.decrypt : this._signer.decryptNip44;
+    const decryptedContent = await decrypt.call(this._signer, remoteUser, event.content);
     const parsedContent = JSON.parse(decryptedContent);
     const { id, method, params, result, error } = parsedContent;
 
@@ -143,51 +129,45 @@ class NostrRpc extends NDKNostrRpc {
   public async sendRequest(remotePubkey: string, method: string, params: string[] = [], kind = 24133, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse> {
     const id = this.getId();
 
-    // 1. Promiseを変数に格納
-    const responsePromise = this.setResponseHandler(id, cb);
-
-    //ちょっと待つ
-    await new Promise(r => setTimeout(r, 100));
+    // response handler will deduplicate auth urls and responses
+    this.setResponseHandler(id, cb);
 
+    // create and sign request
     const event = await this.createRequestEvent(id, remotePubkey, method, params, kind);
+    console.log("sendRequest", { event, method, remotePubkey, params });
 
-    // 2. 送信
+    // send to relays
     await event.publish();
 
-    // 3. undefined ではなく、レスポンスを待つ Promise を返す
-    return responsePromise;
+    // NOTE: ndk returns a promise that never resolves and
+    // in fact REQUIRES cb to be provided (otherwise no way
+    // to consume the result), we've already stepped on the bug
+    // of waiting for this unresolvable result, so now we return
+    // undefined to make sure waiters fail, not hang.
+    // @ts-ignore
+    return undefined as NDKRpcResponse;
   }
 
   protected setResponseHandler(id: string, cb?: (res: NDKRpcResponse) => void) {
-    const now = Date.now();
     let authUrlSent = false;
-
-    // 1. 外部から解決できるように Promise を作成
-    return new Promise<NDKRpcResponse>(resolve => {
+    const now = Date.now();
+    return new Promise<NDKRpcResponse>(() => {
       const responseHandler = (response: NDKRpcResponse) => {
-        console.log(`[NIP46] Received response for ID: ${response.id}`, response);
-
         if (response.result === 'auth_url') {
           this.once(`response-${id}`, responseHandler);
           if (!authUrlSent) {
             authUrlSent = true;
             this.emit('authUrl', response.error);
           }
-        } else {
-          // IDが一致しているか、リクエストリストに存在するか確認
+        } else if (cb) {
           if (this.requests.has(id)) {
             this.requests.delete(id);
             console.log('nostr-login processed nip46 request in', Date.now() - now, 'ms');
-
-            if (cb) cb(response); // 既存のコールバックを実行
-            resolve(response); // ★Promise を解決する（これで await が終わる）
-          } else {
-            console.warn(`[NIP46] Received response for unknown ID: ${id}`);
+            cb(response);
           }
         }
       };
 
-      // イベント登録
       this.once(`response-${id}`, responseHandler);
     });
   }
@@ -206,8 +186,8 @@ class NostrRpc extends NDKNostrRpc {
     } as NostrEvent);
 
     const useNip44 = this._useNip44 && method !== 'create_account';
-    event.content = useNip44 ? await this._signer.encrypt(remoteUser, event.content, 'nip44') : await this._signer.encrypt(remoteUser, event.content, 'nip04');
-    //event.content = await encrypt.call(this._signer, remoteUser, event.content);
+    const encrypt = useNip44 ? this._signer.encryptNip44 : this._signer.encrypt;
+    event.content = await encrypt.call(this._signer, remoteUser, event.content);
     await event.sign(this._signer);
 
     return event;
@@ -219,7 +199,7 @@ export class IframeNostrRpc extends NostrRpc {
   private iframePort?: MessagePort;
   private iframeRequests = new Map<string, { id: string; pubkey: string }>();
 
-  public constructor(ndk: NDK, localSigner: NDKPrivateKeySigner, iframePeerOrigin?: string) {
+  public constructor(ndk: NDK, localSigner: PrivateKeySigner, iframePeerOrigin?: string) {
     super(ndk, localSigner);
     this._ndk = ndk;
     this.peerOrigin = iframePeerOrigin;
@@ -358,54 +338,53 @@ export class ReadyListener {
 }
 
 export class Nip46Signer extends NDKNip46Signer {
+  private _userPubkey: string = '';
   private _rpc: IframeNostrRpc;
-  private _remotePubkey: string = '';
 
-  constructor(ndk: NDK, localSigner: NDKPrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
+  constructor(ndk: NDK, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
     super(ndk, signerPubkey, localSigner);
-    this._remotePubkey = signerPubkey;
 
+    // override with our own rpc implementation
     this._rpc = new IframeNostrRpc(ndk, localSigner, iframeOrigin);
-    this._rpc.setUseNip44(true);
+    this._rpc.setUseNip44(true); // !!this.params.optionsModal.dev);
     this._rpc.on('authUrl', (url: string) => {
       this.emit('authUrl', url);
     });
-    this.rpc = this._rpc;
-  }
 
-  get remotePubkey(): string {
-    return this._remotePubkey;
+    this.rpc = this._rpc;
   }
 
-  set remotePubkey(value: string) {
-    this._remotePubkey = value;
+  get userPubkey() {
+    return this._userPubkey;
   }
 
-  // userPubkeyのgetterを削除し、親クラスのプロパティを直接使用
-
   private async setSignerPubkey(signerPubkey: string, sameAsUser: boolean = false) {
-    console.log('setSignerPubkey', signerPubkey);
+    console.log("setSignerPubkey", signerPubkey);
+
+    // ensure it's set
     this.remotePubkey = signerPubkey;
 
+    // when we're sure it's known
     this._rpc.on(`iframeRestart-${signerPubkey}`, () => {
       this.emit('iframeRestart');
     });
 
+    // now call getPublicKey and swap remotePubkey w/ that
     await this.initUserPubkey(sameAsUser ? signerPubkey : '');
   }
 
   public async initUserPubkey(hintPubkey?: string) {
-    // 親クラスのuserPubkeyプロパティを直接設定
-    if (this.userPubkey) throw new Error('Already called initUserPubkey');
+    if (this._userPubkey) throw new Error('Already called initUserPubkey');
 
     if (hintPubkey) {
-      this.userPubkey = hintPubkey;
+      this._userPubkey = hintPubkey;
       return;
     }
 
-    this.userPubkey = await new Promise((ok, err) => {
+    this._userPubkey = await new Promise<string>((ok, err) => {
       if (!this.remotePubkey) throw new Error('Signer pubkey not set');
-      console.log('get_public_key', this.remotePubkey);
+
+      console.log("get_public_key", this.remotePubkey);
       this._rpc.sendRequest(this.remotePubkey, 'get_public_key', [], 24133, (response: NDKRpcResponse) => {
         ok(response.result);
       });
@@ -429,7 +408,12 @@ export class Nip46Signer extends NDKNip46Signer {
   }
 
   public async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
-    const params = [name, domain, '', perms];
+    const params = [
+      name,
+      domain,
+      '', // email
+      perms,
+    ];
 
     const r = await new Promise<NDKRpcResponse>(ok => {
       this.rpc.sendRequest(bunkerPubkey, 'create_account', params, undefined, ok);
@@ -439,6 +423,7 @@ export class Nip46Signer extends NDKNip46Signer {
     if (r.result === 'error') {
       throw new Error(r.error);
     }
+
     return r.result;
   }
 }

package/src/modules/Signer.ts

@@ -1,4 +1,4 @@
-/* import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
+import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
 import { Nip44 } from '../utils/nip44';
 import { getPublicKey } from 'nostr-tools';
 
@@ -23,4 +23,3 @@ export class PrivateKeySigner extends NDKPrivateKeySigner {
     return Promise.resolve(this.nip44.decrypt(this.privateKey!, sender.pubkey, value));
   }
 }
- */

package/src/utils/index.ts

@@ -102,9 +102,7 @@ export const bunkerUrlToInfo = (bunkerUrl: string, sk = ''): Info => {
 export const isBunkerUrl = (value: string) => value.startsWith('bunker://');
 
 export const getBunkerUrl = async (value: string, optionsModal: NostrLoginOptions) => {
-  if (!value) {
-    return '';
-  }
+  if (!value) return '';
 
   if (isBunkerUrl(value)) {
     return value;
@@ -113,24 +111,28 @@ export const getBunkerUrl = async (value: string, optionsModal: NostrLoginOption
   if (value.includes('@')) {
     const [name, domain] = value.toLocaleLowerCase().split('@');
     const origin = optionsModal.devOverrideBunkerOrigin || `https://${domain}`;
+
     const bunkerUrl = `${origin}/.well-known/nostr.json?name=_`;
-    const userUrl = `${origin}/.well-known/nostr.json?name=${name}`;
-    const bunker = await fetch(bunkerUrl);
-    const bunkerData = await bunker.json();
+    const userUrl   = `${origin}/.well-known/nostr.json?name=${name}`;
+
+    const bunkerRes = await fetch(bunkerUrl);
+    const bunkerData = await bunkerRes.json();
     const bunkerPubkey = bunkerData.names['_'];
-    const bunkerRelays = bunkerData.nip46[bunkerPubkey];
-    const user = await fetch(userUrl);
-    const userData = await user.json();
+    const bunkerRelays: string[] = bunkerData.nip46[bunkerPubkey];
+
+    const userRes = await fetch(userUrl);
+    const userData = await userRes.json();
     const userPubkey = userData.names[name];
-    // console.log({
-    //     bunkerData, userData, bunkerPubkey, bunkerRelays, userPubkey,
-    //     name, domain, origin
-    // })
-    if (!bunkerRelays.length) {
+
+    if (!bunkerRelays || bunkerRelays.length === 0) {
       throw new Error('Bunker relay not provided');
     }
 
-    return `bunker://${userPubkey}?relay=${bunkerRelays[0]}`;
+    const relayParams = bunkerRelays
+      .map(r => `relay=${encodeURIComponent(r)}`)
+      .join('&');
+
+    return `bunker://${userPubkey}?${relayParams}`;
   }
 
   throw new Error('Invalid user name or bunker url');