homebridge-deconz 0.0.26 → 0.1.0

package/lib/DeconzService/Consumption.js

@@ -39,6 +39,8 @@ class Consumption extends DeconzService.SensorsResource {
         silent: true
       })
     }
+
+    service.update(resource.body, resource.rpath)
   }
 
   static updateResourceState (service, state) {
@@ -61,7 +63,7 @@ class Consumption extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates({ noLastUpdated: true })
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Contact.js

@@ -20,33 +20,9 @@ class Contact extends DeconzService.SensorsResource {
       Characteristic: this.Characteristics.hap.ContactSensorState
     })
 
-    this.addCharacteristicDelegate({
-      key: 'timesOpened',
-      Characteristic: this.Characteristics.eve.TimesOpened,
-      value: 0
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'openDuration',
-      Characteristic: this.Characteristics.eve.OpenDuration,
-      value: 0
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'closedDuration',
-      Characteristic: this.Characteristics.eve.ClosedDuration,
-      value: 0
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'lastActivation',
-      Characteristic: this.Characteristics.eve.LastActivation,
-      silent: true
-    })
-
     this.addCharacteristicDelegates({ noTampered: true })
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Daylight.js

@@ -8,7 +8,7 @@
 const DeconzService = require('../DeconzService')
 const Deconz = require('../Deconz')
 
