Update networkAddress when different on deviceAnnounce. Koenkk/zigbee…

…2mqtt#2017
Koenkk · Oct 4, 2019 · 9d63b7f · 9d63b7f
1 parent 21566b9
commit 9d63b7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/controller/controller.ts b/src/controller/controller.ts
@@ -250,6 +250,13 @@ class Controller extends events.EventEmitter {
         debug.log(`Device announce '${payload.ieeeAddr}'`);
         const device = Device.byIeeeAddr(payload.ieeeAddr);
         device.updateLastSeen();
+
+        if (device.networkAddress !== payload.networkAddress) {
+            debug.log(`Device '${payload.ieeeAddr}' announced with new networkAddress '${payload.networkAddress}'`);
+            device.networkAddress = payload.networkAddress;
+            device.save();
+        }
+
         const data: Events.DeviceAnnouncePayload = {device};
         this.emit(Events.Events.deviceAnnounce, data);
     }

diff --git a/test/controller.test.ts b/test/controller.test.ts
@@ -348,6 +348,14 @@ describe('Controller', () => {
         expect(events.deviceAnnounce[0].device.modelID).toBe('myModelID');
     });
 
+    it('Device announce event should update network address when different', async () => {
+        await controller.start();
+        await mockAdapterEvents['deviceJoined']({networkAddress: 129, ieeeAddr: '0x129'});
+        expect(events.deviceAnnounce.length).toBe(0);
+        await mockAdapterEvents['deviceAnnounce']({networkAddress: 9999, ieeeAddr: '0x129'});
+        expect(controller.getDeviceByIeeeAddr('0x129').networkAddress).toBe(9999);
+    });
+
     it('Device leave event and remove from database', async () => {
         await controller.start();
         await mockAdapterEvents['deviceJoined']({networkAddress: 129, ieeeAddr: '0x129'});