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

package/lib/device/fan-H7107.js

@@ -8,23 +8,15 @@ import {
   hexToDecimal,
   hexToTwoItems,
   hkPercentToFanSpeed,
-  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)
     // Set up custom variables for this device type
     const deviceConf = platform.deviceConf[accessory.context.gvDeviceId]
     this.hideLight = deviceConf && deviceConf.hideLight
@@ -151,14 +143,9 @@ export default class {
         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)
+      })
     }
   }
 
@@ -192,14 +179,9 @@ export default class {
         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, fanSpeedToHkPercent(this.cacheSpeed, this.speedSteps, this.autoSpeed))
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -246,14 +228,9 @@ export default class {
         this.accessory.log(`${platformLang.curSwing} [${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.SwingMode, this.cacheSwing === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -281,14 +258,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)
+      })
     }
   }
 
@@ -335,14 +307,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)
+      })
     }
   }
 
@@ -379,14 +346,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/heater-single.js

@@ -1,16 +1,11 @@
 import { generateRandomString, hasProperty, 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
-
+    super(platform, accessory)
     // Set up variables from the accessory
-    this.accessory = accessory
     this.temperatureSource = accessory.context.temperatureSource;
 
     // Remove any old services from simulations
@@ -149,14 +144,9 @@ export default class {
         value === 1 ? newOnState : 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)
+      })
     }
   }
 
@@ -211,17 +201,12 @@ export default class {
         this.cacheHeat === 'on' ? 2 : 1,
       )
     } 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.HeatingThresholdTemperature,
           this.accessory.context.cacheTarget,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/heater1a.js

@@ -6,10 +6,10 @@ import {
   hasProperty,
   hexToTwoItems,
   nearestHalf,
-  parseError,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   H7130 (without temperature reporting)
@@ -32,19 +32,10 @@ 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
-
+    super(platform, accessory)
     this.log = platform.log
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
     // Set up objects
     this.speedCode = {
       33: 'MwUBAAAAAAAAAAAAAAAAAAAAADc=',
@@ -152,14 +143,9 @@ export default class {
         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)
+      })
     }
   }
 
@@ -189,17 +175,12 @@ export default class {
         this.accessory.log(`${platformLang.curSwing} [${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.SwingMode,
           this.cacheSwing === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -229,17 +210,12 @@ export default class {
         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)
+      })
     }
   }
 
@@ -274,14 +250,9 @@ export default class {
         this.accessory.log(`${platformLang.curSpeed} [${this.speedCodeLabel[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.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/heater1b.js

@@ -5,10 +5,10 @@ import {
   hasProperty,
   hexToTwoItems,
   nearestHalf,
-  parseError,
 } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
+import GoveeDevice from './base.js'
 
 /*
   H7130 (with temperature reporting)
@@ -31,19 +31,10 @@ 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
-
+    super(platform, accessory)
     this.log = platform.log
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
     // Set up objects
     this.speedCode = {
       33: 'MwUBAAAAAAAAAAAAAAAAAAAAADc=',
@@ -229,14 +220,9 @@ export default class {
         this.fanService.updateCharacteristic(this.hapChar.On, newValue === 'on')
       }
     } 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)
+      })
     }
   }
 
@@ -264,17 +250,12 @@ export default class {
         this.accessory.log(`${platformLang.curMode} [${newMode}]`)
       }
     } 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.TargetHeaterCoolerState,
           this.cacheMode === 'auto' ? 0 : 1,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -303,14 +284,9 @@ export default class {
         this.accessory.log(`${platformLang.curTarg} [${this.cacheTarg}°C]`)
       }
     } 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.HeatingThresholdTemperature, this.cacheTarg)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -340,17 +316,12 @@ export default class {
         this.accessory.log(`${platformLang.curSwing} [${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.SwingMode,
           this.cacheSwing === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -380,17 +351,12 @@ export default class {
         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)
+      })
     }
   }
 
@@ -427,14 +393,9 @@ export default class {
         this.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
       }, 2000)
     } 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.fanService.updateCharacteristic(this.hapChar.On, this.cacheFanState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -469,14 +430,9 @@ export default class {
         this.accessory.log(`${platformLang.curSpeed} [${this.speedCodeLabel[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.fanService.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/heater2.js

@@ -9,11 +9,11 @@ import {
   hexToDecimal,
   hexToTwoItems,
   nearestHalf,
-  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'
 
 /*
   H7131 and H7132
@@ -44,17 +44,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)
     // Set up objects
     this.speedCode = {
       25: 'OgUJAAAAAAAAAAAAAAAAAAAAADY=',
@@ -263,14 +255,9 @@ export default class {
         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)
+      })
     }
   }
 
@@ -310,17 +297,12 @@ export default class {
         this.accessory.log(`${platformLang.curMode} [${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.TargetHeaterCoolerState,
           this.cacheMode === 'auto' ? 0 : 1,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -350,14 +332,9 @@ export default class {
         this.accessory.log(`${platformLang.curTarg} [${this.cacheTarg}°C]`)
       }
     } 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.HeatingThresholdTemperature, this.cacheTarg)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -387,17 +364,12 @@ export default class {
         this.accessory.log(`${platformLang.curSwing} [${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.SwingMode,
           this.cacheSwing === 'on' ? 1 : 0,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -427,17 +399,12 @@ export default class {
         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)
+      })
     }
   }
 
@@ -480,14 +447,9 @@ export default class {
       this.service.updateCharacteristic(this.hapChar.TargetHeaterCoolerState, 0)
       this.accessory.log(`${platformLang.curMode} [${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.fanService.updateCharacteristic(this.hapChar.On, this.cacheFanState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -517,14 +479,9 @@ export default class {
         this.accessory.log(`${platformLang.curMode} [${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.fanService.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -552,14 +509,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)
+      })
     }
   }
 
@@ -606,14 +558,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)
+      })
     }
   }
 
@@ -650,14 +597,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)
+      })
     }
   }