homebridge-lib 6.0.2 → 6.1.0

package/lib/ServiceDelegate/History/Weather.js

@@ -1,20 +1,13 @@
 // homebridge-lib/lib/ServiceDelegate/History/Weather.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.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
 const homebridgeLib = require('../../../index')
-const util = require('util')
 
-const { ServiceDelegate } = homebridgeLib
-const { History } = ServiceDelegate
-const { swap16, swap32, numToHex } = History
+const { History } = homebridgeLib.ServiceDelegate
 
 /** Class for an Eve Weather _History_ service delegate.
   *
@@ -36,7 +29,7 @@ const { swap16, swap32, numToHex } = History
   * @extends ServiceDelegate.History
   * @memberof ServiceDelegate.History
   */
-class Weather extends ServiceDelegate.History {
+class Weather extends History {
   /** Create a new instance of an Eve Weather _History_ service delegate.
     * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
     * corresponding HomeKit accessory.
@@ -57,67 +50,51 @@ class Weather extends ServiceDelegate.History {
     if (!(params.temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('params.temperatureDelegate: not a CharacteristicDelegate')
     }
-    if (
-      params.humidityDelegate != null &&
-      !(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
-      throw new TypeError('params.humidityDelegate: not a CharacteristicDelegate')
-    }
-    if (
-      params.airPressureDelegate != null &&
-      !(params.airPressureDelegate instanceof homebridgeLib.CharacteristicDelegate)
-    ) {
-      throw new TypeError('params.airPressureDelegate: not a CharacteristicDelegate')
-    }
-    this._entry = {
-      time: 0,
-      temp: params.temperatureDelegate.value
-    }
+    this.entry = { t: params.temperatureDelegate.value }
     params.temperatureDelegate.on('didSet', (value) => {
-      this._entry.temp = value
+      this.entry.t = value
     })
     if (params.humidityDelegate != null) {
-      this._entry.humidity = params.humidityDelegate.value
+      if (!(params.humidityDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+        throw new TypeError('params.humidityDelegate: not a CharacteristicDelegate')
+      }
+      this.entry.h = params.humidityDelegate.value
       params.humidityDelegate.on('didSet', (value) => {
-        this._entry.humidity = value
+        this.entry.h = value
       })
       if (params.airPressureDelegate != null) {
-        this._entry.pressure = params.airPressureDelegate.value
+        if (!(params.airPressureDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
+          throw new TypeError('params.airPressureDelegate: not a CharacteristicDelegate')
+        }
+        this.entry.p = params.airPressureDelegate.value
         params.airPressureDelegate.on('didSet', (value) => {
-          this._entry.pressure = value
+          this.entry.p = value
         })
       }
     }
   }
 
-  get _fingerPrint () { return '03 0102 0202 0302' }
+  get fingerPrint () { return '03 0102 0202 0302' }
 
-  _entryStream (entry) {
-    if (entry.humidity == null) {
-      return util.format(
-        '|0c %s %s 01 %s',
-        numToHex(swap32(this._h.currentEntry), 8),
-        numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.temp * 100), 4)
-      )
+  entryToBuffer (entry) {
+    const buffer = Buffer.alloc(7)
+    let o = 0
+    if (entry.h == null) {
+      buffer.writeUInt8(0x01, o); o += 1
+      buffer.writeUInt16LE(entry.t * 100, o); o += 2
+      return buffer.slice(0, o)
     }
-    if (entry.pressure == null) {
-      return util.format(
-        '|0e %s %s 03 %s %s',
-        numToHex(swap32(this._h.currentEntry), 8),
-        numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(swap16(entry.temp * 100), 4),
-        numToHex(swap16(entry.humidity * 100), 4)
-      )
+    if (entry.p == null) {
+      buffer.writeUInt8(0x03, o); o += 1
+      buffer.writeUInt16LE(entry.t * 100, o); o += 2
+      buffer.writeUInt16LE(entry.h * 100, o); o += 2
+      return buffer.slice(0, o)
     }
-    return util.format(
-      '|10 %s %s 07 %s %s %s',
-      numToHex(swap32(this._h.currentEntry), 8),
-      numToHex(swap32(entry.time - this._h.initialTime), 8),
-      numToHex(swap16(entry.temp * 100), 4),
-      numToHex(swap16(entry.humidity * 100), 4),
-      numToHex(swap16(entry.pressure * 10), 4)
-    )
+    buffer.writeUInt8(0x07, o); o += 1
+    buffer.writeUInt16LE(entry.t * 100, o); o += 2
+    buffer.writeUInt16LE(entry.h * 100, o); o += 2
+    buffer.writeUInt16LE(entry.p * 10, o); o += 2
+    return buffer.slice(0, o)
   }
 }
 

package/lib/ServiceDelegate/History/index.js

@@ -1,9 +1,9 @@
 // homebridge-lib/lib/ServiceDelegate/History/index.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 //
-// The logic for handling Eve history was copied from Simone Tisa's
+// The logic for handling Eve history was inspired by Simone Tisa's
 // fakagato-history repository, copyright © 2017 simont77.
 // See https://github.com/simont77/fakegato-history.
 
@@ -13,54 +13,37 @@ const homebridgeLib = require('../../../index')
 
 const { ServiceDelegate } = homebridgeLib
 
-const util = require('util')
-
 /** Eve history keeps time as # seconds since epoch of 2001/01/01.
   * @type {integer}
   */
 const epoch = Math.round(new Date('2001-01-01T00:00:00Z').valueOf() / 1000)
 
-/** Convert Eve date (in # seconds since epoch) to string.
-  * @param {integer} d - Eve date as # seconds since epoch.
+const defaultMemorySize = 6 * 24 * 7 * 4 // 4 weeks of 1 entry per 10 minutes
+
+// const historyEntryTypes = {
+//   airPressure: { tag: 0x03, length: 2 },
+//   consumption: { tag: 0x07, length: 2 },
+//   contact: { tag: 0x06, length: 1, event: true },
+//   humidity: { tag: 0x02, length: 2 },
+//   lastActivation: { },
+//   lightLevel: { tag: 0x30, length: 2 },
+//   motion: { tag: 0x1C, length: 1, event: true },
+//   on: { tag: 0x0E, length: 1, event: true },
+//   power: { tag: 0x07, length: 2 },
+//   targetTemperature: { tag: 0x11, length: 2 },
+//   currentTemperature: { tag: 0x01, length: 2 },
+//   timesOpened: { },
+//   totalConsumption: { },
+//   valvePosition: { tag: 0x10, length: 1 },
+//   vocDensity: { tag: 0x22, length: 2 }
+// }
+
+/** Convert date (in # seconds since NodeJS epoch) to string.
+  * @param {integer} d - # seconds since NodeJS epoch.
   * @returns {string} Human readable date string.
   */
 function dateToString (d) {
-  return new Date(1000 * (epoch + d)).toString().slice(0, 24)
-}
-
-function hexToBase64 (value) {
-  if (value == null || typeof value !== 'string') {
-    throw new TypeError('value: not a string')
-  }
-  return Buffer.from((value).replace(/[^0-9A-F]/ig, ''), 'hex')
-    .toString('base64')
-}
-
-function base64ToHex (value) {
-  if (value == null || typeof value !== 'string') {
-    throw new TypeError('value: not a string')
-  }
-  return Buffer.from(value, 'base64').toString('hex')
-}
-
-function swap16 (value) {
-  return ((value & 0xFF) << 8) | ((value >>> 8) & 0xFF)
-}
-
-function swap32 (value) {
-  return ((value & 0xFF) << 24) | ((value & 0xFF00) << 8) |
-    ((value >>> 8) & 0xFF00) | ((value >>> 24) & 0xFF)
-}
-
-function numToHex (value, length) {
-  let s = Number(value >>> 0).toString(16)
-  if (s.length % 2 !== 0) {
-    s = '0' + s
-  }
-  if (length) {
-    return ('0000000000000' + s).slice(-length)
-  }
-  return s
+  return new Date(1000 * d).toString().slice(0, 24)
 }
 
 /** Abstract superclass for an Eve _History_ service delegate.
@@ -83,6 +66,7 @@ class History extends ServiceDelegate {
   static get Consumption () { return require('./Consumption') }
   static get Contact () { return require('./Contact') }
   static get Light () { return require('./Light') }
+  static get LightLevel () { return require('./LightLevel') }
   static get Motion () { return require('./Motion') }
   static get On () { return require('./On') }
   static get Power () { return require('./Power') }
@@ -90,19 +74,13 @@ class History extends ServiceDelegate {
   static get Thermo () { return require('./Thermo') }
   static get Weather () { return require('./Weather') }
 
-  static get hexToBase64 () { return hexToBase64 }
-  static get base64ToHex () { return base64ToHex }
-  static get swap16 () { return swap16 }
-  static get swap32 () { return swap32 }
-  static get numToHex () { return numToHex }
-
   /** Create a new instance of an Eve _History_ service delegate.
     * @param {!AccessoryDelegate} accessoryDelegate - The delegate of the
     * 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.
+    * @param {integer} [params.memorySize=4032] - The memory size, in number of
+    * history entries.  The default is 4 weeks of 1 entry per 10 minutes.
     * @param {?boolean} params.config - Expose config.
     */
   constructor (accessoryDelegate, params = {}) {
@@ -110,35 +88,39 @@ class History extends ServiceDelegate {
     params.Service = accessoryDelegate.Services.eve.History
     params.hidden = true
     super(accessoryDelegate, params)
-    this._memorySize = params.memorySize == null ? 4032 : params.memorySize
+    const memorySize = params.memorySize == null ? defaultMemorySize : params.memorySize
     this._transfer = false
-    this._restarted = true
 
     this.addCharacteristicDelegate({
       key: 'history',
       silent: true
     })
-    if (this.context._history != null) {
-      this.values.history = this.context._history
-      delete this.context._history
-    }
     this._h = this.values.history
     if (this._h == null) {
       this.values.history = {
-        firstEntry: 0,
-        lastEntry: 0,
-        history: ['noValue'],
-        usedMemory: 0,
-        currentEntry: 1,
-        initialTime: 0
+        memorySize,
+        firstEntry: 1,
+        lastEntry: 1,
+        entryOffset: 0,
+        entries: [null, null],
+        initialTime: History.now()
+      }
+      this._h = this.values.history
+    } else if (this._h.memorySize !== memorySize) {
+      this.values.history = {
+        memorySize,
+        firstEntry: this._h.lastEntry,
+        lastEntry: this._h.lastEntry,
+        entryOffset: this._h.lastEntry - 1,
+        entries: [null, null],
+        initialTime: this._h.initialTime
       }
       this._h = this.values.history
     } else {
-      this.debug('restored %d history entries', this._h.usedMemory)
-    }
-    if (this._h.refTime != null) {
-      this._h.initialTime = this._h.refTime + epoch
-      delete this._h.refTime
+      this.debug(
+        'restored %d history entries (%d to %d)', this._h.entries.length,
+        this._h.firstEntry, this._h.lastEntry
+      )
     }
 
     this.addCharacteristicDelegate({
@@ -156,8 +138,8 @@ class History extends ServiceDelegate {
       silent: true
     }).on('didSet', (value) => {
       const buffer = Buffer.from(value, 'base64')
-      this.debug('SetTime changed to %j', buffer.toString('hex'))
-      const date = dateToString(buffer.readUInt32LE())
+      this.vdebug('SetTime changed to %j', buffer.toString('hex'))
+      const date = dateToString(buffer.readUInt32LE() + epoch)
       this.debug('SetTime changed to %s', date)
     })
 
@@ -202,157 +184,148 @@ class History extends ServiceDelegate {
       .once('heartbeat', (beat) => {
         this._historyBeat = (beat % 600) + 5
       })
-      .on('heartbeat', this._heartbeat.bind(this))
+      .on('heartbeat', (beat) => {
+        if (beat % 600 === this._historyBeat) {
+          this.addEntry(
+            Object.assign({ time: History.now() }, this.entry)
+          )
+        }
+      })
       .on('shutdown', () => {
-        this.debug('saved %d history entries', this._h.usedMemory)
+        this.debug(
+          'saved %d history entries (%d to %d)', this._h.entries.length,
+          this._h.firstEntry, this._h.lastEntry
+        )
       })
   }
 
-  _addEntry (now = Math.round(new Date().valueOf() / 1000)) {
-    this._entry.time = now
-    if (this._h.usedMemory < this._memorySize) {
-      this._h.usedMemory++
-      this._h.firstEntry = 0
-      this._h.lastEntry = this._h.usedMemory
-    } else {
-      this._h.firstEntry++
-      this._h.lastEntry = this._h.firstEntry + this._h.usedMemory
-      if (this._restarted === true) {
-        this._h.history[this._h.lastEntry % this._memorySize] = {
-          time: this._entry.time,
-          setRefTime: 1
-        }
-        this._h.firstEntry++
-        this._h.lastEntry = this._h.firstEntry + this._h.usedMemory
-        this._restarted = false
-      }
-    }
-
-    if (this._h.initialTime === 0) {
-      this._h.history[this._h.lastEntry] = {
-        time: this._entry.time,
-        setRefTime: 1
-      }
-      this._h.initialTime = this._entry.time
-      this._h.lastEntry++
-      this._h.usedMemory++
-    }
-
-    this._h.history[this._h.lastEntry % this._memorySize] =
-      Object.assign({}, this._entry)
-
-    const usedMemeoryOffset = this._h.usedMemory < this._memorySize ? 1 : 0
-    const firstEntryOffset = this._h.usedMemory < this._memorySize ? 0 : 1
+  /** Return current time as # seconds since NodeJS epoch.
+    * @returns {integer} # seconds since NodeJS epoch.
+    */
+  static now () { return Math.round(new Date().valueOf() / 1000) }
 
-    // const buffer = Buffer.alloc(1024)
-    // let offset = 0
-    // buffer.writeUInt32LE(this._entry.time - this._h.initialTime, offset)
-    // offset += 4
-    // buffer.writeUInt32LE(0, offset)
-    // offset += 4
-    // buffer.writeUInt32LE(this._h.initialTime - epoch, offset)
-    // offset += 4
-    // buffer.write(this._fingerPrint.replace(/[^0-9A-F]/ig, ''), offset, 'hex')
-    // const length = 1 + 2 * parseInt(this._fingerPrint.slice(0, 2))
-    // this.debug('fingerprint length: %d', length)
-    // offset += length
-    // buffer.writeUInt16LE(this._h.usedMemory + usedMemeoryOffset, offset)
-    // offset += 2
-    // buffer.writeUInt16LE(this._memorySize, offset)
-    // offset += 2
-    // buffer.writeUInt32LE(this._h.firstEntry + firstEntryOffset, offset)
-    // offset += 4
-    // buffer.writeUInt32LE(0, offset)
-    // offset += 4
-    // buffer.writeUint8(1, offset)
-    // offset += 1
-    // buffer.writeUint8(1, offset)
-    // offset += 1
+  /** Convert date intp `Characteristics.eve.LastActivation` characteristic value.
+    * @param {integer} date - # seconds since NodeJS epoch.
+    * @returns {integer} Value for last activation.
+    */
+  lastActivationValue (date = History.now()) { return date - this._h.initialTime }
 
-    const value = util.format(
-      '%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,
-      numToHex(swap16(this._h.usedMemory + usedMemeoryOffset), 4),
-      numToHex(swap16(this._memorySize), 4),
-      numToHex(swap32(this._h.firstEntry + firstEntryOffset), 8)
-    )
+  /** Return the history fingerprint.
+    * @abstract
+    * @returns {string} fingerprint - Hex string with the fingerprint.
+    */
+  get fingerPrint () { return '00' }
 
-    this.debug('add entry %d: %j', this._h.lastEntry, this._entry)
-    this.debug('set history status to: %j', value)
-    // this.debug('set history status to: %j', buffer.slice(0, offset).toString('hex'))
-    this.values.historyStatus = hexToBase64(value)
+  /** Convert a history entry to a buffer.
+    * @abstract
+    * @param {object} entry - The entry.
+    * @returns {Buffer} A Buffer with the values from the entry.
+    */
+  entryToBuffer (entry) {
+    return Buffer.alloc(0)
   }
 
-  _heartbeat (beat) {
-    if (beat % 600 === this._historyBeat) {
-      this._addEntry()
+  /** Add an entry to the history.
+    * @param {object} entry - The entry.
+    */
+  addEntry (entry) {
+    if (this._h.memorySize > 0) {
+      if (this._h.lastEntry >= this._h.memorySize) {
+        this._h.firstEntry++
+      }
+      this._h.lastEntry++
+      const index = (this._h.lastEntry - this._h.entryOffset) % this._h.memorySize
+      this.debug(
+        'History Entries: set entry %d (index %d) to %j',
+        this._h.lastEntry, index, entry
+      )
+      this._h.entries[index] = entry
     }
+
+    this.debug('set History Status to %d .. %d', this._h.firstEntry, this._h.lastEntry)
+    const buffer = Buffer.alloc(1024)
+    let offset = 0
+    buffer.writeUInt32LE(entry.time - this._h.initialTime, offset); offset += 4
+    buffer.writeUInt32LE(0, offset); offset += 4
+    buffer.writeUInt32LE(this._h.initialTime - epoch, offset); offset += 4
+    buffer.write(this.fingerPrint.replace(/[^0-9A-F]/ig, ''), offset, 'hex')
+    offset += 1 + 2 * parseInt(this.fingerPrint.slice(0, 2))
+    buffer.writeUInt16LE(this._h.lastEntry - this._h.firstEntry + 1, offset); offset += 2
+    buffer.writeUInt16LE(this._h.memorySize, offset); offset += 2
+    buffer.writeUInt32LE(this._h.firstEntry, offset); offset += 4
+    buffer.writeUInt32LE(0, offset); offset += 4
+    buffer.writeUInt8(1, offset); offset += 1
+    buffer.writeUInt8(1, offset); offset += 1
+    const value = buffer.slice(0, offset)
+    this.values.historyStatus = value.toString('base64')
   }
 
   async _onSetHistoryRequest (value) {
     const buffer = Buffer.from(value, 'base64')
-    this.debug('History Request changed to %j', base64ToHex(value))
+    this.vdebug('History Request changed to %j', buffer.toString('hex'))
     const entry = buffer.readUInt32LE(2)
-    this.debug('request entry: %d', entry)
-    if (entry !== 0) {
-      this._h.currentEntry = entry
-    } else {
-      this._h.currentEntry = 1
-    }
+    this.debug(
+      'History Request changed to %d (%d to %d)', entry,
+      this._h.firstEntry, this._h.lastEntry
+    )
+    this._currentEntry = Math.max(this._h.firstEntry, entry)
     this._transfer = true
   }
 
   async _onGetEntries () {
-    if (this._h.currentEntry > this._h.lastEntry || !this._transfer) {
-      this.debug('send data: 00')
+    if (this._currentEntry > this._h.lastEntry || !this._transfer) {
+      this.debug('History Entries: no entry')
+      this.vdebug('History Entries: send data: 00')
       this._transfer = false
-      return hexToBase64('00')
+      return Buffer.from('00', 'hex').toString('base64')
     }
 
-    let dataStream = ''
+    const buffer = Buffer.alloc(1024)
+    let offset = 0
     for (let i = 0; i < 11; i++) {
-      const address = this._memorySize === 0
-        ? 0
-        : this._h.currentEntry % this._memorySize
-      if (
-        this._h.history[address].setRefTime === 1 ||
-        this._h.currentEntry === this._h.firstEntry + 1
-      ) {
+      const index = this._h.memorySize === 0
+        ? 1
+        : (this._currentEntry - this._h.entryOffset) % this._h.memorySize
+      if (this._currentEntry === this._h.firstEntry) {
         this.debug(
-          'entry: %s, address %s, reftime: %s (%s)', this._h.currentEntry,
-          address, this._h.initialTime - epoch,
-          new Date(1000 * this._h.initialTime).toString().slice(0, 24)
+          'History Entries (%d/11): entry %d (index: %d): %j (%s)',
+          i, this._currentEntry, index, { initialTime: this._h.initialTime - epoch },
+          dateToString(this._h.initialTime)
         )
-        dataStream += util.format(
-          '|15 %s 0100000081 %s 00000000000000',
-          numToHex(swap32(this._h.currentEntry), 8),
-          numToHex(swap32(this._h.initialTime - epoch), 8))
+        buffer.writeUInt8(21, offset); offset += 1
+        buffer.writeUInt32LE(this._currentEntry, offset); offset += 4
+        buffer.write('0100000081', offset, 'hex'); offset += 5
+        buffer.writeUInt32LE(this._h.initialTime - epoch, offset); offset += 4
+        buffer.write('00000000000000', offset, 'hex'); offset += 7
       } else {
+        const entry = this._h.entries[index]
         this.debug(
-          'entry: %s, address: %s, time: %s (%s)', this._h.currentEntry,
-          address, this._h.history[address].time - this._h.initialTime,
-          new Date(1000 * this._h.history[address].time).toString().slice(0, 24)
+          'History Entries (%d/11): entry %d (index: %d): %j (%s)',
+          i, this._currentEntry, index, entry, dateToString(entry.time)
         )
-        dataStream += this._entryStream(this._h.history[address])
+        const b = this.entryToBuffer(entry)
+        buffer.writeUInt8(b.length + 9, offset); offset += 1
+        buffer.writeUInt32LE(this._currentEntry, offset); offset += 4
+        buffer.writeUInt32LE(entry.time - this._h.initialTime, offset); offset += 4
+        b.copy(buffer, offset); offset += b.length
       }
-      this._h.currentEntry++
-      if (this._h.currentEntry > this._h.lastEntry) {
+      this._currentEntry++
+      if (this._currentEntry > this._h.lastEntry) {
         break
       }
     }
-    this.debug('send data: %s', dataStream)
-    return hexToBase64(dataStream)
+    const value = buffer.slice(0, offset)
+    this.vdebug('History Entries: send data: %s', value.toString('hex'))
+    return value.toString('base64')
   }
 
   async _onSetConfig (value) {
-    // const buffer = Buffer.from(value, 'base64')
-    this.debug('Config Request changed to %j', base64ToHex(value))
+    const buffer = Buffer.from(value, 'base64')
+    this.vdebug('Config Request changed to %j', buffer.toString('hex'))
   }
 
   async _onGetConfig () {
-    return hexToBase64('D200')
+    return Buffer.from('D200', 'hex').toString('base64')
   }
 }
 

package/lib/ServiceDelegate/ServiceLabel.js

@@ -1,7 +1,7 @@
 // homebridge-lib/lib/ServiceDelegate/ServiceLabel.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 

package/lib/ServiceDelegate/index.js

@@ -1,7 +1,7 @@
 // homebridge-lib/lib/ServiceDelegate/index.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
@@ -78,7 +78,7 @@ class ServiceDelegate extends homebridgeLib.Delegate {
       : this._accessory.getServiceByUUIDAndSubType(params.Service, params.subtype)
     if (this._service == null) {
       this._service = this._accessory.addService(
-        new params.Service(this.name, params.subtype)
+        new params.Service(null, params.subtype)
       )
     }
     this._accessoryDelegate._linkServiceDelegate(this)
@@ -116,25 +116,28 @@ class ServiceDelegate extends homebridgeLib.Delegate {
     this.addCharacteristicDelegate({
       key: 'name',
       Characteristic: this.Characteristics.hap.Name,
-      silent: true,
       value: params.name
     })
-
-    if (params.exposeConfiguredName) {
+    if (this._service.constructor.name !== 'AccessoryInformation') {
       this.addCharacteristicDelegate({
         key: 'configuredName',
         Characteristic: this.Characteristics.hap.ConfiguredName,
+        props: {
+          perms: [
+            this.Characteristic.Perms.PAIRED_READ,
+            this.Characteristic.Perms.NOTIFY,
+            this.Characteristic.Perms.PAIRED_WRITE,
+            this.Characteristic.Perms.HIDDEN
+          ]
+        },
         value: params.name,
         setter: (value) => {
           if (value == null || value === '') {
-            throw new Error('cannot be empty')
+            throw new RangeError('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
         }
@@ -173,7 +176,7 @@ class ServiceDelegate extends homebridgeLib.Delegate {
     * Removes the associated HomeKit service.
     */
   destroy () {
-    this.debug('destroy %s (%s)', this._key, this._service.displayName)
+    this.debug('destroy %s (%s)', this._key, this.constructor.name)
     this._accessoryDelegate._unlinkServiceDelegate(this)
     this.removeAllListeners()
     for (const key in this._characteristicDelegates) {

package/lib/SystemInfo.js

@@ -1,7 +1,7 @@
 // homebridge-lib/lib/SystemInfo.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2019-2022 Erik Baauw. All rights reserved.
+// Copyright © 2019-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 
@@ -49,7 +49,8 @@ const rpiInfo = {
     17: '4B',
     18: 'Zero 2 W',
     19: '400',
-    20: 'CM4'
+    20: 'CM4',
+    21: 'CM4S'
   },
   processors: {
     0: 'BCM2835',