dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-23 11:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that state and brightness are executed before other commands. #788

Browse Source
This commit is contained in:
Koen Kanters
2019-01-21 17:38:06 +01:00
parent e21bfc1567
commit 86f19affa1
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/devicePublish.js
+5 -1
View File
@@ -131,8 +131,12 @@ class DevicePublish {
delete json.state;
}
// Ensure that state and brightness are executed before other commands.
const keys = Object.keys(json);
keys.sort((a, b) => (['state', 'brightness'].includes(a) ? -1 : 1));
// For each key in the JSON message find the matching converter.
Object.keys(json).forEach((key) => {
keys.forEach((key) => {
const converter = converters.find((c) => c.key.includes(key));
if (!converter) {
logger.error(`No converter available for '${key}' (${json[key]})`);
test/devicePublish.test.js
+20
View File
@@ -399,4 +399,24 @@ describe('DevicePublish', () => {
devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify({state: 1}));
chai.assert.isTrue(zigbee.publish.notCalled);
});
it('Should set state before color', () => {
zigbee.publish.resetHistory();
zigbee.getDevice = sinon.fake.returns({modelId: 'LCT001'});
const msg = {'state': 'ON', 'color': {'x': 0.701, 'y': 0.299}};
devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify(msg));
chai.assert.isTrue(zigbee.publish.calledTwice);
chai.assert.equal(zigbee.publish.getCall(0).args[2], 'genOnOff');
chai.assert.equal(zigbee.publish.getCall(1).args[2], 'lightingColorCtrl');
});
it('Should set state with brightness before color', () => {
zigbee.publish.resetHistory();
zigbee.getDevice = sinon.fake.returns({modelId: 'LCT001'});
const msg = {'state': 'ON', 'color': {'x': 0.701, 'y': 0.299}, 'transition': 3, 'brightness': 100};
devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify(msg));
chai.assert.isTrue(zigbee.publish.calledTwice);
chai.assert.equal(zigbee.publish.getCall(0).args[2], 'genLevelCtrl');
chai.assert.equal(zigbee.publish.getCall(1).args[2], 'lightingColorCtrl');
});
});