@konemono/nostr-login 1.10.1 → 1.10.3

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -116,6 +116,8 @@ class AuthNostrService extends EventEmitter implements Signer {
       this.signerErrCallback('Cancelled by user');
       this.signerErrCallback = undefined;
     }
+    // readyCallbackもクリアする
+    this.resetAuth();
     this.emit('signerCancelled');
   }
 
@@ -126,14 +128,17 @@ class AuthNostrService extends EventEmitter implements Signer {
       link = '',
       iframeUrl = '',
       importConnect = false,
+      customRelays,
     }: {
       domain?: string;
       link?: string;
       importConnect?: boolean;
       iframeUrl?: string;
+      customRelays?: string[];
     } = {},
   ) {
-    relay = relay || DEFAULT_NOSTRCONNECT_RELAY;
+    // カスタムリレーが指定されていれば使用、そうでなければ単一リレーまたはデフォルト
+    const relays = customRelays && customRelays.length > 0 ? customRelays : [relay || DEFAULT_NOSTRCONNECT_RELAY];
 
     const info: Info = {
       authMethod: 'connect',
@@ -141,7 +146,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       signerPubkey: '', // unknown too!
       sk: this.nostrConnectKey,
       domain: domain,
-      relays: [relay],
+      relays: relays,
       iframeUrl,
     };
 
@@ -156,7 +161,9 @@ class AuthNostrService extends EventEmitter implements Signer {
     // signer learns the remote pubkey
     if (!info.pubkey || !info.signerPubkey) throw new Error('Bad remote pubkey');
 
-    info.bunkerUrl = `bunker://${info.signerPubkey}?relay=${relay}`;
+    // bunkerUrl\u306b\u5168\u30ea\u30ec\u30fc\u3092\u542b\u3081\u308b
+    const relayParams = relays.map(r => `relay=${encodeURIComponent(r)}`).join('&');
+    info.bunkerUrl = `bunker://${info.signerPubkey}?${relayParams}`;
 
     // callback
     if (!importConnect) this.onAuth('login', info);

package/src/modules/ModalManager.ts

@@ -219,7 +219,7 @@ class ModalManager extends EventEmitter {
             if (!cs) this.modal.isLoading = false;
           }
 
-          await this.authNostrService.nostrConnect(relay, { domain, link, iframeUrl });
+          await this.authNostrService.nostrConnect(relay, { domain, link, iframeUrl, customRelays: this.customNip46Relays });
         });
       };