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

package/lib/device/sensor-thermo-switch.js

@@ -6,19 +6,14 @@ 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) {
+    super(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
     this.httpTimeout = platform.config.bleRefreshTime * 4.5 * 1000
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold

package/lib/device/sensor-thermo.js

@@ -6,19 +6,14 @@ 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) {
+    super(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
     this.httpTimeout = platform.config.bleRefreshTime * 4.5 * 1000
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold

package/lib/device/sensor-thermo4.js

@@ -1,18 +1,11 @@
 import { base64ToHex, 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 {
+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 temperature sensor, humidity sensor, battery service
     if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor))

package/lib/device/switch-double.js

@@ -1,5 +1,6 @@
-import { base64ToHex, parseError } from '../utils/functions.js'
+import { base64ToHex } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
+import GoveeDevice from './base.js'
 
 // Models that expose a night light. The H5089 reports its light as
 // `aa 1b 01 [on] [level]` and that reading is correct, so the tile shows the
@@ -8,17 +9,9 @@ import platformLang from '../utils/lang-en.js'
 // outright rather than accepted and silently dropped (#1323).
 const nightLightModels = ['H5089']
 
-class MultiSwitchDouble {
+class MultiSwitchDouble extends GoveeDevice {
   constructor(platform, accessory, config) {
-    // 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)
     // Drop the tiles of the other kind, left behind if this device has been
     // shown as the other one before
     if (this.accessory.getService(`${config.other} 1`)) {
@@ -121,14 +114,9 @@ class MultiSwitchDouble {
         this.accessory.log(`[${service.getCharacteristic(this.hapChar.ConfiguredName).value}] ${platformLang.curState} [${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, () => {
         service.updateCharacteristic(this.hapChar.On, service.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/switch-single.js

@@ -1,19 +1,11 @@
-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 old services from simulations
-    ['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Outlet', 'Valve'].forEach((service) => {
+    ;['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Outlet', 'Valve'].forEach((service) => {
       if (this.accessory.getService(this.hapServ[service])) {
         this.accessory.removeService(this.accessory.getService(this.hapServ[service]))
       }
@@ -65,14 +57,9 @@ export default class {
       // Add the entry to the Eve history service
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
     } 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)
+      })
     }
   }
 

package/lib/device/switch-triple.js

@@ -1,17 +1,9 @@
-import { parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
+import GoveeDevice from './base.js'
 
-class MultiSwitchTriple {
+class MultiSwitchTriple extends GoveeDevice {
   constructor(platform, accessory, config) {
-    // 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)
     // Drop the tiles of the other kind, left behind if this device has been
     // shown as the other one before
     if (this.accessory.getService(`${config.other} 1`)) {
@@ -84,14 +76,9 @@ class MultiSwitchTriple {
       service.cacheState = newValue
       this.accessory.log(`[${service.displayName}] ${platformLang.curState} [${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, () => {
         service.updateCharacteristic(this.hapChar.On, service.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/tap-single.js

@@ -1,19 +1,12 @@
-import { generateRandomString, parseError } from '../utils/functions.js'
+import { generateRandomString } 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 old services from simulations
-    ['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Outlet', 'Switch'].forEach((service) => {
+    ;['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Outlet', 'Switch'].forEach((service) => {
       if (this.accessory.getService(this.hapServ[service])) {
         this.accessory.removeService(this.accessory.getService(this.hapServ[service]))
       }
@@ -82,14 +75,9 @@ export default class {
       // Update the InUse characteristic
       this.service.updateCharacteristic(this.hapChar.InUse, 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.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/template.js

@@ -1,18 +1,11 @@
 import { base64ToHex, 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 {
+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)
     // Output the customised options to the log
     const opts = JSON.stringify({})
     platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)

package/lib/device/tv-single.js

@@ -1,17 +1,10 @@
-import { generateRandomString, parseError } from '../utils/functions.js'
+import { generateRandomString } 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)
     // Add the tv service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Television)
       || this.accessory.addService(this.hapServ.Television)
@@ -59,14 +52,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.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/valve-single.js

@@ -1,19 +1,12 @@
-import { generateRandomString, parseError } from '../utils/functions.js'
+import { generateRandomString } 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 old services from simulations
-    ['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Outlet', 'Switch'].forEach((service) => {
+    ;['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Outlet', 'Switch'].forEach((service) => {
       if (this.accessory.getService(this.hapServ[service])) {
         this.accessory.removeService(this.accessory.getService(this.hapServ[service]))
       }
@@ -117,14 +110,9 @@ export default class {
         default:
       }
     } 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)
+      })
     }
   }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@homebridge-plugins/homebridge-govee",
   "alias": "Govee",
   "type": "module",
-  "version": "11.32.2-beta.21",
+  "version": "11.32.2-beta.22",
   "description": "Homebridge plugin to integrate Govee devices into HomeKit.",
   "author": {
     "name": "bwp91",