fix: Don't emit deviceLeave event for devices that already left (#965)

Koenkk · Mar 9, 2024 · d17319e · d17319e
1 parent b380e58
commit d17319e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/controller/controller.ts b/src/controller/controller.ts
@@ -471,11 +471,14 @@ class Controller extends events.EventEmitter {
         debug.log(`Device leave '${payload.ieeeAddr}'`);
 
         const device = Device.byIeeeAddr(payload.ieeeAddr);
-        if (device) {
-            debug.log(`Removing device from database '${payload.ieeeAddr}'`);
-            device.removeFromDatabase();
+        if (!device) {
+            debug.log(`Device leave is from unknown device '${payload.ieeeAddr}'`);
+            return;
         }
 
+        debug.log(`Removing device from database '${payload.ieeeAddr}'`);
+        device.removeFromDatabase();
+
         const data: Events.DeviceLeavePayload = {ieeeAddr: payload.ieeeAddr};
         this.selfAndDeviceEmit(device, Events.Events.deviceLeave, data);
     }

diff --git a/test/controller.test.ts b/test/controller.test.ts
@@ -936,8 +936,8 @@ describe('Controller', () => {
 
         // leaves another time when not in database
         await mockAdapterEvents['deviceLeave']({networkAddress: 129, ieeeAddr: '0x129'});
-        expect(events.deviceLeave.length).toBe(2);
-        expect(events.deviceLeave[1]).toStrictEqual({ieeeAddr: '0x129'});
+        expect(events.deviceLeave.length).toBe(1);
+        expect(events.deviceLeave[0]).toStrictEqual({ieeeAddr: '0x129'});
     });
 
     it('Start with reset should clear database', async () => {