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

Publish one MQTT message when a zigbee message is converted twice. #827

Browse Source
This commit is contained in:
Koen Kanters
2019-01-11 22:38:16 +01:00
parent 6dd60c09bf
commit dccdc5aafa
2 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/deviceReceive.js
+26 -21
View File
@@ -88,35 +88,40 @@ class DeviceReceive {
// - If a payload is returned publish it to the MQTT broker
// - If NO payload is returned do nothing. This is for non-standard behaviour
// for e.g. click switches where we need to count number of clicks and detect long presses.
converters.forEach((converter) => {
const publish = (payload) => {
// Don't cache messages with following properties:
let cache = true;
dontCacheProperties.forEach((property) => {
if (payload.hasOwnProperty(property)) {
cache = false;
}
});
// Add device linkquality.
if (message.hasOwnProperty('linkquality')) {
payload.linkquality = message.linkquality;
const publish = (payload) => {
// Don't cache messages with following properties:
let cache = true;
dontCacheProperties.forEach((property) => {
if (payload.hasOwnProperty(property)) {
cache = false;
}
});
// Add last seen timestamp
const now = new Date();
payload.last_seen = now.toISOString();
// Add device linkquality.
if (message.hasOwnProperty('linkquality')) {
payload.linkquality = message.linkquality;
}
this.publishDeviceState(device, payload, cache);
};
// Add last seen timestamp
const now = new Date();
payload.last_seen = now.toISOString();
this.publishDeviceState(device, payload, cache);
};
let payload = {};
converters.forEach((converter) => {
const options = {...settings.get().device_options, ...settings.getDevice(device.ieeeAddr)};
const payload = converter.convert(mappedDevice, message, publish, options);
const converted = converter.convert(mappedDevice, message, publish, options);
if (payload) {
publish(payload);
if (converted) {
payload = {...payload, ...converted};
}
});
if (Object.keys(payload).length) {
publish(payload);
}
}
}
test/deviceReceive.test.js
+21
View File
@@ -10,6 +10,7 @@ const sandbox = sinon.createSandbox();
const WXKG11LM = devices.find((d) => d.model === 'WXKG11LM');
const WXKG02LM = devices.find((d) => d.model === 'WXKG02LM');
const WSDCGQ11LM = devices.find((d) => d.model === 'WSDCGQ11LM');
const RTCGQ11LM = devices.find((d) => d.model === 'RTCGQ11LM');
const mqtt = {
log: () => {},
@@ -168,5 +169,25 @@ describe('DeviceReceive', () => {
const expected = {battery: 0, voltage: 2000};
chai.assert.deepEqual(utils.withoutLastSeen(publishDeviceState.getCall(0).args[1]), expected);
});
it('Should publish 1 message when converted twice', () => {
const device = {ieeeAddr: '0x12345678'};
const payload = {
'65281': {'1': 3045, '3': 19, '4': 17320, '5': 35, '6': [0, 3], '10': 51107, '11': 381, '100': 0},
};
const message = utils.zigbeeMessage(device, 'genBasic', 'attReport', payload, 1);
deviceReceive.onZigbeeMessage(message, device, RTCGQ11LM);
chai.assert.isTrue(publishDeviceState.calledOnce);
const expected = {'battery': 100, 'illuminance': 381, 'voltage': 3045};
chai.assert.deepEqual(utils.withoutLastSeen(publishDeviceState.getCall(0).args[1]), expected);
});
it('Should publish no message when converted without result', () => {
const device = {ieeeAddr: '0x12345678'};
const payload = {'9999': {'1': 3045}};
const message = utils.zigbeeMessage(device, 'genBasic', 'attReport', payload, 1);
deviceReceive.onZigbeeMessage(message, device, RTCGQ11LM);
chai.assert.isTrue(publishDeviceState.notCalled);
});
});
});