update README with new enableReconnect() behavior.

prevent call stacks from building up

README.md

@@ -160,16 +160,7 @@ Using both `enablePing: true` and `enableReconnect: true` is recommended as it w
 const pool = new SimplePool({ enablePing: true, enableReconnect: true })
 ```
 
-The `enableReconnect` option can also be a callback function which will receive the current subscription filters and should return a new set of filters. This is useful if you want to modify the subscription on reconnect, for example, to update the `since` parameter to fetch only new events.
+When reconnecting, all existing subscriptions will have their filters automatically updated with `since:` set to the timestamp of the last event received on them `+1`, then restarted.
-
-```js
-const pool = new SimplePool({
-  enableReconnect: (filters) => {
-    const newSince = Math.floor(Date.now() / 1000)
-    return filters.map(filter => ({ ...filter, since: newSince }))
-  }
-})
-```
 
 ### Parsing references (mentions) from a content based on NIP-27
 

abstract-relay.ts

@@ -37,7 +37,7 @@ export class AbstractRelay {
   public baseEoseTimeout: number = 4400
   public connectionTimeout: number = 4400
   public publishTimeout: number = 4400
-  public pingFrequency: number = 20000
+  public pingFrequency: number = 29000
   public pingTimeout: number = 20000
   public resubscribeBackoff: number[] = [10000, 10000, 10000, 20000, 20000, 30000, 60000]
   public openSubs: Map<string, Subscription> = new Map()
@@ -45,7 +45,7 @@ export class AbstractRelay {
   public enableReconnect: boolean
   private connectionTimeoutHandle: ReturnType<typeof setTimeout> | undefined
   private reconnectTimeoutHandle: ReturnType<typeof setTimeout> | undefined
-  private pingTimeoutHandle: ReturnType<typeof setTimeout> | undefined
+  private pingIntervalHandle: ReturnType<typeof setInterval> | undefined
   private reconnectAttempts: number = 0
   private closedIntentionally: boolean = false
 
@@ -111,9 +111,9 @@ export class AbstractRelay {
   }
 
   private handleHardClose(reason: string) {
-    if (this.pingTimeoutHandle) {
+    if (this.pingIntervalHandle) {
-      clearTimeout(this.pingTimeoutHandle)
+      clearInterval(this.pingIntervalHandle)
-      this.pingTimeoutHandle = undefined
+      this.pingIntervalHandle = undefined
     }
 
     this._connected = false
@@ -177,7 +177,7 @@ export class AbstractRelay {
         }
 
         if (this.enablePing) {
-          this.pingpong()
+          this.pingIntervalHandle = setInterval(() => this.pingpong(), this.pingFrequency)
         }
         resolve()
       }
@@ -209,20 +209,30 @@ export class AbstractRelay {
     })
   }
 
-  private async waitForDummyReq() {
+  private waitForDummyReq() {
-    return new Promise((resolve, _) => {
+    return new Promise((resolve, reject) => {
+      if (!this.connectionPromise) return reject(new Error(`no connection to ${this.url}, can't ping`))
+
       // make a dummy request with expected empty eose reply
       // ["REQ", "_", {"ids":["aaaa...aaaa"], "limit": 0}]
-      const sub = this.subscribe(
+      try {
-        [{ ids: ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'], limit: 0 }],
+        const sub = this.subscribe(
-        {
+          [{ ids: ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'], limit: 0 }],
-          oneose: () => {
+          {
-            sub.close()
+            oneose: () => {
-            resolve(true)
+              resolve(true)
+              sub.close()
+            },
+            onclose() {
+              // if we get a CLOSED it's because the relay is alive
+              resolve(true)
+            },
+            eoseTimeout: this.pingTimeout + 1000,
           },
-          eoseTimeout: this.pingTimeout + 1000,
+        )
-        },
+      } catch (err) {
-      )
+        reject(err)
+      }
     })
   }
 
@@ -237,10 +247,8 @@ export class AbstractRelay {
         this.ws && this.ws.ping && (this.ws as any).once ? this.waitForPingPong() : this.waitForDummyReq(),
         new Promise(res => setTimeout(() => res(false), this.pingTimeout)),
       ])
-      if (result) {
+
-        // schedule another pingpong
+      if (!result) {
-        this.pingTimeoutHandle = setTimeout(() => this.pingpong(), this.pingFrequency)
-      } else {
         // pingpong closing socket
         if (this.ws?.readyState === this._WebSocket.OPEN) {
           this.ws?.close()
@@ -448,9 +456,9 @@ export class AbstractRelay {
       clearTimeout(this.reconnectTimeoutHandle)
       this.reconnectTimeoutHandle = undefined
     }
-    if (this.pingTimeoutHandle) {
+    if (this.pingIntervalHandle) {
-      clearTimeout(this.pingTimeoutHandle)
+      clearInterval(this.pingIntervalHandle)
-      this.pingTimeoutHandle = undefined
+      this.pingIntervalHandle = undefined
     }
     this.closeAllSubscriptions('relay connection closed by us')
     this._connected = false

jsr.json

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

package.json

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