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

Add last_seen when device publish succeeds. https://github.com/Koenkk/zigbee2mqtt/issues/1651

Browse Source
This commit is contained in:
Koen Kanters
2019-06-24 20:16:03 +02:00
parent 38a1aec823
commit 5934efa41e
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/devicePublish.js
+4
View File
@@ -69,6 +69,10 @@ class DevicePublish {
delete msg.state;
}
if (settings.get().advanced.last_seen !== 'disable') {
msg.last_seen = utils.formatDate(Date.now(), settings.get().advanced.last_seen);
}
this.publishEntityState(entity.ID, msg);
}
}
test/devicePublish.test.js
+32 -4
View File
@@ -1086,7 +1086,11 @@ describe('DevicePublish', () => {
it('Home Assistant: should set state', async () => {
zigbee.publish.mockClear();
publishEntityState.mockClear();
jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
jest.spyOn(settings, 'get').mockReturnValue({
homeassistant: true,
mqtt: {base_topic: 'zigbee2mqtt'},
advanced: {last_seen: 'disable'},
});
zigbee.getDevice = () => ({modelId: 'RB 185 C'});
devicePublish.onMQTTMessage('zigbee2mqtt/0x00000001/set', JSON.stringify({state: 'ON'}));
expect(zigbee.publish).toHaveBeenCalledTimes(1);
@@ -1110,7 +1114,11 @@ describe('DevicePublish', () => {
zigbee.publish.mockClear();
publishEntityState.mockClear();
jest.spyOn(state, 'get').mockReturnValue({state: 'ON'});
jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
jest.spyOn(settings, 'get').mockReturnValue({
homeassistant: true,
mqtt: {base_topic: 'zigbee2mqtt'},
advanced: {last_seen: 'disable'},
});
zigbee.getDevice = () => ({modelId: 'RB 185 C'});
devicePublish.onMQTTMessage('zigbee2mqtt/0x00000001/set', JSON.stringify({state: 'ON', color_temp: 100}));
expect(zigbee.publish).toHaveBeenCalledTimes(1);
@@ -1135,7 +1143,11 @@ describe('DevicePublish', () => {
zigbee.publish.mockClear();
publishEntityState.mockClear();
jest.spyOn(state, 'get').mockReturnValue({state: 'ON'});
jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
jest.spyOn(settings, 'get').mockReturnValue({
homeassistant: true,
mqtt: {base_topic: 'zigbee2mqtt'},
advanced: {last_seen: 'disable'},
});
zigbee.getDevice = () => ({modelId: 'RB 185 C'});
devicePublish.onMQTTMessage(
'zigbee2mqtt/0x00000001/set',
@@ -1163,7 +1175,11 @@ describe('DevicePublish', () => {
zigbee.publish.mockClear();
publishEntityState.mockClear();
jest.spyOn(state, 'get').mockReturnValue({state: 'OFF'});
jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
jest.spyOn(settings, 'get').mockReturnValue({
homeassistant: true,
mqtt: {base_topic: 'zigbee2mqtt'},
advanced: {last_seen: 'disable'},
});
zigbee.getDevice = () => ({modelId: 'RB 185 C'});
devicePublish.onMQTTMessage(
'zigbee2mqtt/0x00000001/set',
@@ -1230,4 +1246,16 @@ describe('DevicePublish', () => {
null,
expect.any(Function));
});
it('Should publish messages to zigbee devices', async () => {
jest.spyOn(settings, 'get').mockReturnValue({
mqtt: {base_topic: 'zigbee2mqtt'},
advanced: {last_seen: 'ISO_8601'},
});
publishEntityState.mockClear();
zigbee.getDevice = () => ({modelId: 'TRADFRI bulb E27 CWS opal 600lm'});
devicePublish.onMQTTMessage('zigbee2mqtt/0x00000001/set', JSON.stringify({brightness: '200'}));
expect(publishEntityState).toHaveBeenCalledTimes(1);
expect(typeof publishEntityState.mock.calls[0][1].last_seen).toBe('string');
});
});