Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix malformed messages #4347

Merged
merged 2 commits into from
Sep 13, 2020
Merged

Fix malformed messages #4347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcad334
Fix mallformed (nullish) messages handling
nurikk Sep 12, 2020
6045f99
Merge branch 'dev' into fix_mallformed_messages
Koenkk Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/extension/frontend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ class Frontend extends Extension {

onWebSocketConnection(ws) {
ws.on('message', (message) => {
const {topic, payload} = utils.parseJSON(message, message);
this.mqtt.onMessage(`${this.mqttBaseTopic}/${topic}`, stringify(payload));
if (message) {
const {topic, payload} = utils.parseJSON(message, message);
this.mqtt.onMessage(`${this.mqttBaseTopic}/${topic}`, stringify(payload));
}
});

for (const [key, value] of this.retainedMessages) {
Expand Down
6 changes: 5 additions & 1 deletion lib/extension/publish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,14 @@ class EntityPublish extends Extension {
json = {state: message};
} else {
logger.error(`Invalid JSON '${message}', skipping...`);
return false;
}
}
}

if (!json) {
logger.error(`Invalid JSON '${message}', skipping...`);
return;
}

/**
* Home Assistant always publishes 'state', even when e.g. only setting
Expand Down
2 changes: 1 addition & 1 deletion lib/mqtt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class MQTT extends events.EventEmitter {
}

onMessage(topic, message) {
this.emit('message', {topic, message: message.toString()});
this.emit('message', {topic, message: message + ''});
}

isConnected() {
Expand Down
4 changes: 4 additions & 0 deletions test/frontend.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ describe('Frontend', () => {
{ retain: false, qos: 0 },
expect.any(Function)
);
mockWSClient.events.message(undefined);
mockWSClient.events.message("");
mockWSClient.events.message(null);
await flushPromises();

// Received message on socket
expect(mockWSClient.implementation.send).toHaveBeenCalledTimes(4);
Expand Down
12 changes: 12 additions & 0 deletions test/publish.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ describe('Publish', () => {
expect(MQTT.publish.mock.calls[0][2]).toStrictEqual({"qos": 0, "retain": false});
});

it('Should corretly handle mallformed messages', async () => {
await MQTT.events.message('zigbee2mqtt/foo', undefined);
await MQTT.events.message('zigbee2mqtt/foo', null);
await MQTT.events.message('zigbee2mqtt/foo', "");

await MQTT.events.message('zigbee2mqtt/bulb_color/set', undefined);
await MQTT.events.message('zigbee2mqtt/bulb_color/set', null);
await MQTT.events.message('zigbee2mqtt/bulb_color/set', "");
await flushPromises();
expectNothingPublished();
});

it('Should publish messages to zigbee devices when there is no converters', async () => {
await MQTT.events.message('zigbee2mqtt/bulb_color/set', stringify({brightness_no: '200'}));
await flushPromises();
Expand Down