@konemono/nostr-login 1.10.2 → 1.10.4

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -128,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',
@@ -143,7 +146,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       signerPubkey: '', // unknown too!
       sk: this.nostrConnectKey,
       domain: domain,
-      relays: [relay],
+      relays: relays,
       iframeUrl,
     };
 
@@ -158,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);
@@ -166,7 +171,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     return info;
   }
 
-  public async createNostrConnect(relay?: string) {
+  public async createNostrConnect(relays?: string[]) {
     this.nostrConnectKey = generatePrivateKey();
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
@@ -178,11 +183,12 @@ class AuthNostrService extends EventEmitter implements Signer {
       perms: encodeURIComponent(this.params.optionsModal.perms || ''),
     };
 
-    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${relay ? `&relay=${relay}` : ''}`;
+    const relayParams = relays && relays.length > 0 ? relays.map(r => `&relay=${encodeURIComponent(r)}`).join('') : '';
+    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${relayParams}`;
   }
 
-  public async getNostrConnectServices(): Promise<[string, ConnectionString[]]> {
-    const nostrconnect = await this.createNostrConnect();
+  public async getNostrConnectServices(customRelays?: string[]): Promise<[string, ConnectionString[]]> {
+    const nostrconnect = await this.createNostrConnect(customRelays);
 
     // copy defaults
     const apps = NOSTRCONNECT_APPS.map(a => ({ ...a }));
@@ -198,20 +204,23 @@ class AuthNostrService extends EventEmitter implements Signer {
     // }
 
     for (const a of apps) {
-      let relay = DEFAULT_NOSTRCONNECT_RELAY;
+      let relays = customRelays && customRelays.length > 0 ? customRelays : [DEFAULT_NOSTRCONNECT_RELAY];
       if (a.link.startsWith('https://')) {
         let domain = a.domain || new URL(a.link).hostname;
         try {
           const info = await (await fetch(`https://${domain}/.well-known/nostr.json`)).json();
           const pubkey = info.names['_'];
-          const relays = info.nip46[pubkey] as string[];
-          if (relays && relays.length) relay = relays[0];
+          const fetchedRelays = info.nip46[pubkey] as string[];
+          if (fetchedRelays && fetchedRelays.length && (!customRelays || customRelays.length === 0)) {
+            relays = fetchedRelays;
+          }
           a.iframeUrl = info.nip46.iframe_url || '';
         } catch (e) {
           console.log('Bad app info', e, a);
         }
       }
-      const nc = nostrconnect + '&relay=' + relay;
+      const relayParams = relays.map(r => `&relay=${encodeURIComponent(r)}`).join('');
+      const nc = nostrconnect + relayParams;
       if (a.iframeUrl) {
         // pass plain nc url for iframe-based flow
         a.link = nc;

package/src/modules/ModalManager.ts

@@ -92,7 +92,7 @@ class ModalManager extends EventEmitter {
     this.modal.isLoadingExtension = false;
     this.modal.isLoading = false;
 
-    [this.modal.connectionString, this.modal.connectionStringServices] = await this.authNostrService.getNostrConnectServices();
+    [this.modal.connectionString, this.modal.connectionStringServices] = await this.authNostrService.getNostrConnectServices(this.customNip46Relays);
 
     dialog.appendChild(this.modal);
     document.body.appendChild(dialog);
@@ -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 });
         });
       };