@konemono/nostr-login 1.7.22 → 1.7.23

package/src/modules/ProcessManager.ts

@@ -23,29 +23,9 @@ class ProcessManager extends EventEmitter {
 
   public async wait<T>(cb: () => Promise<T>): Promise<T> {
     // FIXME only allow 1 parallel req
-    console.log('ProcessManager.wait called, callTimer exists:', !!this.callTimer, 'callCount:', this.callCount);
-
-    let timeoutReject: ((reason?: any) => void) | undefined;
-    let isTimedOut = false;
-    let localTimer: NodeJS.Timeout | undefined;
-    
-    const timeoutPromise = new Promise<T>((_, reject) => {
-      timeoutReject = reject;
-    });
 
     if (!this.callTimer) {
-      console.log('Setting up timeout timer for', CALL_TIMEOUT, 'ms');
-      localTimer = setTimeout(() => {
-        console.log('ProcessManager: timeout reached, emitting onCallTimeout');
-        isTimedOut = true;
-        this.emit('onCallTimeout');
-        if (timeoutReject) {
-          timeoutReject(new Error('[ProcessManager] Request timed out'));
-        }
-      }, CALL_TIMEOUT);
-      this.callTimer = localTimer;
-    } else {
-      console.log('Timer already exists, not setting up new one');
+      this.callTimer = setTimeout(() => this.emit('onCallTimeout'), CALL_TIMEOUT);
     }
 
     if (!this.callCount) {
@@ -56,45 +36,23 @@ class ProcessManager extends EventEmitter {
 
     let error;
     let result;
-    let raceFinished = false;
 
     try {
-      result = await Promise.race([
-        cb().then(r => {
-          if (!raceFinished) {
-            raceFinished = true;
-            return r;
-          }
-          // Race already finished (timed out), ignore this result
-          console.log('ProcessManager: ignoring late result after timeout');
-          throw new Error('Already timed out');
-        }),
-        timeoutPromise.then(
-          () => {
-            raceFinished = true;
-            throw new Error('Should not resolve');
-          },
-          (err) => {
-            raceFinished = true;
-            throw err;
-          }
-        )
-      ]);
+      result = await cb();
     } catch (e) {
       error = e;
     }
 
     this.callCount--;
 
-    // Always emit onCallEnd for cleanup
     this.emit('onCallEnd');
 
-    // Clear the timer if it's the one we created
-    if (this.callTimer === localTimer) {
+    if (this.callTimer) {
       clearTimeout(this.callTimer);
-      this.callTimer = undefined;
     }
 
+    this.callTimer = undefined;
+
     if (error) {
       throw error;
     }

package/src/types.ts

@@ -1,4 +1,4 @@
-import { Info, AuthMethod, ConnectionString, RecentType, BannerNotify } from 'nostr-login-components';
+import { Info, AuthMethod, ConnectionString, RecentType, BannerNotify } from 'nostr-login-components/dist/types/types';
 
 export interface NostrLoginAuthOptions {
   localNsec?: string;
@@ -10,7 +10,6 @@ export interface NostrLoginAuthOptions {
   name?: string;
 }
 
-// NOTE: must be a subset of CURRENT_MODULE enum
 export type StartScreens =
   | 'welcome'
   | 'welcome-login'
@@ -27,56 +26,27 @@ export type StartScreens =
   | 'import';
 
 export interface NostrLoginOptions {
-  // optional
   theme?: string;
   startScreen?: StartScreens;
   bunkers?: string;
   onAuth?: (npub: string, options: NostrLoginAuthOptions) => void;
   perms?: string;
   darkMode?: boolean;
-
-  // do not show the banner, modals must be `launch`-ed
   noBanner?: boolean;
-
-  // forward reqs to this bunker origin for testing
   devOverrideBunkerOrigin?: string;
-
-  // deprecated, use methods=['local']
-  // use local signup instead of nostr connect
   localSignup?: boolean;
-
-  // allowed auth methods
   methods?: AuthMethod[];
-
-  // otp endpoints
   otpRequestUrl?: string;
   otpReplyUrl?: string;
-
-  // welcome screen's title/desc
   title?: string;
   description?: string;
-
-  // comma-separated list of relays added
-  // to relay list of new profiles created with local signup
   signupRelays?: string;
-
-  // relay list to override hardcoded `OUTBOX_RELAYS` constant
   outboxRelays?: string[];
-
-  // dev mode
   dev?: boolean;
-
-  // use start.njump.me instead of local signup
   signupNstart?: boolean;
-
-  // list of npubs to auto/suggest-follow on signup
   followNpubs?: string;
-
-  // when method call auth needed, instead of showing
-  // the modal, we start waiting for incoming nip46
-  // connection and send the nostrconnect string using
-  // nlNeedAuth event
   customNostrConnect?: boolean;
+  connectRelays?: string[];
 }
 
 export interface IBanner {

package/src/utils/index.ts

@@ -115,36 +115,22 @@ export const getBunkerUrl = async (value: string, optionsModal: NostrLoginOption
     const origin = optionsModal.devOverrideBunkerOrigin || `https://${domain}`;
     const bunkerUrl = `${origin}/.well-known/nostr.json?name=_`;
     const userUrl = `${origin}/.well-known/nostr.json?name=${name}`;
-    
-    // 10 sec timeout for fetch
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 10000);
-    
-    try {
-      const bunker = await fetch(bunkerUrl, { signal: controller.signal });
-      const bunkerData = await bunker.json();
-      const bunkerPubkey = bunkerData.names['_'];
-      const bunkerRelays = bunkerData.nip46[bunkerPubkey];
-      const user = await fetch(userUrl, { signal: controller.signal });
-      const userData = await user.json();
-      const userPubkey = userData.names[name];
-      // console.log({
-      //     bunkerData, userData, bunkerPubkey, bunkerRelays, userPubkey,
-      //     name, domain, origin
-      // })
-      if (!bunkerRelays.length) {
-        throw new Error('Bunker relay not provided');
-      }
-
-      return `bunker://${userPubkey}?relay=${bunkerRelays[0]}`;
-    } catch (e: any) {
-      if (e.name === 'AbortError') {
-        throw new Error('[getBunkerUrl] Request timed out');
-      }
-      throw e;
-    } finally {
-      clearTimeout(timeoutId);
+    const bunker = await fetch(bunkerUrl);
+    const bunkerData = await bunker.json();
+    const bunkerPubkey = bunkerData.names['_'];
+    const bunkerRelays = bunkerData.nip46[bunkerPubkey];
+    const user = await fetch(userUrl);
+    const userData = await user.json();
+    const userPubkey = userData.names[name];
+    // console.log({
+    //     bunkerData, userData, bunkerPubkey, bunkerRelays, userPubkey,
+    //     name, domain, origin
+    // })
+    if (!bunkerRelays.length) {
+      throw new Error('Bunker relay not provided');
     }
+
+    return `bunker://${userPubkey}?relay=${bunkerRelays[0]}`;
   }
 
   throw new Error('Invalid user name or bunker url');