@homebridge-plugins/homebridge-govee 11.32.2-beta.12 → 11.32.2-beta.13

package/CHANGELOG.md

@@ -25,6 +25,9 @@ All notable changes to `@homebridge-plugins/homebridge-govee` will be documented
 - test: record what every supported model turns into, so a change can be shown to have altered nothing
 - feat: work out what an appliance can do from what the device itself reports, so a model nobody has written down still gets the right controls
 - feat: offer oscillation and the child lock on any appliance that reports having them, driven through govee's api rather than needing that model's command codes
+- refactor: point three more models at a shared handler instead of a near-copy of the same file, keeping each one's behaviour exactly as it was
+- fix: give the H7124 the air quality handling the H7123 already had, so a poor reading is named properly and stops being logged over and over (#1261)
+- refactor: point the H7151 and H7111 at the handlers they were byte-for-byte copies of
 
 ## v11.32.1 (2026-08-02)
 

package/lib/device/dehumidifier-H7150.js

@@ -8,7 +8,7 @@ import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
 /*
-  H7150
+  H7150 and H7151
   {
     "mode": {
       "options": [
@@ -32,7 +32,7 @@ import { logUnknownData } from '../utils/report-unknown.js'
     }
   }
  */
-export default class {
+export default class GoveeDehumidifierH7150 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic

package/lib/device/fan-H7100.js

@@ -1,3 +1,4 @@
+import { getDeviceCapabilities } from '../utils/device-capabilities.js'
 import {
   base64ToHex,
   fanSpeedToHkPercent,
@@ -9,7 +10,7 @@ import {
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
-export default class {
+export default class GoveeFanH7100 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
@@ -20,6 +21,10 @@ export default class {
     // Set up variables from the accessory
     this.accessory = 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 = {
       1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
@@ -267,7 +272,18 @@ export default class {
           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-H7101.js

@@ -10,7 +10,7 @@ import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
 /*
-  H7101
+  H7101 and H7111
   {
     "mode": {
       "options": [
@@ -53,6 +53,7 @@ import { logUnknownData } from '../utils/report-unknown.js'
 
   // NOTES
   H7101 -> Sleep, Nature, Turbo, Custom, Auto
+  H7111 -> Sleep, Nature, Custom, Auto (no turbo)
 
   sleep
   [31/10/2022, 20:52:08] [Govee] [Device1] [AWS] receiving update {"source":"AWS","result":1,"commands":["qgUFAAAAAAAAAAAAAAAAAAAAAKo=","qgUABQAAAAAAAAAAAAAAAAAAAKo="]}.
@@ -65,7 +66,7 @@ import { logUnknownData } from '../utils/report-unknown.js'
   [31/10/2022, 20:52:43] [Govee] [Device1] new scene code: [qgUABgAAAAAAAAAAAAAAAAAAAKk=] [aa050006000000000000000000000000000000a9].
 */
 
-export default class {
+export default class GoveeFanH7101 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
@@ -318,7 +319,7 @@ 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
         }

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

@@ -2,7 +2,7 @@ import { base64ToHex, getTwoItemPosition, hexToTwoItems, parseError } from '../u
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
-export default class {
+export default class GoveeIceMakerH8121 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
@@ -14,7 +14,7 @@ export default class {
     this.accessory = accessory
 
     // Ice size codes: small=1, medium=2, large=3, matching the OpenAPI workMode
-    // values. Unlike the H8120, the H8121's BLE size byte runs in the SAME
+    // values. Unlike the H8120, this generation's BLE size byte runs in the SAME
     // direction as workMode (small=0x05 01 .. large=0x05 03), so the two paths
     // agree here and no inversion is needed.
     this.sizeCodes = {
@@ -89,7 +89,7 @@ export default class {
       } else {
         // Turn off. The OpenAPI workMode=0 path is authoritative; the BLE frame
         // mirrors the H8120 ice-maker-off command (33 19 00) as a best effort
-        // and is pending confirmation from an H8121 owner.
+        // and is pending confirmation from an owner of either model.
         await this.platform.sendDeviceUpdate(this.accessory, {
           cmd: 'ptReal',
           value: 'MxkAAAAAAAAAAAAAAAAAAAAAACo=',

package/lib/device/index.js

@@ -7,16 +7,13 @@ import {
 } from './appliance-basic.js'
 import deviceCoolerSingle from './cooler-single.js'
 import deviceDehumidifierH7150 from './dehumidifier-H7150.js'
-import deviceDehumidifierH7151 from './dehumidifier-H7151.js'
 import deviceDehumidifierH7152 from './dehumidifier-H7152.js'
 import deviceDiffuserH7161 from './diffuser-H7161.js'
-import deviceFanH1310 from './fan-H1310.js'
 import deviceFanH1370 from './fan-H1370.js'
 import deviceFanH7100 from './fan-H7100.js'
 import deviceFanH7101 from './fan-H7101.js'
 import deviceFanH7105 from './fan-H7105.js'
 import deviceFanH7107 from './fan-H7107.js'
-import deviceFanH7111 from './fan-H7111.js'
 import deviceHeater1A from './heater1a.js'
 import deviceHeater1B from './heater1b.js'
 import deviceHeater2 from './heater2.js'
@@ -28,7 +25,6 @@ import deviceHumidifierH7143 from './humidifier-H7143.js'
 import deviceHumidifierH7160 from './humidifier-H7160.js'
 import deviceIceMakerH7172 from './ice-maker-H7172.js'
 import deviceIceMakerH8121 from './ice-maker-H8121.js'
-import deviceIceMakerH8122 from './ice-maker-H8122.js'
 import deviceKettle from './kettle.js'
 import deviceLightSwitch from './light-switch.js'
 import deviceLight from './light.js'
@@ -36,15 +32,12 @@ import deviceOutletDouble from './outlet-double.js'
 import deviceOutletSingle from './outlet-single.js'
 import deviceOutletTriple from './outlet-triple.js'
 import devicePurifierH7120 from './purifier-H7120.js'
-import devicePurifierH7121 from './purifier-H7121.js'
 import devicePurifierH7122 from './purifier-H7122.js'
 import devicePurifierH7123 from './purifier-H7123.js'
-import devicePurifierH7124 from './purifier-H7124.js'
 import devicePurifierH7126 from './purifier-H7126.js'
 import devicePurifierSingle from './purifier-single.js'
-import deviceSensorButton from './sensor-button.js'
+import deviceSensorBasic from './sensor-basic.js'
 import deviceSensorCO2 from './sensor-co2.js'
-import deviceSensorContact from './sensor-contact.js'
 import deviceSensorLeak from './sensor-leak.js'
 import deviceSensorMonitor from './sensor-monitor.js'
 import deviceSensorPresence from './sensor-presence.js'
@@ -62,22 +55,22 @@ import deviceValveSingle from './valve-single.js'
 export default {
   deviceCoolerSingle,
   deviceDehumidifierH7150,
-  deviceDehumidifierH7151,
+  deviceDehumidifierH7151: deviceDehumidifierH7150, // identical to the H7150
   deviceDehumidifierH7152,
   deviceDiffuserH7161,
   deviceDiffuserH7162: deviceDiffuserH7161, // identical to the H7161
   deviceDehumidifierBasic,
   deviceFanBasic,
-  deviceFanH1310,
+  deviceFanH1310: deviceFanH7100, // same fan, minus a confirmed swing status message
   deviceFanH1370,
-  deviceFanR1310: deviceFanH1310, // R1310 is the newer naming of the H1310
+  deviceFanR1310: deviceFanH7100, // R1310 is the newer naming of the H1310
   deviceFanH7100,
   deviceFanH7102: deviceFanH7100, // identical to the H7100
   deviceFanH7106: deviceFanH7100, // identical to the H7100
   deviceFanH7101,
   deviceFanH7105,
   deviceFanH7107,
-  deviceFanH7111,
+  deviceFanH7111: deviceFanH7101, // same fan without the turbo mode, which is not sent
   deviceHeaterSingle,
   deviceHeater1A,
   deviceHeater1B,
@@ -98,7 +91,7 @@ export default {
   deviceIceMakerH717D: deviceIceMakerH7172, // identical to the H7172
   deviceIceMakerH8120: deviceIceMakerH7172, // identical to the H7172
   deviceIceMakerH8121,
-  deviceIceMakerH8122,
+  deviceIceMakerH8122: deviceIceMakerH8121, // identical to the H8121
   deviceKettle,
   deviceLight,
   deviceLightSwitch,
@@ -107,19 +100,20 @@ export default {
   deviceOutletTriple,
   devicePurifierBasic,
   devicePurifierH7120,
-  devicePurifierH7121,
+  devicePurifierH7121: devicePurifierH7120, // identical apart from its sleep mode value, which is not sent
   devicePurifierH7122,
   devicePurifierH7123,
-  devicePurifierH7124,
+  devicePurifierH7124: devicePurifierH7123, // same device; this also gives it the #1261 air quality fix
   devicePurifierH7126,
   devicePurifierH7127: devicePurifierH7126, // identical to the H7126
   devicePurifierH7128: devicePurifierH7126, // identical to the H7126
   devicePurifierH7129: devicePurifierH7126, // identical to the H7126
   devicePurifierH712C: devicePurifierH7126, // identical to the H7126
   devicePurifierSingle,
-  deviceSensorButton,
+  deviceSensorBasic,
+  deviceSensorButton: deviceSensorBasic, // nothing decoded yet, so it reports instead
   deviceSensorCO2,
-  deviceSensorContact,
+  deviceSensorContact: deviceSensorBasic, // nothing decoded yet, so it reports instead
   deviceSensorLeak,
   deviceSensorMonitor,
   deviceSensorPresence,

package/lib/device/purifier-H7120.js

@@ -8,32 +8,15 @@ import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
 /*
-  H7120
-  {
-    "mode": {
-      "options": [
-        {
-          "name": "Low",
-          "value": 1
-        },
-        {
-          "name": "Medium",
-          "value": 2
-        },
-        {
-          "name": "High",
-          "value": 3
-        },
-        {
-          "name": "Sleep mode",
-          "value": 5
-        }
-      ]
-    }
-  }
+  The modes these purifiers report over the api. Low, medium and high are the
+  gear speeds the plugin drives; sleep is listed for reference and is the one
+  place the two models differ, so it must not be sent as a shared value.
+
+  H7120: Low 1, Medium 2, High 3, "Sleep mode" 5
+  H7121: Low 1, Medium 2, High 3, "Sleep" 16
  */
 
-export default class {
+export default class GoveePurifierH7120 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.cusChar = platform.cusChar

package/lib/device/purifier-H7123.js

@@ -10,7 +10,7 @@ import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
 /*
-  H7123
+  H7123 and H7124
   {
     "mode": {
       "options": [
@@ -39,7 +39,7 @@ import { logUnknownData } from '../utils/report-unknown.js'
   }
  */
 
-export default class {
+export default class GoveePurifierH7123 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.cusChar = platform.cusChar

package/lib/device/{sensor-button.js → sensor-basic.js}

@@ -1,7 +1,14 @@
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
-export default class {
+/**
+ * A sensor whose broadcasts are not decoded yet.
+ *
+ * It offers no tile, because a tile that never updates is worse than none. What
+ * 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 {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic

package/lib/utils/device-capabilities.js

@@ -34,6 +34,13 @@ const modelOverrides = {
   // and only the brightness scale is fixed here (#1332)
   H6102: { bleBrightnessScale: 0x64 },
 
+  // The H1310 ceiling fan shares the H7100's handler, but its oscillation
+  // status message has never been confirmed to mean the same thing, so reading
+  // it back stays off. While it is off, an owner's fan reporting one produces a
+  // line in the log saying so - which is the evidence needed to turn this on
+  H1310: { readsSwingStatus: false },
+  R1310: { readsSwingStatus: false },
+
   // AWS outlet uses 17/16 for on/off instead of 1/0
   H5080: { awsPowerOn: 17, awsPowerOff: 16 },
   H5083: { awsPowerOn: 17, awsPowerOff: 16 },
@@ -101,6 +108,7 @@ const defaults = {
   bleWriteUuid: UUID.WRITE_DEFAULT,
   awsStatusCmdVersion: 2,
   awsBrightnessNoScale: false,
+  readsSwingStatus: true,
 }
 
 export function getDeviceCapabilities(model, firmware) {

package/package.json

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

package/lib/device/dehumidifier-H7151.js

@@ -1,195 +0,0 @@
-import {
-  base64ToHex,
-  getTwoItemPosition,
-  hexToTwoItems,
-  parseError,
-} from '../utils/functions.js'
-import platformLang from '../utils/lang-en.js'
-import { logUnknownData } from '../utils/report-unknown.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
-
-    // Set up variables from the accessory
-    this.accessory = accessory
-
-    // Speed codes
-    this.value2Code = {
-      1: 'MwUBAQAAAAAAAAAAAAAAAAAAADY=',
-      2: 'MwUBAgAAAAAAAAAAAAAAAAAAADU=',
-      3: 'MwUBAwAAAAAAAAAAAAAAAAAAADQ=',
-      4: 'MwUBBAAAAAAAAAAAAAAAAAAAADM=',
-      5: 'MwUBBQAAAAAAAAAAAAAAAAAAADI=',
-      6: 'MwUBBgAAAAAAAAAAAAAAAAAAADE=',
-      7: 'MwUBBwAAAAAAAAAAAAAAAAAAADA=',
-      8: 'MwUBCAAAAAAAAAAAAAAAAAAAAD8=',
-    }
-
-    // Migrate old %-rotation speed to unitless
-    const existingFanService = this.accessory.getService(this.hapServ.Fan)
-    if (existingFanService) {
-      if (existingFanService.getCharacteristic(this.hapChar.RotationSpeed).props.unit === 'percentage') {
-        this.accessory.removeService(existingFanService)
-      }
-    }
-
-    // Add the fan service if it doesn't already exist
-    this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
-
-    // Add the set handler to the fan on/off characteristic
-    this.service
-      .getCharacteristic(this.hapChar.On)
-      .onSet(async value => this.internalStateUpdate(value))
-    this.cacheState = this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-
-    // Add the set handler to the fan rotation speed characteristic
-    this.service
-      .getCharacteristic(this.hapChar.RotationSpeed)
-      .setProps({
-        maxValue: 8,
-        minStep: 1,
-        minValue: 0,
-        unit: 'unitless',
-      })
-      .onSet(async value => this.internalSpeedUpdate(value))
-    this.cacheSpeed = this.service.getCharacteristic(this.hapChar.RotationSpeed).value
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({})
-    platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)
-  }
-
-  async internalStateUpdate(value) {
-    try {
-      const newValue = value ? 'on' : 'off'
-
-      // Don't continue if the new value is the same as before
-      if (this.cacheState === newValue) {
-        return
-      }
-
-      // Send the request to the platform sender function
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        cmd: 'stateHumi',
-        value: value ? 1 : 0,
-      })
-
-      // Cache the new state and log if appropriate
-      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.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async internalSpeedUpdate(value) {
-    try {
-      // Don't continue if the speed is 0
-      if (value === 0) {
-        return
-      }
-
-      // Don't continue if the speed value won't have effect
-      if (value === this.cacheSpeed) {
-        return
-      }
-
-      // Get the scene code for this value
-      const newCode = this.value2Code[value]
-
-      // Send the request to the platform sender function
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        cmd: 'ptReal',
-        value: newCode,
-        openApi: this.accessory.context.openApiCapabilities?.workMode
-          ? { instance: 'workMode', capabilityType: 'devices.capabilities.work_mode', value: { workMode: 1, modeValue: value } }
-          : undefined,
-      })
-
-      // Cache the new state and log if appropriate
-      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.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  externalUpdate(params) {
-    // Check for an ON/OFF change
-    if (params.state && params.state !== this.cacheState) {
-      this.cacheState = params.state
-      this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-
-      // Log the change
-      this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
-    }
-
-    // Handle OpenAPI workMode (speed)
-    if (params.workMode) {
-      const speed = params.workMode.modeValue
-      if (speed >= 1 && speed <= 8) {
-        if (speed !== this.cacheSpeed) {
-          this.cacheSpeed = speed
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-          this.accessory.log(`${platformLang.curSpeed} [${this.cacheSpeed}]`)
-        }
-      }
-    }
-
-    // Check for some other scene/mode change
-    (params.commands || []).forEach((command) => {
-      const hexString = base64ToHex(command)
-      const hexParts = hexToTwoItems(hexString)
-
-      // Return now if not a device query update code
-      if (getTwoItemPosition(hexParts, 1) !== 'aa') {
-        return
-      }
-
-      const deviceFunction = `${getTwoItemPosition(hexParts, 2)}${getTwoItemPosition(hexParts, 3)}`
-
-      switch (deviceFunction) {
-        case '0501':
-        case '0502': {
-          // Speed update
-          const newSpeedValue = Number.parseInt(getTwoItemPosition(hexParts, 4), 16)
-          if (newSpeedValue >= 1 && newSpeedValue <= 8) {
-            if (newSpeedValue !== this.cacheSpeed) {
-              this.cacheSpeed = newSpeedValue
-              this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSpeed)
-              this.accessory.log(`${platformLang.curSpeed} [${this.cacheSpeed}]`)
-            }
-          }
-          break
-        }
-        default:
-          logUnknownData(this.accessory, {
-            kind: 'scene',
-            source: params.source,
-            raw: command,
-            hex: hexString,
-          })
-          break
-      }
-    })
-  }
-}