@konemono/nostr-login 1.7.45 → 1.7.47

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -614,18 +614,11 @@ class AuthNostrService extends EventEmitter implements Signer {
         } else if (connect) {
           await this.connect(info, this.params.optionsModal.perms);
         } else {
-          if (info.pubkey) {
-            await this.signer.initUserPubkey(info.pubkey);
-          }
-        }
-
-        if (this.signer.userPubkey) {
-          info.pubkey = this.signer.userPubkey;
+          await this.signer.initUserPubkey(info.pubkey);
         }
 
-        if (this.signer.remotePubkey) {
-          info.signerPubkey = this.signer.remotePubkey;
-        }
+        info.pubkey = this.signer.userPubkey!;
+        info.signerPubkey = this.signer.remotePubkey;
 
         ok();
       } catch (e) {
@@ -660,15 +653,8 @@ class AuthNostrService extends EventEmitter implements Signer {
       const eventToAddAccount = Boolean(this.params.userInfo);
       console.log('authNip46', type, info);
 
-      await this.startAuth();
-
-      await this.initSigner(info, {
-        connect: true,
-        listen: true,
-        eventToAddAccount,
-      });
-
-      await this.endAuth();
+      // updates the info
+      await this.initSigner(info, { connect: true, eventToAddAccount });
 
       // callback
       this.onAuth(type, info);

package/src/modules/Nip46.ts

@@ -143,45 +143,48 @@ 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();
 
-    // response handler will deduplicate auth urls and responses
-    this.setResponseHandler(id, cb);
+    // 1. Promiseを変数に格納
+    const responsePromise = 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 });
 
-    // send to relays
+    // 2. 送信
     await event.publish();
 
-    // 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;
+    // 3. undefined ではなく、レスポンスを待つ Promise を返す
+    return responsePromise;
   }
 
   protected setResponseHandler(id: string, cb?: (res: NDKRpcResponse) => void) {
-    let authUrlSent = false;
     const now = Date.now();
-    return new Promise<NDKRpcResponse>(() => {
+    let authUrlSent = false;
+
+    // 1. 外部から解決できるように Promise を作成
+    return new Promise<NDKRpcResponse>(resolve => {
       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 if (cb) {
+        } else {
+          // IDが一致しているか、リクエストリストに存在するか確認
           if (this.requests.has(id)) {
             this.requests.delete(id);
             console.log('nostr-login processed nip46 request in', Date.now() - now, 'ms');
-            cb(response);
+
+            if (cb) cb(response); // 既存のコールバックを実行
+            resolve(response); // ★Promise を解決する（これで await が終わる）
+          } else {
+            console.warn(`[NIP46] Received response for unknown ID: ${id}`);
           }
         }
       };
 
+      // イベント登録
       this.once(`response-${id}`, responseHandler);
     });
   }