@konemono/nostr-login 1.7.36 → 1.7.38

package/src/modules/BannerManager.ts

@@ -1,6 +1,6 @@
 import { NostrLoginOptions, TypeBanner } from '../types';
 import { NostrParams } from '.';
-import { Info } from 'nostr-login-components';
+import { Info } from 'nostr-login-components/dist/types/types';
 import { EventEmitter } from 'tseep';
 import { getDarkMode } from '../utils';
 import { ReadyListener } from './Nip46';

package/src/modules/ModalManager.ts

@@ -1,13 +1,11 @@
 import { NostrLoginOptions, StartScreens, TypeModal } from '../types';
-import { checkNip05, getBunkerUrl, getDarkMode, localStorageRemoveRecent, localStorageSetItem, prepareSignupRelays, localStorageGetItem } from '../utils';
+import { checkNip05, getBunkerUrl, getDarkMode, localStorageRemoveRecent, localStorageSetItem, prepareSignupRelays } from '../utils';
 import { AuthNostrService, NostrExtensionService, NostrParams } from '.';
 import { EventEmitter } from 'tseep';
 import { ConnectionString, Info, RecentType } from 'nostr-login-components/dist/types/types';
 import { nip19 } from 'nostr-tools';
 import { setDarkMode } from '..';
 
