mirror of
https://github.com/nbd-wtf/nostr-tools.git
synced 2025-12-08 16:28:49 +00:00
use setInterval() instead of nested setTimeout()s for pingpong.
prevent call stacks from building up
This commit is contained in:
@@ -45,7 +45,7 @@ export class AbstractRelay {
|
|||||||
public enableReconnect: boolean
|
public enableReconnect: boolean
|
||||||
private connectionTimeoutHandle: ReturnType<typeof setTimeout> | undefined
|
private connectionTimeoutHandle: ReturnType<typeof setTimeout> | undefined
|
||||||
private reconnectTimeoutHandle: 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 reconnectAttempts: number = 0
|
||||||
private closedIntentionally: boolean = false
|
private closedIntentionally: boolean = false
|
||||||
|
|
||||||
@@ -111,9 +111,9 @@ export class AbstractRelay {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private handleHardClose(reason: string) {
|
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
|
this._connected = false
|
||||||
@@ -177,7 +177,7 @@ export class AbstractRelay {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.enablePing) {
|
if (this.enablePing) {
|
||||||
this.pingpong()
|
this.pingIntervalHandle = setInterval(() => this.pingpong(), this.pingFrequency)
|
||||||
}
|
}
|
||||||
resolve()
|
resolve()
|
||||||
}
|
}
|
||||||
@@ -247,10 +247,8 @@ export class AbstractRelay {
|
|||||||
this.ws && this.ws.ping && (this.ws as any).once ? this.waitForPingPong() : this.waitForDummyReq(),
|
this.ws && this.ws.ping && (this.ws as any).once ? this.waitForPingPong() : this.waitForDummyReq(),
|
||||||
new Promise(res => setTimeout(() => res(false), this.pingTimeout)),
|
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
|
// pingpong closing socket
|
||||||
if (this.ws?.readyState === this._WebSocket.OPEN) {
|
if (this.ws?.readyState === this._WebSocket.OPEN) {
|
||||||
this.ws?.close()
|
this.ws?.close()
|
||||||
@@ -458,9 +456,9 @@ export class AbstractRelay {
|
|||||||
clearTimeout(this.reconnectTimeoutHandle)
|
clearTimeout(this.reconnectTimeoutHandle)
|
||||||
this.reconnectTimeoutHandle = undefined
|
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.closeAllSubscriptions('relay connection closed by us')
|
||||||
this._connected = false
|
this._connected = false
|
||||||
|
|||||||
2
jsr.json
2
jsr.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@nostr/tools",
|
"name": "@nostr/tools",
|
||||||
"version": "2.19.1",
|
"version": "2.19.2",
|
||||||
"exports": {
|
"exports": {
|
||||||
".": "./index.ts",
|
".": "./index.ts",
|
||||||
"./core": "./core.ts",
|
"./core": "./core.ts",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"name": "nostr-tools",
|
"name": "nostr-tools",
|
||||||
"version": "2.19.1",
|
"version": "2.19.2",
|
||||||
"description": "Tools for making a Nostr client.",
|
"description": "Tools for making a Nostr client.",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
Reference in New Issue
Block a user