catch errors on function passed to auth() and log them.

abstract-pool.ts

@@ -12,7 +12,7 @@ import type { Event, EventTemplate, Nostr, VerifiedEvent } from './core.ts'
 import { type Filter } from './filter.ts'
 import { alwaysTrue } from './helpers.ts'
 
-export type SubCloser = { close: () => void }
+export type SubCloser = { close: (reason?: string) => void }
 
 export type AbstractPoolConstructorOptions = AbstractRelayConstructorOptions & {}
 
@@ -179,10 +179,10 @@ export class AbstractSimplePool {
     )
 
     return {
-      async close() {
+      async close(reason?: string) {
         await allOpened
         subs.forEach(sub => {
-          sub.close()
+          sub.close(reason)
         })
       },
     }
@@ -198,7 +198,7 @@ export class AbstractSimplePool {
     const subcloser = this.subscribe(relays, filter, {
       ...params,
       oneose() {
-        subcloser.close()
+        subcloser.close('closed automatically on eose')
       },
     })
     return subcloser
@@ -214,7 +214,7 @@ export class AbstractSimplePool {
     const subcloser = this.subscribeMany(relays, filters, {
       ...params,
       oneose() {
-        subcloser.close()
+        subcloser.close('closed automatically on eose')
       },
     })
     return subcloser

abstract-relay.ts

@@ -26,9 +26,6 @@ export class AbstractRelay {
   public onclose: (() => void) | null = null
   public onnotice: (msg: string) => void = msg => console.debug(`NOTICE from ${this.url}: ${msg}`)
 
-  // this is exposed just to help in ndk migration, shouldn't be relied upon
-  public _onauth: ((challenge: string) => void) | null = null
-
   public baseEoseTimeout: number = 4400
   public connectionTimeout: number = 4400
   public publishTimeout: number = 4400
@@ -233,7 +230,6 @@ export class AbstractRelay {
           return
         case 'AUTH': {
           this.challenge = data[1] as string
-          this._onauth?.(data[1] as string)
           return
         }
       }
@@ -256,16 +252,20 @@ export class AbstractRelay {
     if (this.authPromise) return this.authPromise
 
     this.authPromise = new Promise<string>(async (resolve, reject) => {
-      const evt = await signAuthEvent(makeAuthEvent(this.url, challenge))
+      try {
-      const timeout = setTimeout(() => {
+        let evt = await signAuthEvent(makeAuthEvent(this.url, challenge))
-        const ep = this.openEventPublishes.get(evt.id) as EventPublishResolver
+        let timeout = setTimeout(() => {
-        if (ep) {
+          let ep = this.openEventPublishes.get(evt.id) as EventPublishResolver
-          ep.reject(new Error('auth timed out'))
+          if (ep) {
-          this.openEventPublishes.delete(evt.id)
+            ep.reject(new Error('auth timed out'))
-        }
+            this.openEventPublishes.delete(evt.id)
-      }, this.publishTimeout)
+          }
-      this.openEventPublishes.set(evt.id, { resolve, reject, timeout })
+        }, this.publishTimeout)
-      this.send('["AUTH",' + JSON.stringify(evt) + ']')
+        this.openEventPublishes.set(evt.id, { resolve, reject, timeout })
+        this.send('["AUTH",' + JSON.stringify(evt) + ']')
+      } catch (err) {
+        console.warn('subscribe auth function failed:', err)
+      }
     })
     return this.authPromise
   }

jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@nostr/tools",
-  "version": "2.14.3",
+  "version": "2.15.0",
   "exports": {
     ".": "./index.ts",
     "./core": "./core.ts",

package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "nostr-tools",
-  "version": "2.14.3",
+  "version": "2.15.0",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",