-const RELAY_STORAGE_KEY = '__nostrlogin_user_relays';
-
 class ModalManager extends EventEmitter {
   private modal: TypeModal | null = null;
   private params: NostrParams;
@@ -25,18 +23,6 @@ class ModalManager extends EventEmitter {
     this.authNostrService = authNostrService;
   }
 
-  private getUserRelays(): string[] {
-    const stored = localStorageGetItem(RELAY_STORAGE_KEY);
-    if (stored && Array.isArray(stored)) {
-      return stored;
-    }
-    return [];
-  }
-
-  private saveUserRelays(relays: string[]) {
-    localStorageSetItem(RELAY_STORAGE_KEY, JSON.stringify(relays));
-  }
-
   public async waitReady() {
     if (this.launcherPromise) {
       try {
@@ -48,8 +34,10 @@ class ModalManager extends EventEmitter {
 
   public async launch(opt: NostrLoginOptions) {
     console.log('nostr-login launch', opt);
+    // mutex
     if (this.launcherPromise) await this.waitReady();
 
+    // hmm?!
     if (this.authNostrService.isAuthing()) this.authNostrService.resetAuth();
 
     this.opt = opt;
@@ -73,6 +61,7 @@ class ModalManager extends EventEmitter {
       this.modal.setAttribute('bunkers', opt.bunkers);
     } else {
       let bunkers = 'nsec.app,highlighter.com';
+      // if (opt.dev) bunkers += ',new.nsec.app';
       this.modal.setAttribute('bunkers', bunkers);
     }
 
@@ -102,11 +91,6 @@ class ModalManager extends EventEmitter {
     this.modal.isLoadingExtension = false;
     this.modal.isLoading = false;
 
-    const userRelays = this.getUserRelays();
-    if (userRelays.length > 0) {
-      this.params.optionsModal.connectRelays = userRelays;
-    }
-
     [this.modal.connectionString, this.modal.connectionStringServices] = await this.authNostrService.getNostrConnectServices();
 
     dialog.appendChild(this.modal);
@@ -116,11 +100,21 @@ class ModalManager extends EventEmitter {
 
     this.launcherPromise = new Promise<void>((ok, err) => {
       dialog.addEventListener('close', () => {
+        // noop if already resolved
         err(new Error('Closed'));
 
         this.authNostrService.resetAuth();
 
         if (this.modal) {
+          // it's reset on modal creation
+          // // reset state
+          // this.modal.isLoading = false;
+          // this.modal.authUrl = '';
+          // this.modal.iframeUrl = '';
+          // this.modal.error = '';
+          // this.modal.isLoadingExtension = false;
+
+          // drop it
           // @ts-ignore
           document.body.removeChild(this.modal.parentNode);
           this.modal = null;
@@ -163,16 +157,20 @@ class ModalManager extends EventEmitter {
 
       const login = async (name: string, domain?: string) => {
         await exec(async () => {
+          // convert name to bunker url
           const bunkerUrl = await getBunkerUrl(name, this.params.optionsModal);
 
+          // connect to bunker by url
           await this.authNostrService.authNip46('login', { name, bunkerUrl, domain });
         });
       };
 
       const signup = async (name: string) => {
         await exec(async () => {
+          // create acc on service and get bunker url
           const { bunkerUrl, sk } = await this.authNostrService.createAccount(name);
 
+          // connect to bunker by url
           await this.authNostrService.authNip46('signup', { name, bunkerUrl, sk });
         });
       };
@@ -192,6 +190,7 @@ class ModalManager extends EventEmitter {
           cs.link = this.authNostrService.prepareImportUrl(cs.link);
 
           if (this.modal && iframeUrl) {
+            // 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;
@@ -204,11 +203,12 @@ class ModalManager extends EventEmitter {
 
       const nostrConnect = async (cs?: ConnectionString) => {
         await exec(async () => {
-          const { relay, domain, link, iframeUrl } = cs || {};
-          console.log('nostrConnect', cs, relay, domain, link, iframeUrl);
+          const { relays, domain, link, iframeUrl } = cs || {};
+          console.log('nostrConnect', cs, relays, 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;
@@ -218,7 +218,7 @@ class ModalManager extends EventEmitter {
             if (!cs) this.modal.isLoading = false;
           }
 
-          await this.authNostrService.nostrConnect(relay, { domain, link, iframeUrl });
+          await this.authNostrService.nostrConnect(relays, { domain, link, iframeUrl });
         });
       };
 
@@ -239,6 +239,8 @@ class ModalManager extends EventEmitter {
               .charAt(0)
               .toUpperCase() + self.hostname.slice(1);
           const relays = prepareSignupRelays(this.params.optionsModal.signupRelays);
+          // const url = `https://start.njump.me/?an=${name}&at=popup&ac=${window.location.href}&s=${this.opt!.followNpubs || ''}&arr=${relays}&awr=${relays}`;
+          // console.log('njump url', url);
 
           this.modal!.njumpIframe = `
           <html><body>
@@ -246,15 +248,18 @@ class ModalManager extends EventEmitter {
           <script>
           new NstartModal({
             baseUrl: 'https://start.njump.me',
+            // Required parameters
             an: '${name}',
+            // Optional parameters
             s: [${this.opt!.followNpubs ? `'${this.opt!.followNpubs}'` : ''}],
-            afb: false,
-            asb: false,
-            aan: false,
-            aac: true,
-            ahc: true,
-            arr: ${JSON.stringify(relays)},
-            awr: ${JSON.stringify(relays)},
+            afb: false, // forceBunker
+            asb: false, // skipBunker
+            aan: false, // avoidNsec
+            aac: true, // avoidNcryptsec
+            ahc: true, // hide close button
+            arr: ${JSON.stringify(relays)}, //readRelays
+            awr: ${JSON.stringify(relays)}, //writeRelays
+            // Callbacks
             onComplete: (result) => {
               console.log('Login token:', result.nostrLogin);
               window.parent.location.href='${window.location.href}#nostr-login='+result.nostrLogin;
@@ -265,10 +270,11 @@ class ModalManager extends EventEmitter {
           }).open();
           </script>
           </body></html>
-          `.replaceAll('&', '&amp;');
+          `.replaceAll('&', '&amp;'); // needed?
 
           return new Promise((ok, err) => {
             const process = async (nsecOrBunker: string) => {
+              // process the returned value
               console.log('nsecOrBunker', nsecOrBunker);
               if (nsecOrBunker.startsWith('nsec1')) {
                 let decoded;
@@ -294,6 +300,7 @@ class ModalManager extends EventEmitter {
               if (window.location.hash.startsWith('#nostr-login=')) {
                 const nsecOrBunker = window.location.hash.split('#nostr-login=')[1];
 
+                // clear hash from history
                 const url = new URL(window.location.toString());
                 url.hash = '';
                 window.history.replaceState({}, '', url.toString());
@@ -302,6 +309,9 @@ class ModalManager extends EventEmitter {
               }
             };
 
+            // // use random 'target' to make sure window.opener is
+            // // accessible to the popup
+            // window.open(url, '' + Date.now(), 'popup=true,width=600,height=950');
             window.addEventListener('hashchange', onOpen);
           });
         });
@@ -349,6 +359,7 @@ class ModalManager extends EventEmitter {
       });
 
       this.modal.addEventListener('nlNostrConnectDefault', () => {
+        // dedup the calls
         if (!this.authNostrService.isAuthing()) nostrConnect();
       });
 
@@ -357,30 +368,18 @@ class ModalManager extends EventEmitter {
         this.authNostrService.cancelNostrConnect();
       });
 
-      this.modal.addEventListener('nlSaveUserRelays', (event: any) => {
-        const relays = event.detail as string[];
-        console.log('nlSaveUserRelays', relays);
-        this.saveUserRelays(relays);
-        this.params.optionsModal.connectRelays = relays;
-      });
-
-      this.modal.addEventListener('nlGetUserRelays', () => {
-        const relays = this.getUserRelays();
-        console.log('nlGetUserRelays', relays);
-        if (this.modal) {
-          this.modal.dispatchEvent(
-            new CustomEvent('nlUserRelaysReply', {
-              detail: relays,
-            }),
-          );
-        }
-      });
-
       this.modal.addEventListener('nlSwitchAccount', (event: any) => {
         const eventInfo: Info = event.detail as Info;
 
         this.emit('onSwitchAccount', eventInfo);
 
+        // wait a bit, if dialog closes before
+        // switching finishes then launched promise rejects
+
+        // FIXME this calls resetAuth which then prevents
+        // endAuth from getting properly called. 300 is not
+        // enough to init iframe, so there should be a
+        // feedback from switchAccount here
         setTimeout(() => dialog.close(), 300);
       });
 
@@ -427,7 +426,7 @@ class ModalManager extends EventEmitter {
           else throw new Error('Bad npub');
         } else if (nameNpub.trim().length === 64) {
           pubkey = nameNpub.trim();
-          nip19.npubEncode(pubkey);
+          nip19.npubEncode(pubkey); // check
         }
         return pubkey;
       };
@@ -467,10 +466,13 @@ class ModalManager extends EventEmitter {
               throw new Error('Failed to send DM');
             }
 
+            // switch to 'enter code' mode
             this.modal.isOTP = true;
 
+            // remember for code handler below
             otpPubkey = pubkey;
 
+            // spinner off
             this.modal.isLoading = false;
           },
           { start: true },
@@ -527,6 +529,8 @@ class ModalManager extends EventEmitter {
           this.modal.isLoading = false;
         }
 
+        // this.authNostrService.cancelListenNostrConnect();
+
         dialog.close();
         err(new Error('Cancelled'));
       };
@@ -551,6 +555,9 @@ class ModalManager extends EventEmitter {
   }
 
   public async showIframeUrl(url: string) {
+    // make sure we consume the previous promise,
+    // otherwise launch will start await-ing
+    // before modal is created and setting iframeUrl will fail
     await this.waitReady();
 
     this.launch({