@homebridge-plugins/homebridge-govee 11.32.2-beta.21 → 11.32.2-beta.23

package/lib/device/humidifier-H7140.js

@@ -4,22 +4,14 @@ import {
   generateCodeFromHexValues,
   getTwoItemPosition,
   hexToTwoItems,
-  parseError,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Speed codes
     this.value2Code = {
       1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
@@ -95,14 +87,9 @@ export default class {
       this.cacheState = newValue
       this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -134,14 +121,9 @@ export default class {
       this.cacheSpeed = value
       this.accessory.log(`${platformLang.curSpeed} [${value}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -182,14 +164,9 @@ export default class {
         this.accessory.log(`${platformLang.curLight} [${newValue}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLightState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/humidifier-H7141.js

@@ -2,10 +2,10 @@ import {
   base64ToHex,
   getTwoItemPosition,
   hexToTwoItems,
-  parseError,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   H7141
@@ -41,17 +41,9 @@ import { logUnknownData } from '../utils/report-unknown.js'
     }
   }
 */
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Speed codes
     this.value2Code = {
       1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
@@ -118,14 +110,9 @@ export default class {
       this.cacheState = newValue
       this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -157,14 +144,9 @@ export default class {
       this.cacheSpeed = value
       this.accessory.log(`${platformLang.curSpeed} [${value}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/humidifier-H7142.js

@@ -6,11 +6,11 @@ import {
   getTwoItemPosition,
   hexToDecimal,
   hexToTwoItems,
-  parseError,
   sleep,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   H7142
@@ -47,17 +47,9 @@ import { logUnknownData } from '../utils/report-unknown.js'
     }
   }
 */
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Speed codes
     this.value2Code = {
       1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
@@ -180,14 +172,9 @@ export default class {
         this.accessory.log(`current light state [${this.cacheLightState}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -219,14 +206,9 @@ export default class {
       this.cacheSpeed = value
       this.accessory.log(`${platformLang.curSpeed} [${value}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -267,14 +249,9 @@ export default class {
         this.accessory.log(`${platformLang.curLight} [${newValue}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLightState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -325,14 +302,9 @@ export default class {
         this.accessory.log(`${platformLang.curBright} [${value}%]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -370,14 +342,9 @@ export default class {
         this.accessory.log(`${platformLang.curColour} [rgb ${newRGB.join(' ')}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/humidifier-H7143.js

@@ -2,22 +2,14 @@ import {
   base64ToHex,
   getTwoItemPosition,
   hexToTwoItems,
-  parseError,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Speed codes
     this.value2Code = {
       1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
@@ -83,14 +75,9 @@ export default class {
       this.cacheState = newValue
       this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -122,14 +109,9 @@ export default class {
       this.cacheSpeed = value
       this.accessory.log(`${platformLang.curSpeed} [${value}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/humidifier-H7160.js

@@ -6,23 +6,15 @@ import {
   getTwoItemPosition,
   hexToDecimal,
   hexToTwoItems,
-  parseError,
   sleep,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Speed codes
     this.value2Code = {
       1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
@@ -128,14 +120,9 @@ export default class {
         this.accessory.log(`current light state [${this.cacheLightState}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -167,14 +154,9 @@ export default class {
       this.cacheSpeed = value
       this.accessory.log(`${platformLang.curSpeed} [${value}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -215,14 +197,9 @@ export default class {
         this.accessory.log(`${platformLang.curLight} [${newValue}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.On, this.cacheLightState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -273,14 +250,9 @@ export default class {
         this.accessory.log(`${platformLang.curBright} [${value}%]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.Brightness, this.cacheBright)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -318,14 +290,9 @@ export default class {
         this.accessory.log(`${platformLang.curColour} [rgb ${newRGB.join(' ')}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.lightService.updateCharacteristic(this.hapChar.Hue, this.cacheHue)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/ice-maker-H7172.js

@@ -1,19 +1,12 @@
 import { getDeviceCapabilities } from '../utils/device-capabilities.js'
-import { base64ToHex, generateCodeFromHexValues, getTwoItemPosition, hexToTwoItems, parseError } from '../utils/functions.js'
+import { base64ToHex, generateCodeFromHexValues, getTwoItemPosition, hexToTwoItems } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
-export default class GoveeIceMaker {
+export default class GoveeIceMaker extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Ice size codes: small=1, medium=2, large=3 (matching OpenAPI workMode values)
     // Small, medium and large are all `33 05 <size>`. Which byte means which
     // size runs the opposite way on the older models, so the order comes from
@@ -106,14 +99,9 @@ export default class GoveeIceMaker {
         this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -150,14 +138,9 @@ export default class GoveeIceMaker {
       this.service.updateCharacteristic(this.hapChar.Active, 1)
       this.accessory.log(`${platformLang.curSpeed} [${this.sizeLabels[value]}]`)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSize)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/index.js

@@ -37,7 +37,7 @@ import deviceSensorCO2 from './sensor-co2.js'
 import deviceSensorLeak from './sensor-leak.js'
 import deviceSensorMonitor from './sensor-monitor.js'
 import deviceSensorPresence from './sensor-presence.js'
-import deviceSensorThermo4 from './sensor-thermo4.js'
+import deviceSensorProbe from './sensor-probe.js'
 import deviceSensorThermoSwitch from './sensor-thermo-switch.js'
 import deviceSensorThermo from './sensor-thermo.js'
 import deviceSwitchDouble, { asOutlet as deviceOutletDouble } from './switch-double.js'
@@ -116,7 +116,7 @@ export default {
   deviceSensorPresence,
   deviceSensorThermo,
   deviceSensorThermoSwitch,
-  deviceSensorThermo4,
+  deviceSensorProbe,
   deviceSwitchDouble,
   deviceSwitchSingle,
   deviceSwitchTriple,

package/lib/device/kettle.js

@@ -2,11 +2,11 @@ import {
   base64ToHex,
   getTwoItemPosition,
   hexToTwoItems,
-  parseError,
   sleep,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   Custom Mode:                                 aa050001010000000000000000000000000000af
@@ -23,16 +23,10 @@ import { logUnknownData } from '../utils/report-unknown.js'
   Black Tea/Boil: MwUABQAAAAAAAAAAAAAAAAAAADM= 3305000500000000000000000000000000000033 [switch]
                   MwEBBQAAAAAAAAAAAAAAAAAAADY= 3301010500000000000000000000000000000036 [enable]
  */
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
+    super(platform, accessory)
     // Set up variables from the accessory
-    this.accessory = accessory
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId] || {}
 
     this.codes = {
@@ -232,14 +226,9 @@ export default class {
         service.updateCharacteristic(this.hapChar.On, false)
       }, 3000)
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         service.updateCharacteristic(this.hapChar.On, false)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/light-switch.js

@@ -1,17 +1,9 @@
-import { parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
+import GoveeDevice from './base.js'
 
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
-    // Set up variables from the platform
-    this.hapChar = platform.api.hap.Characteristic
-    this.hapErr = platform.api.hap.HapStatusError
-    this.hapServ = platform.api.hap.Service
-    this.platform = platform
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
+    super(platform, accessory)
     // Remove any lightbulb service
     if (accessory.getService(this.hapServ.Lightbulb)) {
       accessory.removeService(accessory.getService(this.hapServ.Lightbulb))
@@ -61,14 +53,9 @@ export default class {
         this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
       }
     } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
+      this.failUpdate(err, () => {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }