@konemono/nostr-login 1.15.3 → 1.15.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "Extended fork of nostr-login with multi-relay support, QR scanner, and improved stability",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -27,7 +27,7 @@
     "tseep": "^1.2.1"
   },
   "devDependencies": {
-    "@konemono/nostr-login-components": "^1.4.3",
+    "@konemono/nostr-login-components": "^1.4.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",

package/src/modules/AuthNostrService.ts

@@ -96,6 +96,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   public cancelNostrConnect() {
     console.log('cancelNostrConnect called');
     this.releaseSigner();
+    this.resetNostrConnectKeys();
 
     // readyCallbackのみ解放
     this.resetAuth();
@@ -144,7 +145,21 @@ class AuthNostrService extends EventEmitter implements Signer {
   ) {
     console.log('[nostrConnect] Called', { relay, domain, link, iframeUrl, importConnect, customRelays });
 
-    const relays = customRelays && customRelays.length > 0 ? customRelays : relay ? [relay] : DEFAULT_NIP46_RELAYS;
+    // linkのnostrconnect URLからリレーヒントを抽出
+    let linkRelays: string[] = [];
+    if (link) {
+      try {
+        const ncMatch = link.match(/nostrconnect:\/\/[^?]*\?(.*)/);
+        if (ncMatch) {
+          const params = new URLSearchParams(ncMatch[1]);
+          linkRelays = params.getAll('relay');
+        }
+      } catch (e) {
+        console.warn('[nostrConnect] Failed to parse relay hints from link', e);
+      }
+    }
+
+    const relays = customRelays && customRelays.length > 0 ? customRelays : linkRelays.length > 0 ? linkRelays : relay ? [relay] : DEFAULT_NIP46_RELAYS;
 
     const info: Info = {
       authMethod: 'connect',
@@ -194,14 +209,35 @@ class AuthNostrService extends EventEmitter implements Signer {
       this.onAuth('login', info);
     }
 
+    // 接続成功後にkey/secretをリセット（次回のモーダル表示で新規生成される）
+    this.resetNostrConnectKeys();
+
     console.log('[nostrConnect] Completed successfully');
     return info;
   }
 
-  public async createNostrConnect() {
-    this.nostrConnectKey = generatePrivateKey();
-    this.nostrConnectSecret = Array.from(crypto.getRandomValues(new Uint8Array(16)), b => b.toString(16).padStart(2, '0')).join('');
+  public async createNostrConnect(relays: string[]) {
+    this.ensureNostrConnectKeys();
+    return this.buildNostrConnectUrl(relays);
+  }
+
+  /**
+   * key/secret が未生成なら新規生成する。既存なら再利用。
+   * モーダル表示中にリレーが変更されても key/secret は維持される。
+   */
+  private ensureNostrConnectKeys() {
+    if (!this.nostrConnectKey) {
+      this.nostrConnectKey = generatePrivateKey();
+    }
+    if (!this.nostrConnectSecret) {
+      this.nostrConnectSecret = Array.from(crypto.getRandomValues(new Uint8Array(16)), b => b.toString(16).padStart(2, '0')).join('');
+    }
+  }
 
+  /**
+   * 現在の key/secret を使って nostrconnect:// URL を構築する。
+   */
+  private async buildNostrConnectUrl(relays: string[]): Promise<string> {
     const pubkey = getPublicKey(hexToBytes(this.nostrConnectKey));
     const meta = {
       name: encodeURIComponent(document.location.host),
@@ -210,27 +246,34 @@ 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}`;
+    const relayParams = 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}`;
+  }
+
+  /**
+   * nostrconnect セッションをリセットし、key/secret を再生成可能にする。
+   */
+  public resetNostrConnectKeys() {
+    this.nostrConnectKey = '';
+    this.nostrConnectSecret = '';
   }
 
   public async getNostrConnectServices(customRelays?: string[], onUpdate?: (apps: ConnectionString[]) => void): Promise<[string, ConnectionString[]]> {
-    const nostrconnect = await this.createNostrConnect();
+    const defaultRelays = customRelays && customRelays.length > 0 ? customRelays : DEFAULT_NIP46_RELAYS;
+    // ベースURLにリレーヒントを含める
+    const nostrconnect = await this.createNostrConnect(defaultRelays);
 
     const apps: ConnectionString[] = NOSTRCONNECT_APPS.map(a => ({ ...a }));
-    const defaultRelays = customRelays && customRelays.length > 0 ? customRelays : DEFAULT_NIP46_RELAYS;
 
     // Build initial list: https services are 'loading', others are immediately available
     for (const a of apps) {
       if (a.link.startsWith('https://')) {
         a.available = 'loading';
-        // Set link with default relays for now
-        const relayParams = defaultRelays.map(r => `&relay=${encodeURIComponent(r)}`).join('');
-        a.link = nostrconnect + relayParams;
+        // nostrconnect URL にはすでにリレーヒントが含まれている
+        a.link = nostrconnect;
       } else {
         a.available = true;
-        const relayParams = defaultRelays.map(r => `&relay=${encodeURIComponent(r)}`).join('');
-        const nc = nostrconnect + relayParams;
-        a.link = a.link.replace('<nostrconnect>', nc);
+        a.link = a.link.replace('<nostrconnect>', nostrconnect);
       }
     }
 
@@ -245,15 +288,15 @@ class AuthNostrService extends EventEmitter implements Signer {
         try {
           const info = await fetchNostrJson(domain);
           const pubkey = info.names['_'];
-          let relays = defaultRelays;
           const fetchedRelays = info.nip46[pubkey] as string[];
+          a.iframeUrl = info.nip46.iframe_url || '';
+          // サービス固有のリレーがあればURLを再構築
           if (fetchedRelays && fetchedRelays.length && (!customRelays || customRelays.length === 0)) {
-            relays = fetchedRelays;
+            const serviceNostrconnect = this.replaceRelayHints(nostrconnect, fetchedRelays);
+            a.link = a.iframeUrl ? serviceNostrconnect : a.link;
+          } else {
+            a.link = a.iframeUrl ? nostrconnect : a.link;
           }
-          a.iframeUrl = info.nip46.iframe_url || '';
-          const relayParams = relays.map(r => `&relay=${encodeURIComponent(r)}`).join('');
-          const nc = nostrconnect + relayParams;
-          a.link = a.iframeUrl ? nc : a.link;
           a.available = true;
         } catch (e) {
           console.log('Service unavailable', domain, e);
@@ -267,6 +310,16 @@ class AuthNostrService extends EventEmitter implements Signer {
     return [nostrconnect, apps];
   }
 
+  private replaceRelayHints(nostrconnectUrl: string, newRelays: string[]): string {
+    // 既存のrelay=パラメータを除去して新しいリレーに置換
+    const url = new URL(nostrconnectUrl);
+    url.searchParams.delete('relay');
+    for (const r of newRelays) {
+      url.searchParams.append('relay', r);
+    }
+    return url.toString();
+  }
+
   public async localSignup(name: string, sk?: string) {
     const signup = !sk;
     sk = sk || generatePrivateKey();