-const { dateToString, lightLevelToLux } = Deconz.ApiClient
+const { dateToString } = Deconz.ApiClient
 
 const daylightEvents = {
   100: { name: 'Solar Midnight', period: 'Night' },
@@ -27,15 +27,22 @@ const daylightEvents = {
   230: { name: 'Astronomical Dusk', period: 'Night' }
 }
 
+// Eve uses the following thresholds:
+const VERY_BRIGHT = 1000
+const BRIGHT = 300
+const NORMAL = 100
+const DIM = 10
+const DARK = 0
+
 const daylightPeriods = {
-  Night: { lightlevel: 0, daylight: false, dark: true },
-  'Astronomical Twilight': { lightlevel: 100, daylight: false, dark: true },
-  'Nautical Twilight': { lightlevel: 1000, daylight: false, dark: true },
-  Twilight: { lightlevel: 10000, daylight: false, dark: false },
-  Sunrise: { lightlevel: 15000, daylight: true, dark: false },
-  Sunset: { lightlevel: 20000, daylight: true, dark: false },
-  'Golden Hour': { lightlevel: 40000, daylight: true, dark: false },
-  Day: { lightlevel: 65535, daylight: true, dark: false }
+  Night: { lightLevel: DARK, dark: true, daylight: false },
+  'Astronomical Twilight': { lightLevel: DIM, dark: true, daylight: false },
+  'Nautical Twilight': { lightLevel: DIM, dark: true, daylight: false },
+  Twilight: { lightLevel: NORMAL, dark: false, daylight: false },
+  Sunrise: { lightLevel: BRIGHT, dark: false, daylight: true },
+  Sunset: { lightLevel: BRIGHT, dark: false, daylight: true },
+  'Golden Hour': { lightLevel: BRIGHT, dark: false, daylight: true },
+  Day: { lightLevel: VERY_BRIGHT, dark: false, daylight: true }
 }
 
 /**
@@ -47,7 +54,7 @@ class Daylight extends DeconzService.SensorsResource {
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({
-      key: 'lightlevel',
+      key: 'lightLevel',
       Characteristic: this.Characteristics.hap.CurrentAmbientLightLevel,
       unit: ' lux'
     })
@@ -101,7 +108,7 @@ class Daylight extends DeconzService.SensorsResource {
       this.warn('%s: %s not configured', resource.rpath, resource.body.type)
     }
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {
@@ -110,14 +117,10 @@ class Daylight extends DeconzService.SensorsResource {
       const { name, period } = daylightEvents[state.status]
       this.values.lastEvent = name
       this.values.period = period
-      const { lightlevel } = daylightPeriods[period]
-      this.values.lightlevel = lightLevelToLux(lightlevel)
-    }
-    if (state.dark != null) {
-      this.values.dark = state.dark
-    }
-    if (state.daylight != null) {
-      this.values.daylight = state.daylight
+      const { lightLevel, dark, daylight } = daylightPeriods[period]
+      this.values.lightLevel = lightLevel
+      this.values.dark = dark
+      this.values.daylight = daylight
     }
     if (state.sunrise != null) {
       this.values.sunrise = dateToString(state.sunrise)

package/lib/DeconzService/Flag.js

@@ -38,7 +38,7 @@ class Flag extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Gateway.js

@@ -0,0 +1,48 @@
+// homebridge-deconz/lib/DeconzService/Gateway.js
+// Copyright © 2022 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const homebridgeLib = require('homebridge-lib')
+
+/** Delegate class for a DeconzGateway service.
+  * @extends ServiceDelegate
+  * @memberof DeconzService
+  */
+class Gateway extends homebridgeLib.ServiceDelegate {
+  constructor (gateway, params = {}) {
+    params.Service = gateway.Services.my.DeconzGateway
+    params.exposeConfiguredName = true
+    super(gateway, params)
+    this.gateway = gateway
+
+    this.addCharacteristicDelegate({
+      key: 'lastUpdated',
+      Characteristic: this.Characteristics.my.LastUpdated,
+      silent: true
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'statusActive',
+      Characteristic: this.Characteristics.hap.StatusActive,
+      value: true,
+      silent: true
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'transitionTime',
+      Characteristic: this.Characteristics.my.TransitionTime,
+      value: this.gateway.defaultTransitionTime
+    })
+    this.values.transitionTime = this.gateway.defaultTransitionTime
+  }
+
+  update (config) {
+    this.values.expose = true
+    this.values.lastUpdated = new Date().toString().slice(0, 24)
+  }
+}
+
+module.exports = Gateway

package/lib/DeconzService/Humidity.js

@@ -23,7 +23,7 @@ class Humidity extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Leak.js

@@ -22,7 +22,7 @@ class Leak extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Light.js

@@ -8,6 +8,7 @@
 const homebridgeLib = require('homebridge-lib')
 const DeconzService = require('../DeconzService')
 
+const { History } = homebridgeLib.ServiceDelegate
 const { timeout } = homebridgeLib
 const { xyToHsv, hsvToXy, ctToXy } = homebridgeLib.Colour
 
@@ -207,6 +208,7 @@ class Light extends DeconzService.LightsResource {
           .CharacteristicValueTransitionControl,
         silent: true,
         getter: async () => {
+          this.initAdaptiveLighting()
           return this.adaptiveLighting.generateControl()
         },
         setter: async (value) => {
@@ -238,81 +240,24 @@ class Light extends DeconzService.LightsResource {
     }
 
     if (this.resource.rtype === 'groups') {
-      this.sceneServices = {}
-      this.updateScenes(this.resource.body.scenes)
+      this.addCharacteristicDelegate({
+        key: 'exposeScenes',
+        value: true
+      })
+      if (this.values.exposeScenes) {
+        this.sceneServices = {}
+        this.updateScenes(this.resource.body.scenes)
+      }
     }
 
     if (this.capabilities.effects != null) {
-      this.effectServices = []
       this.addCharacteristicDelegate({
-        key: 'effect',
-        value: -1,
-        silent: true
-      }).on('didSet', (value) => {
-        for (const i in this.capabilities.effects) {
-          this.effectServices[i].values.on = value === i
-        }
+        key: 'exposeEffects',
+        value: true
       })
-      for (const i in this.capabilities.effects) {
-        const effect = this.capabilities.effects[i]
-        const service = new homebridgeLib.ServiceDelegate(accessory, {
-          name: this.resource.body.name + ' ' + effect,
-          Service: this.Services.hap.Switch,
-          subtype: this.subtype + '-E' + i
-        })
-        service.addCharacteristicDelegate({
-          key: 'on',
-          Characteristic: this.Characteristics.hap.On
-        }).on('didSet', (value, fromHomeKit) => {
-          if (fromHomeKit) {
-            this.checkAdaptiveLighting()
-            this.values.effect = value ? i : -1
-            const newEffect = value
-              ? effect.toLowerCase()
-              : 'none'
-            this.put({ effect: newEffect })
-          }
-        })
-        this.effectServices.push(service)
+      if (this.values.exposeEffects) {
+        this.exposeEffects()
       }
-      // if (this.capabilities.effectSpeed) {
-      //   this.addCharacteristicDelegate({
-      //     key: 'effectSpeed',
-      //     Characteristic: this.Characteristics.my.EffectSpeed,
-      //     value: 50
-      //   }).on('didSet', (value) => {
-      //     this.setEffectSpeed(value)
-      //   })
-      //   this.hk.effectColours = []
-      //   for (let i = 0; i <= 5; i++) {
-      //     const service = new this.Service.Lightbulb(
-      //       this.name + ' Effect Color ' + (i + 1), this.subtype + '-C' + i
-      //     )
-      //     service.addCharacteristicDelegate({
-      //       key: 'on',
-      //       Characteristic: this.Characteristics.hap.On,
-      //       value: true
-      //     }).on('didSet', (value) => {
-      //       this.setEffectOn(i, value)
-      //     })
-      //     service.addCharacteristicDelegate({
-      //       key: 'hue',
-      //       Characteristic: this.Characteristics.hap.Hue,
-      //       value: i * 60
-      //     }).on('didSet', (value) => {
-      //       this.setEffectHue(i, value)
-      //     })
-      //     service.addCharacteristicDelegate({
-      //       key: 'saturation',
-      //       Characteristic: this.Characteristics.hap.Saturation,
-      //       value: 100
-      //     }).on('didSet', (value) => {
-      //       this.setEffectSat(i, value)
-      //     })
-      //     this.effectServices.push(service)
-      //   }
-      // }
-      // this.checkEffect(this.obj.state.effect)
     }
 
     this.settings = {
@@ -322,6 +267,100 @@ class Light extends DeconzService.LightsResource {
     }
   }
 
+  exposeEffects () {
+    this.effectServices = {}
+    this.addCharacteristicDelegate({
+      key: 'effect',
+      value: -1,
+      silent: true
+    }).on('didSet', (value) => {
+      for (const i in this.capabilities.effects) {
+        this.effectServices[i].values.on = value === i
+      }
+    })
+    for (const id in this.capabilities.effects) {
+      const effect = this.capabilities.effects[id]
+      const service = new homebridgeLib.ServiceDelegate(this.accessoryDelegate, {
+        name: this.resource.body.name + ' ' + effect,
+        Service: this.Services.hap.Lightbulb,
+        subtype: this.subtype + '-E' + id,
+        exposeConfiguredName: true
+      })
+      service.addCharacteristicDelegate({
+        key: 'on',
+        Characteristic: this.Characteristics.hap.On
+      }).on('didSet', (value, fromHomeKit) => {
+        service.values.lastActivation =
+          this.accessoryDelegate.historyService.lastActivationValue(History.now())
+        if (fromHomeKit) {
+          this.checkAdaptiveLighting()
+          this.values.effect = value ? id : -1
+          const newEffect = value
+            ? effect.toLowerCase()
+            : 'none'
+          this.put({ effect: newEffect })
+        }
+      })
+      service.addCharacteristicDelegate({
+        key: 'index',
+        Characteristic: this.Characteristics.hap.ServiceLabelIndex,
+        value: Number(id) + 1
+      })
+      service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
+      })
+      this.effectServices[id] = service
+
+      this.characteristicDelegate('configuredName')
+        .on('didSet', (value) => {
+          for (const id in this.capabilities.effects) {
+            this.effectServices[id].values.configuredName = value +
+              ' ' + this.capabilities.effects[id]
+          }
+        })
+    }
+    // if (this.capabilities.effectSpeed) {
+    //   this.addCharacteristicDelegate({
+    //     key: 'effectSpeed',
+    //     Characteristic: this.Characteristics.my.EffectSpeed,
+    //     value: 50
+    //   }).on('didSet', (value) => {
+    //     this.setEffectSpeed(value)
+    //   })
+    //   this.hk.effectColours = []
+    //   for (let i = 0; i <= 5; i++) {
+    //     const service = new this.Service.Lightbulb(
+    //       this.name + ' Effect Color ' + (i + 1), this.subtype + '-C' + i
+    //     )
+    //     service.addCharacteristicDelegate({
+    //       key: 'on',
+    //       Characteristic: this.Characteristics.hap.On,
+    //       value: true
+    //     }).on('didSet', (value) => {
+    //       this.setEffectOn(i, value)
+    //     })
+    //     service.addCharacteristicDelegate({
+    //       key: 'hue',
+    //       Characteristic: this.Characteristics.hap.Hue,
+    //       value: i * 60
+    //     }).on('didSet', (value) => {
+    //       this.setEffectHue(i, value)
+    //     })
+    //     service.addCharacteristicDelegate({
+    //       key: 'saturation',
+    //       Characteristic: this.Characteristics.hap.Saturation,
+    //       value: 100
+    //     }).on('didSet', (value) => {
+    //       this.setEffectSat(i, value)
+    //     })
+    //     this.effectServices.push(service)
+    //   }
+    // }
+    // this.checkEffect(this.obj.state.effect)
+  }
+
   updateState (state) {
     this.initAdaptiveLighting()
     let updateAdaptiveLighting = false
@@ -399,8 +438,9 @@ class Light extends DeconzService.LightsResource {
       if (this.sceneServices[scene.id] == null) {
         const service = new homebridgeLib.ServiceDelegate(this.accessoryDelegate, {
           name: this.resource.body.name + ' ' + scene.name,
-          Service: this.Services.hap.Switch,
-          subtype: this.subtype + '-S' + scene.id
+          Service: this.Services.hap.Lightbulb,
+          subtype: this.subtype + '-S' + scene.id,
+          exposeConfiguredName: true
         })
         service.addCharacteristicDelegate({
           key: 'on',
@@ -418,8 +458,15 @@ class Light extends DeconzService.LightsResource {
             service.values.on = false
           }
         })
+        service.addCharacteristicDelegate({
+          key: 'index',
+          Characteristic: this.Characteristics.hap.ServiceLabelIndex,
+          value: Number(scene.id) + 1
+        })
         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) {
@@ -452,13 +499,13 @@ class Light extends DeconzService.LightsResource {
   async updateAdaptiveLighting () {
     if (
       this.adaptiveLighting == null || // not supported
-      this.values.activeTransitionCount === 0 || // disabled
-      !this.values.on // light is off
+      this.values.activeTransitionCount === 0 // disabled
+      // !this.values.on // light is off
     ) {
       return
     }
     const ct = this.adaptiveLighting.getCt(
-      this.values.brightness * this.platform.config.brightnessAdjustment
+      this.values.brightness * this.gateway.values.brightnessAdjustment
     )
     if (ct == null) {
       this.warn('adaptive lighting: cannot compute Color Temperature')

package/lib/DeconzService/LightLevel.js

@@ -19,7 +19,7 @@ class LightLevel extends DeconzService.SensorsResource {
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({
-      key: 'lightlevel',
+      key: 'lightLevel',
       Characteristic: this.Characteristics.hap.CurrentAmbientLightLevel,
       unit: ' lux'
     })
@@ -36,12 +36,12 @@ class LightLevel extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {
     if (state.lightlevel != null) {
-      this.values.lightlevel = lightLevelToLux(state.lightlevel)
+      this.values.lightLevel = lightLevelToLux(state.lightlevel)
     }
     if (state.dark != null) {
       this.values.dark = state.dark

package/lib/DeconzService/LightsResource.js

@@ -15,7 +15,7 @@ const { timeout } = homebridgeLib
 class LightsResource extends DeconzService {
   constructor (accessory, resource, params) {
     super(accessory, resource, params)
-    this.rpath += resource.rtype === 'groups' ? '/action' : '/state'
+    this.rpathState = this.rpath + (resource.rtype === 'groups' ? '/action' : '/state')
 
     this.updating = 0
     this.targetState = {}
@@ -23,16 +23,18 @@ class LightsResource extends DeconzService {
   }
 
   addCharacteristicDelegates (params = {}) {
-    this.addCharacteristicDelegate({
-      key: 'lastSeen',
-      Characteristic: this.Characteristics.my.LastSeen,
-      silent: true
-    })
+    if (this.resource.rtype !== 'groups') {
+      this.addCharacteristicDelegate({
+        key: 'lastSeen',
+        Characteristic: this.Characteristics.my.LastSeen,
+        silent: true
+      })
 
-    this.addCharacteristicDelegate({
-      key: 'statusFault',
-      Characteristic: this.Characteristics.hap.StatusFault
-    })
+      this.addCharacteristicDelegate({
+        key: 'statusFault',
+        Characteristic: this.Characteristics.hap.StatusFault
+      })
+    }
   }
 
   updateState (state) {
@@ -43,24 +45,28 @@ class LightsResource extends DeconzService {
     }
   }
 
+  updateConfig (config) {
+  }
+
   async identify () {
     if (this.capabilities.alert) {
       if (this.capabilities.breathe) {
-        await this.client.put(this.rpath, { alert: 'breathe' })
-        await timeout(1500)
-        await this.client.put(this.rpath, { alert: 'stop' })
+        await this.put({ alert: 'breathe' })
+        await timeout(1000)
+        await this.put({ alert: 'stop' })
+      } else {
+        await this.put({ alert: 'select' })
       }
-      await this.put(this.rpath, { alert: 'select' })
     }
   }
 
   // Collect changes into a combined request.
-  put (state) {
+  async put (state) {
     for (const key in state) {
       this.resource.body.state[key] = state[key]
       this.targetState[key] = state[key]
     }
-    this._put()
+    return this._put()
   }
 
   // Send the request (for the combined changes) to the gateway.
@@ -96,8 +102,8 @@ class LightsResource extends DeconzService {
           targetState.transitiontime = 0
         }
       }
-      this.debug('PUT %s %j', this.rpath, targetState)
-      await this.client.put(this.rpath, targetState)
+      this.debug('PUT %s %j', this.rpathState, targetState)
+      await this.client.put(this.rpathState, targetState)
       this.recentlyUpdated = true
       await timeout(500)
       this.recentlyUpdated = false

package/lib/DeconzService/Motion.js

@@ -15,13 +15,13 @@ class Motion extends DeconzService.SensorsResource {
     params.Service = accessory.Services.hap.MotionSensor
     super(accessory, resource, params)
 
-    this.durationKey = resource.body.config.delay !== null ? 'delay' : 'duration'
+    this.durationKey = resource.body.config.delay != null ? 'delay' : 'duration'
     this.sensitivitymax = resource.body.config.sensitivitymax
 
     this.addCharacteristicDelegate({
       key: 'motion',
       Characteristic: this.Characteristics.hap.MotionDetected,
-      value: 0
+      value: false
     })
 
     this.addCharacteristicDelegate({
@@ -52,15 +52,9 @@ class Motion extends DeconzService.SensorsResource {
       }
     })
 
-    this.addCharacteristicDelegate({
-      key: 'lastActivation',
-      Characteristic: this.Characteristics.eve.LastActivation,
-      silent: true
-    })
-
     this.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Power.js

@@ -46,6 +46,7 @@ class Power extends DeconzService.SensorsResource {
         silent: true
       })
     }
+    service.update(resource.body, resource.rpath)
   }
 
   static updateResourceState (service, state) {
@@ -71,7 +72,7 @@ class Power extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates({ noLastUpdated: true })
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Status.js

@@ -39,7 +39,7 @@ class Status extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/WindowCovering.js

@@ -15,6 +15,12 @@ class WindowCovering extends DeconzService.LightsResource {
     params.Service = accessory.Services.hap.WindowCovering
     super(accessory, resource, params)
 
+    this.addCharacteristicDelegate({
+      key: 'venetianBlind',
+      value: false,
+      silent: true
+    })
+
     this.addCharacteristicDelegate({
       key: 'currentPosition',
       Characteristic: this.Characteristics.hap.CurrentPosition,
@@ -47,7 +53,7 @@ class WindowCovering extends DeconzService.LightsResource {
       this.values.positionState = this.Characteristics.hap.PositionState.STOPPED
     })
 
-    if (this.venetianBlind) {
+    if (this.values.venetianBlind) {
       this.addCharacteristicDelegate({
         key: 'closeUpwards',
         Characteristic: this.Characteristics.my.CloseUpwards
@@ -55,7 +61,9 @@ class WindowCovering extends DeconzService.LightsResource {
         if (!fromHomeKit) {
           return
         }
-        await this.setPosition()
+        if (this.values.currentPosition !== 100) {
+          await this.setPosition()
+        }
       })
     }
 
@@ -100,7 +108,7 @@ class WindowCovering extends DeconzService.LightsResource {
 
   async setPosition () {
     let lift = 100 - this.values.targetPosition // % closed --> % open
-    if (this.venetianBlind) {
+    if (this.values.venetianBlind) {
       if (this.values.closeUpwards) {
         lift *= -1
       }
@@ -121,7 +129,9 @@ class WindowCovering extends DeconzService.LightsResource {
     if (state.lift != null) {
       let position = Math.round(state.lift / 5) * 5
       let closeUpwards
-      if (this.venetianBlind) {
+      if (this.values.venetianBlind) {
+        position *= 2
+        position -= 100
         if (position < 0) {
           position *= -1
           closeUpwards = true