@konemono/nostr-login 1.7.22 → 1.7.24

package/src/modules/Nip46.ts

@@ -1,11 +1,13 @@
 import NDK, { NDKEvent, NDKFilter, NDKNip46Signer, NDKNostrRpc, NDKRpcRequest, NDKRpcResponse, NDKSubscription, NDKSubscriptionCacheUsage, NostrEvent } from '@nostr-dev-kit/ndk';
 import { validateEvent, verifySignature } from 'nostr-tools';
 import { PrivateKeySigner } from './Signer';
+import { NIP46_TIMEOUT } from '../const';
 
 class NostrRpc extends NDKNostrRpc {
   protected _ndk: NDK;
   protected _signer: PrivateKeySigner;
   protected requests: Set<string> = new Set();
+  protected requestTimeouts: Map<string, NodeJS.Timeout> = new Map();
   private sub?: NDKSubscription;
   protected _useNip44: boolean = false;
 
@@ -16,19 +18,34 @@ class NostrRpc extends NDKNostrRpc {
   }
 
   public async subscribe(filter: NDKFilter): Promise<NDKSubscription> {
-    // NOTE: fixing ndk
     filter.kinds = filter.kinds?.filter(k => k === 24133);
     this.sub = await super.subscribe(filter);
     return this.sub;
   }
 
   public stop() {
+    this.clearAllTimeouts();
     if (this.sub) {
       this.sub.stop();
       this.sub = undefined;
     }
   }
 
+  private clearAllTimeouts() {
+    for (const timeout of this.requestTimeouts.values()) {
+      clearTimeout(timeout);
+    }
+    this.requestTimeouts.clear();
+  }
+
+  private clearTimeout(id: string) {
+    const timeout = this.requestTimeouts.get(id);
+    if (timeout) {
+      clearTimeout(timeout);
+      this.requestTimeouts.delete(id);
+    }
+  }
+
   public setUseNip44(useNip44: boolean) {
     this._useNip44 = useNip44;
   }
@@ -39,7 +56,6 @@ class NostrRpc extends NDKNostrRpc {
     return ciphertext[l - 28] === '?' && ciphertext[l - 27] === 'i' && ciphertext[l - 26] === 'v' && ciphertext[l - 25] === '=';
   }
 
-  // override to auto-decrypt nip04/nip44
   public async parseEvent(event: NDKEvent): Promise<NDKRpcRequest | NDKRpcResponse> {
     const remoteUser = this._ndk.getUser({ pubkey: event.pubkey });
     remoteUser.ndk = this._ndk;
@@ -68,9 +84,6 @@ class NostrRpc extends NDKNostrRpc {
     }
   }
 
-  // ndk doesn't support nostrconnect:
-  // we just listed to an unsolicited reply to
-  // our pubkey and if it's ack/secret - we're fine
   public async listen(nostrConnectSecret: string): Promise<string> {
     const pubkey = this._signer.pubkey;
     console.log('nostr-login listening for conn to', pubkey);
@@ -78,61 +91,46 @@ class NostrRpc extends NDKNostrRpc {
       'kinds': [24133],
       '#p': [pubkey],
     });
-    
     return new Promise<string>((ok, err) => {
-      let finished = false;
-      
-      // 30 sec timeout
       const timeoutId = setTimeout(() => {
-        if (!finished) {
-          finished = true;
-          this.stop();
-          console.log('nostr-login: listen timeout, emitting timeout event');
-          this.emit('timeout');
-          err('Listen timed out');
-        }
-      }, 30000);
-      
+        this.stop();
+        err(new Error('NIP46 listen timeout'));
+      }, NIP46_TIMEOUT);
+
       sub.on('event', async (event: NDKEvent) => {
-        if (finished) return;
-        
         try {
           const parsedEvent = await this.parseEvent(event);
-          // console.log('ack parsedEvent', parsedEvent);
           if (!(parsedEvent as NDKRpcRequest).method) {
             const response = parsedEvent as NDKRpcResponse;
 
-            // ignore
             if (response.result === 'auth_url') return;
 
-            // FIXME for now accept 'ack' replies, later on only
-            // accept secrets
             if (response.result === 'ack' || response.result === nostrConnectSecret) {
-              finished = true;
               clearTimeout(timeoutId);
-              this.stop();
               ok(event.pubkey);
             } else {
-              finished = true;
               clearTimeout(timeoutId);
-              this.stop();
               err(response.error);
             }
           }
         } catch (e) {
           console.log('error parsing event', e, event.rawEvent());
         }
+        this.stop();
       });
     });
   }
 
