machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5649 from mempool/mononaut/fix-acc-ws-timeout

Browse Source 
fix acceleration websocket timeout loop
This commit is contained in:
wiz 2024-11-22 07:21:10 -10:00 committed by GitHub
commit 4c66bf61f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
backend/src/api/services/acceleration.ts
View File

@ -246,17 +246,22 @@ class AccelerationApi {
this.startedWebsocketLoop = true; this.startedWebsocketLoop = true;
if (!this.ws) { if (!this.ws) {
this.ws = new WebSocket(this.websocketPath); this.ws = new WebSocket(this.websocketPath);
this.websocketConnected = true; this.lastPing = 0;
this.ws.on('open', () => { this.ws.on('open', () => {
logger.info(`Acceleration websocket opened to ${this.websocketPath}`); logger.info(`Acceleration websocket opened to ${this.websocketPath}`);
this.websocketConnected = true;
this.ws?.send(JSON.stringify({ this.ws?.send(JSON.stringify({
'watch-accelerations': true 'watch-accelerations': true
})); }));
}); });
this.ws.on('error', (error) => { this.ws.on('error', (error) => {
logger.err(`Acceleration websocket error on ${this.websocketPath}: ` + error); let errMsg = `Acceleration websocket error on ${this.websocketPath}: ${error['code']}`;
if (error['errors']) {
errMsg += ' - ' + error['errors'].join(' - ');
}
logger.err(errMsg);
this.ws = null; this.ws = null;
this.websocketConnected = false; this.websocketConnected = false;
}); });
@ -285,16 +290,28 @@ class AccelerationApi {
logger.debug('received pong from acceleration websocket server'); logger.debug('received pong from acceleration websocket server');
this.lastPong = Date.now(); this.lastPong = Date.now();
}); });
} else { } else if (this.websocketConnected) {
if (this.lastPing > this.lastPong && Date.now() - this.lastPing > 10000) { if (this.lastPing && this.lastPing > this.lastPong && (Date.now() - this.lastPing > 10000)) {
logger.warn('No pong received within 10 seconds, terminating connection'); logger.warn('No pong received within 10 seconds, terminating connection');
this.ws.terminate(); try {
this.ws = null; this.ws?.terminate();
this.websocketConnected = false; } catch (e) {
} else if (Date.now() - this.lastPing > 30000) { logger.warn('failed to terminate acceleration websocket connection: ' + (e instanceof Error ? e.message : e));
} finally {
this.ws = null;
this.websocketConnected = false;
this.lastPing = 0;
}
} else if (!this.lastPing || (Date.now() - this.lastPing > 30000)) {
logger.debug('sending ping to acceleration websocket server'); logger.debug('sending ping to acceleration websocket server');
this.ws.ping(); if (this.ws?.readyState === WebSocket.OPEN) {
this.lastPing = Date.now(); try {
this.ws?.ping();
this.lastPing = Date.now();
} catch (e) {
logger.warn('failed to send ping to acceleration websocket server: ' + (e instanceof Error ? e.message : e));
}
}
} }
} }
await new Promise(resolve => setTimeout(resolve, 5000)); await new Promise(resolve => setTimeout(resolve, 5000));