homebridge-deconz 1.0.2 → 1.0.4

package/lib/DeconzAccessory/Light.js

@@ -33,101 +33,122 @@ class Light extends DeconzAccessory {
       serviceName: this.values.serviceName
     })
 
+    for (const subtype in device.resourceBySubtype) {
+      const resource = device.resourceBySubtype[subtype]
+      if (subtype === device.primary) {
+        continue
+      }
+      if (resource.rtype === 'lights') {
+        this.createService(resource, { serviceName: this.values.serviceName })
+      } else {
+        this.createService(resource)
+      }
+    }
+
     const params = {}
 
-    if (this.values.serviceName === 'Outlet') {
-      this.service.addCharacteristicDelegate({
-        key: 'lockPhysicalControls',
-        Characteristic: this.Characteristics.hap.LockPhysicalControls
-      })
-      params.onDelegate = this.service.characteristicDelegate('on')
-      params.lastOnDelegate = this.service.addCharacteristicDelegate({
+    if (this.values.serviceName === 'Valve') {
+      // No history
+    } else if (
+      this.servicesByServiceName[this.values.serviceName].length > 1 ||
+      this.values.serviceName === 'Light'
+    ) {
+      params.lightOnDelegate = this.service.characteristicDelegate('on')
+      params.lastLightOnDelegate = this.service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
-    } else if (this.values.serviceName === 'Switch') {
+    } else { // Outlet or Switch
+      if (this.values.serviceName === 'Outlet') {
+        this.service.addCharacteristicDelegate({
+          key: 'lockPhysicalControls',
+          Characteristic: this.Characteristics.hap.LockPhysicalControls
+        })
+      }
       params.onDelegate = this.service.characteristicDelegate('on')
       params.lastOnDelegate = this.service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
-    } else if (this.values.serviceName === 'Light') {
-      params.lightOnDelegate = this.service.characteristicDelegate('on')
-      params.lastLightOnDelegate = this.service.addCharacteristicDelegate({
-        key: 'lastActivation',
-        Characteristic: this.Characteristics.eve.LastActivation,
-        silent: true
-      })
     }
 
-    if (this.service.characteristicDelegate('totalConsumption') != null) {
-      params.totalConsumptionDelegate = this.service.characteristicDelegate('totalConsumption')
-      if (this.service.values.consumption === undefined) {
+    if (this.servicesByServiceName.Consumption?.length === 1) {
+      const service = this.servicesByServiceName.Consumption[0]
+      params.totalConsumptionDelegate = service.characteristicDelegate('totalConsumption')
+      if (service.values.consumption === undefined) {
         // Power to be computed by history if not exposed by device
-        params.computedConsumptionDelegate = this.service.addCharacteristicDelegate({
+        params.computedConsumptionDelegate = service.addCharacteristicDelegate({
           key: 'consumption',
           Characteristic: this.Characteristics.eve.Consumption,
           unit: ' W'
         })
       }
-    } else if (this.service.characteristicDelegate('consumption') != null) {
-      params.consumptionDelegate = this.service.characteristicDelegate('consumption')
+    } else if (this.servicesByServiceName.Power?.length === 1) {
+      const service = this.servicesByServiceName.Power[0]
+      params.consumptionDelegate = service.characteristicDelegate('consumption')
       // Total Consumption to be computed by history
-      params.computedTotalConsumptionDelegate = this.service.addCharacteristicDelegate({
+      params.computedTotalConsumptionDelegate = service.addCharacteristicDelegate({
         key: 'totalConsumption',
         Characteristic: this.Characteristics.eve.TotalConsumption,
         unit: ' kWh'
       })
     }
-    this.historyService = new ServiceDelegate.History(this, params)
 
-    for (const subtype in device.resourceBySubtype) {
-      const resource = device.resourceBySubtype[subtype]
-      if (subtype === device.primary) {
-        continue
+    if (Object.keys(params).length > 0) {
+      this.historyService = new ServiceDelegate.History(this, params)
+    }
+
+    if (this.servicesByServiceName[this.values.serviceName].length === 1) {
+      if (
+        this.values.serviceName === 'Outlet' &&
+        this.servicesByServiceName.Consumption == null &&
+        this.servicesByServiceName.Power == null
+      ) {
+        // Dumb Outlet
+        const service = new ServiceDelegate(this, {
+          name: this.name + ' Consumption',
+          Service: this.Services.eve.Consumption,
+          hidden: true
+        })
+        service.addCharacteristicDelegate({
+          key: 'dummyTotalConsumption',
+          Characteristic: this.Characteristics.eve.TotalConsumption,
+          props: {
+            perms: [
+              this.Characteristic.Perms.PAIRED_READ,
+              this.Characteristic.Perms.NOTIFY,
+              this.Characteristic.Perms.HIDDEN
+            ]
+          },
+          silent: true,
+          value: 0
+        })
       }
-      if (resource.rtype === 'lights') {
-        const service = this.createService(resource, { serviceName: this.values.serviceName })
-        if (this.values.serviceName !== 'Valve') {
-          this.historyService.addLastOnDelegate(
-            service.characteristicDelegate('on'),
-            service.addCharacteristicDelegate({
-              key: 'lastActivation',
-              Characteristic: this.Characteristics.eve.LastActivation,
-              silent: true
-            })
-          )
+    } else {
+      for (const i in this.servicesByServiceName[this.values.serviceName]) {
+        const service = this.servicesByServiceName[this.values.serviceName][i]
+        service.addCharacteristicDelegate({
+          key: 'index',
+          Characteristic: this.Characteristics.hap.ServiceLabelIndex,
+          silent: true,
+          value: Number(i)
+        })
+        if (i === '0') {
+          continue
         }
-      } else {
-        this.createService(resource)
+        this.historyService?.addLastOnDelegate(
+          service.characteristicDelegate('on'),
+          service.addCharacteristicDelegate({
+            key: 'lastActivation',
+            Characteristic: this.Characteristics.eve.LastActivation,
+            silent: true
+          })
+        )
       }
     }
 
-    if (
-      this.values.serviceName === 'Outlet' &&
-      this.service.characteristicDelegate('totalConsumption') == null &&
-      this.service.characteristicDelegate('consumption') == null &&
-      this.servicesByServiceName.Outlet?.length === 1
-    ) {
-      // Dumb Outlet
-      this.warn('dumb outlet')
-      this.service.addCharacteristicDelegate({
-        key: 'dummyTotalConsumption',
-        Characteristic: this.Characteristics.eve.TotalConsumption,
-        props: {
-          perms: [
-            this.Characteristic.Perms.PAIRED_READ,
-            this.Characteristic.Perms.NOTIFY,
-            this.Characteristic.Perms.HIDDEN
-          ]
-        },
-        silent: true,
-        value: 0
-      })
-    }
-
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')

package/lib/DeconzAccessory/index.js

@@ -164,16 +164,12 @@ class DeconzAccessory extends AccessoryDelegate {
     } else if (params.serviceName === 'Battery') {
       service = this.servicesByServiceName.Battery?.[0]
     } else if (params.serviceName === 'Consumption') {
-      service = this.servicesByServiceName.Outlet?.[0] ||
-        this.servicesByServiceName.Light?.[0] ||
-        this.servicesByServiceName.Power?.[0]
+      service = this.servicesByServiceName.Power?.[0]
       if (service != null) {
         service.addResource(resource)
       }
     } else if (params.serviceName === 'Power') {
-      service = this.servicesByServiceName.Outlet?.[0] ||
-        this.servicesByServiceName.Light?.[0] ||
-        this.servicesByServiceName.Consumption?.[0]
+      service = this.servicesByServiceName.Consumption?.[0]
       if (service != null) {
         service.addResource(resource)
       }
@@ -203,11 +199,11 @@ class DeconzAccessory extends AccessoryDelegate {
       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 (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)
@@ -223,17 +219,6 @@ class DeconzAccessory extends AccessoryDelegate {
     return service
   }
 
-  settings = {
-    anyOn: { service: 'Lightbulb', type: 'bool' },
-    buttonRepeat: { service: 'Button', type: 'boolMap' },
-    effects: { service: 'Light', type: 'boolMap' },
-    expose: { type: 'bool' },
-    logLevel: { type: 'int', min: 0, max: 3 },
-    lowBatteryThreshold: { service: 'Battery', type: 'int', min: 10, max: 100, factor: 100 },
-    offset: { service: 'Temperature', type: 'number', min: -5, max: 5 },
-    splitLight: { service: 'Light' }
-  }
-
   onUiGet (details = false) {
     const resource = this.device.resourceBySubtype[this.device.primary]
     const body = {

package/lib/DeconzService/Consumption.js

@@ -56,7 +56,9 @@ class Consumption extends DeconzService.SensorsResource {
   }
 
   constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.my.Resource
+    params.name = accessory.name + ' Consumption'
+    params.Service = accessory.Services.eve.Consumption
+    params.exposeConfiguredName = true
     super(accessory, resource, params)
 
     Consumption.addResource(this, resource)

package/lib/DeconzService/Power.js

@@ -66,7 +66,9 @@ class Power extends DeconzService.SensorsResource {
   }
 
   constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.my.Resource
+    params.name = accessory.name + ' Consumption'
+    params.Service = accessory.Services.eve.Consumption
+    params.exposeConfiguredName = true
     super(accessory, resource, params)
 
     Power.addResource(this, resource)

package/lib/DeconzService/index.js

@@ -49,7 +49,7 @@ class DeconzService extends ServiceDelegate {
   constructor (accessory, resource, params) {
     super(accessory, {
       id: resource.id,
-      name: resource.body.name,
+      name: params.name ?? resource.body.name,
       Service: params.Service,
       subtype: resource.subtype,
       primaryService: params.primaryService,

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -22,13 +22,13 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.23.1",
+    "deCONZ": "2.23.2",
     "homebridge": "^1.6.1",
-    "node": "20.7.0||^20||^18"
+    "node": "20.8.0||^20||^18"
   },
   "dependencies": {
-    "hb-deconz-tools": "~1.0.7",
-    "homebridge-lib": "~6.6.0"
+    "hb-deconz-tools": "~1.0.8",
+    "homebridge-lib": "~6.6.1"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",