@konemono/nostr-login 1.10.10 → 1.10.12

package/package.json

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

package/src/index.ts

@@ -148,6 +148,7 @@ export class NostrLoginInitializer {
 
     this.bannerManager.on('cancelTimeout', () => {
       this.authNostrService.cancelSignerInit();
+      this.processManager.cancelAllPendingCalls();
       this.bannerManager.onCallEnd();
     });
   }

package/src/modules/AuthNostrService.ts

@@ -703,6 +703,12 @@ class AuthNostrService extends EventEmitter implements Signer {
       event.id = getEventHash(event);
       event.sig = await this.localSigner.sign(event);
     } else {
+      // リレー接続を確認・再接続
+      if (this.ndk.pool.stats().connected === 0) {
+        console.log('NDK relays disconnected, reconnecting...');
+        await this.ndk.connect();
+      }
+
       event.pubkey = this.signer?.remotePubkey;
       event.id = getEventHash(event);
       event.sig = await this.signer?.sign(event);

package/src/modules/ProcessManager.ts

@@ -4,11 +4,20 @@ import { CALL_TIMEOUT } from '../const';
 class ProcessManager extends EventEmitter {
   private callCount: number = 0;
   private callTimer: NodeJS.Timeout | undefined;
+  private pendingCalls: Map<number, { reject: (reason?: any) => void }> = new Map();
+  private callIdCounter: number = 0;
 
   constructor() {
     super();
   }
 
+  public cancelAllPendingCalls() {
+    for (const [id, { reject }] of this.pendingCalls.entries()) {
+      reject(new Error('Cancelled by user'));
+    }
+    this.pendingCalls.clear();
+  }
+
   public onAuthUrl() {
     if (Boolean(this.callTimer)) {
       clearTimeout(this.callTimer);
@@ -34,11 +43,22 @@ class ProcessManager extends EventEmitter {
 
     this.callCount++;
 
+    const callId = this.callIdCounter++;
     let error;
     let result;
 
     try {
-      result = await cb();
+      result = await new Promise<T>(async (resolve, reject) => {
+        this.pendingCalls.set(callId, { reject });
+        try {
+          const res = await cb();
+          this.pendingCalls.delete(callId);
+          resolve(res);
+        } catch (e) {
+          this.pendingCalls.delete(callId);
+          reject(e);
+        }
+      });
     } catch (e) {
       error = e;
     }