@konemono/nostr-login 1.10.4 → 1.10.6

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -9,9 +9,9 @@ import { Signer } from './Nostr';
 import { Nip44 } from '../utils/nip44';
 import { IframeNostrRpc, Nip46Signer, ReadyListener } from './Nip46';
 import { PrivateKeySigner } from './Signer';
+import { DEFAULT_NIP46_RELAYS } from '../const';
 
 const OUTBOX_RELAYS = ['wss://user.kindpag.es', 'wss://purplepag.es', 'wss://relay.nos.social'];
-const DEFAULT_NOSTRCONNECT_RELAY = 'wss://relay.nsec.app/';
 const NOSTRCONNECT_APPS: ConnectionString[] = [
   {
     name: 'Nsec.app',
@@ -19,19 +19,16 @@ const NOSTRCONNECT_APPS: ConnectionString[] = [
     canImport: true,
     img: 'https://nsec.app/assets/favicon.ico',
     link: 'https://use.nsec.app/<nostrconnect>',
-    relay: 'wss://relay.nsec.app/',
   },
   {
     name: 'Amber',
     img: 'https://raw.githubusercontent.com/greenart7c3/Amber/refs/heads/master/assets/android-icon.svg',
     link: '<nostrconnect>',
-    relay: 'wss://relay.nsec.app/',
   },
   {
     name: 'Other key stores',
     img: '',
     link: '<nostrconnect>',
-    relay: 'wss://relay.nsec.app/',
   },
 ];
 
@@ -138,7 +135,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     } = {},
   ) {
     // カスタムリレーが指定されていれば使用、そうでなければ単一リレーまたはデフォルト
-    const relays = customRelays && customRelays.length > 0 ? customRelays : [relay || DEFAULT_NOSTRCONNECT_RELAY];
+    const relays = customRelays && customRelays.length > 0 ? customRelays : relay ? [relay] : DEFAULT_NIP46_RELAYS;
 
     const info: Info = {
       authMethod: 'connect',
@@ -171,7 +168,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     return info;
   }
 
-  public async createNostrConnect(relays?: string[]) {
+  public async createNostrConnect() {
     this.nostrConnectKey = generatePrivateKey();
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
@@ -183,12 +180,11 @@ class AuthNostrService extends EventEmitter implements Signer {
       perms: encodeURIComponent(this.params.optionsModal.perms || ''),
     };
 
-    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}`;
+    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}`;
   }
 
   public async getNostrConnectServices(customRelays?: string[]): Promise<[string, ConnectionString[]]> {
-    const nostrconnect = await this.createNostrConnect(customRelays);
+    const nostrconnect = await this.createNostrConnect();
 
     // copy defaults
     const apps = NOSTRCONNECT_APPS.map(a => ({ ...a }));
@@ -204,7 +200,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     // }
 
     for (const a of apps) {
-      let relays = customRelays && customRelays.length > 0 ? customRelays : [DEFAULT_NOSTRCONNECT_RELAY];
+      let relays = customRelays && customRelays.length > 0 ? customRelays : DEFAULT_NIP46_RELAYS;
       if (a.link.startsWith('https://')) {
         let domain = a.domain || new URL(a.link).hostname;
         try {

package/src/modules/ModalManager.ts

@@ -194,7 +194,7 @@ class ModalManager extends EventEmitter {
             // we pass the link down to iframe so it could open it
             this.modal.authUrl = cs.link;
             this.modal.iframeUrl = iframeUrl;
-            this.modal.isLoading = false;
+            // Don't set isLoading = false here, let exec handle it
             console.log('nostrconnect authUrl', this.modal.authUrl, this.modal.iframeUrl);
           }
 
@@ -207,16 +207,12 @@ class ModalManager extends EventEmitter {
           const { relay, domain, link, iframeUrl } = cs || {};
           console.log('nostrConnect', cs, relay, domain, link, iframeUrl);
 
-          if (this.modal) {
-            if (iframeUrl) {
-              // we pass the link down to iframe so it could open it
-              this.modal.authUrl = link;
-              this.modal.iframeUrl = iframeUrl;
-              this.modal.isLoading = false;
-              console.log('nostrconnect authUrl', this.modal.authUrl, this.modal.iframeUrl);
-            }
-
-            if (!cs) this.modal.isLoading = false;
+          if (this.modal && iframeUrl) {
+            // we pass the link down to iframe so it could open it
+            this.modal.authUrl = link;
+            this.modal.iframeUrl = iframeUrl;
+            // Don't set isLoading = false here, let exec handle it
+            console.log('nostrconnect authUrl', this.modal.authUrl, this.modal.iframeUrl);
           }
 
           await this.authNostrService.nostrConnect(relay, { domain, link, iframeUrl, customRelays: this.customNip46Relays });