@konemono/nostr-login 1.7.42 → 1.7.43

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -532,21 +532,19 @@ class AuthNostrService extends EventEmitter implements Signer {
       } catch {}
     }
 
-    // we remove support for iframe from nip05 and bunker-url methods,
-    // only nostrconnect flow will use it.
-    // info.iframeUrl = info.iframeUrl || (await this.getIframeUrl(info.domain));
     console.log('initSigner info', info);
 
-    // start listening for the ready signal
     const iframeOrigin = info.iframeUrl ? new URL(info.iframeUrl!).origin : undefined;
-    if (iframeOrigin) this.starterReady = new ReadyListener(['starterDone', 'starterError'], iframeOrigin);
 
-    // notify modals so they could show the starter iframe,
-    // FIXME shouldn't this come from nostrconnect service list?
+    if (iframeOrigin) {
+      this.starterReady = new ReadyListener(['starterDone', 'starterError'], iframeOrigin);
+    }
+
     this.emit('onIframeUrl', info.iframeUrl);
 
     this.signerPromise = new Promise<void>(async (ok, err) => {
       this.signerErrCallback = err;
+
       try {
         console.log('NDK relays before connect:', Array.from(this.ndk.pool.relays.keys()));
 
@@ -559,87 +557,70 @@ class AuthNostrService extends EventEmitter implements Signer {
 
         console.log('NDK relays after add:', Array.from(this.ndk.pool.relays.keys()));
 
-        // 全リレーを待たずに、接続できたものだけで進める
-        this.ndk.connect(CONNECT_TIMEOUT).catch(e => {
-          console.log('Some relays failed to connect, continuing anyway:', e);
-        });
+        // 接続開始（失敗しても続行）
+        this.ndk.connect(CONNECT_TIMEOUT).catch(() => {});
+
+        // 少なくとも1つ接続されるのを待つ（致命扱いしない）
+        await new Promise<void>(resolve => {
+          const start = Date.now();
 
-        // 少なくとも1つのリレーが接続するまで待つ
-        await new Promise<void>((resolve, reject) => {
-          const checkConnection = () => {
-            const connectedRelays = Array.from(this.ndk.pool.relays.values()).filter(r => r.status === 3);
+          const timer = setInterval(() => {
+            const connected = this.ndk.pool.connectedRelays();
 
-            if (connectedRelays.length > 0) {
+            if (connected.length > 0) {
+              clearInterval(timer);
               resolve();
-            } else {
-              setTimeout(checkConnection, 100);
+              return;
             }
-          };
-
-          const timeoutId = setTimeout(() => {
-            const connectedRelays = Array.from(this.ndk.pool.relays.values()).filter(r => r.status === 3);
 
-            if (connectedRelays.length > 0) {
+            if (Date.now() - start > CONNECT_TIMEOUT) {
+              // タイムアウトしても続行
+              clearInterval(timer);
               resolve();
-            } else {
-              reject(new Error('No relays connected'));
             }
-          }, CONNECT_TIMEOUT);
-
-          checkConnection();
+          }, 100);
         });
 
         console.log(
           'NDK connected relays:',
-          Array.from(this.ndk.pool.relays.entries()).map(([url, relay]) => ({
-            url,
-            status: relay.status,
-          })),
+          this.ndk.pool.connectedRelays().map(r => r.url),
         );
 
         const localSigner = new NDKPrivateKeySigner(info.sk!);
         this.signer = new Nip46Signer(this.ndk, localSigner, info.signerPubkey!, iframeOrigin);
 
-        // we should notify the banner the same way as
-        // the onAuthUrl does
-        this.signer.on(`iframeRestart`, async () => {
+        this.signer.on('iframeRestart', async () => {
           const iframeUrl = info.iframeUrl + (info.iframeUrl!.includes('?') ? '&' : '?') + 'pubkey=' + info.pubkey + '&rebind=' + localSigner.pubkey;
-          this.emit('iframeRestart', { pubkey: info.pubkey, iframeUrl });
+
+          this.emit('iframeRestart', {
+            pubkey: info.pubkey,
+            iframeUrl,
+          });
         });
 
-        // OAuth flow
-        // if (!listen) {
         this.signer.on('authUrl', (url: string) => {
           console.log('nostr login auth url', url);
-
-          // notify our UI
-          this.emit('onAuthUrl', { url, iframeUrl: info.iframeUrl, eventToAddAccount });
+          this.emit('onAuthUrl', {
+            url,
+            iframeUrl: info.iframeUrl,
+            eventToAddAccount,
+          });
         });
-        // }
 
         if (listen) {
-          // nostrconnect: flow
-          // wait for the incoming message from signer
           await this.listen(info);
         } else if (connect) {
-          // bunker: flow
-          // send 'connect' message to signer
           await this.connect(info, this.params.optionsModal.perms);
         } else {
-          // provide saved pubkey as a hint
-          await this.signer!.initUserPubkey(info.pubkey);
+          await this.signer.initUserPubkey(info.pubkey);
         }
 
-        // ensure, we're using it in callbacks above
-        // and expect info to be valid after this call
-        info.pubkey = this.signer!.userPubkey!;
-        // learned after nostrconnect flow
-        info.signerPubkey = this.signer!.remotePubkey;
+        info.pubkey = this.signer.userPubkey!;
+        info.signerPubkey = this.signer.remotePubkey;
 
         ok();
       } catch (e) {
         console.log('initSigner failure', e);
-        // make sure signer isn't set
         this.signer = null;
         err(e);
       }