laantungir/nostr-tools
1
0
Fork 0
mirror of https://github.com/nbd-wtf/nostr-tools.git synced 2025-12-09 08:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ping pong memory leak fix for #511 (#512)

Browse Source 
* New test for pingpong memory leak (failing).

* Shim once in relay ping mem test.

* Fix pong memory leak with .once.

Fixes #511.

* Fix missing global WebSocket on Node.

* Lint fix.

* Remove overkill WebSocket impl check.
This commit is contained in:
Chris McCormick
2025-10-27 10:14:33 +08:00
committed by fiatjaf
parent e8927d78e6
commit 1bec9fa365
4 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
abstract-relay.ts
View File

@@ -193,12 +193,12 @@ export class AbstractRelay {
return this.connectionPromise
}
private async waitForPingPong() {
return new Promise((res, err) => {
private waitForPingPong() {
return new Promise(resolve => {
// listen for pong
this.ws && this.ws.on ? this.ws.on('pong', () => res(true)) : err("ws can't listen for pong")
;(this.ws as any).once('pong', () => resolve(true))
// send a ping
this.ws && this.ws.ping && this.ws.ping()
this.ws!.ping!()
})
}
@@ -224,7 +224,7 @@ export class AbstractRelay {
// wait for either a ping-pong reply or a timeout
const result = await Promise.any([
// browsers don't have ping so use a dummy req
this.ws && this.ws.ping && this.ws.on ? 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)),
])
if (result) {
@@ -232,7 +232,7 @@ export class AbstractRelay {
this.pingTimeoutHandle = setTimeout(() => this.pingpong(), this.pingFrequency)
} else {
// pingpong closing socket
if (this.ws?.readyState === WebSocket.OPEN) {
if (this.ws?.readyState === this._WebSocket.OPEN) {
this.ws?.close()
}
}
@@ -434,7 +434,7 @@ export class AbstractRelay {
this.closeAllSubscriptions('relay connection closed by us')
this._connected = false
this.onclose?.()
if (this.ws?.readyState === WebSocket.OPEN) {
if (this.ws?.readyState === this._WebSocket.OPEN) {
this.ws?.close()
}
}