@konemono/nostr-login 1.7.16 → 1.7.18

package/package.json

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

package/src/modules/BannerManager.ts

@@ -47,11 +47,15 @@ class BannerManager extends EventEmitter {
   }
 
   public onCallTimeout() {
+    console.log('BannerManager.onCallTimeout called, banner:', this.banner);
     if (this.banner) {
+      console.log('Setting banner isLoading=false and notify=timeout');
       this.banner.isLoading = false;
       this.banner.notify = {
         mode: 'timeout',
       };
+    } else {
+      console.log('Banner is null, cannot set timeout notification');
     }
   }
 

package/src/modules/Nip46.ts

@@ -199,7 +199,7 @@ class NostrRpc extends NDKNostrRpc {
           this.removeListener(`response-${id}`, responseHandler);
           console.log('nostr-login: NIP-46 request timeout, emitting timeout event');
           this.emit('timeout');
-          reject('Request timed out');
+          reject('[Nip46] Request timed out');
         }
       }, 30000);
     });

package/src/modules/ProcessManager.ts

@@ -23,19 +23,29 @@ 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) {
-      this.callTimer = setTimeout(() => {
+      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('Request timed out'));
+          timeoutReject(new Error('[ProcessManager] Request timed out'));
         }
       }, CALL_TIMEOUT);
+      this.callTimer = localTimer;
+    } else {
+      console.log('Timer already exists, not setting up new one');
     }
 
     if (!this.callCount) {
@@ -55,14 +65,17 @@ class ProcessManager extends EventEmitter {
 
     this.callCount--;
 
-    this.emit('onCallEnd');
+    // Only emit onCallEnd if not timed out (timeout already handled cleanup)
+    if (!isTimedOut) {
+      this.emit('onCallEnd');
+    }
 
-    if (this.callTimer) {
+    // Clear the timer if it's the one we created
+    if (this.callTimer === localTimer) {
       clearTimeout(this.callTimer);
+      this.callTimer = undefined;
     }
 
-    this.callTimer = undefined;
-
     if (error) {
       throw error;
     }

package/src/utils/index.ts

@@ -139,7 +139,7 @@ export const getBunkerUrl = async (value: string, optionsModal: NostrLoginOption
       return `bunker://${userPubkey}?relay=${bunkerRelays[0]}`;
     } catch (e: any) {
       if (e.name === 'AbortError') {
-        throw new Error('Request timed out');
+        throw new Error('[getBunkerUrl] Request timed out');
       }
       throw e;
     } finally {