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

Merge pull request #3704 from mempool/mononaut/handle-websocket-errors

Browse Source 
Disconnect websocket clients on error
This commit is contained in:
softsimon 2023-11-30 17:56:58 +09:00 committed by GitHub
commit ba933a81c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/api/websocket-handler.ts
View File

@ -94,9 +94,13 @@ class WebsocketHandler {
throw new Error('WebSocket.Server is not set'); throw new Error('WebSocket.Server is not set');
} }
this.wss.on('connection', (client: WebSocket) => { this.wss.on('connection', (client: WebSocket, req) => {
this.numConnected++; this.numConnected++;
client.on('error', logger.info); client['remoteAddress'] = req.headers['x-forwarded-for'] || req.socket?.remoteAddress || 'unknown';
client.on('error', (e) => {
logger.info(`websocket client error from ${client['remoteAddress']}: ` + (e instanceof Error ? e.message : e));
client.close();
});
client.on('close', () => { client.on('close', () => {
this.numDisconnected++; this.numDisconnected++;
}); });
@ -282,7 +286,8 @@ class WebsocketHandler {
client.send(serializedResponse); client.send(serializedResponse);
} }
} catch (e) { } catch (e) {
logger.debug('Error parsing websocket message: ' + (e instanceof Error ? e.message : e)); logger.debug(`Error parsing websocket message from ${client['remoteAddress']}: ` + (e instanceof Error ? e.message : e));
client.close();
} }
}); });
}); });