@homebridge-plugins/homebridge-meross 10.20.0 → 10.20.2-beta.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to `@homebridge-plugins/homebridge-meross` will be documented in this file.
 
+## v10.20.2 (Pending Release)
+
+### Changed
+
+- fix(ui): let a hub's sensors be hidden one by one from the my devices tab (#816)
+- feat: add support for the mss815 in-wall switch (#813)
+- fix(thermostat): give the mts960 its own handler, so it shows its temperature and mode (#809)
+
+## v10.20.1 (2026-10-18)
+
+### Changed
+
+- chore(deps): dependency updates
+
 ## v10.20.0 (2026-08-16)
 
 ### Changed

package/config.schema.json

@@ -325,6 +325,10 @@
                 "title": "MSS810",
                 "enum": ["MSS810"]
               },
+              {
+                "title": "MSS815",
+                "enum": ["MSS815"]
+              },
               {
                 "title": "P11",
                 "enum": ["P11"]

package/lib/device/baby.js

@@ -1,11 +1,11 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
 import {
   generateRandomString,
   hasProperty,
+  isTimeoutError,
   parseError,
   sleep,
 } from '../utils/functions.js'
@@ -190,7 +190,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -250,7 +250,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState)
@@ -291,7 +291,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.ActiveIdentifier, this.cacheChannel)
@@ -344,7 +344,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.speakerService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheVolume)
@@ -389,7 +389,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.serviceLight.updateCharacteristic(this.cusChar[charToUpdate], false)
@@ -468,7 +468,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/cooler-single.js

@@ -1,9 +1,8 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
-import { hasProperty, parseError } from '../utils/functions.js'
+import { hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -98,7 +97,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -196,7 +195,7 @@ export default class {
         )
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState ? 1 : 0)
@@ -266,7 +265,7 @@ export default class {
         )
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(
@@ -333,7 +332,7 @@ export default class {
         )
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
     }
   }
@@ -431,7 +430,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/diffuser.js

@@ -1,5 +1,4 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import {
@@ -12,6 +11,7 @@ import platformConsts from '../utils/constants.js'
 import {
   generateRandomString,
   hasProperty,
+  isTimeoutError,
   parseError,
   sleep,
 } from '../utils/functions.js'
@@ -155,7 +155,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -217,7 +217,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheFanState)
@@ -284,7 +284,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.fanService.updateCharacteristic(
@@ -333,7 +333,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLightState)
@@ -510,7 +510,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       let charToError
       switch (mode) {
@@ -605,7 +605,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/fan.js

@@ -1,11 +1,11 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
 import {
   generateRandomString,
   hasProperty,
+  isTimeoutError,
   parseError,
   sleep,
 } from '../utils/functions.js'
@@ -113,7 +113,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -171,7 +171,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheFanState)
@@ -241,7 +241,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.fanService.updateCharacteristic(
@@ -286,7 +286,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLightState)
@@ -414,7 +414,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/garage-main.js

@@ -1,9 +1,8 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
-import { hasProperty, parseError } from '../utils/functions.js'
+import { hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -37,7 +36,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -157,7 +156,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/garage-single.js

@@ -1,9 +1,8 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
-import { generateRandomString, hasProperty, parseError } from '../utils/functions.js'
+import { generateRandomString, hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -80,7 +79,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -307,7 +306,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cacheTarget)
@@ -386,7 +385,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/garage-sub.js

@@ -1,8 +1,7 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import platformConsts from '../utils/constants.js'
-import { generateRandomString, hasProperty, parseError } from '../utils/functions.js'
+import { generateRandomString, hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -71,7 +70,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -286,7 +285,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.TargetDoorState, this.cacheTarget)

package/lib/device/heater-single.js

@@ -1,9 +1,8 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
-import { hasProperty, parseError } from '../utils/functions.js'
+import { hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -98,7 +97,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -196,7 +195,7 @@ export default class {
         )
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState ? 1 : 0)
@@ -265,7 +264,7 @@ export default class {
         )
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(
@@ -331,7 +330,7 @@ export default class {
         )
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
     }
   }
