Stop pinging device when removed. #2419

lib/extension/deviceAvailability.js

@@ -69,9 +69,14 @@ class DeviceAvailability extends BaseExtension {
 
     async handleInterval(device) {
         // When a device is already unavailable, log the ping failed on 'debug' instead of 'error'.
+        const entity = this.zigbee.resolveEntity(device.ieeeAddr);
+        if (!entity) {
+            logger.debug(`Stop pinging '${device.ieeeAddr}', device is not known anymore`);
+            return;
+        }
+
         const ieeeAddr = device.ieeeAddr;
         const level = this.state.hasOwnProperty(ieeeAddr) && !this.state[ieeeAddr] ? 'debug' : 'error';
-        const entity = this.zigbee.resolveEntity(device.ieeeAddr);
         try {
             await device.ping();
             this.publishAvailability(device, true);

test/deviceAvailability.test.js

@@ -258,7 +258,7 @@ describe('Device availability', () => {
         jest.advanceTimersByTime(11 * 1000);
         await flushPromises();
         expect(device.ping).toHaveBeenCalledTimes(0);
-    });    
+    });
 
     it('Should not read when device has no modelID and reconnects', async () => {
         const device = zigbeeHerdsman.devices.nomodel;
@@ -277,4 +277,17 @@ describe('Device availability', () => {
         await flushPromises();
         expect(endpoint.read).toHaveBeenCalledTimes(0);
     });
+
+    it('Should stop pinging device when removed', async () => {
+        const device = zigbeeHerdsman.devices.bulb_color;
+        device.ping.mockClear();
+        const endpoint = device.getEndpoint(1);
+        jest.advanceTimersByTime(11 * 1000);
+        await flushPromises();
+        expect(device.ping).toHaveBeenCalledTimes(1);
+        settings.removeDevice(device.ieeeAddr);
+        jest.advanceTimersByTime(11 * 1000);
+        await flushPromises();
+        expect(device.ping).toHaveBeenCalledTimes(1);
+    });
 });