fix: Fix socket error crashing Zigbee2MQTT (#18388)

This commit is contained in:
Koen Kanters
2023-07-21 14:51:39 +00:00
committed by GitHub
parent df8e1687b2
commit f64cd7e8f3
2 changed files with 7 additions and 2 deletions
+1
View File
@@ -119,6 +119,7 @@ export default class Frontend extends Extension {
}
@bind private onWebSocketConnection(ws: WebSocket): void {
ws.on('error', (msg) => logger.error(`WebSocket error: ${msg.message}`));
ws.on('message', (data: Buffer, isBinary: boolean) => {
if (!isBinary && data) {
const message = data.toString();
+6 -2
View File
@@ -1,5 +1,5 @@
const data = require('./stub/data');
require('./stub/logger');
const logger = require('./stub/logger');
require('./stub/zigbeeHerdsman');
const MQTT = require('./stub/mqtt');
const settings = require('../lib/util/settings');
@@ -197,7 +197,7 @@ describe('Frontend', () => {
});
it('Websocket interaction', async () => {
it('onlythis Websocket interaction', async () => {
controller = new Controller(jest.fn(), jest.fn());
await controller.start();
@@ -233,6 +233,10 @@ describe('Frontend', () => {
mockWSClient.events.message(null, false);
await flushPromises();
// Error
mockWSClient.events.error(new Error('This is an error'));
expect(logger.error).toHaveBeenCalledWith('WebSocket error: This is an error');
// Received message on socket
expect(mockWSClient.implementation.send).toHaveBeenCalledTimes(1);
expect(mockWSClient.implementation.send).toHaveBeenCalledWith(stringify({topic: 'bulb_color', payload: {state: 'ON', power_on_behavior:null, linkquality: null, update_available: null, update: {state: null, installed_version: -1, latest_version: -1}}}));