@konemono/nostr-login 1.7.27 → 1.7.30

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -572,7 +572,8 @@ class AuthNostrService extends EventEmitter implements Signer {
     }
   }
 
-  public async signEvent(event: any) {
+  public async signEvent(ev: any) {
+    const event = { ...ev };
     if (this.localSigner) {
       event.pubkey = getPublicKey(this.localSigner.privateKey!);
       event.id = getEventHash(event);

package/src/modules/ProcessManager.ts

@@ -3,71 +3,92 @@ import { CALL_TIMEOUT } from '../const';
 
 class ProcessManager extends EventEmitter {
   private paused = false;
-  private callCount = 0;
-  private callTimer?: NodeJS.Timeout;
+  private callCount: number = 0;
+  private callTimer: NodeJS.Timeout | undefined;
 
   constructor() {
     super();
   }
 
   public onAuthUrl() {
+    console.log('ProcessManager.onAuthUrl called, resetting timer');
     this.resetTimer();
   }
 
   public onIframeUrl() {
+    console.log('ProcessManager.onIframeUrl called, resetting timer');
     this.resetTimer();
   }
 
-  private startTimer() {
-    if (this.paused) return;
-    if (this.callTimer) clearTimeout(this.callTimer);
-
-    this.callTimer = setTimeout(() => {
-      this.emit('onCallTimeout');
-    }, CALL_TIMEOUT);
-  }
-
   private resetTimer() {
+    if (this.callTimer) {
+      clearTimeout(this.callTimer);
+      console.log('ProcessManager: timer reset');
+    }
     if (this.callCount > 0) {
-      this.startTimer();
+      this.callTimer = setTimeout(() => {
+        console.log('ProcessManager: timeout reached, emitting onCallTimeout');
+        this.emit('onCallTimeout');
+      }, CALL_TIMEOUT);
+      console.log(`ProcessManager: new timer set for ${CALL_TIMEOUT} ms`);
     }
   }
 
   public async wait<T>(cb: () => Promise<T>): Promise<T> {
-    if (this.callCount === 0) {
+    console.log('ProcessManager.wait called, callTimer exists:', !!this.callTimer, 'callCount:', this.callCount);
+
+    if (!this.callTimer) {
+      this.callTimer = setTimeout(() => {
+        console.log('ProcessManager: timeout reached, emitting onCallTimeout');
+        this.emit('onCallTimeout');
+      }, CALL_TIMEOUT);
+      console.log(`Setting up timeout timer for ${CALL_TIMEOUT} ms`);
+    }
+
+    if (!this.callCount) {
       this.emit('onCallStart');
     }
 
     this.callCount++;
-    this.startTimer();
+
+    let error;
+    let result;
 
     try {
-      return await cb();
-    } finally {
-      this.callCount--;
-
-      if (this.callCount === 0) {
-        if (this.callTimer) {
-          clearTimeout(this.callTimer);
-          this.callTimer = undefined;
-        }
-        this.emit('onCallEnd');
-      }
+      result = await cb();
+    } catch (e) {
+      error = e;
     }
-  }
 
-  public pause() {
-    this.paused = true;
+    this.callCount--;
+
+    this.emit('onCallEnd');
+
     if (this.callTimer) {
       clearTimeout(this.callTimer);
-      this.callTimer = undefined;
     }
+
+    this.callTimer = undefined;
+
+    if (error) {
+      throw error;
+    }
+
+    // @ts-ignore
+    return result;
+  }
+  public pause() {
+    if (this.callTimer) clearTimeout(this.callTimer);
+    this.callTimer = undefined;
+    this.paused = true;
   }
 
   public resume() {
     this.paused = false;
-    if (this.callCount > 0) {
-      this.startTimer();
+    if (this.callCount > 0 && !this.callTimer) {
+      this.callTimer = setTimeout(() => {
+        this.emit('onCallTimeout');
+      }, CALL_TIMEOUT);
     }
   }
 }