homebridge-lib 5.7.1 → 5.8.0

package/lib/AccessoryDelegate.js

@@ -63,8 +63,9 @@ class AccessoryDelegate extends homebridgeLib.Delegate {
     // Setup shortcut for property values and values of the characteristics
     // of the _Accessory Information_ service.
     this._values = {} // by key
-
     this._propertyDelegates = {}
+    this.addPropertyDelegate({ key: 'name', value: this.name, silent: true })
+      .on('didSet', (name) => { this.name = name })
 
     // Create delegate for AccessoryInformation service.
     this._serviceDelegates = {}
@@ -124,20 +125,6 @@ class AccessoryDelegate extends homebridgeLib.Delegate {
     delete this._context[key]
   }
 
-  get name () {
-    return super.name
-  }
-
-  set name (name) {
-    super.name = name
-    if (this._accessory != null) {
-      this._accessory.displayName = name
-    }
-    if (this._accessoryInformationDelegate != null) {
-      this._accessoryInformationDelegate.values.name = name
-    }
-  }
-
   /** Creates a new {@link PropertyDelegate} instance, for a property of the
     * associated HomeKit accessory.
     *
@@ -173,7 +160,7 @@ class AccessoryDelegate extends homebridgeLib.Delegate {
       throw new RangeError(`params.key: ${params.key}: invalid key`)
     }
     const key = params.key
-    if (this.values[key] !== undefined) {
+    if (this._values[key] !== undefined) {
       throw new SyntaxError(`${key}: duplicate key`)
     }
 
@@ -181,7 +168,7 @@ class AccessoryDelegate extends homebridgeLib.Delegate {
     this._propertyDelegates[key] = delegate
 
     // Create shortcut for characteristic value.
-    Object.defineProperty(this.values, key, {
+    Object.defineProperty(this._values, key, {
       configurable: true, // make sure we can delete it again
       writeable: true,
       get () { return delegate.value },
@@ -195,7 +182,7 @@ class AccessoryDelegate extends homebridgeLib.Delegate {
     if (this._accessoryInformationDelegate.values[key] != null) {
       throw new RangeError('%s: invalid key')
     }
-    delete this.values[key]
+    delete this._values[key]
     const delegate = this._propertyDelegates[key]
     delegate._destroy()
     delete this._propertyDelegates[key]

package/lib/CharacteristicDelegate.js

@@ -415,7 +415,7 @@ class CharacteristicDelegate extends homebridgeLib.Delegate {
         result = await this._setter(value)
       } catch (error) {
         clearTimeout(timeout)
-        this.error(error)
+        this.warn('set %s: %s', this.displayName, error)
         if (!timedOut) {
           callback(error)
         }

package/lib/EveHomeKitTypes.js

@@ -159,8 +159,8 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
     this.createCharacteristicClass('Voltage', uuid('10A'), {
       format: this.Formats.FLOAT,
       unit: 'V',
-      minValue: 100,
-      maxValue: 250,
+      minValue: 0,
+      maxValue: 380,
       minStep: 0.1,
       perms: [this.Perms.READ, this.Perms.NOTIFY]
     })
@@ -188,7 +188,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       unit: 'kWh',
       minValue: 0,
       maxValue: 1000000,
-      minStep: 0.1,
+      minStep: 0.01,
       perms: [this.Perms.READ, this.Perms.NOTIFY]
     }, 'Total Consumption')
 
@@ -255,6 +255,12 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       perms: [this.Perms.WRITE, this.Perms.HIDDEN]
     }, 'Config Command')
 
+    // On various Eve devices - presumably for firmware upgrade.
+    this.createCharacteristicClass('Char11E', uuid('11E'), {
+      format: this.Formats.DATA,
+      perms: [this.Perms.READ, this.Perms.WRITE, this.Perms.HIDDEN]
+    }, 'Eve 11E')
+
     this.createCharacteristicClass('Sensitivity', uuid('120'), {
       format: this.Formats.UINT8,
       minValue: 0,
@@ -277,7 +283,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       unit: 'A',
       minValue: 0,
       maxValue: 48,
-      minStep: 0.1,
+      minStep: 0.01,
       perms: [this.Perms.READ, this.Perms.NOTIFY]
     }, 'Electric Current')
 
@@ -326,9 +332,9 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
     this.createCharacteristicClass('Elevation', uuid('130'), {
       format: this.Formats.INT,
       unit: 'm',
-      minValue: -430,
-      maxValue: 8850,
-      minStep: 10,
+      minValue: -450,
+      maxValue: 9000,
+      minStep: 1,
       perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE],
       adminOnlyAccess: [this.Access.WRITE]
     })
@@ -338,6 +344,25 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
     }, 'Config Data')
 
+    this.createCharacteristicClass('WeatherTrend', uuid('136'), {
+      format: this.Formats.UINT8,
+      minValue: 0,
+      maxValue: 15,
+      minStep: 1,
+      perms: [this.Perms.READ, this.Perms.NOTIFY]
+    }, 'Weather Trend')
+    this.Characteristics.WeatherTrend.BLANK = 0 // also: 2, 8, 10
+    this.Characteristics.WeatherTrend.SUN = 1 // also: 9
+    this.Characteristics.WeatherTrend.CLOUDS_SUN = 3 // also: 11
+    this.Characteristics.WeatherTrend.RAIN = 4 // also: 5, 6, 7
+    this.Characteristics.WeatherTrend.RAIN_WIND = 12 // also: 13, 14, 15
+
+    // On various Eve devices - presumably for firmware upgrade.
+    this.createCharacteristicClass('Char158', uuid('158'), {
+      format: this.Formats.DATA,
+      perms: [this.Perms.READ, this.Perms.WRITE, this.Perms.HIDDEN]
+    }, 'Eve 158')
+
     // =========================================================================
 
     // The following custom characteristics are supported by the Eve app.
@@ -560,15 +585,16 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
     ])
 
     this.createServiceClass('History', uuid('007'), [
-      this.Characteristics.HistoryRequest,
-      this.Characteristics.SetTime,
-      this.Characteristics.HistoryStatus,
-      this.Characteristics.HistoryEntries
+      this.Characteristics.HistoryRequest, // 11C
+      this.Characteristics.SetTime, // 121
+      this.Characteristics.HistoryStatus, // 116
+      this.Characteristics.HistoryEntries // 117
     ], [
-      // this.Characteristics.Char11E, // Used for firmware update?
-      this.Characteristics.ResetTotal
-      // this.Characteristics.ConfigCommand,
-      // this.Characteristics.ConfigData
+      this.Characteristics.ResetTotal // 112
+      // this.Characteristics.ConfigCommand, // 11D
+      // this.Characteristics.ConfigData, // 131
+      // this.Characteristics.Char11E, // presumably for firmware upgrade
+      // this.Characteristics.Char158, // presumably for firmware upgrade
     ])
 
     this.createServiceClass('AirPressureSensor', uuid('00A'), [

package/lib/MyHomeKitTypes.js

@@ -168,6 +168,8 @@ class MyHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       * <br>Used by: homebridge-hue for Hue Entertainment groups.
       * @property {Class} SubEnabled - Enabled/disable Sub.
       * <br>Used by: homebridge-zp in Speaker service.
+      * @property {Class} SubLevel - Level for the Sub.
+      * <br>Used by: homebridge-zp in Speaker service.
       * @property {Class} Sunrise - Date/time of today's sun rise.
       * <br>Used by: homebridge-hue, homebridge-ws.
       * @property {Class} Sunset - Date/time of today's sun set.
@@ -749,6 +751,14 @@ class MyHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       adminOnlyAccess: [this.Access.WRITE]
     }, 'Expose Schedules')
 
+    this.createCharacteristicClass('SubLevel', uuid('07D'), {
+      format: this.Formats.INT,
+      minValue: -15,
+      maxValue: 15,
+      minStep: 1,
+      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+    }, 'Sub Level')
+
     // Characteristic for Unique ID, used by homebridge-hue.
     // Source: as exposed by the Philips Hue bridge.  This characteristic is
     // used by the Hue app to select the accessories when syncing Hue bridge

package/lib/ServiceDelegate/AccessoryInformation.js

@@ -89,6 +89,11 @@ class AccessoryInformation extends ServiceDelegate {
         value: params.software
       })
     }
+
+    accessoryDelegate.propertyDelegate('name')
+      .on('didSet', (value) => {
+        this.values.configuredName = value
+      })
   }
 
   addCharacteristicDelegate (params = {}) {

package/lib/ServiceDelegate/Battery.js

@@ -74,6 +74,11 @@ class Battery extends ServiceDelegate {
     }).on('didSet', (value) => {
       this.updateStatusLowBattery()
     })
+
+    accessoryDelegate.propertyDelegate('name')
+      .on('didSet', (value) => {
+        this.values.configuredName = value + ' Battery'
+      })
   }
 
   updateStatusLowBattery () {

package/lib/ServiceDelegate/Dummy.js

@@ -25,10 +25,10 @@ const { ServiceDelegate } = homebridgeLib
   * @memberof ServiceDelegate
   */
 class Dummy extends ServiceDelegate {
-  constructor (nbAccessory, params = {}) {
-    params.name = nbAccessory.name
-    params.Service = nbAccessory.Services.hap.StatelessProgrammableSwitch
-    super(nbAccessory, params)
+  constructor (accessoryDelegate, params = {}) {
+    params.name = accessoryDelegate.name
+    params.Service = accessoryDelegate.Services.hap.StatelessProgrammableSwitch
+    super(accessoryDelegate, params)
 
     this.addCharacteristicDelegate({
       key: 'programmableSwitchEvent',
@@ -38,6 +38,11 @@ class Dummy extends ServiceDelegate {
         maxValue: this.Characteristics.hap.ProgrammableSwitchEvent.SINGLE_PRESS
       }
     })
+
+    accessoryDelegate.propertyDelegate('name')
+      .on('didSet', (value) => {
+        this.values.configuredName = value
+      })
   }
 }
 

package/lib/ServiceDelegate/History/Consumption.js

@@ -47,44 +47,56 @@ class Consumption extends History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} consumptionDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.TotalConsumption`
+    * @param {!CharacteristicDelegate} params.consumptionDelegate - A reference
+    * to the delegate of the associated `Characteristics.eve.TotalConsumption`
     * characteristic.
-    * @param {?CharacteristicDelegate} powerDelegate - A reference to the
+    * @param {?CharacteristicDelegate} params.powerDelegate - A reference to the
     * delegate of the associated `Characteristics.eve.CurrentConsumption`
     * characteristic.
-    * @param {!CharacteristicDelegate} onDelegate - A reference to the
+    * @param {!CharacteristicDelegate} params.onDelegate - A reference to the
     * delegate of the associated `Characteristics.hap.On` characteristic.
+    * @param {!CharacteristicDelegate} params.lastActivationDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.LastActivation` characteristic.
     */
-  constructor (
-    accessoryDelegate, params, consumptionDelegate, powerDelegate, onDelegate
-  ) {
+  constructor (accessoryDelegate, params = {}) {
     super(accessoryDelegate, params)
-    if (!(consumptionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('consumptionDelegate: not a CharacteristicDelegate')
+    if (!(params.consumptionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.consumptionDelegate: not a CharacteristicDelegate')
     }
     if (
-      powerDelegate != null &&
-      !(powerDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.powerDelegate != null &&
+      !(params.powerDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('powerDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.powerDelegate: not a CharacteristicDelegate')
     }
     if (
-      onDelegate != null &&
-      !(onDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.onDelegate != null &&
+      !(params.onDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.onDelegate: not a CharacteristicDelegate')
     }
-    this._consumptionDelegate = consumptionDelegate
-    this._powerDelegate = powerDelegate
+    if (
+      params.lastActivationDelegate != null &&
+      !(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)
+    ) {
+      throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
+    }
+    this._consumptionDelegate = params.consumptionDelegate
+    this._powerDelegate = params.powerDelegate
+
     this._entry = { time: 0, power: 0 }
-    if (onDelegate != null) {
-      this._entry.on = onDelegate.value ? 1 : 0
-      onDelegate.on('didSet', (value) => {
+    if (params.onDelegate != null) {
+      this._entry.on = params.onDelegate.value ? 1 : 0
+      params.onDelegate.on('didSet', (value) => {
+        const now = Math.round(new Date().valueOf() / 1000)
+        if (params.lastActivationDelegate != null) {
+          params.lastActivationDelegate.value = now - this._h.initialTime
+        }
         this._entry.on = value ? 1 : 0
         const power = this._entry.power
         this._entry.power = null
-        super._addEntry()
+        super._addEntry(now)
         this._entry.power = power
       })
     }
@@ -96,11 +108,11 @@ class Consumption extends History {
     if (this._consumption != null && this._time != null) {
       const delta = this._consumptionDelegate.value - this._consumption // kWh
       const period = now - this._time // s
-      const power = Math.round(1000 * 3600 * delta / period) // W
+      const power = 1000 * 3600 * delta / period // W
       if (this._powerDelegate != null) {
-        this._powerDelegate.value = power
+        this._powerDelegate.value = Math.round(power) // W
       }
-      this._entry.power = power
+      this._entry.power = Math.round(power * 10) // 0.1 W * 10 min
       super._addEntry(now)
     }
     this._consumption = this._consumptionDelegate.value
@@ -115,7 +127,7 @@ class Consumption extends History {
         '|0c %s %s 01 %s',
         numToHex(swap32(this._h.currentEntry), 8),
         numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.power * 10), 4)
+        numToHex(swap16(entry.power), 4)
       )
     }
     if (entry.power == null) {
@@ -130,7 +142,7 @@ class Consumption extends History {
       '|0d %s %s 03 %s %s',
       numToHex(swap32(this._h.currentEntry), 8),
       numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.power * 10), 4),
+      numToHex(swap16(entry.power), 4),
       numToHex(entry.on, 2)
     )
   }

package/lib/ServiceDelegate/History/Contact.js

@@ -38,40 +38,37 @@ const { swap32, numToHex } = History
   * @memberof ServiceDelegate.History
   */
 class Contact extends History {
-  /** Create a new instance of an Eve Door _History_ service delegate.
+  /** Create a new instance of an Eve Door & Window _History_ service delegate.
     * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} contactDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.ContactSensorState`
+    * @param {!CharacteristicDelegate} params.contactDelegate - A reference to
+    * thedelegate of the associated `Characteristics.hap.ContactSensorState`
     * characteristic.
-    * @param {!CharacteristicDelegate} timesOpenedDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.TimesOpened`
-    * characteristic.
-    * @param {!CharacteristicDelegate} lastActivationDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.LastActivation`
+    * @param {!CharacteristicDelegate} params.timesOpenedDelegate - A reference
+    * to the delegate of the associated `Characteristics.eve.TimesOpened`
     * characteristic.
+    * @param {!CharacteristicDelegate} params.lastActivationDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.LastActivation` characteristic.
     */
-  constructor (
-    accessoryDelegate, params,
-    contactDelegate, timesOpenedDelegate, lastActivationDelegate
-  ) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(contactDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('contactDelegate: not a CharacteristicDelegate')
+    if (!(params.contactDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.contactDelegate: not a CharacteristicDelegate')
     }
-    if (!(timesOpenedDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('timesOpenedDelegate: not a CharacteristicDelegate')
+    if (!(params.timesOpenedDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.timesOpenedDelegate: not a CharacteristicDelegate')
     }
-    if (!(lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('lastActivationDelegate: not a CharacteristicDelegate')
+    if (!(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
     }
-    this._entry = { time: 0, status: contactDelegate.value }
-    contactDelegate.on('didSet', (value) => {
+    this._entry = { time: 0, status: params.contactDelegate.value }
+    params.contactDelegate.on('didSet', (value) => {
       const now = Math.round(new Date().valueOf() / 1000)
-      timesOpenedDelegate.value += value
-      lastActivationDelegate.value = now - this._h.initialTime
+      params.timesOpenedDelegate.value += value
+      params.lastActivationDelegate.value = now - this._h.initialTime
       this._entry.status = value
       this._addEntry(now)
     })
@@ -79,9 +76,8 @@ class Contact extends History {
       key: 'resetTotal',
       Characteristic: this.Characteristics.eve.ResetTotal,
       value: params.resetTotal
-    })
-    this._characteristicDelegates.resetTotal.on('didSet', (value) => {
-      timesOpenedDelegate.value = 0
+    }).on('didSet', (value) => {
+      params.timesOpenedDelegate.value = 0
     })
   }
 

package/lib/ServiceDelegate/History/Light.js

@@ -0,0 +1,82 @@
+// homebridge-lib/lib/ServiceDelegate/History/On.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2017-2022 Erik Baauw. All rights reserved.
+//
+// The logic for handling Eve history was copied from Simone Tisa's
+// fakagato-history repository, copyright © 2017 simont77.
+// See https://github.com/simont77/fakegato-history.
+
+'use strict'
+
+const homebridgeLib = require('../../../index')
+
+const { ServiceDelegate } = homebridgeLib
+const { History } = ServiceDelegate
+
+/** Class for an Eve Light Strip _History_ service delegate.
+  *
+  * This delegate sets up a `Services.eve.History` HomeKit service
+  * with keys for the following HomeKit characteristics:
+  *
+  * key              | Characteristic
+  * ---------------- | ----------------------------------
+  * `name`           | `Characteristics.hap.Name`
+  * `historyRequest` | `Characteristics.eve.HistoryRequest`
+  * `setTime`        | `Characteristics.eve.SetTime`
+  * `historyStatus`  | `Characteristics.eve.HistoryStatus`
+  * `historyEntries` | `Characteristics.eve.HistoryEntries`
+  *
+  * This delegate creates the history from the associated
+  * `Characteristics.hap.On` characteristic.
+  * @extends ServiceDelegate.History
+  * @memberof ServiceDelegate.History
+  */
+class Light extends History {
+  /** Create a new instance of a Raspberry Pi _History_ service delegate.
+    * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
+    * corresponding HomeKit accessory.
+    * @param {!object} params - The parameters for the
+    * _History_ HomeKit service.
+    * @param {!CharacteristicDelegate} params.onDelegate - A reference to the
+    * delegate of the associated `Characteristics.hap.On`
+    * characteristic.
+    * @param {!CharacteristicDelegate} params.lastActivationDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.LastActivation` characteristic.
+    */
+  constructor (accessoryDelegate, params) {
+    params.memorySize = 0
+    super(accessoryDelegate, params)
+    if (!(params.onDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.onDelegate: not a CharacteristicDelegate')
+    }
+    if (!(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
+    }
+    if (
+      params.temperatureDelegate != null &&
+      !(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
+    ) {
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
+    }
+    this._entry = {
+      time: 0
+    }
+    params.onDelegate.on('didSet', (value) => {
+      const now = Math.round(new Date().valueOf() / 1000)
+      if (params.lastActivationDelegate != null) {
+        params.lastActivationDelegate.value = now - this._h.initialTime
+      }
+      this._addEntry(now)
+    })
+  }
+
+  get _fingerPrint () { return '00' }
+
+  _entryStream (entry) {
+    return ''
+  }
+}
+
+module.exports = Light

package/lib/ServiceDelegate/History/Motion.js

@@ -42,49 +42,47 @@ class Motion extends History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} motionDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.MotionDetected`
+    * @param {!CharacteristicDelegate} params.motionDelegate - A reference to
+    * the delegate of the associated `Characteristics.hap.MotionDetected`
     * characteristic.
-    * @param {!CharacteristicDelegate} lastActivationDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.LastActivation`
+    * @param {!CharacteristicDelegate} params.lastActivationDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.LastActivation` characteristic.
+    * @param {?CharacteristicDelegate} params.lightLevelDelegate - A reference
+    * to the delegate of the associated
+    * `Characteristics.hap.CurrentAmbientLightLevel` characteristic.
+    * For PIR sensors (like the Hue motion sensor) that report light level in
+    * addition to motion.
+    * @param {?CharacteristicDelegate} params.temperatureDelegate - A reference
+    * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
     * characteristic.
-    * @param {?CharacteristicDelegate} lightLevelDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentAmbientLightLevel`
-    * characteristic.  For PIR sensors (like the Hue motion sensor) that report
-    * light level in addition to motion.
-    * @param {?CharacteristicDelegate} temperatureDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentTemperature`
-    * characteristic.  For PIR sensors (like the Hue motion sensor) that report
-    * temperature in addition to motion.
+    * For PIR sensors (like the Hue motion sensor) that report temperature in
+    * addition to motion.
     */
-  constructor (
-    accessoryDelegate, params,
-    motionDelegate, lastActivationDelegate,
-    lightLevelDelegate, temperatureDelegate
-  ) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(motionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('motionDelegate: not a CharacteristicDelegate')
+    if (!(params.motionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.motionDelegate: not a CharacteristicDelegate')
     }
-    if (!(lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('lastActivationDelegate: not a CharacteristicDelegate')
+    if (!(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
     }
     if (
-      lightLevelDelegate != null &&
-      !(lightLevelDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.lightLevelDelegate != null &&
+      !(params.lightLevelDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('lightLevelDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.lightLevelDelegate: not a CharacteristicDelegate')
     }
     if (
-      temperatureDelegate != null &&
-      !(temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.temperatureDelegate != null &&
+      !(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
-    this._entry = { time: 0, status: motionDelegate.value }
-    motionDelegate.on('didSet', (value) => {
+    this._entry = { time: 0, status: params.motionDelegate.value }
+    params.motionDelegate.on('didSet', (value) => {
       const now = Math.round(new Date().valueOf() / 1000)
-      lastActivationDelegate.value = now - this._h.initialTime
+      params.lastActivationDelegate.value = now - this._h.initialTime
       this._entry.status = value
       if (this._entry.temp != null) {
         const lightlevel = this._entry.lightlevel
@@ -98,15 +96,15 @@ class Motion extends History {
         this._addEntry(now)
       }
     })
-    if (lightLevelDelegate != null) {
-      this._entry.lightlevel = lightLevelDelegate.value
-      lightLevelDelegate.on('didSet', (value) => {
+    if (params.lightLevelDelegate != null) {
+      this._entry.lightlevel = params.lightLevelDelegate.value
+      params.lightLevelDelegate.on('didSet', (value) => {
         this._entry.lightlevel = value
       })
     }
-    if (temperatureDelegate != null) {
-      this._entry.temp = temperatureDelegate.value
-      temperatureDelegate.on('didSet', (value) => {
+    if (params.temperatureDelegate != null) {
+      this._entry.temp = params.temperatureDelegate.value
+      params.temperatureDelegate.on('didSet', (value) => {
         this._entry.temp = value
       })
     }

package/lib/ServiceDelegate/History/On.js

@@ -40,32 +40,48 @@ class On extends History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} onDelegate - A reference to the
+    * @param {!CharacteristicDelegate} params.onDelegate - A reference to the
     * delegate of the associated `Characteristics.hap.On`
     * characteristic.
+    * @param {?CharacteristicDelegate} params.lastActivationDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.LastActivation` characteristic.
+    * @param {?CharacteristicDelegate} params.temperatureDelegate - A reference
+    * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
+    * characteristic.
     */
-  constructor (accessoryDelegate, params, onDelegate, temperatureDelegate) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(onDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('onDelegate: not a CharacteristicDelegate')
+    if (!(params.onDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.onDelegate: not a CharacteristicDelegate')
+    }
+    if (
+      params.lastActivationDelegate != null &&
+      !(params.lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)
+    ) {
+      throw new TypeError('params.lastActivationDelegate: not a CharacteristicDelegate')
     }
     if (
-      temperatureDelegate != null &&
-      !(temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.temperatureDelegate != null &&
+      !(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
     this._entry = {
       time: 0,
-      on: onDelegate.value ? 1 : 0
+      on: params.onDelegate.value ? 1 : 0
     }
-    onDelegate.on('didSet', (value) => {
+    params.onDelegate.on('didSet', (value) => {
+      const now = Math.round(new Date().valueOf() / 1000)
+      if (params.lastActivationDelegate != null) {
+        params.lastActivationDelegate.value = now - this._h.initialTime
+      }
       this._entry.on = value ? 1 : 0
-      this._addEntry()
+      this._addEntry(now)
     })
-    if (temperatureDelegate != null) {
-      this._entry.temp = temperatureDelegate.value
-      temperatureDelegate.on('didSet', (value) => {
+    if (params.temperatureDelegate != null) {
+      this._entry.temp = params.temperatureDelegate.value
+      params.temperatureDelegate.on('didSet', (value) => {
         this._entry.temp = value
       })
     }

package/lib/ServiceDelegate/History/Power.js

@@ -43,42 +43,40 @@ class Power extends History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} powerDelegate - A reference to the
+    * @param {!CharacteristicDelegate} params.powerDelegate - A reference to the
     * delegate of the associated `Characteristics.eve.CurrentConsumption`
     * characteristic.
-    * @param {!CharacteristicDelegate} consumptionDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.TotalConsumption`
+    * @param {!CharacteristicDelegate} params.consumptionDelegate - A reference
+    * to the delegate of the associated `Characteristics.eve.TotalConsumption`
     * characteristic.
-    * @param {!CharacteristicDelegate} onDelegate - A reference to the
+    * @param {!CharacteristicDelegate} params.onDelegate - A reference to the
     * delegate of the associated `Characteristics.hap.On` characteristic.
     */
-  constructor (
-    accessoryDelegate, params, powerDelegate, consumptionDelegate, onDelegate
-  ) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(powerDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('powerDelegate: not a CharacteristicDelegate')
+    if (!(params.powerDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.powerDelegate: not a CharacteristicDelegate')
     }
-    if (!(consumptionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('consumptionDelegate: not a CharacteristicDelegate')
+    if (!(params.consumptionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.consumptionDelegate: not a CharacteristicDelegate')
     }
     if (
-      onDelegate != null &&
-      !(onDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.onDelegate != null &&
+      !(params.onDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
-    this._powerDelegate = powerDelegate
-    this._consumptionDelegate = consumptionDelegate
+    this._powerDelegate = params.powerDelegate
+    this._consumptionDelegate = params.consumptionDelegate
     this._entry = { time: 0, power: 0 }
     this._runningConsumption = 0 // 10-min-interval running value
-    this._totalConsumption = consumptionDelegate.value // life-time value
-    powerDelegate.on('didSet', (value) => {
+    this._totalConsumption = params.consumptionDelegate.value // life-time value
+    params.powerDelegate.on('didSet', (value) => {
       const now = Math.round(new Date().valueOf() / 1000)
       if (this._time != null) {
         const delta = this._power * (now - this._time) // Ws
-        this._runningConsumption += Math.round(delta / 600.0) // W * 10 min
-        this._totalConsumption += Math.round(delta / 3600000.0) // kWh
+        this._runningConsumption += Math.round(delta / 60.0) // 0.1W * 10 min
+        this._totalConsumption += delta / 36000.0 // 0.01 kWh
       }
       this._power = value
       this._time = now
@@ -87,33 +85,36 @@ class Power extends History {
       key: 'resetTotal',
       Characteristic: this.Characteristics.eve.ResetTotal,
       value: params.resetTotal
-    })
-    this._characteristicDelegates.resetTotal.on('didSet', (value) => {
+    }).on('didSet', (value) => {
       this._runningConsumption = 0
       this._totalConsumption = 0
       this._consumptionDelegate.value = this._totalConsumption
     })
-    if (onDelegate != null) {
-      this._entry.on = onDelegate.value ? 1 : 0
-      onDelegate.on('didSet', (value) => {
+    if (params.onDelegate != null) {
+      this._entry.on = params.onDelegate.value ? 1 : 0
+      params.onDelegate.on('didSet', (value) => {
+        const now = Math.round(new Date().valueOf() / 1000)
+        if (params.lastActivationDelegate != null) {
+          params.lastActivationDelegate.value = now - this._h.initialTime
+        }
         this._entry.on = value ? 1 : 0
         const power = this._entry.power
         this._entry.power = null
-        super._addEntry()
+        super._addEntry(now)
         this._entry.power = power
       })
     }
   }
 
   _addEntry () {
-    // Sensor delivers currentConsumption, compute totalConsumption
     const now = Math.round(new Date().valueOf() / 1000)
+    // Sensor delivers currentConsumption, compute totalConsumption
     if (this._time != null) {
       const delta = this._power * (now - this._time) // Ws
-      this._runningConsumption += Math.round(delta / 600.0) // W * 10 min
-      this._totalConsumption += Math.round(delta / 3600000.0) // kWh
-      this._consumptionDelegate.value = this._totalConsumption
-      this._entry.power = this._runningConsumption
+      this._runningConsumption += delta / 60.0 // 0.1 W * 10 min
+      this._totalConsumption += delta / 36000.0 // 0.01 kWh
+      this._consumptionDelegate.value = Math.round(this._totalConsumption) / 100.0 // kWh
+      this._entry.power = Math.round(this._runningConsumption) // 0.1 W * 10 min
       super._addEntry(now)
     } else if (this._entry.on != null) {
       super._addEntry(now)
@@ -131,7 +132,7 @@ class Power extends History {
         '|0c %s %s 01 %s',
         numToHex(swap32(this._h.currentEntry), 8),
         numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.power * 10), 4)
+        numToHex(swap16(entry.power), 4)
       )
     }
     if (entry.power == null) {
@@ -146,7 +147,7 @@ class Power extends History {
       '|0d %s %s 03 %s %s',
       numToHex(swap32(this._h.currentEntry), 8),
       numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.power * 10), 4),
+      numToHex(swap16(entry.power), 4),
       numToHex(entry.on, 2)
     )
   }

package/lib/ServiceDelegate/History/Room.js

@@ -42,53 +42,50 @@ class Room extends ServiceDelegate.History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} temperatureDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentTemperature`
+    * @param {!CharacteristicDelegate} params.temperatureDelegate - A reference
+    * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
     * characteristic.
-    * @param {?CharacteristicDelegate} humidityDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentRelativeHumidity`
-    * characteristic.
-    * @param {?CharacteristicDelegate} vocDensityDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.AirPressure`
+    * @param {?CharacteristicDelegate} params.humidityDelegate - A reference to
+    * the delegate of the associated
+    * `Characteristics.hap.CurrentRelativeHumidity` characteristic.
+    * @param {?CharacteristicDelegate} params.vocDensityDelegate - A reference
+    * to the delegate of the associated `Characteristics.eve.AirPressure`
     * characteristic.
     */
-  constructor (
-    accessoryDelegate, params,
-    temperatureDelegate, humidityDelegate, vocDensityDelegate
-  ) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+    if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
     if (
-      humidityDelegate != null &&
-      !(humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.humidityDelegate != null &&
+      !(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('humidityDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.humidityDelegate: not a CharacteristicDelegate')
     }
     if (
-      vocDensityDelegate != null &&
-      !(vocDensityDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.vocDensityDelegate != null &&
+      !(params.vocDensityDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
-      throw new TypeError('vocDensityDelegate: not a CharacteristicDelegate')
+      throw new TypeError('params.vocDensityDelegate: not a CharacteristicDelegate')
     }
     this._entry = {
       time: 0,
-      temp: temperatureDelegate.value,
+      temp: params.temperatureDelegate.value,
       humidity: 0,
       voc: 0
     }
-    temperatureDelegate.on('didSet', (value) => {
+    params.temperatureDelegate.on('didSet', (value) => {
       this._entry.temp = value
     })
-    if (humidityDelegate != null) {
-      this._entry.humidity = humidityDelegate.value
-      humidityDelegate.on('didSet', (value) => {
+    if (params.humidityDelegate != null) {
+      this._entry.humidity = params.humidityDelegate.value
+      params.humidityDelegate.on('didSet', (value) => {
         this._entry.humidity = value
       })
-      if (vocDensityDelegate != null) {
-        this._entry.voc = vocDensityDelegate.value
-        vocDensityDelegate.on('didSet', (value) => {
+      if (params.vocDensityDelegate != null) {
+        this._entry.voc = params.vocDensityDelegate.value
+        params.vocDensityDelegate.on('didSet', (value) => {
           this._entry.voc = value
         })
       }

package/lib/ServiceDelegate/History/Thermo.js

@@ -42,42 +42,42 @@ class Thermo extends ServiceDelegate.History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} temperatureDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentTemperature`
-    * characteristic.
-    * @param {!CharacteristicDelegate} targetTemperatureDelegate - A reference
-    * to the delegate of the associated `Characteristics.hap.TargetTemperature`
-    * characteristic.
-    * @param {!CharacteristicDelegate} valvePositionDelegate - A reference to
-    * the delegate of the associated `Characteristics.eve.ValvePosition`
+    * @param {!CharacteristicDelegate} params.temperatureDelegate - A reference
+    * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
     * characteristic.
+    * @param {!CharacteristicDelegate} params.targetTemperatureDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.hap.TargetTemperature` characteristic.
+    * @param {!CharacteristicDelegate} params.valvePositionDelegate - A
+    * reference to the delegate of the associated
+    * `Characteristics.eve.ValvePosition` characteristic.
     */
-  constructor (
-    accessoryDelegate, params,
-    temperatureDelegate, targetTemperatureDelegate, valvePositionDelegate
-  ) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+    if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
-    if (!(targetTemperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('targetTemperatureDelegate: not a CharacteristicDelegate')
+    if (!(params.targetTemperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.targetTemperatureDelegate: not a CharacteristicDelegate')
     }
-    if (!(valvePositionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('valvePositionDelegate: not a CharacteristicDelegate')
+    if (!(params.valvePositionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.valvePositionDelegate: not a CharacteristicDelegate')
     }
     this._entry = {
       time: 0,
-      currentTemp: temperatureDelegate.value,
-      setTemp: targetTemperatureDelegate.value,
-      valvePosition: valvePositionDelegate.value
+      currentTemp: params.temperatureDelegate.value,
+      setTemp: params.targetTemperatureDelegate.value,
+      valvePosition: params.valvePositionDelegate.value
     }
-    temperatureDelegate
-      .on('didSet', (value) => { this._entry.currentTemp = value })
-    targetTemperatureDelegate
-      .on('didSet', (value) => { this._entry.setTemp = value })
-    valvePositionDelegate
-      .on('didSet', (value) => { this._entry.valvePosition = value })
+    params.temperatureDelegate.on('didSet', (value) => {
+      this._entry.currentTemp = value
+    })
+    params.targetTemperatureDelegate.on('didSet', (value) => {
+      this._entry.setTemp = value
+    })
+    params.valvePositionDelegate.on('didSet', (value) => {
+      this._entry.valvePosition = value
+    })
   }
 
   // I think 1201 and 1d01 are for current mode and target more, but it doesn't

package/lib/ServiceDelegate/History/Weather.js

@@ -42,51 +42,48 @@ class Weather extends ServiceDelegate.History {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
-    * @param {!CharacteristicDelegate} temperatureDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentTemperature`
+    * @param {!CharacteristicDelegate} params.temperatureDelegate - A reference
+    * to the delegate of the associated `Characteristics.hap.CurrentTemperature`
     * characteristic.
-    * @param {?CharacteristicDelegate} humidityDelegate - A reference to the
-    * delegate of the associated `Characteristics.hap.CurrentRelativeHumidity`
-    * characteristic.
-    * @param {?CharacteristicDelegate} pressureDelegate - A reference to the
-    * delegate of the associated `Characteristics.eve.AirPressure`
+    * @param {?CharacteristicDelegate} params.humidityDelegate - A reference
+    * to the delegate of the associated
+    * `Characteristics.hap.CurrentRelativeHumidity` characteristic.
+    * @param {?CharacteristicDelegate} params.pressureDelegate - A reference to
+    * the delegate of the associated `Characteristics.eve.AirPressure`
     * characteristic.
     */
-  constructor (
-    accessoryDelegate, params,
-    temperatureDelegate, humidityDelegate, pressureDelegate
-  ) {
+  constructor (accessoryDelegate, params) {
     super(accessoryDelegate, params)
-    if (!(temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
-      throw new TypeError('temperatureDelegate: not a CharacteristicDelegate')
+    if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+      throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
     if (
-      humidityDelegate != null &&
-      !(humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.humidityDelegate != null &&
+      !(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
       throw new TypeError('humidityDelegate: not a CharacteristicDelegate')
     }
     if (
-      pressureDelegate != null &&
-      !(pressureDelegate instanceof homebridgeLib.CharacteristicDelegate)
+      params.pressureDelegate != null &&
+      !(params.pressureDelegate instanceof homebridgeLib.CharacteristicDelegate)
     ) {
       throw new TypeError('pressureDelegate: not a CharacteristicDelegate')
     }
     this._entry = {
       time: 0,
-      temp: temperatureDelegate.value
+      temp: params.temperatureDelegate.value
     }
-    temperatureDelegate.on('didSet', (value) => {
+    params.temperatureDelegate.on('didSet', (value) => {
       this._entry.temp = value
     })
-    if (humidityDelegate != null) {
-      this._entry.humidity = humidityDelegate.value
-      humidityDelegate.on('didSet', (value) => {
+    if (params.humidityDelegate != null) {
+      this._entry.humidity = params.humidityDelegate.value
+      params.humidityDelegate.on('didSet', (value) => {
         this._entry.humidity = value
       })
-      if (pressureDelegate != null) {
-        this._entry.pressure = pressureDelegate.value
-        pressureDelegate.on('didSet', (value) => {
+      if (params.pressureDelegate != null) {
+        this._entry.pressure = params.pressureDelegate.value
+        params.pressureDelegate.on('didSet', (value) => {
           this._entry.pressure = value
         })
       }

package/lib/ServiceDelegate/History/index.js

@@ -82,6 +82,7 @@ function numToHex (value, length) {
 class History extends ServiceDelegate {
   static get Consumption () { return require('./Consumption') }
   static get Contact () { return require('./Contact') }
+  static get Light () { return require('./Light') }
   static get Motion () { return require('./Motion') }
   static get On () { return require('./On') }
   static get Power () { return require('./Power') }
@@ -100,13 +101,15 @@ class History extends ServiceDelegate {
     * corresponding HomeKit accessory.
     * @param {!object} params - The parameters for the
     * _History_ HomeKit service.
+    * @param {integer} [params.memorySize=2304] - The memory size, in number of
+    * history entries.  The default is 4 weeks of 6 entries per hour.
     */
   constructor (accessoryDelegate, params = {}) {
     params.name = accessoryDelegate.name + ' History'
     params.Service = accessoryDelegate.Services.eve.History
     params.hidden = true
     super(accessoryDelegate, params)
-    this._memorySize = 6 * 24 * 7 * 4 // Four weeks.
+    this._memorySize = params.memorySize == null ? 4032 : params.memorySize
     this._transfer = false
     this._restarted = true
 
@@ -186,6 +189,11 @@ class History extends ServiceDelegate {
     //   // silent: true
     // })
 
+    accessoryDelegate.propertyDelegate('name')
+      .on('didSet', (value) => {
+        this.values.configuredName = value + ' History'
+      })
+
     this._accessoryDelegate.heartbeatEnabled = true
     this._accessoryDelegate
       .once('heartbeat', (beat) => {
@@ -259,7 +267,7 @@ class History extends ServiceDelegate {
     // offset += 1
 
     const value = util.format(
-      '%s 00000000 %s [%s] %s %s %s 000000000101',
+      '%s 00000000 %s [%s] %s %s %s 00000000 0101',
       numToHex(swap32(this._entry.time - this._h.initialTime), 8),
       numToHex(swap32(this._h.initialTime - epoch), 8),
       this._fingerPrint,

package/lib/ServiceDelegate/ServiceLabel.js

@@ -33,7 +33,7 @@ class ServiceLabel extends ServiceDelegate {
     * `Characteristics.hap.ServiceLabelNamespace`.
     */
   constructor (accessoryDelegate, params = {}) {
-    params.name = accessoryDelegate.name
+    params.name = accessoryDelegate.name + ' Label'
     params.Service = accessoryDelegate.Services.hap.ServiceLabel
     super(accessoryDelegate, params)
     this.addCharacteristicDelegate({
@@ -41,6 +41,11 @@ class ServiceLabel extends ServiceDelegate {
       Characteristic: this.Characteristics.hap.ServiceLabelNamespace,
       value: params.namespace
     })
+
+    accessoryDelegate.propertyDelegate('name')
+      .on('didSet', (value) => {
+        this.values.configuredName = value + ' Label'
+      })
   }
 }
 

package/lib/ServiceDelegate/index.js

@@ -47,9 +47,6 @@ class ServiceDelegate extends homebridgeLib.Delegate {
     * @params {?ServiceDelegate} params.linkedServiceDelegate - The delegate
     * of the service this service links to.
     * @params {?boolean} params.hidden - Hidden service.
-    * @params {?boolean} params.exposeConfiguredName - Expose
-    * `Characteristics.hap.ConfiguredName`, so device name can be synced with
-    * HomeKit service name.
     */
   constructor (accessoryDelegate, params = {}) {
     if (!(accessoryDelegate instanceof homebridgeLib.AccessoryDelegate)) {
@@ -80,7 +77,6 @@ class ServiceDelegate extends homebridgeLib.Delegate {
       this._service = this._accessory.addService(
         new params.Service(this.name, params.subtype)
       )
-      this._service.displayName = this.name
     }
     this._accessoryDelegate._linkServiceDelegate(this)
     this._service.setPrimaryService(!!params.primaryService)
@@ -114,38 +110,34 @@ class ServiceDelegate extends homebridgeLib.Delegate {
     this._characteristicDelegates = {} // by key
     this._characteristics = {} // by uuid
 
-    if (!params.hidden) {
-      this.addCharacteristicDelegate({
-        key: 'name',
-        Characteristic: this.Characteristics.hap.Name,
-        silent: true,
-        value: params.name
-      })
-      if (params.exposeConfiguredName) {
-        this.addCharacteristicDelegate({
-          key: 'configuredName',
-          Characteristic: this.Characteristics.hap.ConfiguredName,
-          // silent: true,
-          props: {
-            perms: [
-              this.Characteristic.Perms.READ, this.Characteristic.Perms.WRITE
-            ]
-          },
-          value: params.name
-        }).on('didSet', (value) => {
-          if (value.trim() !== '') {
-            this.name = value
-            this._service.displayName = value
-            this.values.name = value
-            for (const key in this._characteristicDelegates) {
-              this._characteristicDelegates[key].name = value
-            }
-          }
-        })
+    this.addCharacteristicDelegate({
+      key: 'name',
+      Characteristic: this.Characteristics.hap.Name,
+      silent: true,
+      value: params.name
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'configuredName',
+      Characteristic: this.Characteristics.hap.ConfiguredName,
+      value: params.name,
+      setter: (value) => {
+        if (value == null || value === '') {
+          throw new Error('cannot be empty')
+        }
       }
-    }
+    }).on('didSet', (value) => {
+      this.name = value
+      for (const key in this._characteristicDelegates) {
+        this._characteristicDelegates[key].name = value
+      }
+      if (params.primaryService) {
+        accessoryDelegate.values.name = value
+      }
+    })
 
     this.once('initialised', () => {
+      this.values.configuredName = this.name
       const staleCharacteristics = []
       for (const uuid in this._service.characteristics) {
         const characteristic = this._service.characteristics[uuid]

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.7.1",
+  "version": "5.8.0",
   "keywords": [
     "homekit",
     "homebridge"
@@ -22,7 +22,7 @@
   },
   "engines": {
     "homebridge": "^1.5.1",
-    "node": "^18.12.0"
+    "node": "^18.12.1"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "~0.0.19",