homebridge-lib 5.4.1 → 5.6.1-0

package/lib/Platform.js

@@ -62,8 +62,6 @@ class Platform extends homebridgeLib.Delegate {
   static loadPlatform (homebridge, packageJson, platformName, Platform) {
     if (context.homebridge == null) {
       context.homebridge = homebridge
-      context.packageJson = packageJson
-      context.platformName = platformName
       context.homebridgeVersion = homebridge.serverVersion
       context.PlatformAccessory = homebridge.platformAccessory
       const hap = {
@@ -103,6 +101,10 @@ class Platform extends homebridgeLib.Delegate {
         my: Object.freeze(my.Characteristics)
       })
     }
+    context[Platform.name] = {
+      packageJson: packageJson,
+      platformName: platformName
+    }
     homebridge.registerPlatform(
       packageJson.name, platformName, Platform, true
     )
@@ -116,6 +118,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 this._myContext.packageJson }
+
   /** Create a new instance of the platform plugin.
     *
     * Called by Homebridge when initialising the plugin from `config.json`.
@@ -134,19 +142,21 @@ class Platform extends homebridgeLib.Delegate {
     this._log = log
     this._configJson = configJson
     this._homebridge = homebridge
-    this._platformName = context.platformName
-    this._pluginName = context.packageJson.name
-    this._pluginVersion = context.packageJson.version
+    this._myContext = context[this.className]
+    this._platformName = this._myContext.platformName
+    this._pluginName = this._myContext.packageJson.name
+    this._pluginVersion = this._myContext.packageJson.version
 
     this._accessories = {}
     this._accessoryDelegates = {}
 
-    if (context.platform != null) {
+    if (this._myContext.platform != null) {
       this.fatal(
-        'config.json: duplicate entry for %s platform', context.platformName
+        'config.json: duplicate entry for %s platform',
+        this._myContext.platformName
       )
     }
-    context.platform = this
+    this._myContext.platform = this
     this._identify()
 
     this._homebridge

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/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.4.1",
+  "version": "5.6.1-0",
   "keywords": [
     "homekit",
     "homebridge"
@@ -22,7 +22,7 @@
   },
   "engines": {
     "homebridge": "^1.4.1",
-    "node": "^16.15.0"
+    "node": "^16.15.1"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "~0.0.19",