@konemono/nostr-login 1.7.25 → 1.7.26

package/package.json

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

package/src/index.ts

@@ -93,6 +93,11 @@ export class NostrLoginInitializer {
       this.bannerManager.onUserInfo(info);
     });
 
+    this.authNostrService.on('reconnecting', () => {
+      // リレー再接続中はProcessManagerのタイマーをリセット
+      this.processManager.onIframeUrl();
+    });
+
     this.modalManager.on('onAuthUrlClick', url => {
       this.openPopup(url);
     });
@@ -322,7 +327,7 @@ export class NostrLoginInitializer {
   };
 
   public cancelNeedAuth = () => {
-    console.log("cancelNeedAuth");
+    console.log('cancelNeedAuth');
     this.fulfillCustomLaunchPromise();
     this.authNostrService.cancelNostrConnect();
   };

package/src/modules/Nip46.ts

@@ -2,8 +2,10 @@ import NDK, { NDKEvent, NDKFilter, NDKNip46Signer, NDKNostrRpc, NDKRpcRequest, N
 import { validateEvent, verifySignature } from 'nostr-tools';
 import { PrivateKeySigner } from './Signer';
 import { NIP46_TIMEOUT } from '../const';
+import ProcessManager from './ProcessManager';
 
 class NostrRpc extends NDKNostrRpc {
+  protected processManager?: ProcessManager;
   protected _ndk: NDK;
   protected _signer: PrivateKeySigner;
   protected requests: Set<string> = new Set();
@@ -11,10 +13,11 @@ class NostrRpc extends NDKNostrRpc {
   private sub?: NDKSubscription;
   protected _useNip44: boolean = false;
 
-  public constructor(ndk: NDK, signer: PrivateKeySigner) {
+  public constructor(ndk: NDK, signer: PrivateKeySigner, processManager?: ProcessManager) {
     super(ndk, signer, ndk.debug.extend('nip46:signer:rpc'));
     this._ndk = ndk;
     this._signer = signer;
+    this.processManager = processManager;
   }
 
   public async subscribe(filter: NDKFilter): Promise<NDKSubscription> {
@@ -207,6 +210,7 @@ class NostrRpc extends NDKNostrRpc {
     console.log('sendRequest called:', method, 'to', remotePubkey);
 
     try {
+      this.processManager?.pause();
       await this.ensureConnected();
     } catch (e) {
       console.error('Failed to ensure connection:', e);
@@ -219,6 +223,8 @@ class NostrRpc extends NDKNostrRpc {
         });
       }
       throw e;
+    } finally {
+      this.processManager?.resume();
     }
 
     const id = this.getId();
@@ -380,6 +386,7 @@ export class IframeNostrRpc extends NostrRpc {
 
     if (!this.iframePort) {
       try {
+        this.processManager?.pause();
         await this.ensureConnected();
       } catch (e) {
         console.error('Failed to ensure connection:', e);
@@ -392,6 +399,8 @@ export class IframeNostrRpc extends NostrRpc {
           });
         }
         throw e;
+      } finally {
+        this.processManager?.resume();
       }
     }
 

package/src/modules/ProcessManager.ts

@@ -2,6 +2,7 @@ import { EventEmitter } from 'tseep';
 import { CALL_TIMEOUT } from '../const';
 
 class ProcessManager extends EventEmitter {
+  private paused = false;
   private callCount: number = 0;
   private callTimer: NodeJS.Timeout | undefined;
 
@@ -10,22 +11,38 @@ class ProcessManager extends EventEmitter {
   }
 
   public onAuthUrl() {
-    if (Boolean(this.callTimer)) {
-      clearTimeout(this.callTimer);
-    }
+    console.log('ProcessManager.onAuthUrl called, resetting timer');
+    this.resetTimer();
   }
 
   public onIframeUrl() {
-    if (Boolean(this.callTimer)) {
+    console.log('ProcessManager.onIframeUrl called, resetting timer');
+    this.resetTimer();
+  }
+
+  private resetTimer() {
+    if (this.callTimer) {
       clearTimeout(this.callTimer);
+      console.log('ProcessManager: timer reset');
+    }
+    if (this.callCount > 0) {
+      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> {
-    // FIXME only allow 1 parallel req
+    console.log('ProcessManager.wait called, callTimer exists:', !!this.callTimer, 'callCount:', this.callCount);
 
     if (!this.callTimer) {
-      this.callTimer = setTimeout(() => this.emit('onCallTimeout'), CALL_TIMEOUT);
+      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) {
@@ -57,11 +74,23 @@ class ProcessManager extends EventEmitter {
       throw error;
     }
 
-    // we can't return undefined bcs an exception is
-    // thrown above on 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.callTimer) {
+      this.callTimer = setTimeout(() => {
+        this.emit('onCallTimeout');
+      }, CALL_TIMEOUT);
+    }
+  }
 }
 
 export default ProcessManager;