homebridge-deconz 0.0.22 → 0.0.23

package/lib/Deconz/Resource.js

@@ -256,7 +256,7 @@ class Resource {
     */
   get prio () {
     if (this.rtype === 'groups') return -1
-    if (this.rtype === 'lights') return this.endpoint
+    if (this.rtype === 'lights') return 0xFF - this.endpoint
     return sensorsPrios.indexOf(this.serviceName)
   }
 

package/lib/DeconzAccessory/Light.js

@@ -21,6 +21,8 @@ class Light extends DeconzAccessory {
     * @param {Deconz.Device} device - The device.
     */
   constructor (gateway, device, settings = {}) {
+    // settings.forceEveEnergy = true
+
     super(gateway, device, gateway.Accessory.Categories.LIGHTBULB)
 
     this.identify()
@@ -35,12 +37,14 @@ class Light extends DeconzAccessory {
       serviceName: this.values.serviceName
     })
 
+    let nLights = 1
     for (const subtype in device.resourceBySubtype) {
       const resource = device.resourceBySubtype[subtype]
       if (subtype === device.primary) {
         continue
       }
       if (resource.rtype === 'lights') {
+        nLights++
         this.createService(resource, { serviceName: this.values.serviceName })
       } else {
         this.createService(resource)
@@ -48,16 +52,66 @@ class Light extends DeconzAccessory {
     }
 
     if (this.serviceByServiceName.Consumption != null) {
+      // Current Consumption to be computed by history if not exposed by device
+      const currentConsumption =
+        this.service.values.currentConsumption === undefined
+          ? this.service.addCharacteristicDelegate({
+            key: 'currentConsumption',
+            Characteristic: this.Characteristics.eve.CurrentConsumption,
+            unit: ' W'
+          })
+          : null
       this.historyService = new History.Consumption(
         this, {},
-        this.serviceByServiceName.Consumption.characteristicDelegate('totalConsumption'),
-        this.serviceByServiceName.Consumption.characteristicDelegate('currentConsumption')
+        this.service.characteristicDelegate('totalConsumption'),
+        currentConsumption,
+        this.service.characteristicDelegate('on')
       )
     } else if (this.serviceByServiceName.Power != null) {
+      // Total Consumption to be computed by history
+      const TotalConsumption = this.service.addCharacteristicDelegate({
+        key: 'totalConsumption',
+        Characteristic: this.Characteristics.eve.TotalConsumption,
+        unit: ' kWh',
+        value: 0
+      })
       this.historyService = new History.Power(
         this, {},
-        this.serviceByServiceName.Power.characteristicDelegate('currentConsumption')
+        this.service.characteristicDelegate('currentConsumption'),
+        TotalConsumption,
+        this.service.characteristicDelegate('on')
       )
+    } else if (this.values.serviceName === 'Outlet' && settings.forceEveEnergy) {
+      if (nLights > 1) {
+        // Eve would recognise device as Eve Energy Strip.
+      } else if (this.serviceByServiceName.Switch != null) {
+        // Eve would recognise device as Eve Button.
+      } else {
+        // Needed for Eve to recognise device as Eve Energy.
+        this.service.addCharacteristicDelegate({
+          key: 'totalConsumption',
+          Characteristic: this.Characteristics.eve.TotalConsumption,
+          unit: ' kWh'
+        })
+        this.historyService = new History.On(
+          this, {},
+          this.service.characteristicDelegate('on')
+        )
+      }
+    }
+
+    if (this.values.serviceName === 'Outlet' && this.historyService != null) {
+      if (nLights > 1) {
+        // Eve would recognise device as Eve Energy Strip.
+      } else if (this.serviceByServiceName.Switch != null) {
+        // Eve would recognise device as Eve Button.
+      } else {
+        // Needed for Eve to show history for On.
+        this.service.addCharacteristicDelegate({
+          key: 'lockPhysicalControls',
+          Characteristic: this.Characteristics.hap.LockPhysicalControls
+        })
+      }
     }
 
     this.createSettingsService()

package/lib/DeconzAccessory/index.js

@@ -157,7 +157,6 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
       if (service != null) {
         service.addResource(resource)
       }
-      this.consumptionService = service
     } else if (params.serviceName === 'Switch') {
       // Default button
       if (resource.capabilities.buttons == null) {

package/lib/DeconzService/GatewaySettings.js

@@ -71,7 +71,7 @@ class GatewaySettings extends homebridgeLib.ServiceDelegate {
     this.addCharacteristicDelegate({
       key: 'logLevel',
       Characteristic: this.Characteristics.my.LogLevel,
-      value: gateway.platform.logLevel
+      value: this.accessoryDelegate.logLevel
     })
 
     this.addCharacteristicDelegate({

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -20,14 +20,13 @@
     "deconz": "cli/deconz.js"
   },
   "engines": {
-    "deCONZ": "2.17.1",
+    "deCONZ": "2.18.2",
     "homebridge": "^1.5.0",
-    "node": "^16.17.0"
+    "node": "^16.17.1"
   },
   "dependencies": {
-    "homebridge-lib": "~5.6.5",
-    "semver": "^7.3.7",
-    "ws": "^8.8.1",
+    "homebridge-lib": "~5.6.8",
+    "ws": "^8.9.0",
     "xml2js": "~0.4.23"
   },
   "scripts": {
@@ -42,8 +41,14 @@
     "url": "https://github.com/ebaauw/homebridge-deconz/issues"
   },
   "homepage": "https://github.com/ebaauw/homebridge-deconz#readme",
-  "funding": {
-    "type": "paypal",
-    "url": "https://www.paypal.me/ebaauw/EUR"
-  }
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/ebaauw"
+    },
+    {
+      "type": "paypal",
+      "url": "https://www.paypal.me/ebaauw/EUR"
+    }
+  ]
 }