@konemono/nostr-login 1.7.15 → 1.7.16

package/package.json

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

package/src/modules/BannerManager.ts

@@ -48,6 +48,7 @@ class BannerManager extends EventEmitter {
 
   public onCallTimeout() {
     if (this.banner) {
+      this.banner.isLoading = false;
       this.banner.notify = {
         mode: 'timeout',
       };

package/src/modules/ProcessManager.ts

@@ -24,8 +24,18 @@ class ProcessManager extends EventEmitter {
   public async wait<T>(cb: () => Promise<T>): Promise<T> {
     // FIXME only allow 1 parallel req
 
+    let timeoutReject: ((reason?: any) => void) | undefined;
+    const timeoutPromise = new Promise<T>((_, reject) => {
+      timeoutReject = reject;
+    });
+
     if (!this.callTimer) {
-      this.callTimer = setTimeout(() => this.emit('onCallTimeout'), CALL_TIMEOUT);
+      this.callTimer = setTimeout(() => {
+        this.emit('onCallTimeout');
+        if (timeoutReject) {
+          timeoutReject(new Error('Request timed out'));
+        }
+      }, CALL_TIMEOUT);
     }
 
     if (!this.callCount) {
@@ -38,7 +48,7 @@ class ProcessManager extends EventEmitter {
     let result;
 
     try {
-      result = await cb();
+      result = await Promise.race([cb(), timeoutPromise]);
     } catch (e) {
       error = e;
     }