homebridge-deconz 0.0.18 → 0.0.22

package/README.md

@@ -82,3 +82,6 @@ Allow ample time after exposing or removing accessories for HomeKit to sync the
 Homebridge deCONZ includes the `deconz` command-line utility, to discover,
 monitor, and interact with a deCONZ gateway.
 See the [`deconz` Tutorial](https://github.com/ebaauw/homebridge-deconz/wiki/%60deconz%60-Tutorial) in the Wiki for more info.
+
+### Troubleshooting
+- As mentioned above, Homebridge deCONZ is still under development.  Sometimes, cached accessories from an older version might confuse a newer version, causing all sorts of weird errors.  In this case, best un-expose the offending accessory, wait for HomeKit to remove it, and re-expose the accessory.  Note that this will cause HomeKit to see a new accessory, and lose any associations with HomeKit rooms, groups, scenes, and automations.

package/config.schema.json

@@ -14,6 +14,13 @@
         "required": true,
         "default": "deCONZ"
       },
+      "brightnessAdjustment": {
+        "description": "Adjustment factor for brightness for adaptive lighting.  Default: 100.",
+        "type": "integer",
+        "placeholder": 100,
+        "minimum": 10,
+        "maximum": 100
+      },
       "forceHttp": {
         "description": "Use plain http instead of https.",
         "type": "boolean"
@@ -94,6 +101,7 @@
       "title": "Advanced Settings",
       "description": "Don't change these, unless you understand what you're doing.",
       "items": [
+        "brightnessAdjustment",
         "forceHttp",
         "parallelRequests",
         "stealth",

package/lib/DeconzAccessory/index.js

@@ -144,13 +144,15 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
     if (params.serviceName === 'Battery') {
       service = this.serviceByServiceName.Battery
     } else if (params.serviceName === 'Consumption') {
-      service = this.serviceByServiceName.Light ||
+      service = this.serviceByServiceName.Outlet ||
+        this.serviceByServiceName.Light ||
         this.serviceByServiceName.Power
       if (service != null) {
         service.addResource(resource)
       }
     } else if (params.serviceName === 'Power') {
-      service = this.serviceByServiceName.Light ||
+      service = this.serviceByServiceName.Outlet ||
+        this.serviceByServiceName.Light ||
         this.serviceByServiceName.Consumption
       if (service != null) {
         service.addResource(resource)

package/lib/DeconzPlatform.js

@@ -25,6 +25,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
 
   parseConfigJson (configJson) {
     this.config = {
+      brightnessAdjustment: 100,
       forceHttp: false,
       hosts: [],
       noResponse: false,
@@ -44,6 +45,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
       })
       .stringKey('name')
       .stringKey('platform')
+      .intKey('brightnessAdjustment', 10, 100)
       .boolKey('forceHttp')
       .stringKey('host')
       .arrayKey('hosts')
@@ -61,6 +63,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
 
     try {
       optionParser.parse(configJson)
+      this.config.brightnessAdjustment /= 100
       if (this.config.host != null) {
         this.config.hosts.push(this.config.host)
       }
@@ -170,7 +173,8 @@ class DeconzPlatform extends homebridgeLib.Platform {
       }
       for (const id in this.gatewayMap) {
         const gateway = this.gatewayMap[id]
-        dumpInfo.gatewayMap[id] = gateway.context
+        dumpInfo.gatewayMap[id] = Object.assign({}, gateway.context)
+        dumpInfo.gatewayMap[id].deviceById = gateway.deviceById
       }
       await this.createDumpFile(dumpInfo)
     } catch (error) { this.error(error) }

package/lib/DeconzService/AirPurifier.js

@@ -47,7 +47,7 @@ class FilterMaintenance extends DeconzService.SensorsResource {
       )
     }
     if (state.replacefilter != null) {
-      this.values.filterChange = state.filterChange
+      this.values.filterChange = state.replacefilter
         ? this.Characteristics.hap.FilterChangeIndication.CHANGE_FILTER
         : this.Characteristics.hap.FilterChangeIndication.FILTER_OK
     }
@@ -158,16 +158,6 @@ class AirPurifier extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (this.values.filterLifeTime != null && state.filterruntime != null) {
-      this.values.filterLifeLevel = 100 - Math.round(
-        100 * state.filterruntime / this.values.filterLifeTime
-      )
-    }
-    if (state.replacefilter != null) {
-      this.values.filterChange = state.replacefilter
-        ? this.Characteristics.hap.FilterChangeIndication.CHANGE_FILTER
-        : this.Characteristics.hap.FilterChangeIndication.FILTER_OK
-    }
     if (state.speed != null) {
       this.values.active = state.speed > 0
         ? this.Characteristics.hap.Active.ACTIVE

package/lib/DeconzService/Consumption.js

@@ -31,6 +31,14 @@ class Consumption extends DeconzService.SensorsResource {
         unit: ' W'
       })
     }
+
+    if (service.values.lastUpdated === undefined) {
+      service.addCharacteristicDelegate({
+        key: 'lastUpdated',
+        Characteristic: service.Characteristics.my.LastUpdated,
+        silent: true
+      })
+    }
   }
 
   static updateResourceState (service, state) {
@@ -51,7 +59,7 @@ class Consumption extends DeconzService.SensorsResource {
 
     Consumption.addResource(this, resource)
 
-    super.addCharacteristicDelegates()
+    super.addCharacteristicDelegates({ noLastUpdated: true })
 
     this.update(resource.body)
   }

package/lib/DeconzService/Light.js

@@ -92,11 +92,11 @@ class Light extends DeconzService.LightsResource {
         },
         value: this.resource.body.state.ct
       }).on('didSet', (value, fromHomeKit) => {
-        this.checkAdaptiveLighting()
         const ct = Math.max(
           this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
         )
         if (fromHomeKit) {
+          this.checkAdaptiveLighting()
           this.put({ ct })
           this.values.colormode = 'ct'
         }
@@ -190,6 +190,7 @@ class Light extends DeconzService.LightsResource {
     this.addCharacteristicDelegates()
 
     if (this.capabilities.bri && this.capabilities.ct && !this.capabilities.hs) {
+      this.adaptiveLightingNotInitialised = true
       this.addCharacteristicDelegate({
         key: 'supportedTransitionConfiguration',
         Characteristic: this.Characteristics.hap
@@ -214,7 +215,7 @@ class Light extends DeconzService.LightsResource {
           const response = this.adaptiveLighting.generateControlResponse()
           const parsedResponse = this.adaptiveLighting.parseControl(response)
           this.vdebug(
-            'Adaptive Lighting: control update: %j => %j',
+            'adaptive lighting: control update: %j => %j',
             control, parsedResponse
           )
           this.values.activeTransitionCount = parsedResponse === '' ? 0 : 1
@@ -228,7 +229,7 @@ class Light extends DeconzService.LightsResource {
         silent: true,
         value: 0
       }).on('didSet', (value) => {
-        this.log('Adaptive Lighting: %sabled', value > 0 ? 'en' : 'dis')
+        this.log('adaptive lighting: %sabled', value > 0 ? 'en' : 'dis')
         if (value) {
           this.updateAdaptiveLighting()
         }
@@ -314,7 +315,6 @@ class Light extends DeconzService.LightsResource {
     }
 
     this.settings = {
-      brightnessAdjustment: 1,
       resetTimeout: this.platform.config.resetTimeout,
       waitTimeUpdate: this.platform.config.waitTimeUpdate,
       wallSwitch: false
@@ -322,9 +322,11 @@ class Light extends DeconzService.LightsResource {
   }
 
   updateState (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
       switch (key) {
         case 'all_on':
@@ -427,7 +429,8 @@ class Light extends DeconzService.LightsResource {
   }
 
   initAdaptiveLighting () {
-    if (this.adaptiveLighting == null) {
+    if (this.adaptiveLightingNotInitialised) {
+      delete this.adaptiveLightingNotInitialised
       this.adaptiveLighting = new homebridgeLib.AdaptiveLighting(
         this.brightnessDelegate, this.colorTemperatureDelegate
       )
@@ -435,11 +438,11 @@ class Light extends DeconzService.LightsResource {
         const control = this.adaptiveLighting.parseControl(
           this.context.transitionControl
         )
-        this.vdebug('Adaptive Lighting: restore control: %j', control)
+        this.vdebug('adaptive lighting: restore control: %j', control)
         this.adaptiveLighting.parseControl(this.context.transitionControl)
       }
       this.log(
-        'Adaptive Lighting: %sabled',
+        'adaptive lighting: %sabled',
         this.values.activeTransitionCount > 0 ? 'en' : 'dis'
       )
     }
@@ -454,24 +457,21 @@ class Light extends DeconzService.LightsResource {
       return
     }
     const ct = this.adaptiveLighting.getCt(
-      this.values.brightness * this.settings.brightnessAdjustment
+      this.values.brightness * this.platform.config.brightnessAdjustment
     )
     if (ct == null) {
-      this.warn('assertion failed')
+      this.warn('adaptive lighting: cannot compute Color Temperature')
       return
     }
-    this.debug(
-      '/%s/%d: adaptive lighting: {"state":{"ct": %d}}',
-      this.rtype, this.rid, ct
-    )
     if (this.values.colormode === 'ct' && ct === this.values.colorTemperature) {
       return
     }
+    this.debug('adaptive lighting: set Color Temperature to %d mired', ct)
     this.put({ ct })
     this.fromAdaptiveLighting = true
     this.values.colormode = 'ct'
     if (ct !== this.values.colorTemperature) {
-      this.values.colorTemperature = ct
+      this.values.colorTemperature = ct // should only do this when PUT succeeds
     } else if (this.capabilities.xy) { // colormode changed
       const { h, s } = xyToHsv(ctToXy(ct), this.capabilities.gamut)
       this.values.hue = h

package/lib/DeconzService/LightsResource.js

@@ -17,6 +17,7 @@ class LightsResource extends DeconzService {
     super(accessory, resource, params)
     this.rpath += resource.rtype === 'groups' ? '/action' : '/state'
 
+    this.updating = 0
     this.targetState = {}
     this.deferrals = []
   }
@@ -65,16 +66,15 @@ class LightsResource extends DeconzService {
   // Send the request (for the combined changes) to the gateway.
   async _put () {
     try {
-      if (this.updating) {
-        return
-      }
-      this.updating = true
       if (this.platform.config.waitTimeUpdate > 0) {
+        this.updating++
         await timeout(this.platform.config.waitTimeUpdate)
+        if (--this.updating > 0) {
+          return
+        }
       }
       const targetState = this.targetState
       this.targetState = {}
-      this.updating = false
       if (
         this.gateway.transitionTime !== this.gateway.defaultTransitionTime &&
         targetState.transitiontime === undefined

package/lib/DeconzService/Power.js

@@ -69,7 +69,7 @@ class Power extends DeconzService.SensorsResource {
 
     Power.addResource(this, resource)
 
-    super.addCharacteristicDelegates()
+    super.addCharacteristicDelegates({ noLastUpdated: true })
 
     this.update(resource.body)
   }

package/lib/DeconzService/Switch.js

@@ -29,13 +29,13 @@ class Switch extends DeconzService.SensorsResource {
   }
 
   createButtonServices (resource) {
-    if (resource.body.type === 'ZHASwitch') {
+    if (resource.body.type.endsWith('Switch')) {
       this.buttonResources[resource.rpath] = {
         buttonEvent: resource.body.state.buttonevent,
         lastUpdated: '',
         toButtonEvent: resource.capabilities.toButtonEvent
       }
-    } else if (resource.body.type === 'ZHARelativeRotary') {
+    } else if (resource.body.type.endsWith('RelativeRotary')) {
       const keys = Object.keys(resource.capabilities.buttons)
       this.buttonResources[resource.rpath] = {
         lastUpdated: '',

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.18",
+  "version": "0.0.22",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -22,10 +22,10 @@
   "engines": {
     "deCONZ": "2.17.1",
     "homebridge": "^1.5.0",
-    "node": "^16.16.0"
+    "node": "^16.17.0"
   },
   "dependencies": {
-    "homebridge-lib": "~5.6.4",
+    "homebridge-lib": "~5.6.5",
     "semver": "^7.3.7",
     "ws": "^8.8.1",
     "xml2js": "~0.4.23"