@@ -429,7 +428,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/hub-main.js

@@ -1,9 +1,8 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import platformConsts from '../utils/constants.js'
-import { hasProperty, parseError } from '../utils/functions.js'
+import { hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 /**
@@ -63,7 +62,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -346,7 +345,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/hub-sprinkler.js

@@ -1,8 +1,7 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import platformConsts from '../utils/constants.js'
-import { hasProperty, parseError } from '../utils/functions.js'
+import { hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -71,7 +70,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -130,7 +129,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState)

package/lib/device/hub-valve.js

@@ -1,8 +1,7 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import platformConsts from '../utils/constants.js'
-import { hasProperty, parseError } from '../utils/functions.js'
+import { hasProperty, isTimeoutError, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
 export default class {
@@ -106,7 +105,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -154,7 +153,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.TargetHeatingCoolingState, this.cacheState)
@@ -211,7 +210,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.mode2Char[newMode], false)
@@ -268,7 +267,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.TargetTemperature, this.cacheTarg)

package/lib/device/humidifier.js

@@ -1,5 +1,4 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import {
@@ -12,6 +11,7 @@ import platformConsts from '../utils/constants.js'
 import {
   generateRandomString,
   hasProperty,
+  isTimeoutError,
   parseError,
   sleep,
 } from '../utils/functions.js'
@@ -118,7 +118,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -176,7 +176,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.fanService.updateCharacteristic(this.hapChar.On, this.cacheFanState)
@@ -240,7 +240,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.fanService.updateCharacteristic(
@@ -285,7 +285,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLightState)
@@ -433,7 +433,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout

package/lib/device/index.js

@@ -30,6 +30,7 @@ import deviceSwitchSingle from './switch-single.js'
 import deviceTemplate from './template.js'
 import deviceThermostatMts215 from './thermostat-mts215.js'
 import deviceThermostatMts300 from './thermostat-mts300.js'
+import deviceThermostatMts960 from './thermostat-mts960.js'
 import deviceThermostat from './thermostat.js'
 
 export default {
@@ -65,5 +66,6 @@ export default {
   deviceTemplate,
   deviceThermostat,
   deviceThermostatMts300,
+  deviceThermostatMts960,
   deviceThermostatMts215,
 }

package/lib/device/light-cct.js

@@ -1,5 +1,4 @@
 import PQueue from 'p-queue'
-import { TimeoutError } from 'p-timeout'
 
 import mqttClient from '../connection/mqtt.js'
 import { hk2mrCT, mr2hkCT } from '../utils/colour.js'
@@ -7,6 +6,7 @@ import platformConsts from '../utils/constants.js'
 import {
   generateRandomString,
   hasProperty,
+  isTimeoutError,
   parseError,
   sleep,
 } from '../utils/functions.js'
@@ -121,7 +121,7 @@ export default class {
       timeout: 10000,
       throwOnTimeout: true,
     })
-    this.queue.on('idle', () => {
+    this.queue.addEventListener('idle', () => {
       this.updateInProgress = false
     })
 
@@ -180,7 +180,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState)
@@ -331,7 +331,7 @@ export default class {
       })
     } catch (err) {
       // Catch any errors whilst updating the device
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logWarn(`${platformLang.sendFailed} ${eText}`)
       setTimeout(() => {
         this.service.updateCharacteristic(this.cusChar.On, this.cacheState)
@@ -410,7 +410,7 @@ export default class {
         }
       })
     } catch (err) {
-      const eText = err instanceof TimeoutError ? platformLang.timeout : parseError(err)
+      const eText = isTimeoutError(err) ? platformLang.timeout : parseError(err)
       this.accessory.logDebugWarn(`${platformLang.reqFailed}: ${eText}`)
 
       // Set the homebridge-ui status of the device to offline if local and error is timeout