homebridge-lib 5.4.0 → 5.6.0

package/lib/AdaptiveLighting.js

@@ -172,12 +172,8 @@ class AdaptiveLighting {
     * @param {integer} ct - The IID of the _Color Temperature_ characteristic.
     */
   constructor (bri, ct) {
-    this.bri = bri instanceof homebridgeLib.CharacteristicDelegate
-      ? bri._characteristic.iid
-      : bri
-    this.ct = ct instanceof homebridgeLib.CharacteristicDelegate
-      ? ct._characteristic.iid
-      : ct
+    this._bri = bri
+    this._ct = ct
     this._active = false
   }
 
@@ -187,6 +183,24 @@ class AdaptiveLighting {
     */
   get active () { return this._control != null }
 
+  get briIid () {
+    if (this._briIid == null) {
+      this._briIid = this._bri instanceof homebridgeLib.CharacteristicDelegate
+        ? this._bri._characteristic.iid
+        : this._bri
+    }
+    return this._briIid
+  }
+
+  get ctIid () {
+    if (this._ctIid == null) {
+      this._ctIid = this._ct instanceof homebridgeLib.CharacteristicDelegate
+        ? this._ct._characteristic.iid
+        : this._ct
+    }
+    return this._ctIid
+  }
+
   /** Deactivtate adaptive lighting.
     */
   deactivate () {
@@ -199,12 +213,12 @@ class AdaptiveLighting {
   generateConfiguration () {
     return Buffer.concat([
       tlvFromBuffer(1, Buffer.concat([
-        tlvFromUInt(1, this.bri),
+        tlvFromUInt(1, this.briIid),
         tlvFromUInt(2, 1)
       ])),
       tlvFromNull(0),
       tlvFromBuffer(1, Buffer.concat([
-        tlvFromUInt(1, this.ct),
+        tlvFromUInt(1, this.ctIid),
         tlvFromUInt(2, 2)
       ]))
     ]).toString('base64')
@@ -212,7 +226,7 @@ class AdaptiveLighting {
 
   _generateControl () {
     return tlvFromBuffer(1, Buffer.concat([
-      tlvFromUInt(1, this.ct),
+      tlvFromUInt(1, this.ctIid),
       tlvFromBuffer(2, Buffer.concat([
         tlvFromHexString(1, this._control.transitionParameters['2.1.2.1']),
         tlvFromUInt(2, this._startTime - epoch),
@@ -266,11 +280,11 @@ class AdaptiveLighting {
       value = parseTlv('2', buf)
     }
     const control = value.colorTemperature
-    if (control.iid != null && control.iid !== this.ct) {
+    if (control.iid != null && control.iid !== this.ctIid) {
       throw new Error('%d: bad ColorTemperature iid', control.iid)
     }
     if (control.curve != null) {
-      if (control.curve.adjustmentIid !== this.bri) {
+      if (control.curve.adjustmentIid !== this.briIid) {
         throw new Error('%d: bad Brightness iid', control.curve.adjustmentIid)
       }
       this._control = control

package/lib/CharacteristicDelegate.js

@@ -274,7 +274,7 @@ class CharacteristicDelegate extends homebridgeLib.Delegate {
           break
       }
     }
-    return { value: value, s: s }
+    return { value, s }
   }
 
   /** Value of associated Characteristic.

package/lib/Colour.js

@@ -109,7 +109,7 @@ class Colour {
       case 4: r = x + m; g = m; b = C + m; break
       case 5: r = C + m; g = m; b = x + m; break
     }
-    return { r: r, g: g, b: b }
+    return { r, g, b }
   }
 
   /** Convert {@link Colour.RGB RGB} to {@link Colour.HSV HSV}.

package/lib/CommandLineParser.js

@@ -201,11 +201,7 @@ See ${this._packageJson.homepage.split('#')[0]} for more info.
   parameter (key, callback, optional = false) {
     key = homebridgeLib.OptionParser.toString('key', key, true)
     callback = homebridgeLib.OptionParser.toFunction('callback', callback)
-    this._callbacks.parameters.push({
-      key: key,
-      callback: callback,
-      optional: optional
-    })
+    this._callbacks.parameters.push({ key, callback, optional })
     return this
   }
 

package/lib/HttpClient.js

@@ -349,14 +349,14 @@ class HttpClient extends events.EventEmitter {
       const requestId = ++this.__requestId
       const url = this.__params.url + (resource === '/' ? '' : resource) +
                   this.__params.suffix + suffix
-      const options = Object.assign({ method: method }, this.__options)
+      const options = Object.assign({ method }, this.__options)
       const requestInfo = Object.assign({
         name: this.name,
         id: requestId,
-        method: method,
-        resource: resource,
-        body: body,
-        url: url
+        method,
+        resource,
+        body,
+        url
       }, info)
       const request = this._http.request(url, options)
       request

package/lib/JsonFormatter.js

@@ -185,9 +185,9 @@ class JsonFormatter {
         obj[`/${keys.join('/')}`] = value
         return obj
       } else {
-        if (this.options.keysOnly) { return { keys: keys } }
-        if (this.options.valuesOnly) { return { value: value } }
-        return { keys: keys, value: value }
+        if (this.options.keysOnly) { return { keys } }
+        if (this.options.valuesOnly) { return { value } }
+        return { keys, value }
       }
     })
     if (this.options.ascii) {

package/lib/Platform.js

@@ -116,6 +116,12 @@ class Platform extends homebridgeLib.Delegate {
 
   get Characteristics () { return context.Characteristics }
 
+  /** Content of the plugin's package.json file.
+    * @type {object}
+    * @readonly
+    */
+  get packageJson () { return context.packageJson }
+
   /** Create a new instance of the platform plugin.
     *
     * Called by Homebridge when initialising the plugin from `config.json`.
@@ -466,10 +472,10 @@ class Platform extends homebridgeLib.Delegate {
       this._accessories[id] = accessory
       accessory.displayName = name
       accessory.context = {
-        className: className,
-        version: version,
-        id: id,
-        name: name,
+        className,
+        version,
+        id,
+        name,
         logLevel: this.logLevel,
         context: {}
       }

package/lib/PropertyDelegate.js

@@ -94,7 +94,7 @@ class PropertyDelegate extends homebridgeLib.Delegate {
 
   validate (value) {
     // Todo: check value against type.
-    return { value: value, s: '' }
+    return { value, s: '' }
   }
 
   /** Value of associated Characteristic.

package/lib/ServiceDelegate/History/Motion.js

@@ -48,6 +48,10 @@ class Motion extends History {
     * @param {!CharacteristicDelegate} lastActivationDelegate - A reference to the
     * delegate of the associated `Characteristics.eve.LastActivation`
     * 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
@@ -55,7 +59,8 @@ class Motion extends History {
     */
   constructor (
     accessoryDelegate, params,
-    motionDelegate, lastActivationDelegate, temperatureDelegate
+    motionDelegate, lastActivationDelegate,
+    lightLevelDelegate, temperatureDelegate
   ) {
     super(accessoryDelegate, params)
     if (!(motionDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
@@ -64,6 +69,12 @@ class Motion extends History {
     if (!(lastActivationDelegate instanceof homebridgeLib.CharacteristicDelegate)) {
       throw new TypeError('lastActivationDelegate: not a CharacteristicDelegate')
     }
+    if (
+      lightLevelDelegate != null &&
+      !(lightLevelDelegate instanceof homebridgeLib.CharacteristicDelegate)
+    ) {
+      throw new TypeError('lightLevelDelegate: not a CharacteristicDelegate')
+    }
     if (
       temperatureDelegate != null &&
       !(temperatureDelegate instanceof homebridgeLib.CharacteristicDelegate)
@@ -76,14 +87,23 @@ class Motion extends History {
       lastActivationDelegate.value = now - this._h.initialTime
       this._entry.status = value
       if (this._entry.temp != null) {
+        const lightlevel = this._entry.lightlevel
         const temp = this._entry.temp
+        this._entry.lightlevel = null
         this._entry.temp = null
         this._addEntry(now)
+        this._entry.lightlevel = lightlevel
         this._entry.temp = temp
       } else {
         this._addEntry(now)
       }
     })
+    if (lightLevelDelegate != null) {
+      this._entry.lightlevel = lightLevelDelegate.value
+      lightLevelDelegate.on('didSet', (value) => {
+        this._entry.lightlevel = value
+      })
+    }
     if (temperatureDelegate != null) {
       this._entry.temp = temperatureDelegate.value
       temperatureDelegate.on('didSet', (value) => {
@@ -93,23 +113,42 @@ class Motion extends History {
   }
 
   get _fingerPrint () {
-    return '02 1c01 0102'
+    return '03 1c01 3002 0102'
   }
 
   _entryStream (entry) {
     if (entry.temp == null) {
+      if (entry.lightlevel == null) {
+        return util.format(
+          '|0b %s %s 01 %s',
+          numToHex(swap32(this._h.currentEntry), 8),
+          numToHex(swap32(entry.time - this._h.initialTime), 8),
+          numToHex(entry.status, 2)
+        )
+      }
+      return util.format(
+        '|0d %s %s 03 %s %s',
+        numToHex(swap32(this._h.currentEntry), 8),
+        numToHex(swap32(entry.time - this._h.initialTime), 8),
+        numToHex(entry.status, 2),
+        numToHex(swap16(entry.lightlevel), 4)
+      )
+    }
+    if (entry.lightlevel == null) {
       return util.format(
-        '|0b %s %s 01 %s',
+        '|0d %s %s 05 %s %s',
         numToHex(swap32(this._h.currentEntry), 8),
         numToHex(swap32(entry.time - this._h.initialTime), 8),
-        numToHex(entry.status, 2)
+        numToHex(entry.status, 2),
+        numToHex(swap16(entry.temp * 100), 4)
       )
     }
     return util.format(
-      '|0d %s %s 03 %s %s',
+      '|0f %s %s 07 %s %s %s',
       numToHex(swap32(this._h.currentEntry), 8),
       numToHex(swap32(entry.time - this._h.initialTime), 8),
       numToHex(entry.status, 2),
+      numToHex(swap16(entry.lightlevel), 4),
       numToHex(swap16(entry.temp * 100), 4)
     )
   }

package/lib/SystemInfo.js

@@ -150,19 +150,19 @@ class SystemInfo extends events.EventEmitter {
       gpioMask = 0x03E6CF93 // 0-1, 4, 7-11, 14-15, 17-18, 21-25
     }
     return {
-      gpioMask: gpioMask,
+      gpioMask,
       gpioMaskSerial: (1 << 15) | (1 << 14),
-      id: id,
+      id,
       isRpi: true,
-      manufacturer: manufacturer,
-      memory: memory,
-      model: model,
-      modelRevision: modelRevision,
+      manufacturer,
+      memory,
+      model,
+      modelRevision,
       prettyName: [
         'Raspberry Pi', model, modelRevision, '(' + memory + ')'
       ].join(' '),
       powerLed: !(['A', 'B', 'Zero', 'Zero W', 'Zero 2 W'].includes(model)),
-      processor: processor,
+      processor,
       revision: homebridgeLib.toHexString(revision, 6),
       usbPower: ['B+', '2B', '3B', '3B+'].includes(model)
     }
@@ -249,13 +249,7 @@ class SystemInfo extends events.EventEmitter {
         }
       }
     }
-    return {
-      name: name,
-      platform: platform,
-      prettyName: prettyName,
-      version: version,
-      versionName: versionName
-    }
+    return { name, platform, prettyName, version, versionName }
   }
 
   /** Extract Apple Mac hardware info from `system_profiler` command.
@@ -315,15 +309,15 @@ class SystemInfo extends events.EventEmitter {
       this.emit('error', error)
     }
     return {
-      id: id,
+      id,
       isMac: true,
       manufacturer: 'Apple Inc.',
-      memory: memory,
-      model: model,
-      nCores: nCores,
+      memory,
+      model,
+      nCores,
       prettyName: prettyName || model,
-      processor: processor,
-      revision: revision
+      processor,
+      revision
     }
   }
 
@@ -361,13 +355,13 @@ class SystemInfo extends events.EventEmitter {
     }
     const versionName = macOsInfo.versionNames[v] // e.g. 'Monterey'
     return {
-      build: build,
+      build,
       catalina: semver.gte(version, '10.15.0'),
-      name: name,
+      name,
       platform: process.platform,
       prettyName: [name, versionName, version, '(' + build + ')'].join(' '),
-      version: version,
-      versionName: versionName
+      version,
+      versionName
     }
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.4.0",
+  "version": "5.6.0",
   "keywords": [
     "homekit",
     "homebridge"
@@ -21,8 +21,8 @@
     "upnp": "cli/upnp.js"
   },
   "engines": {
-    "homebridge": "^1.4.0",
-    "node": "^16.14.2"
+    "homebridge": "^1.4.1",
+    "node": "^16.15.1"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "~0.0.19",