homebridge-deconz 0.1.11 → 0.1.13

package/lib/Deconz/Resource.js

@@ -129,10 +129,10 @@ class Resource {
         * @type {boolean}
         */
       this.zigbee = true
-    } else if (this.isDeconzClip()) {
+    } else if (this.isMultiClip()) {
       const a = body.uniqueid.split('-')
-      this.id = gateway.id + '-M' + a?.[0]
-      this.subtype = a?.[1]
+      this.id = gateway.id + '-M' + a[0]
+      this.subtype = a[1]
       this.zigbee = false
     } else {
       this.subtype = rtype[0].toUpperCase() + rid
@@ -195,7 +195,7 @@ class Resource {
     if (this.rtype === 'groups') {
       return -1
     }
-    if (this.rtype === 'lights' || this.isDeconzClip()) {
+    if (this.rtype === 'lights' || this.isMultiClip()) {
       return 0xFF - this.endpoint
     }
     return sensorsPrios.indexOf(this.serviceName)
@@ -341,6 +341,10 @@ class Resource {
     )
   }
 
+  isMultiClip () {
+    return this.isDeconzClip() && /^[0-9]+-[0-9]+$/.test(this.body.uniqueid)
+  }
+
   /** Patch a resource corresponding to a `Flag` service.
     */
   patchFlag () {

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/lib/DeconzService/Light.js

@@ -17,13 +17,15 @@ class Light extends DeconzService.LightsResource {
 
     this.capabilities = {
       on: this.resource.body.state.on !== undefined,
-      bri: this.resource.body.state.bri !== undefined,
-      ct: this.resource.body.state.ct !== undefined,
-      hs: this.resource.body.state.xy === undefined &&
-        this.resource.body.state.hue !== undefined,
-      xy: this.resource.body.state.xy !== undefined
+      bri: this.resource.body[this.stateKey].bri !== undefined,
+      ct: this.resource.body[this.stateKey].ct !== undefined,
+      hs: this.resource.body[this.stateKey].xy === undefined &&
+        this.resource.body[this.stateKey].hue !== undefined,
+      xy: this.resource.body[this.stateKey].xy !== undefined
     }
-    if (this.resource.body?.capabilities?.color?.effects != null) {
+    if (this.resource.body.action?.effect !== undefined) {
+      this.capabilities.colorLoop = true
+    } else if (this.resource.body?.capabilities?.color?.effects != null) {
       const effects = this.resource.body.capabilities.color.effects
       if (effects.length > 1 && effects[1] === 'colorloop') {
         this.capabilities.colorLoop = true
@@ -64,7 +66,7 @@ class Light extends DeconzService.LightsResource {
         key: 'brightness',
         Characteristic: this.Characteristics.hap.Brightness,
         unit: '%',
-        value: Math.round(this.resource.body.state.bri / 2.54)
+        value: Math.round(this.resource.body[this.stateKey].bri / 2.54)
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const bri = Math.round(value * 2.54)
@@ -88,7 +90,7 @@ class Light extends DeconzService.LightsResource {
     if (this.capabilities.ct || this.capabilities.xy || this.capabilities.hs) {
       this.addCharacteristicDelegate({
         key: 'colormode',
-        value: this.resource.body.state.colormode,
+        value: this.resource.body[this.stateKey].colormode,
         silent: true
       }).on('didSet', (value) => {
         this.resource.body.colormode = value
@@ -124,7 +126,7 @@ class Light extends DeconzService.LightsResource {
           minValue: ctMin,
           maxValue: ctMax
         },
-        value: this.resource.body.state.ct
+        value: this.resource.body[this.stateKey].ct
       }).on('didSet', (value, fromHomeKit) => {
         const ct = Math.max(ctMin, Math.min(value, ctMax))
         if (fromHomeKit) {
@@ -375,13 +377,13 @@ class Light extends DeconzService.LightsResource {
     // this.checkEffect(this.obj.state.effect)
   }
 
-  updateState (state) {
+  updateState (state, rpath, stateKey = 'state') {
     this.initAdaptiveLighting()
     let updateAdaptiveLighting = false
     for (const key in state) {
       const value = state[key]
-      // const oldValue = this.resource.body.state[key]
-      this.resource.body.state[key] = value
+      // const oldValue = this.resource.body[stateKey][key]
+      this.resource.body[stateKey][key] = value
       switch (key) {
         case 'all_on':
           this.values.on = value
@@ -393,7 +395,8 @@ class Light extends DeconzService.LightsResource {
           break
         case 'bri':
           if (!this.recentlyUpdated) {
-            this.values.brightness = Math.round(value / 2.54)
+            this.values.brightness = Math.max(1, Math.round(value / 2.54)) // iOS 16.4 Home bug
+            // this.values.brightness = Math.round(value / 2.54)
             updateAdaptiveLighting = true
           }
           break
@@ -417,6 +420,9 @@ class Light extends DeconzService.LightsResource {
           }
           break
         case 'on':
+          if (stateKey === 'action') {
+            break
+          }
           if (this.values.wallSwitch && !state.reachable) {
             if (this.values.on) {
               this.log('not reachable: force On to false')
@@ -476,8 +482,7 @@ class Light extends DeconzService.LightsResource {
         const service = new ServiceDelegate(this.accessoryDelegate, {
           name: this.resource.body.name + ' ' + scene.name,
           Service: this.Services.hap.Lightbulb,
-          subtype: this.subtype + '-S' + scene.id,
-          exposeConfiguredName: true
+          subtype: this.resource.subtype + '-S' + scene.id
         })
         service.addCharacteristicDelegate({
           key: 'on',
@@ -502,8 +507,6 @@ class Light extends DeconzService.LightsResource {
         })
         this.sceneServices[scene.id] = service
       }
-      this.sceneServices[scene.id].values.configuredName =
-        this.resource.body.name + ' ' + scene.name
     }
     for (const id in this.scenesServices) {
       if (sceneById[id] == null) {

package/lib/DeconzService/LightsResource.js

@@ -14,7 +14,8 @@ const { HttpError } = Deconz.ApiClient
 class LightsResource extends DeconzService {
   constructor (accessory, resource, params) {
     super(accessory, resource, params)
-    this.rpathState = this.rpath + (resource.rtype === 'groups' ? '/action' : '/state')
+    this.stateKey = resource.rtype === 'groups' ? 'action' : 'state'
+    this.rpathState = this.rpath + '/' + this.stateKey
 
     this.updating = 0
     this.targetState = {}
@@ -62,7 +63,7 @@ class LightsResource extends DeconzService {
   // Collect changes into a combined request.
   async put (state) {
     for (const key in state) {
-      this.resource.body.state[key] = state[key]
+      this.resource.body[this.stateKey][key] = state[key]
       this.targetState[key] = state[key]
     }
     return this._put()

package/lib/DeconzService/Outlet.js

@@ -51,7 +51,7 @@ class Outlet extends DeconzService.LightsResource {
     }
   }
 
-  updateState (state, rpath) {
+  updateState (state) {
     for (const key in state) {
       const value = state[key]
       this.resource.body.state[key] = value

package/lib/DeconzService/Switch.js

@@ -45,7 +45,7 @@ class Switch extends DeconzService.LightsResource {
     }
   }
 
-  updateState (state, rpath) {
+  updateState (state) {
     for (const key in state) {
       const value = state[key]
       this.resource.body.state[key] = value

package/lib/DeconzService/WarningDevice.js

@@ -57,7 +57,7 @@ class WarningDevice extends DeconzService.LightsResource {
     this.update(resource.body, resource.rpath)
   }
 
-  updateState (state, rpath) {
+  updateState (state) {
     if (state.on != null) {
       this.values.on = state.on
     }

package/lib/DeconzService/index.js

@@ -104,8 +104,13 @@ class DeconzService extends ServiceDelegate {
     if (body.state != null) {
       this.updateState(body.state, rpath)
     }
-    if (body.scenes != null && this.rtype === 'groups') {
-      this.updateScenes(body.scenes)
+    if (this.rtype === 'groups') {
+      if (body.action != null) {
+        this.updateState(body.action, rpath, 'action')
+      }
+      if (body.scenes != null) {
+        this.updateScenes(body.scenes)
+      }
     }
   }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -23,12 +23,12 @@
   "engines": {
     "deCONZ": "2.21.2",
     "homebridge": "^1.6.0",
-    "node": "^18.15.0"
+    "node": "^18.16.0"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.13",
+    "homebridge-lib": "~6.3.14",
     "ws": "^8.13.0",
-    "xml2js": "~0.4.23"
+    "xml2js": "~0.5.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",