homebridge-deconz 0.0.9 → 0.0.10

package/config.schema.json

@@ -69,7 +69,7 @@
         "maximum": 2000
       },
       "waitTimeUpdate": {
-        "description": "The time, in milliseconds, to wait for a change from HomeKit to another characteristic for the same light or group, before updating the deCONZ gateway.  Default: 20.",
+        "description": "The time, in milliseconds, to wait for a change from HomeKit to another characteristic for the same light or group, before updating the deCONZ gateway.  Default: 100.",
         "type": "integer",
         "minimum": 0,
         "maximum": 500

package/lib/Deconz/Resource.js

@@ -161,8 +161,8 @@ class Resource {
         */
       this.zigbee = true
     } else {
-      this.subtype = '-' + rtype[0].toUpperCase() + rid
-      this.id = gateway.id + this.subtype
+      this.subtype = rtype[0].toUpperCase() + rid
+      this.id = gateway.id + '-' + this.subtype
       this.zigbee = false
     }
 

package/lib/DeconzAccessory/Gateway.js

@@ -139,6 +139,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       primaryService: true,
       host: params.host
     })
+    this.manageLogLevel(this.service.characteristicDelegate('logLevel'))
 
     /** The service delegate for the Stateless Programmable Switch service.
       * @type {DeconzService.Button}

package/lib/DeconzAccessory/Light.js

@@ -33,12 +33,14 @@ class Light extends DeconzAccessory {
       expose: true,
       logLevel: gateway.logLevel
     })
+    this.manageLogLevel(this.settingsService.characteristicDelegate('logLevel'))
 
     this
       .on('polled', (device) => {
-        this.debug('%s: polled: %j', device.resource.rpath, device.resource.body)
+        this.debug(
+          '%s: polled: %j', device.rpaths.join(', '), device.resource.body
+        )
         this.service.update(device.resource.body)
-        this.service.checkAdaptiveLighting()
       })
       .on('changed', (rpath, body) => {
         if (rpath === device.resource.rpath) {

package/lib/DeconzAccessory/index.js

@@ -28,8 +28,7 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
       manufacturer: device.resource.manufacturer,
       model: device.resource.model,
       firmware: device.resource.firmware,
-      category: category,
-      logLevel: gateway.logLevel
+      category: category
     })
 
     /** The gateway.

package/lib/DeconzPlatform.js

@@ -37,7 +37,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
       waitTimePutGroup: 1000,
       waitTimeResend: 300,
       waitTimeReset: 500,
-      waitTimeUpdate: 20
+      waitTimeUpdate: 100
     }
     const optionParser = new homebridgeLib.OptionParser(this.config, true)
     optionParser

package/lib/DeconzService/DeviceSettings.js

@@ -29,10 +29,7 @@ class DeviceSettings extends homebridgeLib.ServiceDelegate {
       this.addCharacteristicDelegate({
         key: 'logLevel',
         Characteristic: this.Characteristics.my.LogLevel,
-        value: params.logLevel,
-        silent: true
-      }).on('didSet', (value) => {
-        accessory.logLevel = value
+        value: params.logLevel
       })
     }
 

package/lib/DeconzService/GatewaySettings.js

@@ -71,10 +71,7 @@ class GatewaySettings extends homebridgeLib.ServiceDelegate {
     this.addCharacteristicDelegate({
       key: 'logLevel',
       Characteristic: this.Characteristics.my.LogLevel,
-      value: gateway.platform.logLevel,
-      silent: true
-    }).on('didSet', (value) => {
-      gateway.logLevel = value
+      value: gateway.platform.logLevel
     })
 
     this.addCharacteristicDelegate({

package/lib/DeconzService/Light.js

@@ -40,20 +40,24 @@ class Light extends homebridgeLib.ServiceDelegate {
       Characteristic: this.Characteristics.hap.On,
       value: this.capabilities.on
         ? this.resource.body.state.on
-        : this.resource.body.state.all_on,
-      setter: async (value) => { return this.put({ on: value }) }
-    }).on('didSet', (value, fromHomekit) => {
-      this.checkAdaptiveLighting()
+        : this.resource.body.state.all_on
+    }).on('didSet', (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        this.put({ on: value })
+        this.updateAdaptiveLighting()
+      }
     })
 
     if (!this.capabilities.on) {
       this.addCharacteristicDelegate({
         key: 'anyOn',
         Characteristic: this.Characteristics.my.AnyOn,
-        value: this.resource.body.state.any_on,
-        setter: async (value) => { return this.put({ on: value }) }
-      }).on('didSet', (value, fromHomekit) => {
-        this.checkAdaptiveLighting()
+        value: this.resource.body.state.any_on
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          this.put({ on: value })
+          this.updateAdaptiveLighting()
+        }
       })
     }
 
@@ -62,23 +66,21 @@ class Light extends homebridgeLib.ServiceDelegate {
         key: 'brightness',
         Characteristic: this.Characteristics.hap.Brightness,
         unit: '%',
-        value: this.resource.body.state.bri,
-        setter: async (value) => {
+        value: this.resource.body.state.bri
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
           const bri = Math.round(value * 254.0 / 100.0)
-          return this.put({ bri: bri })
+          this.put({ bri: bri })
+          this.updateAdaptiveLighting()
         }
-      }).on('didSet', (value, fromHomekit) => {
-        this.checkAdaptiveLighting()
       })
 
       this.addCharacteristicDelegate({
         key: 'brightnessChange',
         Characteristic: this.Characteristics.my.BrightnessChange,
-        value: 0,
-        setter: async (value) => {
-          return this.put({ bri_inc: Math.round(value * 254.0 / 100.0) })
-        }
-      }).on('didSet', async () => {
+        value: 0
+      }).on('didSet', async (value) => {
+        this.put({ bri_inc: Math.round(value * 254.0 / 100.0) })
         await timeout(this.platform.config.waitTimeReset)
         this.values.brightnessChange = 0
       })
@@ -88,7 +90,13 @@ class Light extends homebridgeLib.ServiceDelegate {
     if (this.capabilities.ct || this.capabilities.xy || this.capabilities.hs) {
       this.addCharacteristicDelegate({
         key: 'colormode',
-        value: this.resource.body.state.colormode
+        value: this.resource.body.state.colormode,
+        silent: true
+      }).on('didSet', (value) => {
+        this.resource.body.colormode = value
+        if (value !== 'ct') {
+          this.checkAdaptiveLighting()
+        }
       })
     }
 
@@ -101,118 +109,70 @@ class Light extends homebridgeLib.ServiceDelegate {
           minValue: this.capabilities.ctMin,
           maxValue: this.capabilities.ctMax
         },
-        value: this.resource.body.state.ct,
-        setter: async (value) => {
-          const ct = Math.max(
-            this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
-          )
-          return this.put({ ct: ct })
-        }
+        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.values.activeTransitionCount = 0
+          this.put({ ct: ct })
+          this.values.colormode = 'ct'
         }
-        if (
-          this.capabilities.xy && !this.capabilities.computesXy &&
-          this.values.colormode === 'ct'
-        ) {
-          const { h, s } = xyToHsv(ctToXy(value), this.capabilities.gamut)
+        if (this.capabilities.xy && this.values.colormode === 'ct') {
+          const { h, s } = xyToHsv(ctToXy(ct), this.capabilities.gamut)
           this.values.hue = h
           this.values.saturation = s
         }
       })
-
-      if (this.capabilities.bri) {
-        this.addCharacteristicDelegate({
-          key: 'supportedTransitionConfiguration',
-          Characteristic: this.Characteristics.hap
-            .SupportedCharacteristicValueTransitionConfiguration,
-          silent: true
-        })
-        this.addCharacteristicDelegate({
-          key: 'transitionControl',
-          Characteristic: this.Characteristics.hap
-            .CharacteristicValueTransitionControl,
-          silent: true,
-          getter: async () => {
-            await this.initAdaptiveLighting()
-            return this.adaptiveLighting.generateControl()
-          },
-          setter: async (value) => {
-            await this.initAdaptiveLighting()
-            this.adaptiveLighting.parseControl(value)
-            const response = this.adaptiveLighting.generateControlResponse()
-            this.values.activeTransitionCount = 1
-            return response
-          }
-        })
-        this.addCharacteristicDelegate({
-          key: 'activeTransitionCount',
-          Characteristic: this.Characteristics.hap
-            .CharacteristicValueActiveTransitionCount,
-          value: 0
-        }).on('didSet', (value) => {
-          if (!value) {
-            this.adaptiveLighting.deactivate()
-          } else {
-            this.checkAdaptiveLighting()
-          }
-        })
-      }
     }
 
     if (this.capabilities.xy) {
       this.addCharacteristicDelegate({
         key: 'hue',
         Characteristic: this.Characteristics.hap.Hue,
-        unit: '°',
-        setter: async (value) => {
-          const xy = hsvToXy(value, this.values.saturation, this.capabilities.gamut)
-          return this.put({ xy: xy })
-        }
-      }).on('didSet', (value, fromHomekit) => {
-        if (fromHomekit) {
-          this.values.activeTransitionCount = 0
+        unit: '°'
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          const xy = hsvToXy(
+            value, this.values.saturation, this.capabilities.gamut
+          )
+          this.put({ xy: xy })
+          this.values.colormode = 'xy'
         }
       })
       this.addCharacteristicDelegate({
         key: 'saturation',
         Characteristic: this.Characteristics.hap.Saturation,
-        unit: '%',
-        setter: async (value) => {
+        unit: '%'
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
           const xy = hsvToXy(this.values.hue, value, this.capabilities.gamut)
-          return this.put({ xy: xy })
-        }
-      }).on('didSet', (value, fromHomekit) => {
-        if (fromHomekit) {
-          this.values.activeTransitionCount = 0
+          this.put({ xy: xy })
+          this.values.colormode = 'xy'
         }
       })
     } else if (this.capabilities.hs) {
       this.addCharacteristicDelegate({
         key: 'hue',
         Characteristic: this.Characteristics.hap.Hue,
-        unit: '°',
-        setter: async (value) => {
+        unit: '°'
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
           const hue = Math.round(this.hk.hue * 65535.0 / 360.0)
-          return this.put({ hue: hue })
-        }
-      }).on('didSet', (value, fromHomekit) => {
-        if (fromHomekit) {
-          this.values.activeTransitionCount = 0
+          this.put({ hue: hue })
+          this.values.colormode = 'hs'
         }
       })
       this.addCharacteristicDelegate({
         key: 'saturation',
         Characteristic: this.Characteristics.hap.Saturation,
-        unit: '%',
-        setter: async (value) => {
+        unit: '%'
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
           const sat = Math.round(this.hk.sat * 254.0 / 100.0)
-          return this.put({ sat: sat })
-        }
-      }).on('didSet', (value, fromHomekit) => {
-        if (fromHomekit) {
-          this.values.activeTransitionCount = 0
+          this.put({ sat: sat })
+          this.values.colormode = 'hs'
         }
       })
     }
@@ -220,30 +180,36 @@ class Light extends homebridgeLib.ServiceDelegate {
     if (this.capabilities.colorLoop) {
       this.addCharacteristicDelegate({
         key: 'colorLoop',
-        Characteristic: this.Characteristics.my.ColorLoop,
-        setter: async (value) => {
+        Characteristic: this.Characteristics.my.ColorLoop
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
           const effect = value ? 'colorloop' : 'none'
           const state = { effect: effect }
           if (value) {
             state.colorloopspeed = this.values.colorLoopSpeed
           }
-          return this.put(state)
+          this.put(state)
+          this.values.colormode = 'hs'
         }
       })
       this.addCharacteristicDelegate({
         key: 'colorLoopSpeed',
         Characteristic: this.Characteristics.my.ColorLoopSpeed,
         unit: 's',
-        value: 25,
-        setter: async (value) => {
-          return this.put({ effect: 'colorloop', colorloopspeed: value })
+        value: 25
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          const effect = 'colorloop'
+          this.put({ effect: effect, colorloopspeed: value })
+          this.values.colormode = 'hs'
         }
       })
     }
 
     this.addCharacteristicDelegate({
       key: 'lastSeen',
-      Characteristic: this.Characteristics.my.LastSeen
+      Characteristic: this.Characteristics.my.LastSeen,
+      silent: true
     })
 
     this.addCharacteristicDelegate({
@@ -251,17 +217,65 @@ class Light extends homebridgeLib.ServiceDelegate {
       Characteristic: this.Characteristics.hap.StatusFault
     })
 
+    if (this.capabilities.bri && this.capabilities.ct && !this.capabilities.hs) {
+      this.addCharacteristicDelegate({
+        key: 'supportedTransitionConfiguration',
+        Characteristic: this.Characteristics.hap
+          .SupportedCharacteristicValueTransitionConfiguration,
+        silent: true
+      })
+      this.addCharacteristicDelegate({
+        key: 'transitionControl',
+        Characteristic: this.Characteristics.hap
+          .CharacteristicValueTransitionControl,
+        silent: true,
+        getter: async () => {
+          this.initAdaptiveLighting()
+          return this.adaptiveLighting.generateControl()
+        },
+        setter: async (value) => {
+          this.initAdaptiveLighting()
+          const control = this.adaptiveLighting.parseControl(value)
+          this.context.transitionControl = value
+          const response = this.adaptiveLighting.generateControlResponse()
+          const parsedResponse = this.adaptiveLighting.parseControl(response)
+          this.vdebug(
+            'Adaptive Lighting: control update: %j => %j',
+            control, parsedResponse
+          )
+          this.values.activeTransitionCount = parsedResponse === '' ? 0 : 1
+          return response
+        }
+      })
+      this.addCharacteristicDelegate({
+        key: 'activeTransitionCount',
+        Characteristic: this.Characteristics.hap
+          .CharacteristicValueActiveTransitionCount,
+        silent: true,
+        value: 0
+      }).on('didSet', (value) => {
+        this.log('Adaptive Lighting: %sabled', value > 0 ? 'en' : 'dis')
+        if (value) {
+          this.updateAdaptiveLighting()
+        }
+      })
+      if (this.values.supportedTransitionConfiguration != null) {
+        this.initAdaptiveLighting()
+      }
+    }
+
     this.settings = {
       brightnessAdjustment: 1,
       resetTimeout: this.platform.config.resetTimeout,
       waitTimeUpdate: this.platform.config.waitTimeUpdate,
       wallSwitch: false
     }
-
-    this.update(this.resource.body)
   }
 
   update (body) {
+    if (this.updating) {
+      return
+    }
     for (const key in body) {
       const value = body[key]
       switch (key) {
@@ -275,6 +289,7 @@ class Light extends homebridgeLib.ServiceDelegate {
           // this.values.lastBoot = dateToString(value)
           break
         case 'lastseen':
+          this.resource.body.lastseen = value
           this.values.lastSeen = dateToString(value)
           break
         case 'colorcapabilities':
@@ -302,25 +317,34 @@ class Light extends homebridgeLib.ServiceDelegate {
   }
 
   updateState (state) {
+    let updateAdaptiveLighting = false
     for (const key in state) {
       const value = state[key]
+      this.resource.body.state[key] = value
       switch (key) {
         case 'all_on':
           this.values.on = value
+          updateAdaptiveLighting = true
           break
         case 'any_on':
           this.values.anyOn = value
+          updateAdaptiveLighting = true
           break
         case 'alert':
           break
         case 'bri':
-          this.values.brightness = Math.round(value * 100.0 / 254.0)
+          if (!this.recentlyUpdated) {
+            this.values.brightness = Math.round(value * 100.0 / 254.0)
+            updateAdaptiveLighting = true
+          }
           break
         case 'colormode':
           this.values.colormode = value
           break
         case 'ct':
-          this.values.colorTemperature = value
+          if (!this.recentlyUpdated && this.values.colormode === 'ct') {
+            this.values.colorTemperature = value
+          }
           break
         case 'effect':
           break
@@ -345,7 +369,10 @@ class Light extends homebridgeLib.ServiceDelegate {
         case 'scene':
           break
         case 'xy':
-          if (this.values.colormode !== 'ct' || this.capabilities.computesXy) {
+          if (
+            !this.recentlyUpdated &&
+            (this.values.colormode !== 'ct' || this.capabilities.computesXy)
+          ) {
             const { h, s } = xyToHsv(value, this.capabilities.gamut)
             this.values.hue = h
             this.values.saturation = s
@@ -356,113 +383,145 @@ class Light extends homebridgeLib.ServiceDelegate {
           break
       }
     }
+    if (updateAdaptiveLighting) {
+      this.updateAdaptiveLighting()
+    }
   }
 
   async identify () {
     try {
       if (this.capabilities.alert) {
         if (this.capabilities.breathe) {
-          await this.put({ alert: 'breathe' })
+          await this.client.put({ alert: 'breathe' })
           await timeout(1500)
-          return this.put({ alert: 'stop' })
+          return this.client.put({ alert: 'stop' })
         }
         return this.put({ alert: 'select' })
       }
-    } catch (error) { this.warn(error) }
+    } catch (error) {
+      if (!(error instanceof Deconz.ApiClient.HttpError)) {
+        this.warn(error)
+      }
+    }
   }
 
-  async initAdaptiveLighting () {
+  initAdaptiveLighting () {
     if (this.adaptiveLighting == null) {
       this.adaptiveLighting = new homebridgeLib.AdaptiveLighting(
         this.brightnessDelegate, this.colorTemperatureDelegate
       )
       this.values.supportedTransitionConfiguration =
         this.adaptiveLighting.generateConfiguration()
-      if (
-        this.values.activeTransitionCount === 1 &&
-        this.values.transitionControl != null
-      ) {
-        this.adaptiveLighting.parseControl(this.values.transitionControl)
+      if (this.values.activeTransitionCount > 0) {
+        const control = this.adaptiveLighting.parseControl(
+          this.context.transitionControl
+        )
+        this.vdebug('Adaptive Lighting: restore control: %j', control)
+        this.adaptiveLighting.parseControl(this.context.transitionControl)
       }
+      this.log(
+        'Adaptive Lighting: %sabled',
+        this.values.activeTransitionCount > 0 ? 'en' : 'dis'
+      )
     }
   }
 
-  async checkAdaptiveLighting () {
-    if (this.adaptiveLighting == null || !this.values.on) {
+  async updateAdaptiveLighting () {
+    if (
+      this.adaptiveLighting == null || // not supported
+      this.values.activeTransitionCount === 0 || // disabled
+      !this.values.on // light is off
+    ) {
       return
     }
     const ct = this.adaptiveLighting.getCt(
       this.values.brightness * this.settings.brightnessAdjustment
     )
-    if (ct == null || ct === this.values.ct) {
+    if (ct == null) {
+      this.warn('assertion failed')
+      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.put({ ct: ct })
+    this.fromAdaptiveLighting = true
+    this.values.colormode = 'ct'
+    if (ct !== this.values.colorTemperature) {
+      this.values.colorTemperature = ct
+    } else if (this.capabilities.xy) { // colormode changed
+      const { h, s } = xyToHsv(ctToXy(ct), this.capabilities.gamut)
+      this.values.hue = h
+      this.values.saturation = s
+    }
+    this.fromAdaptiveLighting = false
+  }
+
+  checkAdaptiveLighting (key, value) {
+    if (this.fromAdaptiveLighting) {
       return
     }
-    return this.put({ ct: ct })
+    this.adaptiveLighting.deactivate()
+    this.values.activeTransitionCount = 0
   }
 
   // Collect changes into a combined request.
-  async put (state) {
-    return new Promise((resolve, reject) => {
-      for (const key in state) {
-        this.targetState[key] = state[key]
-      }
-      const d = { resolve: resolve, reject: reject }
-      this.deferrals.push(d)
+  put (state) {
+    for (const key in state) {
+      this.resource.body.state[key] = state[key]
+      this.targetState[key] = state[key]
+    }
+    this._put()
+  }
+
+  // Send the request (for the combined changes) to the gateway.
+  async _put () {
+    try {
       if (this.updating) {
         return
       }
       this.updating = true
       if (this.settings.waitTimeUpdate > 0) {
-        setTimeout(() => {
-          this._put()
-        }, this.settings.waitTimeUpdate)
-      } else {
-        this._put()
+        await timeout(this.settings.waitTimeUpdate)
       }
-    })
-  }
-
-  // Send the request (for the combined changes) to the gateway.
-  async _put () {
-    const targetState = this.targetState
-    const deferrals = this.deferrals
-    this.targetState = {}
-    this.deferrals = []
-    this.updating = false
-    if (
-      this.gateway.transitionTime !== this.gateway.defaultTransitionTime &&
-      targetState.transitiontime === undefined
-    ) {
-      targetState.transitiontime = this.gateway.transitionTime * 10
-      this.gateway.resetTransitionTime()
-    }
-    if (this.capabilities.noTransition) {
+      const targetState = this.targetState
+      this.targetState = {}
+      this.updating = false
       if (
-        (
-          targetState.on != null || targetState.bri != null ||
-          targetState.bri_inc != null
-        ) && (
-          targetState.xy != null || targetState.ct != null ||
-          targetState.hue != null || targetState.sat != null ||
-          targetState.effect != null
-        )
+        this.gateway.transitionTime !== this.gateway.defaultTransitionTime &&
+        targetState.transitiontime === undefined
       ) {
-        targetState.transitiontime = 0
+        targetState.transitiontime = this.gateway.transitionTime * 10
+        this.gateway.resetTransitionTime()
       }
-    }
-    this.client.put(this.rpath, targetState).then((obj) => {
-      this.recentlyUpdated = true
-      for (const d of deferrals) {
-        d.resolve(true)
+      if (this.capabilities.noTransition) {
+        if (
+          (
+            targetState.on != null || targetState.bri != null ||
+            targetState.bri_inc != null
+          ) && (
+            targetState.xy != null || targetState.ct != null ||
+            targetState.hue != null || targetState.sat != null ||
+            targetState.effect != null
+          )
+        ) {
+          targetState.transitiontime = 0
+        }
       }
-      setTimeout(() => {
-        this.recentlyUpdated = false
-      }, 500)
-    }).catch((error) => {
-      for (const d of deferrals) {
-        d.reject(error)
+      this.debug('PUT %s %j', this.rpath, targetState)
+      await this.client.put(this.rpath, targetState)
+      this.recentlyUpdated = true
+      await timeout(500)
+      this.recentlyUpdated = false
+    } catch (error) {
+      if (!(error instanceof Deconz.ApiClient.HttpError)) {
+        this.warn(error)
       }
-    })
+    }
   }
 }
 

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -21,11 +21,11 @@
   },
   "engines": {
     "deCONZ": "2.13.4",
-    "homebridge": "^1.3.9",
+    "homebridge": "^1.4.0",
     "node": "^16.13.2"
   },
   "dependencies": {
-    "homebridge-lib": "~5.1.24-6",
+    "homebridge-lib": "~5.2.0",
     "semver": "^7.3.5",
     "ws": "^8.4.2",
     "xml2js": "~0.4.23"