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

package/lib/device/outlet-single.js

@@ -1,21 +1,16 @@
-import { base64ToHex, generateRandomString, getTwoItemPosition, hexToTwoItems, parseError } from '../utils/functions.js'
+import { base64ToHex, generateRandomString, 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) {
+    super(platform, accessory)
+
     // Set up variables from the platform
     this.eveChar = platform.eveChar
-    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;
-
     // Remove any old services from simulations
-    ['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Switch', 'Valve'].forEach((service) => {
+    ;['AirPurifier', 'HeaterCooler', 'Lightbulb', 'Switch', 'Valve'].forEach((service) => {
       if (this.accessory.getService(this.hapServ[service])) {
         this.accessory.removeService(this.accessory.getService(this.hapServ[service]))
       }
@@ -98,14 +93,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/purifier-H7120.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'
 
 /*
   The modes these purifiers report over the api. Low, medium and high are the
@@ -16,18 +16,12 @@ import { logUnknownData } from '../utils/report-unknown.js'
   H7121: Low 1, Medium 2, High 3, "Sleep" 16
  */
 
-export default class GoveePurifierH7120 {
+export default class GoveePurifierH7120 extends GoveeDevice {
   constructor(platform, accessory) {
+    super(platform, accessory)
+
     // Set up variables from the platform
     this.cusChar = platform.cusChar
-    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
-
     // Rotation speed to value in {1, 2, 3, 4}
     this.speed2Value = speed => Math.min(Math.max(Number.parseInt(speed / 25, 10), 1), 4)
 
@@ -144,14 +138,9 @@ export default class GoveePurifierH7120 {
       this.cacheState = newValue
       this.accessory.log(`${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, () => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -186,14 +175,9 @@ export default class GoveePurifierH7120 {
       this.cacheSpeed = newValue * 25
       this.accessory.log(`${platformLang.curSpeed} [${this.cacheSpeed}%]`)
     } 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)
+      })
     }
   }
 
@@ -219,14 +203,9 @@ export default class GoveePurifierH7120 {
       this.cacheLight = newValue
       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.service.updateCharacteristic(this.cusChar.NightLight, this.cacheLight === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -252,17 +231,12 @@ export default class GoveePurifierH7120 {
       this.cacheLock = newValue
       this.accessory.log(`${platformLang.curLock} [${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.service.updateCharacteristic(
           this.hapChar.LockPhysicalControls,
           this.cacheLock === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -288,14 +262,9 @@ export default class GoveePurifierH7120 {
       this.cacheDisplay = newValue
       this.accessory.log(`${platformLang.curDisplay} [${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.service.updateCharacteristic(this.cusChar.DisplayLight, this.cacheDisplay === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/purifier-H7122.js

@@ -4,11 +4,11 @@ import {
   hexToBase64,
   hexToDecimal,
   hexToTwoItems,
-  parseError,
   statusToActionCode,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   H7122
@@ -44,18 +44,12 @@ import { logUnknownData } from '../utils/report-unknown.js'
   }
 */
 
-export default class {
+export default class extends GoveeDevice {
   constructor(platform, accessory) {
+    super(platform, accessory)
+
     // Set up variables from the platform
     this.cusChar = platform.cusChar
-    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
-
     // Speed codes
     this.value2Code = {
       1: 'OgUFAAAAAAAAAAAAAAAAAAAAADo=', // sleep
@@ -175,14 +169,9 @@ export default class {
       this.cacheState = newValue
       this.accessory.log(`${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, () => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -214,14 +203,9 @@ export default class {
       this.cacheMode = newValueKey
       this.accessory.log(`${platformLang.curMode} [${this.value2Label[this.cacheMode]}]`)
     } 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.cacheMode * 20)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -247,14 +231,9 @@ export default class {
       this.cacheLight = newValue
       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.service.updateCharacteristic(this.cusChar.NightLight, this.cacheLight === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -280,17 +259,12 @@ export default class {
       this.cacheLock = newValue
       this.accessory.log(`${platformLang.curLock} [${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.service.updateCharacteristic(
           this.hapChar.LockPhysicalControls,
           this.cacheLock === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -326,14 +300,9 @@ export default class {
       this.cacheDisplay = newValue
       this.accessory.log(`${platformLang.curDisplay} [${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.service.updateCharacteristic(this.cusChar.DisplayLight, this.cacheDisplay === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/purifier-H7123.js

@@ -3,11 +3,11 @@ import {
   getTwoItemPosition,
   hexToBase64,
   hexToTwoItems,
-  parseError,
   statusToActionCode,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   H7123 and H7124
@@ -39,18 +39,12 @@ import { logUnknownData } from '../utils/report-unknown.js'
   }
  */
 
-export default class GoveePurifierH7123 {
+export default class GoveePurifierH7123 extends GoveeDevice {
   constructor(platform, accessory) {
+    super(platform, accessory)
+
     // Set up variables from the platform
     this.cusChar = platform.cusChar
-    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
-
     // Speed codes
     this.value2Code = {
       1: 'OgUFAAAAAAAAAAAAAAAAAAAAADo=', // sleep
@@ -179,14 +173,9 @@ export default class GoveePurifierH7123 {
       this.cacheState = newValue
       this.accessory.log(`${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, () => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -218,14 +207,9 @@ export default class GoveePurifierH7123 {
       this.cacheMode = newValueKey
       this.accessory.log(`${platformLang.curMode} [${this.value2Label[this.cacheMode]}]`)
     } 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.cacheMode * 20)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -251,14 +235,9 @@ export default class GoveePurifierH7123 {
       this.cacheLight = newValue
       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.service.updateCharacteristic(this.cusChar.NightLight, this.cacheLight === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -284,17 +263,12 @@ export default class GoveePurifierH7123 {
       this.cacheLock = newValue
       this.accessory.log(`${platformLang.curLock} [${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.service.updateCharacteristic(
           this.hapChar.LockPhysicalControls,
           this.cacheLock === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -330,14 +304,9 @@ export default class GoveePurifierH7123 {
       this.cacheDisplay = newValue
       this.accessory.log(`${platformLang.curDisplay} [${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.service.updateCharacteristic(this.cusChar.DisplayLight, this.cacheDisplay === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/purifier-H7126.js

@@ -2,23 +2,17 @@ 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) {
+    super(platform, accessory)
+
     // Set up variables from the platform
     this.cusChar = platform.cusChar
-    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
-
     this.speed2Value = (speed) => {
       if (speed <= 33) {
         return 1
@@ -128,14 +122,9 @@ export default class {
       this.cacheState = newValue
       this.accessory.log(`${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, () => {
         this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -172,14 +161,9 @@ export default class {
       this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
       this.accessory.log(`${platformLang.curSpeed} [${this.cacheSpeed}%]`)
     } 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)
+      })
     }
   }
 
@@ -205,17 +189,12 @@ export default class {
       this.cacheLock = newValue
       this.accessory.log(`${platformLang.curLock} [${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.service.updateCharacteristic(
           this.hapChar.LockPhysicalControls,
           this.cacheLock === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -241,14 +220,9 @@ export default class {
       this.cacheDisplay = newValue
       this.accessory.log(`${platformLang.curDisplay} [${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.service.updateCharacteristic(this.cusChar.DisplayLight, this.cacheDisplay === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/purifier-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
-    ['HeaterCooler', 'Lightbulb', 'Outlet', 'Switch', 'Valve'].forEach((service) => {
+    ;['HeaterCooler', 'Lightbulb', 'Outlet', 'Switch', 'Valve'].forEach((service) => {
       if (this.accessory.getService(this.hapServ[service])) {
         this.accessory.removeService(this.accessory.getService(this.hapServ[service]))
       }
@@ -85,14 +78,9 @@ export default class {
       this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
       this.service.updateCharacteristic(this.hapChar.CurrentAirPurifierState, value === 1 ? 2 : 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.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/sensor-basic.js

@@ -1,5 +1,6 @@
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /**
  * A sensor whose broadcasts are not decoded yet.
@@ -8,17 +9,9 @@ import { logUnknownData } from '../utils/report-unknown.js'
  * it does is report every message it receives in one copy-paste line, so an
  * owner can send in exactly what is needed to finish the model off.
  */
-export default class GoveeSensorBasic {
+export default class GoveeSensorBasic 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/sensor-co2.js

@@ -6,22 +6,15 @@ import {
   parseError,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
+import GoveeDevice from './base.js'
 
 // HomeKit triggers "CO2 detected" abnormal flag at this threshold (ppm).
 // Govee app default warn level is 1000 ppm; override via deviceConf.co2AbnormalThreshold.
 const DEFAULT_CO2_ABNORMAL_PPM = 1000
 
-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)
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId] || {}
     this.co2AbnormalThreshold = deviceConf.co2AbnormalThreshold || DEFAULT_CO2_ABNORMAL_PPM

package/lib/device/sensor-leak.js

@@ -1,19 +1,14 @@
 import platformConsts from '../utils/constants.js'
 import { hasProperty } 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.eveChar = platform.eveChar
-    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
-
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold

package/lib/device/sensor-monitor.js

@@ -9,18 +9,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)
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId]
     this.lowBattThreshold = deviceConf && deviceConf.lowBattThreshold

package/lib/device/sensor-presence.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)
     // Add the occupancy sensor if it does not already exist
     this.service = this.accessory.getService(this.hapServ.OccupancySensor) || this.accessory.addService(this.hapServ.OccupancySensor)
     this.cacheState = this.service.getCharacteristic(this.hapChar.OccupancyDetected).value