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

package/CHANGELOG.md

@@ -28,6 +28,8 @@ All notable changes to `@homebridge-plugins/homebridge-govee` will be documented
 - 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
+- refactor: build the ice maker size codes from the model rather than writing both orderings out by hand
+- refactor: build the switch and outlet tiles of a multi-socket device from one handler instead of two copies of it
 
 ## v11.32.1 (2026-08-02)
 

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

@@ -1,8 +1,9 @@
-import { base64ToHex, getTwoItemPosition, hexToTwoItems, parseError } from '../utils/functions.js'
+import { getDeviceCapabilities } from '../utils/device-capabilities.js'
+import { base64ToHex, generateCodeFromHexValues, getTwoItemPosition, hexToTwoItems, parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 import { logUnknownData } from '../utils/report-unknown.js'
 
-export default class {
+export default class GoveeIceMaker {
   constructor(platform, accessory) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
@@ -14,10 +15,15 @@ export default class {
     this.accessory = accessory
 
     // Ice size codes: small=1, medium=2, large=3 (matching OpenAPI workMode values)
+    // Small, medium and large are all `33 05 <size>`. Which byte means which
+    // size runs the opposite way on the older models, so the order comes from
+    // the model rather than being written out twice
+    const ascending = getDeviceCapabilities(accessory.context.gvModel).iceSizeAscending
+    const sizeBytes = ascending ? [0x01, 0x02, 0x03] : [0x03, 0x02, 0x01]
     this.sizeCodes = {
-      1: 'MwUDAAAAAAAAAAAAAAAAAAAAADU=', // small
-      2: 'MwUCAAAAAAAAAAAAAAAAAAAAADQ=', // medium
-      3: 'MwUBAAAAAAAAAAAAAAAAAAAAADc=', // large
+      1: generateCodeFromHexValues([0x33, 0x05, sizeBytes[0]]), // small
+      2: generateCodeFromHexValues([0x33, 0x05, sizeBytes[1]]), // medium
+      3: generateCodeFromHexValues([0x33, 0x05, sizeBytes[2]]), // large
     }
 
     this.sizeLabels = {
@@ -204,7 +210,7 @@ export default class {
         }
         case 'aa05': {
           // Ice size report. The payload encoding is deliberately NOT decoded here:
-          // sizeCodes runs small=0x03..large=0x01 while the OpenAPI path sends
+          // the size byte order differs by model while the OpenAPI path sends
           // workMode un-inverted, and which is authoritative is unresolved (#1329).
           // Claiming a mapping here could silently swap sizes, so this case exists
           // only to stop a routine status report being logged as a new scene code.

package/lib/device/index.js

@@ -24,13 +24,10 @@ import deviceHumidifierH7142 from './humidifier-H7142.js'
 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 deviceKettle from './kettle.js'
 import deviceLightSwitch from './light-switch.js'
 import deviceLight from './light.js'
-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 devicePurifierH7122 from './purifier-H7122.js'
 import devicePurifierH7123 from './purifier-H7123.js'
@@ -44,9 +41,9 @@ import deviceSensorPresence from './sensor-presence.js'
 import deviceSensorThermo4 from './sensor-thermo4.js'
 import deviceSensorThermoSwitch from './sensor-thermo-switch.js'
 import deviceSensorThermo from './sensor-thermo.js'
-import deviceSwitchDouble from './switch-double.js'
+import deviceSwitchDouble, { asOutlet as deviceOutletDouble } from './switch-double.js'
 import deviceSwitchSingle from './switch-single.js'
-import deviceSwitchTriple from './switch-triple.js'
+import deviceSwitchTriple, { asOutlet as deviceOutletTriple } from './switch-triple.js'
 import deviceTapSingle from './tap-single.js'
 import deviceTemplate from './template.js'
 import deviceTVSingle from './tv-single.js'
@@ -90,8 +87,8 @@ export default {
   deviceIceMakerH7172,
   deviceIceMakerH717D: deviceIceMakerH7172, // identical to the H7172
   deviceIceMakerH8120: deviceIceMakerH7172, // identical to the H7172
-  deviceIceMakerH8121,
-  deviceIceMakerH8122: deviceIceMakerH8121, // identical to the H8121
+  deviceIceMakerH8121: deviceIceMakerH7172, // same handler; its size byte order comes from the model
+  deviceIceMakerH8122: deviceIceMakerH7172, // identical to the H8121
   deviceKettle,
   deviceLight,
   deviceLightSwitch,

package/lib/device/switch-double.js

@@ -8,8 +8,8 @@ import platformLang from '../utils/lang-en.js'
 // outright rather than accepted and silently dropped (#1323).
 const nightLightModels = ['H5089']
 
-export default class {
-  constructor(platform, accessory) {
+class MultiSwitchDouble {
+  constructor(platform, accessory, config) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -19,12 +19,13 @@ export default class {
     // Set up variables from the accessory
     this.accessory = accessory
 
-    // Remove outlet services if they exist
-    if (this.accessory.getService('Outlet 1')) {
-      this.accessory.removeService(this.accessory.getService('Outlet 1'))
+    // Drop the tiles of the other kind, left behind if this device has been
+    // shown as the other one before
+    if (this.accessory.getService(`${config.other} 1`)) {
+      this.accessory.removeService(this.accessory.getService(`${config.other} 1`))
     }
-    if (this.accessory.getService('Outlet 2')) {
-      this.accessory.removeService(this.accessory.getService('Outlet 2'))
+    if (this.accessory.getService(`${config.other} 2`)) {
+      this.accessory.removeService(this.accessory.getService(`${config.other} 2`))
     }
 
     // A model that used to be treated as a single switch or outlet leaves an
@@ -35,15 +36,15 @@ export default class {
         && [this.hapServ.Switch.UUID, this.hapServ.Outlet.UUID].includes(service.UUID))
       .forEach(service => this.accessory.removeService(service))
 
-    // Add the switch services if they don't already exist
-    this.service1 = this.accessory.getService('Switch 1')
-      || this.accessory.addService(this.hapServ.Switch, 'Switch 1', 'switch1')
-    this.service2 = this.accessory.getService('Switch 2')
-      || this.accessory.addService(this.hapServ.Switch, 'Switch 2', 'switch2')
+    // Add this device's tiles if they are not there already
+    this.service1 = this.accessory.getService(`${config.label} 1`)
+      || this.accessory.addService(this.hapServ[config.label], `${config.label} 1`, `${config.subtype}1`)
+    this.service2 = this.accessory.getService(`${config.label} 2`)
+      || this.accessory.addService(this.hapServ[config.label], `${config.label} 2`, `${config.subtype}2`)
 
     if (!this.service1.testCharacteristic(this.hapChar.ConfiguredName)) {
       this.service1.addCharacteristic(this.hapChar.ConfiguredName)
-      this.service1.updateCharacteristic(this.hapChar.ConfiguredName, 'Switch 1')
+      this.service1.updateCharacteristic(this.hapChar.ConfiguredName, `${config.label} 1`)
     }
     if (!this.service1.testCharacteristic(this.hapChar.ServiceLabelIndex)) {
       this.service1.addCharacteristic(this.hapChar.ServiceLabelIndex)
@@ -51,7 +52,7 @@ export default class {
     }
     if (!this.service2.testCharacteristic(this.hapChar.ConfiguredName)) {
       this.service2.addCharacteristic(this.hapChar.ConfiguredName)
-      this.service2.updateCharacteristic(this.hapChar.ConfiguredName, 'Switch 2')
+      this.service2.updateCharacteristic(this.hapChar.ConfiguredName, `${config.label} 2`)
     }
     if (!this.service2.testCharacteristic(this.hapChar.ServiceLabelIndex)) {
       this.service2.addCharacteristic(this.hapChar.ServiceLabelIndex)
@@ -86,7 +87,7 @@ export default class {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      showAs: 'switch',
+      showAs: config.showAs,
     })
     platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)
 
@@ -186,3 +187,21 @@ export default class {
     }
   }
 }
+
+/**
+ * A double switch and a double outlet are the same device with a different tile
+ * in the Home app, chosen by the owner's `showAs` setting. Only the service
+ * type, the tile names and the logged option differ, so they share this and are
+ * built from it rather than from a copy of it.
+ */
+function make(config) {
+  return class extends MultiSwitchDouble {
+    constructor(platform, accessory) {
+      super(platform, accessory, config)
+    }
+  }
+}
+
+export default make({ label: 'Switch', subtype: 'switch', other: 'Outlet', showAs: 'switch' })
+
+export const asOutlet = make({ label: 'Outlet', subtype: 'outlet', other: 'Switch', showAs: 'outlet' })

package/lib/device/switch-triple.js

@@ -1,8 +1,8 @@
 import { parseError } from '../utils/functions.js'
 import platformLang from '../utils/lang-en.js'
 
-export default class {
-  constructor(platform, accessory) {
+class MultiSwitchTriple {
+  constructor(platform, accessory, config) {
     // Set up variables from the platform
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
@@ -12,24 +12,25 @@ export default class {
     // Set up variables from the accessory
     this.accessory = accessory
 
-    // Remove outlet services if they exist
-    if (this.accessory.getService('Outlet 1')) {
-      this.accessory.removeService(this.accessory.getService('Outlet 1'))
+    // Drop the tiles of the other kind, left behind if this device has been
+    // shown as the other one before
+    if (this.accessory.getService(`${config.other} 1`)) {
+      this.accessory.removeService(this.accessory.getService(`${config.other} 1`))
     }
-    if (this.accessory.getService('Outlet 2')) {
-      this.accessory.removeService(this.accessory.getService('Outlet 2'))
+    if (this.accessory.getService(`${config.other} 2`)) {
+      this.accessory.removeService(this.accessory.getService(`${config.other} 2`))
     }
-    if (this.accessory.getService('Outlet 3')) {
-      this.accessory.removeService(this.accessory.getService('Outlet 3'))
+    if (this.accessory.getService(`${config.other} 3`)) {
+      this.accessory.removeService(this.accessory.getService(`${config.other} 3`))
     }
 
-    // Add the switch services if they don't already exist
-    this.service1 = this.accessory.getService('Switch 1')
-      || this.accessory.addService(this.hapServ.Switch, 'Switch 1', 'switch1')
-    this.service2 = this.accessory.getService('Switch 2')
-      || this.accessory.addService(this.hapServ.Switch, 'Switch 2', 'switch2')
-    this.service3 = this.accessory.getService('Switch 3')
-      || this.accessory.addService(this.hapServ.Switch, 'Switch 3', 'switch3')
+    // Add this device's tiles if they are not there already
+    this.service1 = this.accessory.getService(`${config.label} 1`)
+      || this.accessory.addService(this.hapServ[config.label], `${config.label} 1`, `${config.subtype}1`)
+    this.service2 = this.accessory.getService(`${config.label} 2`)
+      || this.accessory.addService(this.hapServ[config.label], `${config.label} 2`, `${config.subtype}2`)
+    this.service3 = this.accessory.getService(`${config.label} 3`)
+      || this.accessory.addService(this.hapServ[config.label], `${config.label} 3`, `${config.subtype}3`)
 
     // Add the set handler to the switch on/off characteristic
     this.service1.getCharacteristic(this.hapChar.On).onSet(async (value) => {
@@ -47,7 +48,7 @@ export default class {
 
     // Output the customised options to the log
     const opts = JSON.stringify({
-      showAs: 'switch',
+      showAs: config.showAs,
     })
     platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)
 
@@ -158,3 +159,21 @@ export default class {
     }
   }
 }
+
+/**
+ * A triple switch and a triple outlet are the same device with a different tile
+ * in the Home app, chosen by the owner's `showAs` setting. Only the service
+ * type, the tile names and the logged option differ, so they share this and are
+ * built from it rather than from a copy of it.
+ */
+function make(config) {
+  return class extends MultiSwitchTriple {
+    constructor(platform, accessory) {
+      super(platform, accessory, config)
+    }
+  }
+}
+
+export default make({ label: 'Switch', subtype: 'switch', other: 'Outlet', showAs: 'switch' })
+
+export const asOutlet = make({ label: 'Outlet', subtype: 'outlet', other: 'Switch', showAs: 'outlet' })

package/lib/utils/device-capabilities.js

@@ -41,6 +41,12 @@ const modelOverrides = {
   H1310: { readsSwingStatus: false },
   R1310: { readsSwingStatus: false },
 
+  // Later ice makers number their ice sizes the natural way round. The older
+  // ones run the other way, small being the highest byte, so the two families
+  // share a handler and differ only here
+  H8121: { iceSizeAscending: true },
+  H8122: { iceSizeAscending: true },
+
   // AWS outlet uses 17/16 for on/off instead of 1/0
   H5080: { awsPowerOn: 17, awsPowerOff: 16 },
   H5083: { awsPowerOn: 17, awsPowerOff: 16 },
@@ -109,6 +115,7 @@ const defaults = {
   awsStatusCmdVersion: 2,
   awsBrightnessNoScale: false,
   readsSwingStatus: true,
+  iceSizeAscending: false,
 }
 
 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.13",
+  "version": "11.32.2-beta.14",
   "description": "Homebridge plugin to integrate Govee devices into HomeKit.",
   "author": {
     "name": "bwp91",

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

@@ -1,228 +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 GoveeIceMakerH8121 {
-  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
-
-    // Ice size codes: small=1, medium=2, large=3, matching the OpenAPI workMode
-    // 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 = {
-      1: 'MwUBAAAAAAAAAAAAAAAAAAAAADc=', // small  -> 33 05 01
-      2: 'MwUCAAAAAAAAAAAAAAAAAAAAADQ=', // medium -> 33 05 02
-      3: 'MwUDAAAAAAAAAAAAAAAAAAAAADU=', // large  -> 33 05 03
-    }
-
-    this.sizeLabels = {
-      1: 'small',
-      2: 'medium',
-      3: 'large',
-    }
-
-    // Remove old switch service if migrating
-    if (this.accessory.getService(this.hapServ.Switch)) {
-      this.accessory.removeService(this.accessory.getService(this.hapServ.Switch))
-    }
-
-    // Add the fan service for ice size control
-    this.service = this.accessory.getService(this.hapServ.Fanv2)
-      || this.accessory.addService(this.hapServ.Fanv2)
-
-    // Add the set handler to the on/off characteristic
-    this.service.getCharacteristic(this.hapChar.Active).onSet(async (value) => {
-      await this.internalStateUpdate(value)
-    })
-    this.cacheState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
-
-    // Add the set handler to the rotation speed characteristic (ice size)
-    this.service
-      .getCharacteristic(this.hapChar.RotationSpeed)
-      .setProps({
-        maxValue: 3,
-        minStep: 1,
-        minValue: 0,
-        unit: 'unitless',
-      })
-      .onSet(async value => this.internalSizeUpdate(value))
-    this.cacheSize = this.service.getCharacteristic(this.hapChar.RotationSpeed).value || 2
-
-    // Keep the characteristic in step with the cache. Without this an accessory
-    // that has never had a size set reports Active=1 with RotationSpeed=0, which
-    // is contradictory and which the Home app renders as "0".
-    if (this.service.getCharacteristic(this.hapChar.RotationSpeed).value !== this.cacheSize) {
-      this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSize)
-    }
-
-    // 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 newState = value ? 'on' : 'off'
-
-      // Don't continue if the new value is the same as before
-      if (newState === this.cacheState) {
-        return
-      }
-
-      if (value) {
-        // Turn on with current cached ice size
-        await this.platform.sendDeviceUpdate(this.accessory, {
-          cmd: 'ptReal',
-          value: this.sizeCodes[this.cacheSize],
-          openApi: this.accessory.context.openApiCapabilities?.workMode
-            ? { instance: 'workMode', capabilityType: 'devices.capabilities.work_mode', value: { workMode: this.cacheSize, modeValue: 0 } }
-            : undefined,
-        })
-      } 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 owner of either model.
-        await this.platform.sendDeviceUpdate(this.accessory, {
-          cmd: 'ptReal',
-          value: 'MxkAAAAAAAAAAAAAAAAAAAAAACo=',
-          openApi: this.accessory.context.openApiCapabilities?.workMode
-            ? { instance: 'workMode', capabilityType: 'devices.capabilities.work_mode', value: { workMode: 0, modeValue: 0 } }
-            : undefined,
-        })
-      }
-
-      // Cache the new state and log if appropriate
-      if (this.cacheState !== newState) {
-        this.cacheState = newState
-        this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
-      }
-    } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
-        this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  async internalSizeUpdate(value) {
-    try {
-      // 0 is not a valid ice size. Put the slider back, otherwise HomeKit keeps 0
-      // while the device carries on at cacheSize - and that 0 is what gets written
-      // to the accessory cache, so it returns on the next restart. Deferred for the
-      // same reason as the error reverts below: an immediate update would be
-      // overwritten by the value HomeKit is currently writing.
-      if (value === 0) {
-        setTimeout(() => {
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSize)
-        }, 1000)
-        return
-      }
-
-      // Don't continue if the new value is the same as before
-      if (value === this.cacheSize) {
-        return
-      }
-
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        cmd: 'ptReal',
-        value: this.sizeCodes[value],
-        openApi: this.accessory.context.openApiCapabilities?.workMode
-          ? { instance: 'workMode', capabilityType: 'devices.capabilities.work_mode', value: { workMode: value, modeValue: 0 } }
-          : undefined,
-      })
-
-      // Cache the new state and log if appropriate
-      this.cacheSize = value
-      this.cacheState = 'on'
-      this.service.updateCharacteristic(this.hapChar.Active, 1)
-      this.accessory.log(`${platformLang.curSpeed} [${this.sizeLabels[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.cacheSize)
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  externalUpdate(params) {
-    // Handle OpenAPI workMode
-    if (params.workMode) {
-      const mode = params.workMode.workMode
-      if (mode > 0 && mode <= 3) {
-        if (this.cacheState !== 'on') {
-          this.cacheState = 'on'
-          this.service.updateCharacteristic(this.hapChar.Active, 1)
-          this.accessory.log(`${platformLang.curState} [on]`)
-        }
-        if (this.cacheSize !== mode) {
-          this.cacheSize = mode
-          this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.cacheSize)
-          this.accessory.log(`${platformLang.curSpeed} [${this.sizeLabels[this.cacheSize]}]`)
-        }
-      } else if (mode === 0) {
-        if (this.cacheState !== 'off') {
-          this.cacheState = 'off'
-          this.service.updateCharacteristic(this.hapChar.Active, 0)
-          this.accessory.log(`${platformLang.curState} [off]`)
-        }
-      }
-    }
-
-    // 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, 1)}${getTwoItemPosition(hexParts, 2)}`
-
-      switch (deviceFunction) {
-        case 'aa19': {
-          // On/Off
-          const newState = getTwoItemPosition(hexParts, 3) === '01' ? 'on' : 'off'
-          if (this.cacheState !== newState) {
-            this.cacheState = newState
-            this.service.updateCharacteristic(this.hapChar.Active, this.cacheState === 'on' ? 1 : 0)
-            this.accessory.log(`${platformLang.curState} [${this.cacheState}]`)
-          }
-          break
-        }
-        case 'aa05': {
-          // Ice size report. Left undecoded for now: the OpenAPI workMode report
-          // above is the authoritative source of the current size, so decoding
-          // the BLE echo would only risk a mismatch. This case exists to stop a
-          // routine status report being logged as an unrecognised scene code.
-          break
-        }
-        default:
-          logUnknownData(this.accessory, {
-            kind: 'scene',
-            source: params.source,
-            raw: command,
-            hex: hexString,
-          })
-          break
-      }
-    })
-  }
-}

package/lib/device/outlet-double.js

@@ -1,188 +0,0 @@
-import { base64ToHex, parseError } from '../utils/functions.js'
-import platformLang from '../utils/lang-en.js'
-
-// Models that expose a night light. The H5089 reports its light as
-// `aa 1b 01 [on] [level]` and that reading is correct, so the tile shows the
-// real state. No command shape tried moves it - neither mirroring its own
-// status code nor the `33 18` the purifiers use - so control is refused
-// outright rather than accepted and silently dropped (#1323).
-const nightLightModels = ['H5089']
-
-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
-
-    // Remove switch services if they exist
-    if (this.accessory.getService('Switch 1')) {
-      this.accessory.removeService(this.accessory.getService('Switch 1'))
-    }
-    if (this.accessory.getService('Switch 2')) {
-      this.accessory.removeService(this.accessory.getService('Switch 2'))
-    }
-
-    // A model that used to be treated as a single switch or outlet leaves an
-    // unnumbered service behind, which would sit next to the numbered pair as
-    // a tile that no longer does anything (#1323)
-    this.accessory.services
-      .filter(service => !service.subtype
-        && [this.hapServ.Switch.UUID, this.hapServ.Outlet.UUID].includes(service.UUID))
-      .forEach(service => this.accessory.removeService(service))
-
-    // Add the outlet services if they don't already exist
-    this.service1 = this.accessory.getService('Outlet 1')
-      || this.accessory.addService(this.hapServ.Outlet, 'Outlet 1', 'outlet1')
-    this.service2 = this.accessory.getService('Outlet 2')
-      || this.accessory.addService(this.hapServ.Outlet, 'Outlet 2', 'outlet2')
-
-    if (!this.service1.testCharacteristic(this.hapChar.ConfiguredName)) {
-      this.service1.addCharacteristic(this.hapChar.ConfiguredName)
-      this.service1.updateCharacteristic(this.hapChar.ConfiguredName, 'Outlet 1')
-    }
-    if (!this.service1.testCharacteristic(this.hapChar.ServiceLabelIndex)) {
-      this.service1.addCharacteristic(this.hapChar.ServiceLabelIndex)
-      this.service1.updateCharacteristic(this.hapChar.ServiceLabelIndex, 1)
-    }
-    if (!this.service2.testCharacteristic(this.hapChar.ConfiguredName)) {
-      this.service2.addCharacteristic(this.hapChar.ConfiguredName)
-      this.service2.updateCharacteristic(this.hapChar.ConfiguredName, 'Outlet 2')
-    }
-    if (!this.service2.testCharacteristic(this.hapChar.ServiceLabelIndex)) {
-      this.service2.addCharacteristic(this.hapChar.ServiceLabelIndex)
-      this.service2.updateCharacteristic(this.hapChar.ServiceLabelIndex, 2)
-    }
-
-    // Add the set handler to the switch on/off characteristic
-    this.service1.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      await this.internalStateUpdate(this.service1, value ? 17 : 16)
-    })
-    this.service1.cacheState = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    this.service2.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      await this.internalStateUpdate(this.service2, value ? 34 : 32)
-    })
-    this.service2.cacheState = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-
-    // Add a night light service for the models that have one
-    if (nightLightModels.includes(this.accessory.context.gvModel)) {
-      this.lightService = this.accessory.getService('Night Light')
-        || this.accessory.addService(this.hapServ.Lightbulb, 'Night Light', 'nightlight')
-      if (!this.lightService.testCharacteristic(this.hapChar.ConfiguredName)) {
-        this.lightService.addCharacteristic(this.hapChar.ConfiguredName)
-        this.lightService.updateCharacteristic(this.hapChar.ConfiguredName, 'Night Light')
-      }
-      this.lightService.getCharacteristic(this.hapChar.On).onSet(() => this.refuseLightControl())
-      this.cacheLightState = this.lightService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-      this.lightService.getCharacteristic(this.hapChar.Brightness).onSet(() => this.refuseLightControl())
-      this.cacheLightBright = this.lightService.getCharacteristic(this.hapChar.Brightness).value || 100
-    } else if (this.accessory.getService('Night Light')) {
-      this.accessory.removeService(this.accessory.getService('Night Light'))
-    }
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({
-      showAs: 'outlet',
-    })
-    platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)
-
-    // The value is (which outlets to change << 4) | (which of those to turn on)
-    // 51 turns BOTH ON
-    // 48 turns BOTH OFF
-    // 17 turns outlet 1 ON
-    // 16 turns outlet 1 OFF
-    // 34 turns outlet 2 ON
-    // 32 turns outlet 2 OFF
-  }
-
-  async internalStateUpdate(service, value) {
-    try {
-      const newValue = value % 16 === 0 ? 'off' : 'on'
-
-      // Don't continue if the new value is the same as before
-      if (service.cacheState === newValue) {
-        return
-      }
-
-      // Send the request to the platform sender function
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        cmd: 'stateDual',
-        value,
-      })
-
-      // Cache the new state and log if appropriate
-      if (service.cacheState !== newValue) {
-        service.cacheState = newValue
-        this.accessory.log(`[${service.getCharacteristic(this.hapChar.ConfiguredName).value}] ${platformLang.curState} [${newValue}]`)
-      }
-    } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
-        service.updateCharacteristic(this.hapChar.On, service.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  // The night light reading is correct, but every command shape tried has been
-  // ignored by the plug, so refuse the write. HomeKit reverts the tile rather
-  // than showing a state the plug was never given (#1323)
-  refuseLightControl() {
-    this.accessory.logWarn(`[Night Light] ${platformLang.devNotUpdated} this device does not accept night light commands`)
-    throw new this.hapErr(-70402)
-  }
-
-  externalUpdate(params) {
-    if (Array.isArray(params.state)) {
-      if (params.state[0] !== this.service1.cacheState) {
-        this.service1.cacheState = params.state[0]
-        this.service1.updateCharacteristic(this.hapChar.On, this.service1.cacheState === 'on')
-
-        this.accessory.log(`[${this.service1.getCharacteristic(this.hapChar.ConfiguredName).value}] ${platformLang.curState} [${this.service1.cacheState}]`)
-      }
-
-      if (params.state[1] !== this.service2.cacheState) {
-        this.service2.cacheState = params.state[1]
-        this.service2.updateCharacteristic(this.hapChar.On, this.service2.cacheState === 'on')
-
-        this.accessory.log(`[${this.service2.getCharacteristic(this.hapChar.ConfiguredName).value}] ${platformLang.curState} [${this.service2.cacheState}]`)
-      }
-    }
-
-    // The night light reports as `aa 1b 01 [on] [level]` (#1323)
-    if (this.lightService && Array.isArray(params.commands)) {
-      params.commands.forEach((command) => {
-        let hexString
-        try {
-          hexString = base64ToHex(command)
-        } catch {
-          return
-        }
-        if (!hexString.startsWith('aa1b01')) {
-          return
-        }
-
-        const newState = hexString.substring(6, 8) === '01' ? 'on' : 'off'
-        if (newState !== this.cacheLightState) {
-          this.cacheLightState = newState
-          this.lightService.updateCharacteristic(this.hapChar.On, newState === 'on')
-          this.accessory.log(`[Night Light] ${platformLang.curState} [${newState}]`)
-        }
-
-        const newBright = Number.parseInt(hexString.substring(8, 10), 16)
-        if (newBright >= 1 && newBright <= 100 && newBright !== this.cacheLightBright) {
-          this.cacheLightBright = newBright
-          this.lightService.updateCharacteristic(this.hapChar.Brightness, newBright)
-          this.accessory.log(`[Night Light] ${platformLang.curBright} [${newBright}%]`)
-        }
-      })
-    }
-  }
-}

package/lib/device/outlet-triple.js

@@ -1,160 +0,0 @@
-import { parseError } from '../utils/functions.js'
-import platformLang from '../utils/lang-en.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
-
-    // Remove switch services if they exist
-    if (this.accessory.getService('Switch 1')) {
-      this.accessory.removeService(this.accessory.getService('Switch 1'))
-    }
-    if (this.accessory.getService('Switch 2')) {
-      this.accessory.removeService(this.accessory.getService('Switch 2'))
-    }
-    if (this.accessory.getService('Switch 3')) {
-      this.accessory.removeService(this.accessory.getService('Switch 3'))
-    }
-
-    // Add the outlet services if they don't already exist
-    this.service1 = this.accessory.getService('Outlet 1')
-      || this.accessory.addService(this.hapServ.Outlet, 'Outlet 1', 'outlet1')
-    this.service2 = this.accessory.getService('Outlet 2')
-      || this.accessory.addService(this.hapServ.Outlet, 'Outlet 2', 'outlet2')
-    this.service3 = this.accessory.getService('Outlet 3')
-      || this.accessory.addService(this.hapServ.Outlet, 'Outlet 3', 'outlet3')
-
-    // Add the set handler to the switch on/off characteristic
-    this.service1.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      await this.internalStateUpdate(this.service1, value ? 17 : 16)
-    })
-    this.service1.cacheState = this.service1.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    this.service2.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      await this.internalStateUpdate(this.service2, value ? 34 : 32)
-    })
-    this.service2.cacheState = this.service2.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-    this.service3.getCharacteristic(this.hapChar.On).onSet(async (value) => {
-      await this.internalStateUpdate(this.service3, value ? 68 : 64)
-    })
-    this.service3.cacheState = this.service3.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
-
-    // Output the customised options to the log
-    const opts = JSON.stringify({
-      showAs: 'outlet',
-    })
-    platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts)
-
-    // 119 turns BOTH ON
-    // 112 turns BOTH OFF
-
-    // 68 turns outlet 3 ON
-    // 64 turns outlet 3 OFF
-
-    // 34 turns outlet 2 ON
-    // 32 turns outlet 2 OFF
-
-    // 17 turns outlet 1 ON
-    // 16 turns outlet 1 OFF
-  }
-
-  async internalStateUpdate(service, value) {
-    try {
-      const newValue = value % 16 === 0 ? 'off' : 'on'
-
-      // Don't continue if the new value is the same as before
-      if (service.cacheState === newValue) {
-        return
-      }
-
-      // Send the request to the platform sender function
-      await this.platform.sendDeviceUpdate(this.accessory, {
-        cmd: 'stateDual',
-        value,
-      })
-
-      // Cache the new state and log if appropriate
-      service.cacheState = newValue
-      this.accessory.log(`[${service.displayName}] ${platformLang.curState} [${newValue}]`)
-    } catch (err) {
-      // Catch any errors during the process
-      this.accessory.logWarn(`${platformLang.devNotUpdated} ${parseError(err)}`)
-
-      // Throw a 'no response' error and set a timeout to revert this after 2 seconds
-      setTimeout(() => {
-        service.updateCharacteristic(this.hapChar.On, service.cacheState === 'on')
-      }, 2000)
-      throw new this.hapErr(-70402)
-    }
-  }
-
-  externalUpdate(params) {
-    // Check to see if the provided state is different from the cached state
-    if (!params.stateDual) {
-      return
-    }
-
-    if ([112, 119].includes(params.stateDual)) {
-      // 112 -> both off
-      // 119 -> both on
-      const newState = params.stateDual === 119 ? 'on' : 'off'
-      if (newState !== this.service1.cacheState) {
-        this.service1.cacheState = newState
-        this.service1.updateCharacteristic(this.hapChar.On, this.service1.cacheState === 'on')
-
-        // Log the change
-        this.accessory.log(`[${this.service1.displayName}] ${platformLang.curState} [${this.service1.cacheState}]`)
-      }
-      if (newState !== this.service2.cacheState) {
-        this.service2.cacheState = newState
-        this.service2.updateCharacteristic(this.hapChar.On, this.service2.cacheState === 'on')
-
-        // Log the change
-        this.accessory.log(`[${this.service2.displayName}] ${platformLang.curState} [${this.service2.cacheState}]`)
-      }
-      if (newState !== this.service3.cacheState) {
-        this.service3.cacheState = newState
-        this.service3.updateCharacteristic(this.hapChar.On, this.service3.cacheState === 'on')
-
-        // Log the change
-        this.accessory.log(`[${this.service3.displayName}] ${platformLang.curState} [${this.service3.cacheState}]`)
-      }
-    }
-    if ([16, 17].includes(params.stateDual)) {
-      const newState = params.stateDual === 17 ? 'on' : 'off'
-      if (newState !== this.service1.cacheState) {
-        this.service1.cacheState = newState
-        this.service1.updateCharacteristic(this.hapChar.On, this.service1.cacheState === 'on')
-
-        // Log the change
-        this.accessory.log(`[${this.service1.displayName}] ${platformLang.curState} [${this.service1.cacheState}]`)
-      }
-    }
-    if ([32, 34].includes(params.stateDual)) {
-      const newState = params.stateDual === 34 ? 'on' : 'off'
-      if (newState !== this.service2.cacheState) {
-        this.service2.cacheState = newState
-        this.service2.updateCharacteristic(this.hapChar.On, this.service2.cacheState === 'on')
-
-        // Log the change
-        this.accessory.log(`[${this.service2.displayName}] ${platformLang.curState} [${this.service2.cacheState}]`)
-      }
-    }
-    if ([64, 68].includes(params.stateDual)) {
-      const newState = params.stateDual === 68 ? 'on' : 'off'
-      if (newState !== this.service3.cacheState) {
-        this.service3.cacheState = newState
-        this.service3.updateCharacteristic(this.hapChar.On, this.service3.cacheState === 'on')
-
-        // Log the change
-        this.accessory.log(`[${this.service3.displayName}] ${platformLang.curState} [${this.service3.cacheState}]`)
-      }
-    }
-  }
-}