@konemono/nostr-login 1.7.38 → 1.7.39

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -1,3 +1,4 @@
+//AuthNostrService.ts
 import { localStorageAddAccount, bunkerUrlToInfo, isBunkerUrl, fetchProfile, getBunkerUrl, localStorageRemoveCurrentAccount, createProfile, getIcon } from '../utils';
 import { ConnectionString, Info } from 'nostr-login-components/dist/types/types';
 import { generatePrivateKey, getEventHash, getPublicKey, nip19 } from 'nostr-tools';
@@ -153,13 +154,6 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async createNostrConnect(relays?: string[]) {
-    /*const relayList = relays
-      ? relays
-        .split(",")
-        .map(r => r.trim().replace(/['"]/g, ""))
-        .filter(r => r.length > 0)
-      : [];*/
-
     this.nostrConnectKey = generatePrivateKey();
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
@@ -175,20 +169,9 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async getNostrConnectServices(): Promise<[string, ConnectionString[]]> {
-    const nostrconnect = await this.createNostrConnect();
+    const nostrconnect = await this.createNostrConnect(DEFAULT_NOSTRCONNECT_RELAYS);
 
-    // copy defaults
     const apps = NOSTRCONNECT_APPS.map(a => ({ ...a }));
-    // if (this.params.optionsModal.dev) {
-    //   apps.push({
-    //     name: 'Dev.Nsec.app',
-    //     domain: 'new.nsec.app',
-    //     canImport: true,
-    //     img: 'https://new.nsec.app/assets/favicon.ico',
-    //     link: 'https://dev.nsec.app/<nostrconnect>',
-    //     relay: 'wss://relay.nsec.app/',
-    //   });
-    // }
 
     for (const a of apps) {
       let relays: string[] = [...DEFAULT_NOSTRCONNECT_RELAYS];
@@ -210,18 +193,12 @@ class AuthNostrService extends EventEmitter implements Signer {
         }
       }
 
-      const relayParams = relays
-        .map(r => r.replace(/['"]/g, ''))
-        .map(r => `&relay=${encodeURIComponent(r)}`)
-        .join('');
-
-      const nc = nostrconnect + relayParams;
+      // nostrconnectから既存のリレーを削除して新しいリレーを追加
+      const baseUrl = nostrconnect.split('&relay=')[0];
+      const relayParams = relays.map(r => `&relay=${encodeURIComponent(r)}`).join('');
+      const nc = baseUrl + relayParams;
 
-      if (a.iframeUrl) {
-        a.link = nc;
-      } else {
-        a.link = a.link.replace('<nostrconnect>', nc);
-      }
+      a.link = a.iframeUrl ? nc : a.link.replace('<nostrconnect>', nc);
     }
 
     return [nostrconnect, apps];

package/src/modules/Nip46.ts

@@ -1,3 +1,4 @@
+//Nip46.ts
 import NDK, {
   NDKEvent,
   NDKFilter,