-  // since ndk doesn't yet support perms param
-  // we reimplement the 'connect' call here
-  // instead of await signer.blockUntilReady();
   public async connect(pubkey: string, token?: string, perms?: string) {
     return new Promise<void>((ok, err) => {
       const connectParams = [pubkey!, token || '', perms || ''];
+
+      const timeoutId = setTimeout(() => {
+        err(new Error('NIP46 connect timeout'));
+      }, NIP46_TIMEOUT);
+
       this.sendRequest(pubkey!, 'connect', connectParams, 24133, (response: NDKRpcResponse) => {
+        clearTimeout(timeoutId);
         if (response.result === 'ack') {
           ok();
         } else {
@@ -146,25 +144,45 @@ class NostrRpc extends NDKNostrRpc {
     return Math.random().toString(36).substring(7);
   }
 
+  protected async ensureConnected(): Promise<void> {
+    const connectedRelays = Array.from(this._ndk.pool.relays.values()).filter(r => r.status === 1);
+
+    if (connectedRelays.length === 0) {
+      console.log('No connected relays, reconnecting...');
+      await this._ndk.connect();
+
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          reject(new Error('Failed to reconnect to relays'));
+        }, 5000);
+
+        const checkConnection = () => {
+          const connected = Array.from(this._ndk.pool.relays.values()).filter(r => r.status === 1);
+          if (connected.length > 0) {
+            clearTimeout(timeout);
+            console.log('Reconnected to', connected.length, 'relays');
+            resolve();
+          } else {
+            setTimeout(checkConnection, 100);
+          }
+        };
+        checkConnection();
+      });
+    }
+  }
+
   public async sendRequest(remotePubkey: string, method: string, params: string[] = [], kind = 24133, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse> {
+    await this.ensureConnected();
+
     const id = this.getId();
 
-    // response handler will deduplicate auth urls and responses
     this.setResponseHandler(id, cb);
 
-    // create and sign request
     const event = await this.createRequestEvent(id, remotePubkey, method, params, kind);
-    console.log("sendRequest", { event, method, remotePubkey, params });
+    console.log('sendRequest', { event, method, remotePubkey, params });
 
-    // send to relays
-    const relays = await event.publish();
-    if (relays.size === 0) throw new Error('Failed to publish to relays');
+    await event.publish();
 
-    // NOTE: ndk returns a promise that never resolves and
-    // in fact REQUIRES cb to be provided (otherwise no way
-    // to consume the result), we've already stepped on the bug
-    // of waiting for this unresolvable result, so now we return
-    // undefined to make sure waiters fail, not hang.
     // @ts-ignore
     return undefined as NDKRpcResponse;
   }
@@ -172,7 +190,26 @@ class NostrRpc extends NDKNostrRpc {
   protected setResponseHandler(id: string, cb?: (res: NDKRpcResponse) => void) {
     let authUrlSent = false;
     const now = Date.now();
-    return new Promise<NDKRpcResponse>((resolve, reject) => {
+
+    const timeoutId = setTimeout(() => {
+      if (this.requests.has(id)) {
+        this.requests.delete(id);
+        this.requestTimeouts.delete(id);
+        console.log('NIP46 request timeout for', id);
+        if (cb) {
+          cb({
+            id,
+            result: '',
+            error: 'NIP46 request timeout',
+            event: undefined as any,
+          });
+        }
+      }
+    }, NIP46_TIMEOUT);
+
+    this.requestTimeouts.set(id, timeoutId);
+
+    return new Promise<NDKRpcResponse>(() => {
       const responseHandler = (response: NDKRpcResponse) => {
         if (response.result === 'auth_url') {
           this.once(`response-${id}`, responseHandler);
@@ -182,30 +219,18 @@ class NostrRpc extends NDKNostrRpc {
           }
         } else if (cb) {
           if (this.requests.has(id)) {
+            this.clearTimeout(id);
             this.requests.delete(id);
             console.log('nostr-login processed nip46 request in', Date.now() - now, 'ms');
             cb(response);
-            resolve(response);
           }
         }
       };
 
       this.once(`response-${id}`, responseHandler);
-
-      // timeout
-      setTimeout(() => {
-        if (this.requests.has(id)) {
-          this.requests.delete(id);
-          this.removeListener(`response-${id}`, responseHandler);
-          console.log('nostr-login: NIP-46 request timeout, emitting timeout event');
-          this.emit('timeout');
-          reject('[Nip46] Request timed out');
-        }
-      }, 30000);
     });
   }
 
-
   protected async createRequestEvent(id: string, remotePubkey: string, method: string, params: string[] = [], kind = 24133) {
     this.requests.add(id);
     const localUser = await this._signer.user();
@@ -232,7 +257,6 @@ export class IframeNostrRpc extends NostrRpc {
   private peerOrigin?: string;
   private iframePort?: MessagePort;
   private iframeRequests = new Map<string, { id: string; pubkey: string }>();
-  private iframePingInterval?: NodeJS.Timeout;
 
   public constructor(ndk: NDK, localSigner: PrivateKeySigner, iframePeerOrigin?: string) {
     super(ndk, localSigner);
@@ -246,7 +270,6 @@ export class IframeNostrRpc extends NostrRpc {
       this._ndk,
       {},
       {
-        // don't send to relay
         closeOnEose: true,
         cacheUsage: NDKSubscriptionCacheUsage.ONLY_CACHE,
       },
@@ -258,8 +281,7 @@ export class IframeNostrRpc extends NostrRpc {
 
     this.iframePort = port;
 
-    // to make sure Chrome doesn't terminate the channel
-    this.iframePingInterval = setInterval(() => {
+    setInterval(() => {
       console.log('iframe-nip46 ping');
       this.iframePort!.postMessage('ping');
     }, 5000);
@@ -273,7 +295,6 @@ export class IframeNostrRpc extends NostrRpc {
         return;
       }
 
-      // a copy-paste from rpc.subscribe
       try {
         const event = ev.data;
 
@@ -281,7 +302,6 @@ export class IframeNostrRpc extends NostrRpc {
         if (!verifySignature(event)) throw new Error('Invalid event signature from iframe');
         const nevent = new NDKEvent(this._ndk, event);
         const parsedEvent = await this.parseEvent(nevent);
-        // we're only implementing client-side rpc
         if (!(parsedEvent as NDKRpcRequest).method) {
           console.log('parsed response', parsedEvent);
           this.emit(`response-${parsedEvent.id}`, parsedEvent);
@@ -292,39 +312,26 @@ export class IframeNostrRpc extends NostrRpc {
     };
   }
 
-  public cleanup() {
-    if (this.iframePingInterval) {
-      clearInterval(this.iframePingInterval);
-      this.iframePingInterval = undefined;
+  public async sendRequest(remotePubkey: string, method: string, params: string[] = [], kind = 24133, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse> {
+    if (!this.iframePort) {
+      await this.ensureConnected();
     }
-  }
 
-  public async sendRequest(remotePubkey: string, method: string, params: string[] = [], kind = 24133, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse> {
     const id = this.getId();
 
-    // create and sign request event
     const event = await this.createRequestEvent(id, remotePubkey, method, params, kind);
 
-    // set response handler, it will dedup auth urls,
-    // and also dedup response handlers - we're sending
-    // to relays and to iframe
     this.setResponseHandler(id, cb);
 
     if (this.iframePort) {
-      // map request event id to request id, if iframe
-      // has no key it will reply with error:event_id (it can't
-      // decrypt the request id without keys)
       this.iframeRequests.set(event.id, { id, pubkey: remotePubkey });
 
-      // send to iframe
       console.log('iframe-nip46 sending request to', this.peerOrigin, event.rawEvent());
       this.iframePort.postMessage(event.rawEvent());
     } else {
-      // send to relays
       await event.publish();
     }
 
-    // see notes in 'super'
     // @ts-ignore
     return undefined as NDKRpcResponse;
   }
@@ -341,14 +348,11 @@ export class ReadyListener {
     this.promise = new Promise<any>(ok => {
       console.log(new Date(), 'started listener for', this.messages);
 
-      // ready message handler
       const onReady = async (e: MessageEvent) => {
         const originHostname = new URL(origin!).hostname;
         const messageHostname = new URL(e.origin).hostname;
-        // same host or subdomain
         const validHost = messageHostname === originHostname || messageHostname.endsWith('.' + originHostname);
         if (!validHost || !Array.isArray(e.data) || !e.data.length || !this.messages.includes(e.data[0])) {
-          // console.log(new Date(), 'got invalid ready message', e.origin, e.data);
           return;
         }
 
@@ -362,14 +366,7 @@ export class ReadyListener {
 
   async wait(): Promise<any> {
     console.log(new Date(), 'waiting for', this.messages);
-    
-    const r = await new Promise<any>((ok, err) => {
-      // 30 sec timeout for iframe ready
-      setTimeout(() => err(new Date() + ' timeout for ' + this.messages), 30000);
-      
-      this.promise.then(ok).catch(err);
-    });
-    
+    const r = await this.promise;
     console.log(new Date(), 'finished waiting for', this.messages, r);
     return r;
   }
@@ -382,15 +379,11 @@ export class Nip46Signer extends NDKNip46Signer {
   constructor(ndk: NDK, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
     super(ndk, signerPubkey, localSigner);
 
-    // override with our own rpc implementation
     this._rpc = new IframeNostrRpc(ndk, localSigner, iframeOrigin);
-    this._rpc.setUseNip44(true); // !!this.params.optionsModal.dev);
+    this._rpc.setUseNip44(true);
     this._rpc.on('authUrl', (url: string) => {
       this.emit('authUrl', url);
     });
-    this._rpc.on('timeout', () => {
-      this.emit('timeout');
-    });
 
     this.rpc = this._rpc;
   }
@@ -400,17 +393,14 @@ export class Nip46Signer extends NDKNip46Signer {
   }
 
   private async setSignerPubkey(signerPubkey: string, sameAsUser: boolean = false) {
-    console.log("setSignerPubkey", signerPubkey);
+    console.log('setSignerPubkey', signerPubkey);
 
-    // ensure it's set
     this.remotePubkey = signerPubkey;
 
-    // when we're sure it's known
     this._rpc.on(`iframeRestart-${signerPubkey}`, () => {
       this.emit('iframeRestart');
     });
 
-    // now call getPublicKey and swap remotePubkey w/ that
     await this.initUserPubkey(sameAsUser ? signerPubkey : '');
   }
 
@@ -425,9 +415,19 @@ export class Nip46Signer extends NDKNip46Signer {
     this._userPubkey = await new Promise<string>((ok, err) => {
       if (!this.remotePubkey) throw new Error('Signer pubkey not set');
 
-      console.log("get_public_key", this.remotePubkey);
+      console.log('get_public_key', this.remotePubkey);
+
+      const timeoutId = setTimeout(() => {
+        err(new Error('NIP46 get_public_key timeout'));
+      }, NIP46_TIMEOUT);
+
       this._rpc.sendRequest(this.remotePubkey, 'get_public_key', [], 24133, (response: NDKRpcResponse) => {
-        ok(response.result);
+        clearTimeout(timeoutId);
+        if (response.error) {
+          err(new Error(response.error));
+        } else {
+          ok(response.result);
+        }
       });
     });
   }
@@ -449,15 +449,21 @@ export class Nip46Signer extends NDKNip46Signer {
   }
 
   public async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
-    const params = [
-      name,
-      domain,
-      '', // email
-      perms,
-    ];
-
-    const r = await new Promise<NDKRpcResponse>(ok => {
-      this.rpc.sendRequest(bunkerPubkey, 'create_account', params, undefined, ok);
+    const params = [name, domain, '', perms];
+
+    const r = await new Promise<NDKRpcResponse>((ok, err) => {
+      const timeoutId = setTimeout(() => {
+        err(new Error('NIP46 create_account timeout'));
+      }, NIP46_TIMEOUT);
+
+      this.rpc.sendRequest(bunkerPubkey, 'create_account', params, undefined, response => {
+        clearTimeout(timeoutId);
+        if (response.error) {
+          err(new Error(response.error));
+        } else {
+          ok(response);
+        }
+      });
     });
 
     console.log('create_account pubkey', r);

package/src/modules/ProcessManager.ts

@@ -23,29 +23,9 @@ class ProcessManager extends EventEmitter {
 
   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);
-
-    let timeoutReject: ((reason?: any) => void) | undefined;
-    let isTimedOut = false;
-    let localTimer: NodeJS.Timeout | undefined;
-    
-    const timeoutPromise = new Promise<T>((_, reject) => {
-      timeoutReject = reject;
-    });
 
     if (!this.callTimer) {
-      console.log('Setting up timeout timer for', CALL_TIMEOUT, 'ms');
-      localTimer = setTimeout(() => {
-        console.log('ProcessManager: timeout reached, emitting onCallTimeout');
-        isTimedOut = true;
-        this.emit('onCallTimeout');
-        if (timeoutReject) {
-          timeoutReject(new Error('[ProcessManager] Request timed out'));
-        }
-      }, CALL_TIMEOUT);
-      this.callTimer = localTimer;
-    } else {
-      console.log('Timer already exists, not setting up new one');
+      this.callTimer = setTimeout(() => this.emit('onCallTimeout'), CALL_TIMEOUT);
     }
 
     if (!this.callCount) {
@@ -56,45 +36,23 @@ class ProcessManager extends EventEmitter {
 
     let error;
     let result;
-    let raceFinished = false;
 
     try {
-      result = await Promise.race([
-        cb().then(r => {
-          if (!raceFinished) {
-            raceFinished = true;
-            return r;
-          }
-          // Race already finished (timed out), ignore this result
-          console.log('ProcessManager: ignoring late result after timeout');
-          throw new Error('Already timed out');
-        }),
-        timeoutPromise.then(
-          () => {
-            raceFinished = true;
-            throw new Error('Should not resolve');
-          },
-          (err) => {
-            raceFinished = true;
-            throw err;
-          }
-        )
-      ]);
+      result = await cb();
     } catch (e) {
       error = e;
     }
 
     this.callCount--;
 
-    // Always emit onCallEnd for cleanup
     this.emit('onCallEnd');
 
-    // Clear the timer if it's the one we created
-    if (this.callTimer === localTimer) {
+    if (this.callTimer) {
       clearTimeout(this.callTimer);
-      this.callTimer = undefined;
     }
 
+    this.callTimer = undefined;
+
     if (error) {
       throw error;
     }

package/src/types.ts

@@ -1,4 +1,4 @@
-import { Info, AuthMethod, ConnectionString, RecentType, BannerNotify } from 'nostr-login-components';
+import { Info, AuthMethod, ConnectionString, RecentType, BannerNotify } from 'nostr-login-components/dist/types/types';
 
 export interface NostrLoginAuthOptions {
   localNsec?: string;
@@ -10,7 +10,6 @@ export interface NostrLoginAuthOptions {
   name?: string;
 }
 
-// NOTE: must be a subset of CURRENT_MODULE enum
 export type StartScreens =
   | 'welcome'
   | 'welcome-login'
@@ -27,56 +26,27 @@ 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

@@ -115,36 +115,22 @@ export const getBunkerUrl = async (value: string, optionsModal: NostrLoginOption
     const origin = optionsModal.devOverrideBunkerOrigin || `https://${domain}`;
     const bunkerUrl = `${origin}/.well-known/nostr.json?name=_`;
     const userUrl = `${origin}/.well-known/nostr.json?name=${name}`;
-    
-    // 10 sec timeout for fetch
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 10000);
-    
-    try {
-      const bunker = await fetch(bunkerUrl, { signal: controller.signal });
-      const bunkerData = await bunker.json();
-      const bunkerPubkey = bunkerData.names['_'];
-      const bunkerRelays = bunkerData.nip46[bunkerPubkey];
-      const user = await fetch(userUrl, { signal: controller.signal });
-      const userData = await user.json();
-      const userPubkey = userData.names[name];
-      // console.log({
-      //     bunkerData, userData, bunkerPubkey, bunkerRelays, userPubkey,
-      //     name, domain, origin
-      // })
-      if (!bunkerRelays.length) {
-        throw new Error('Bunker relay not provided');
-      }
-
-      return `bunker://${userPubkey}?relay=${bunkerRelays[0]}`;
-    } catch (e: any) {
-      if (e.name === 'AbortError') {
-        throw new Error('[getBunkerUrl] Request timed out');
-      }
-      throw e;
-    } finally {
-      clearTimeout(timeoutId);
+    const bunker = await fetch(bunkerUrl);
+    const bunkerData = await bunker.json();
+    const bunkerPubkey = bunkerData.names['_'];
+    const bunkerRelays = bunkerData.nip46[bunkerPubkey];
+    const user = await fetch(userUrl);
+    const userData = await user.json();
+    const userPubkey = userData.names[name];
+    // console.log({
+    //     bunkerData, userData, bunkerPubkey, bunkerRelays, userPubkey,
+    //     name, domain, origin
+    // })
+    if (!bunkerRelays.length) {
+      throw new Error('Bunker relay not provided');
     }
+
+    return `bunker://${userPubkey}?relay=${bunkerRelays[0]}`;
   }
 
   throw new Error('Invalid user name or bunker url');