@konemono/nostr-login 1.7.36 → 1.7.38

package/src/modules/ProcessManager.ts

@@ -2,7 +2,6 @@ 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;
 
@@ -11,41 +10,22 @@ class ProcessManager extends EventEmitter {
   }
 
   public onAuthUrl() {
-    console.log('ProcessManager.onAuthUrl called, resetting timer');
-    this.resetTimer();
+    if (Boolean(this.callTimer)) {
+      clearTimeout(this.callTimer);
+    }
   }
 
   public onIframeUrl() {
-    console.log('ProcessManager.onIframeUrl called, resetting timer');
-    this.resetTimer();
-  }
-
-  public resetTimer() {
-    // 既存のタイマーがあればクリア
-    if (this.callTimer) {
+    if (Boolean(this.callTimer)) {
       clearTimeout(this.callTimer);
-      this.callTimer = undefined; // IDをクリア
-      console.log('ProcessManager: timer reset');
-    }
-
-    // 監視対象が残っていて、かつ一時停止中でなければ、新しいタイマーを設定
-    if (this.callCount > 0 && !this.paused) {
-      this.callTimer = setTimeout(() => {
-        console.log('ProcessManager: timeout reached, emitting onCallTimeout');
-        this.callTimer = undefined; // タイムアウト時にIDをクリア
-        this.emit('onCallTimeout');
-      }, CALL_TIMEOUT);
-      console.log(`ProcessManager: new timer set for ${CALL_TIMEOUT} ms`);
     }
   }
 
   public async wait<T>(cb: () => Promise<T>): Promise<T> {
-    console.log('ProcessManager.wait called, callTimer exists:', !!this.callTimer, 'callCount:', this.callCount);
+    // FIXME only allow 1 parallel req
 
-    // ★ 修正点: タイマーの初期設定を resetTimer に任せる
-    if (!this.callTimer && this.callCount === 0) {
-      // waitの最初の呼び出し時のみ、タイマーを初期設定
-      this.resetTimer();
+    if (!this.callTimer) {
+      this.callTimer = setTimeout(() => this.emit('onCallTimeout'), CALL_TIMEOUT);
     }
 
     if (!this.callCount) {
@@ -54,52 +34,33 @@ class ProcessManager extends EventEmitter {
 
     this.callCount++;
 
-    let error: any;
-    let result: any;
+    let error;
+    let result;
 
-    // 非同期処理の実行
     try {
       result = await cb();
     } catch (e) {
       error = e;
     }
 
-    // ★ 修正点: クリーンアップロジックを resetTimer に置き換え
-    // ProcessManagerの呼び出しカウントをデクリメント
     this.callCount--;
-    this.emit('onCallEnd');
-
-    // リクエスト完了後、タイマーをリセットし、callCountに応じて再設定
-    this.resetTimer();
 
-    // エラーがあればスローし、呼び出し元に伝播させる
-    if (error) {
-      throw error;
-    }
-
-    // @ts-ignore
-    return result as T;
-  }
+    this.emit('onCallEnd');
 
-  public pause() {
-    console.log('ProcessManager: PAUSING timer...');
     if (this.callTimer) {
       clearTimeout(this.callTimer);
     }
-    this.callTimer = undefined; // タイマーをクリア
-    this.paused = true;
-    this.emit('onCallPause');
-  }
 
-  public resume() {
-    console.log('ProcessManager: RESUMING timer...');
-    this.paused = false;
+    this.callTimer = undefined;
 
-    // ★ 修正点: pause解除後、監視対象が残っていればタイマーを再設定 (resetTimerを呼び出す)
-    if (this.callCount > 0 && !this.callTimer) {
-      this.resetTimer();
+    if (error) {
+      throw error;
     }
-    this.emit('onCallResume');
+
+    // we can't return undefined bcs an exception is
+    // thrown above on error
+    // @ts-ignore
+    return result;
   }
 }
 

package/src/modules/Signer.ts

@@ -1,4 +1,4 @@
-import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
+/* import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
 import { Nip44 } from '../utils/nip44';
 import { getPublicKey } from 'nostr-tools';
 
@@ -23,3 +23,4 @@ export class PrivateKeySigner extends NDKPrivateKeySigner {
     return Promise.resolve(this.nip44.decrypt(this.privateKey!, sender.pubkey, value));
   }
 }
+ */

package/src/types.ts

@@ -10,6 +10,7 @@ export interface NostrLoginAuthOptions {
   name?: string;
 }
 
+// NOTE: must be a subset of CURRENT_MODULE enum
 export type StartScreens =
   | 'welcome'
   | 'welcome-login'
@@ -26,27 +27,56 @@ export type StartScreens =
   | 'import';
 
 export interface NostrLoginOptions {
+  // optional
   theme?: string;
   startScreen?: StartScreens;
   bunkers?: string;
   onAuth?: (npub: string, options: NostrLoginAuthOptions) => void;
   perms?: string;
   darkMode?: boolean;
+
+  // do not show the banner, modals must be `launch`-ed
   noBanner?: boolean;
+
+  // forward reqs to this bunker origin for testing
   devOverrideBunkerOrigin?: string;
+
+  // deprecated, use methods=['local']
+  // use local signup instead of nostr connect
   localSignup?: boolean;
+
+  // allowed auth methods
   methods?: AuthMethod[];
+
+  // otp endpoints
   otpRequestUrl?: string;
   otpReplyUrl?: string;
+
+  // welcome screen's title/desc
   title?: string;
   description?: string;
+
+  // comma-separated list of relays added
+  // to relay list of new profiles created with local signup
   signupRelays?: string;
+
+  // relay list to override hardcoded `OUTBOX_RELAYS` constant
   outboxRelays?: string[];
+
+  // dev mode
   dev?: boolean;
+
+  // use start.njump.me instead of local signup
   signupNstart?: boolean;
+
+  // list of npubs to auto/suggest-follow on signup
   followNpubs?: string;
+
+  // when method call auth needed, instead of showing
+  // the modal, we start waiting for incoming nip46
+  // connection and send the nostrconnect string using
+  // nlNeedAuth event
   customNostrConnect?: boolean;
-  connectRelays?: string[];
 }
 
 export interface IBanner {

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-import { Info, RecentType } from 'nostr-login-components';
+import { Info, RecentType } from 'nostr-login-components/dist/types/types';
 import NDK, { NDKEvent, NDKRelaySet, NDKSigner, NDKUser } from '@nostr-dev-kit/ndk';
 import { generatePrivateKey } from 'nostr-tools';
 import { NostrLoginOptions } from '../types';