@homebridge-plugins/homebridge-govee 11.32.2-beta.8 → 11.32.2

package/lib/device/cooler-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.cacheCool === 'on' ? 3 : 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.CoolingThresholdTemperature,
           this.accessory.context.cacheTarget,
         )
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/dehumidifier-H7150.js

@@ -2,13 +2,13 @@ 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'
 
 /*
-  H7150
+  H7150, H7151 and H7152
   {
     "mode": {
       "options": [
@@ -32,17 +32,9 @@ import { logUnknownData } from '../utils/report-unknown.js'
     }
   }
  */
-export default class {
+export default class GoveeDehumidifierH7150 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=',
@@ -108,14 +100,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.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -147,14 +134,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/diffuser-H7161.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)
     // Remove fan service if exists
     if (this.accessory.getService(this.hapServ.Fan)) {
       this.accessory.removeService(this.accessory.getService(this.hapServ.Fan))
@@ -71,14 +63,9 @@ export default class {
 
       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/fan-H1370.js

@@ -6,11 +6,11 @@ import {
   getTwoItemPosition,
   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'
 
 /*
   Codes below were decoded from a real device's AWS status reports in
@@ -20,17 +20,9 @@ import { logUnknownData } from '../utils/report-unknown.js'
   The light reports through the standard state/brightness/kelvin fields
   (colour temperature only, 2700-6500K)
 */
-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
@@ -138,14 +130,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)
+      })
     }
   }
 
@@ -176,14 +163,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))
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 
@@ -208,14 +190,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)
+      })
     }
   }
 
@@ -246,14 +223,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)
+      })
     }
   }
 
@@ -287,14 +259,9 @@ export default class {
       this.cacheKelvin = k
       this.accessory.log(`${platformLang.curColour} [${k}K]`)
     } 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.ColorTemperature, this.cacheMired)
-      }, 2000)
-      throw new this.hapErr(-70402)
+      })
     }
   }
 

package/lib/device/fan-H7100.js

@@ -1,24 +1,31 @@
+import { getDeviceCapabilities } from '../utils/device-capabilities.js'
 import {
   base64ToHex,
   fanSpeedToHkPercent,
   getTwoItemPosition,
   hexToTwoItems,
   hkPercentToFanSpeed,
-  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 {
-  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
+/*
+  The models on this handler and the modes each offers:
+
+  H7100, H7102, H7106 -> Sleep, Nature, Custom, Auto
+  H7101               -> Sleep, Nature, Turbo, Custom, Auto
+  H7111               -> Sleep, Nature, Custom, Auto
+  H1310, R1310        -> as the H7100, but its oscillation status message has
+                         never been confirmed, so it is not read back
+ */
 
-    // Set up variables from the accessory
-    this.accessory = accessory
+export default class GoveeFanH7100 extends GoveeDevice {
+  constructor(platform, accessory) {
+    super(platform, accessory)
+    // Which of the models on this handler have a confirmed meaning for the
+    // oscillation status message
+    this.readsSwingStatus = getDeviceCapabilities(accessory.context.gvModel).readsSwingStatus
 
     // Codes etc
     this.speedCodes = {
@@ -104,14 +111,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)
+      })
     }
   }
 
@@ -147,14 +149,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)
+      })
     }
   }
 
@@ -180,14 +177,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)
+      })
     }
   }
 
@@ -262,12 +254,23 @@ export default class {
             this.cacheSpeed = this.autoSpeed
             // Cache auto so we can tell it apart from "user asked for max speed"
             this.service.updateCharacteristic(this.hapChar.RotationSpeed, 100)
-            this.accessory.log(`${platformLang.curSpeed} [auto]`)
+            this.accessory.log(`${platformLang.curSpeed} [auto -> 100%]`)
           }
           break
         }
         case '1f01': {
-          // Swing Mode
+          // Not every model on this handler is known to mean oscillation by
+          // this message, so one that has not been confirmed falls through and
+          // reports it instead - which is how it gets confirmed
+          if (!this.readsSwingStatus) {
+            logUnknownData(this.accessory, {
+              kind: 'scene',
+              source: params.source,
+              raw: command,
+              hex: hexString,
+            })
+            break
+          }
           const newSwing = getTwoItemPosition(hexParts, 4) === '01' ? 'on' : 'off'
           if (this.cacheSwing !== newSwing) {
             this.cacheSwing = newSwing

package/lib/device/fan-H7105.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)
+      })
     }
   }
 
@@ -233,14 +215,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)
+      })
     }
   }
 
@@ -268,14 +245,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)
+      })
     }
   }
 
@@ -322,14 +294,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)
+      })
     }
   }
 
@@ -366,14 +333,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/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)
+      })
     }
   }