homebridge-deconz 0.1.11 → 0.1.12

package/lib/DeconzAccessory/Light.js

@@ -65,7 +65,7 @@ class Light extends DeconzAccessory {
         silent: true
       })
     }
-    if (this.servicesByServiceName.Consumption?.[0] != null) {
+    if (this.service.characteristicDelegate('totalConsumption') != null) {
       params.totalConsumptionDelegate = this.service.characteristicDelegate('totalConsumption')
       if (this.service.values.consumption === undefined) {
         // Power to be computed by history if not exposed by device
@@ -75,7 +75,7 @@ class Light extends DeconzAccessory {
           unit: ' W'
         })
       }
-    } else if (this.servicesByServiceName.Power?.[0] != null) {
+    } else if (this.service.characteristicDelegate('consumption') != null) {
       params.consumptionDelegate = this.service.characteristicDelegate('consumption')
       // Total Consumption to be computed by history
       params.computedTotalConsumptionDelegate = this.service.addCharacteristicDelegate({

package/lib/DeconzAccessory/index.js

@@ -178,25 +178,22 @@ class DeconzAccessory extends AccessoryDelegate {
           this.Characteristics.hap.ServiceLabelNamespace.ARABIC_NUMERALS
       }
       service = this.servicesByServiceName.Label?.[0]
-      if (service == null) {
-        service = new DeconzService.Label(this, resource, {
-          primaryService: params.primaryService
-        })
-      }
-      service.createButtonServices(resource, params)
     }
     if (service == null) {
       service = new DeconzService[params.serviceName](this, resource, {
         primaryService: params.primaryService
       })
+      if (this.servicesByServiceName[params.serviceName] == null) {
+        this.servicesByServiceName[params.serviceName] = [service]
+      } else {
+        this.servicesByServiceName[params.serviceName].push(service)
+      }
+    }
+    if (params.serviceName === 'Label') {
+      service.createButtonServices(resource, params)
     }
     this.serviceBySubtype[resource.subtype] = service
     this.serviceByRpath[resource.rpath] = service
-    if (this.servicesByServiceName[params.serviceName] == null) {
-      this.servicesByServiceName[params.serviceName] = [service]
-    } else {
-      this.servicesByServiceName[params.serviceName].push(service)
-    }
     if (resource.body.config?.battery !== undefined) {
       if (this.servicesByServiceName.Battery?.[0] == null) {
         this.servicesByServiceName.Battery = [new DeconzService.Battery(this, resource)]

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "keywords": [
     "homebridge-plugin",
     "homekit",