homebridge-deconz 1.0.0 → 1.0.2

package/lib/Deconz/Device.js

@@ -28,13 +28,24 @@ class Device {
       */
     this.id = resource.id
 
-    /** Zigbee device vs virtual device.
+    /** The key of the delegate for the primary resource for the device in
+      * {@link DeconzDevice#resourceBySubtype resourceBySubtype}
       *
-      * This is the {@link Deconz.Resource#zigbee zigbee} of the
-      * delegates of all resources for the device.
-      * @type {boolean}
+      * This is the {@link DeconzDevice.Resource#subtype subtype} of the
+      * HomeKit service corresponding to the primary resource.
+      * @type {string}
       */
-    this.zigbee = resource.zigbee
+    this.primary = resource.subtype
+
+    /** An array of keys of the delegates for the resources for the device in
+      * {@link DeconzDevice#resourceBySubtype resourceBySubtype} by service name.
+      *
+      * These are the {@link DeconzDevice.Resource#subtype subtype} values of the
+      * HomeKit service corresponding to the resource.
+      * @type {Object.<string, Array.<string>>}
+      */
+    this.subtypesByServiceName = {}
+    this.subtypesByServiceName[resource.serviceName] = [resource.subtype]
 
     /** The delegates of the resources for the device, by subtype of the
       * corresponding HomeKit service.
@@ -43,14 +54,13 @@ class Device {
     this.resourceBySubtype = {}
     this.resourceBySubtype[resource.subtype] = resource
 
-    /** The key of the delegate for the primary resource for the device in
-      * {@link DeconzDevice#resourceBySubtype resourceBySubtype}
+    /** Zigbee device vs virtual device.
       *
-      * This is the {@link DeconzDevice.Resource#subtype subtype} of the
-      * HomeKit service corresponding to the primary resource.
-      * @type {string}
+      * This is the {@link Deconz.Resource#zigbee zigbee} of the
+      * delegates of all resources for the device.
+      * @type {boolean}
       */
-    this.primary = resource.subtype
+    this.zigbee = resource.zigbee
   }
 
   /** The delegate of the primary resource of the device.
@@ -89,6 +99,11 @@ class Device {
         `${resource.rpath}: cannot combine ${r.rpath}`
       )
     }
+    if (this.subtypesByServiceName[resource.serviceName] == null) {
+      this.subtypesByServiceName[resource.serviceName] = [resource.subtype]
+    } else {
+      this.subtypesByServiceName[resource.serviceName].push(resource.subtype)
+    }
     this.resourceBySubtype[subtype] = resource
     const p = this.resourceBySubtype[this.primary]
     if (p.rtype === rtype && p.prio < prio) {

package/lib/Deconz/Resource.js

@@ -145,6 +145,11 @@ class Resource {
         */
       this.endpoint = endpoint
 
+      /** Zigbee cluster
+        * @type {string}
+        */
+      this.cluster = cluster
+
       /** Zigbee device vs virtual device.
         *
         * Derived from the resource type and, for `sensors`, on the `type` in the
@@ -301,6 +306,7 @@ class Resource {
         case 'LightLevel': return 'LightLevel'
         case 'Moisture': return 'Humidity'
         case 'OpenClose': return 'Contact'
+        case 'ParticulateMatter': return 'AirQuality'
         case 'Power': return 'Power'
         case 'Presence': return 'Motion'
         case 'Pressure': return 'AirPressure'
@@ -482,14 +488,23 @@ class Resource {
             buttons.push([3, 'Previous', SINGLE | LONG])
             buttons.push([4, 'Next', SINGLE | LONG])
             break
+          case 'RODRET Dimmer':
+            buttons.push([1, 'Dim Up', SINGLE | LONG])
+            buttons.push([2, 'Dim Down', SINGLE | LONG])
+            break
           case 'SYMFONISK Sound Controller':
-            buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
-            if (this.body.mode === 1) {
-              buttons.push([2, 'Turn Right', LONG])
-              buttons.push([3, 'Turn Left', LONG])
-            } else {
-              buttons.push([2, 'Turn Right', SINGLE])
-              buttons.push([3, 'Turn Left', SINGLE])
+            if (this.cluster === '1000') {
+              buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
+              if (this.body.mode === 1) {
+                buttons.push([2, 'Turn Right', LONG])
+                buttons.push([3, 'Turn Left', LONG])
+              } else {
+                buttons.push([2, 'Turn Right', SINGLE])
+                buttons.push([3, 'Turn Left', SINGLE])
+              }
+            } else if (this.cluster === '0008') { // ZHARelativeRotary
+              // buttons.push([4, 'Turn Right', SINGLE])
+              // buttons.push([5, 'Turn Left', SINGLE])
             }
             break
           case 'SYMFONISK sound remote gen2':
@@ -754,7 +769,7 @@ class Resource {
               buttons.push([2, '2', SINGLE | LONG, true])
               buttons.push([3, '3', SINGLE | LONG, true])
               buttons.push([4, '4', SINGLE | LONG, true])
-            } else if (this.endpoint === '14') {
+            } else if (this.endpoint === '14') { // ZHARelativeRotary
               buttons.push([5, 'Right Turn', SINGLE])
               buttons.push([6, 'Left Turn', SINGLE])
             }

package/lib/DeconzAccessory/Gateway.js

@@ -82,6 +82,12 @@ class Gateway extends AccessoryDelegate {
       this.client.apiKey = value
     })
 
+    this.addPropertyDelegate({
+      key: 'autoExpose',
+      value: true,
+      silent: true
+    })
+
     this.addPropertyDelegate({
       key: 'brightnessAdjustment',
       value: 1,
@@ -495,7 +501,7 @@ class Gateway extends AccessoryDelegate {
     */
   async connect (retry = 0) {
     if (!this.values.expose) {
-      this.warn('unlock gateway and set Expose to obtain an API key')
+      this.warn('unlock gateway and set expose to obtain an API key')
       return
     }
     try {
@@ -782,10 +788,12 @@ class Gateway extends AccessoryDelegate {
         name: this.name,
         settings: this.values.apiKey == null
           ? {
+              autoExpose: this.values.autoExpose,
               expose: this.values.expose,
               logLevel: this.values.logLevel
             }
           : {
+              autoExpose: this.values.autoExpose,
               brightnessAdjustment: this.values.brightnessAdjustment * 100,
               expose: this.values.expose,
               exposeSchedules: this.values.exposeSchedules,
@@ -842,6 +850,7 @@ class Gateway extends AccessoryDelegate {
         .on('userInputError', (error) => {
           this.warn(error)
         })
+        .boolKey('autoExpose')
         .boolKey('expose')
         .intKey('logLevel', 0, 3)
       if (this.values.apiKey != null) {
@@ -863,6 +872,7 @@ class Gateway extends AccessoryDelegate {
             this.values[key] = settings[key] / 100
             responseBody[key] = this.values[key]
             break
+          case 'autoExpose':
           case 'expose':
           case 'exposeSchedules':
           case 'heartrate':
@@ -1105,7 +1115,7 @@ class Gateway extends AccessoryDelegate {
         try {
           const { id, zigbee } = this.deviceByRidByRtype[rtype][rid]
           if (this.context.settingsById[id] == null) {
-            this.context.settingsById[id] = { expose: zigbee }
+            this.context.settingsById[id] = { expose: zigbee && this.values.autoExpose }
           }
           if (this.context.settingsById[id].expose) {
             if (this.accessoryById[id] == null) {

package/lib/DeconzAccessory/Light.js

@@ -33,19 +33,8 @@ 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',
@@ -57,7 +46,14 @@ class Light extends DeconzAccessory {
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
-    } else {
+    } else if (this.values.serviceName === 'Switch') {
+      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',
@@ -65,6 +61,7 @@ class Light extends DeconzAccessory {
         silent: true
       })
     }
+
     if (this.service.characteristicDelegate('totalConsumption') != null) {
       params.totalConsumptionDelegate = this.service.characteristicDelegate('totalConsumption')
       if (this.service.values.consumption === undefined) {
@@ -86,6 +83,51 @@ class Light extends DeconzAccessory {
     }
     this.historyService = new ServiceDelegate.History(this, params)
 
+    for (const subtype in device.resourceBySubtype) {
+      const resource = device.resourceBySubtype[subtype]
+      if (subtype === device.primary) {
+        continue
+      }
+      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 {
+        this.createService(resource)
+      }
+    }
+
+    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/Sensor.js

@@ -106,15 +106,39 @@ class Sensor extends DeconzAccessory {
         params.vocDensityDelegate = service.characteristicDelegate('vocDensity')
       }
     }
-    if (this.servicesByServiceName.Flag != null) {
+    if (this.servicesByServiceName.Flag?.length === 1) {
       const service = this.servicesByServiceName.Flag[0]
-      params.switchOnDelegate = service.characteristicDelegate('on')
-      params.lastSwitchOnDelegate = service.addCharacteristicDelegate({
+      params.onDelegate = service.characteristicDelegate('on')
+      params.lastOnDelegate = service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
     }
+    if (
+      params.temperatureDelegate != null && params.humidityDelegate != null &&
+      params.airPressureDelegate == null && params.vocDensityDelegate == null &&
+      this.servicesByServiceName.Battery?.length === 1
+    ) {
+      // Eve would see this as an Eve Thermo Control.
+      this.airPressureService = new ServiceDelegate(this, {
+        name: this.name + ' Pressure',
+        Service: this.Services.eve.AirPressureSensor,
+        hidden: true
+      })
+      this.airPressureService.addCharacteristicDelegate({
+        key: 'airPressure',
+        Characteristic: this.Characteristics.eve.AirPressure,
+        props: {
+          perms: [
+            this.Characteristic.Perms.PAIRED_READ,
+            this.Characteristic.Perms.NOTIFY,
+            this.Characteristic.Perms.HIDDEN
+          ]
+        },
+        value: 0
+      })
+    }
     if (Object.keys(params).length > 0) {
       this.historyService = new ServiceDelegate.History(this, params)
     }

package/lib/DeconzAccessory/WarningDevice.js

@@ -35,8 +35,8 @@ class WarningDevice extends DeconzAccessory {
 
     const params = {}
     if (this.servicesByServiceName.WarningDevice?.length === 1) {
-      params.switchOnDelegate = this.service.characteristicDelegate('on')
-      params.lastSwitchOnDelegate = this.service.addCharacteristicDelegate({
+      params.onDelegate = this.service.characteristicDelegate('on')
+      params.lastOnDelegate = this.service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true

package/lib/DeconzAccessory/index.js

@@ -130,6 +130,7 @@ class DeconzAccessory extends AccessoryDelegate {
       this.values.firmware, this.rpaths.length
     )
     this.debug('%d resources: %s', this.rpaths.length, this.rpaths.join(', '))
+    this.vdebug('device: %j', this.device)
     if (this.service != null) {
       await this.service.identify()
     }
@@ -177,22 +178,26 @@ class DeconzAccessory extends AccessoryDelegate {
         service.addResource(resource)
       }
     } else if (params.serviceName === 'Label') {
+      service = this.servicesByServiceName.Label?.[0]
       // Default button
       if (resource.capabilities.buttons == null) {
-        this.warn(
-          '%s: unknown %s: %j', resource.rpath, resource.body.type,
-          resource.body
-        )
-        resource.capabilities.buttons = {
-          1: {
-            label: 'Unknown Button',
-            events: SINGLE | DOUBLE | LONG
+        if (service == null) {
+          this.warn(
+            '%s: unknown %s: %j', resource.rpath, resource.body.type,
+            resource.body
+          )
+          resource.capabilities.buttons = {
+            1: {
+              label: 'Unknown Button',
+              events: SINGLE | DOUBLE | LONG
+            }
           }
+          resource.capabilities.namespace =
+            this.Characteristics.hap.ServiceLabelNamespace.ARABIC_NUMERALS
+        } else {
+          resource.capabilities.buttons = {}
         }
-        resource.capabilities.namespace =
-          this.Characteristics.hap.ServiceLabelNamespace.ARABIC_NUMERALS
       }
-      service = this.servicesByServiceName.Label?.[0]
     }
     if (service == null) {
       service = new DeconzService[params.serviceName](this, resource, {

package/lib/DeconzService/AirQuality.js

@@ -22,16 +22,64 @@ class AirQuality extends DeconzService.SensorsResource {
       })
     }
 
-    if (resource.body.state.airqualityppb !== undefined) {
+    if (resource.body.state.measured_value !== undefined) {
+      const cmv = resource.body.capabilities.measured_value
+      switch (cmv.substance) {
+        case 'PM2.5':
+          if (cmv.quantity !== 'density') {
+            service.warn('%s: unsupported substance', cmv.quantity)
+            break
+          }
+          if (cmv.unit !== 'ug/m^3') {
+            service.warn('%s: unsupported unit', cmv.unit)
+            break
+          }
+          service.addCharacteristicDelegate({
+            key: 'pm25Density',
+            Characteristic: service.Characteristics.hap.PM2_5Density,
+            unit: ' µg/m³',
+            props: { minValue: cmv.min, maxValue: cmv.max }
+          })
+          service.resources[resource.rpath] = {
+            key: 'pm25Density',
+            f: (v) => { return v }
+          }
+          break
+        case 'tVOC':
+          if (cmv.quantity !== 'level') {
+            service.warn('%s: unsupported substance', cmv.quantity)
+            break
+          }
+          if (cmv.unit !== 'ppb') {
+            service.warn('%s: unsupported unit', cmv.unit)
+            break
+          }
+          service.addCharacteristicDelegate({
+            key: 'vocDensity',
+            Characteristic: service.Characteristics.hap.VOCDensity,
+            unit: ' µg/m³',
+            props: {
+              minValue: Math.floor(cmv.min * 4.57),
+              maxValue: Math.ceil(cmv.max * 4.57)
+            }
+          })
+          service.resources[resource.rpath] = {
+            key: 'vocDensity',
+            f: (v) => { return Math.round(v * 4.57) }
+          }
+          break
+        default:
+          service.warn('%s: unsupported substance', cmv.substance)
+          break
+      }
+    } else if (resource.body.state.airqualityppb !== undefined) {
       service.addCharacteristicDelegate({
         key: 'vocDensity',
         Characteristic: service.Characteristics.hap.VOCDensity,
         unit: ' µg/m³',
         props: { minValue: 0, maxValue: 65535, minStep: 1 }
       })
-    }
-
-    if (resource.body.state.pm2_5 !== undefined) {
+    } else if (resource.body.state.pm2_5 !== undefined) {
       service.addCharacteristicDelegate({
         key: 'pm25Density',
         Characteristic: service.Characteristics.hap.PM2_5Density,
@@ -68,16 +116,27 @@ class AirQuality extends DeconzService.SensorsResource {
     }
   }
 
-  static updateResourceState (service, state) {
-    if (state.airqualityppb != null) {
+  static updateResourceState (service, state, rpath) {
+    if (state.measured_value != null && service.resources[rpath] != null) {
+      const { key, f } = service.resources[rpath]
+      service.values[key] = f(state.measured_value)
+      if (
+        state.airquality != null && (
+          key === 'vocDensity' || service.values.vocDensity === undefined
+        )
+      ) {
+        service.values.airQuality = AirQuality.airQualityValue(
+          service, state.airquality
+        )
+      }
+    } else if (state.airqualityppb != null) {
       service.values.vocDensity = Math.round(state.airqualityppb * 4.57)
       if (state.airquality != null) {
         service.values.airQuality = AirQuality.airQualityValue(
           service, state.airquality
         )
       }
-    }
-    if (state.pm2_5 != null) {
+    } else if (state.pm2_5 != null) {
       service.values.pm25Density = state.pm2_5
       if (state.airquality != null && service.values.vocDensity === undefined) {
         service.values.airQuality = AirQuality.airQualityValue(
@@ -93,6 +152,7 @@ class AirQuality extends DeconzService.SensorsResource {
   constructor (accessory, resource, params = {}) {
     params.Service = accessory.Services.hap.AirQualitySensor
     super(accessory, resource, params)
+    this.resources = {}
 
     AirQuality.addResource(this, resource)
 
@@ -101,8 +161,8 @@ class AirQuality extends DeconzService.SensorsResource {
     this.update(resource.body, resource.rpath)
   }
 
-  updateState (state) {
-    AirQuality.updateResourceState(this, state)
+  updateState (state, rpath) {
+    AirQuality.updateResourceState(this, state, rpath)
     super.updateState(state)
   }
 }

package/lib/DeconzService/Contact.js

@@ -20,6 +20,8 @@ class Contact extends DeconzService.SensorsResource {
       Characteristic: this.Characteristics.hap.ContactSensorState
     })
 
+    // With _Status Tapered_ Eve thinks the _Door Sensor_ is an Eve Windows Guard
+    // (instead of an Eve Door & Window) and won't display it.
     this.addCharacteristicDelegates({ noTampered: true })
 
     this.update(resource.body, resource.rpath)

package/lib/DeconzService/Humidity.js

@@ -27,10 +27,11 @@ class Humidity extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (state.humidity != null) {
+    if (state.measured_value != null) {
+      this.values.humidity = Math.round(state.measured_value * 10) / 10
+    } else if (state.humidity != null) {
       this.values.humidity = Math.round(state.humidity / 10) / 10
-    }
-    if (state.moisture != null) {
+    } else if (state.moisture != null) {
       this.values.humidity = Math.round(state.moisture / 10) / 10
     }
     super.updateState(state)

package/lib/DeconzService/Label.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const DeconzService = require('.')
+const DeconzService = require('../DeconzService')
 
 /**
   * @memberof DeconzService
@@ -32,13 +32,14 @@ class Label extends DeconzService.SensorsResource {
     if (resource.body.type.endsWith('Switch')) {
       this.buttonResources[resource.rpath] = {
         buttonEvent: resource.body.state.buttonevent,
-        lastUpdated: '',
+        lastUpdated: new Date(),
         toButtonEvent: resource.capabilities.toButtonEvent
       }
     } else if (resource.body.type.endsWith('RelativeRotary')) {
       const keys = Object.keys(resource.capabilities.buttons)
       this.buttonResources[resource.rpath] = {
-        lastUpdated: '',
+        expectedRotation: resource.body.state.expectedrotation,
+        lastUpdated: new Date(),
         right: keys[0],
         left: keys[1]
       }
@@ -64,13 +65,9 @@ class Label extends DeconzService.SensorsResource {
       this.gateway.reExposeAccessory(this.accessory.id)
       return
     }
-    if (buttonResource.lastUpdated === '') {
-      buttonResource.lastUpdated = state.lastupdated
-    } else if (
-      state.lastupdated != null &&
-      state.lastupdated !== buttonResource.lastUpdated
-    ) {
-      buttonResource.lastUpdated = state.lastupdated
+    const lastUpdated = new Date(state.lastupdated + 'Z')
+    if (lastUpdated > buttonResource.lastUpdated) {
+      buttonResource.lastUpdated = lastUpdated
       if (buttonResource.buttonEvent !== undefined) {
         const oldValue = buttonResource.buttonEvent
         if (state.buttonevent != null) {
@@ -85,10 +82,13 @@ class Label extends DeconzService.SensorsResource {
           false // this.accessoryDelegate.settingsService.values.repeat
         )
       } else {
-        const i = state.expectedrotation >= 0
+        if (state.expectedrotation != null) {
+          buttonResource.expectedRotation = state.expectedrotation
+        }
+        const i = buttonResource.expectedRotation >= 0
           ? buttonResource.right
           : buttonResource.left
-        this.buttonServices[i].updateRotation()
+        this.buttonServices[i]?.updateRotation()
       }
     }
     super.updateState(state)

package/lib/DeconzService/Light.js

@@ -43,7 +43,7 @@ class Light extends DeconzService.LightsResource {
         : this.resource.body.state.all_on
     }).on('didSet', (value, fromHomeKit) => {
       if (fromHomeKit) {
-        this.put({ on: value })
+        this.putState({ on: value })
         this.updateAdaptiveLighting()
       }
     })
@@ -55,7 +55,7 @@ class Light extends DeconzService.LightsResource {
         value: this.resource.body.state.any_on
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
-          this.put({ on: value })
+          this.putState({ on: value })
           this.updateAdaptiveLighting()
         }
       })
@@ -70,7 +70,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const bri = Math.round(value * 2.54)
-          this.put({ bri })
+          this.putState({ bri })
           this.updateAdaptiveLighting()
         }
       })
@@ -80,7 +80,7 @@ class Light extends DeconzService.LightsResource {
         Characteristic: this.Characteristics.my.BrightnessChange,
         value: 0
       }).on('didSet', async (value) => {
-        this.put({ bri_inc: Math.round(value * 254.0 / 100.0) })
+        this.putState({ bri_inc: Math.round(value * 254.0 / 100.0) })
         await timeout(this.platform.config.waitTimeReset)
         this.values.brightnessChange = 0
       })
@@ -104,6 +104,10 @@ class Light extends DeconzService.LightsResource {
       this.addCharacteristicDelegate({
         key: 'colorExecuteIfOff',
         value: this.resource.body.config.color.execute_if_off
+      }).on('didSet', async (value) => {
+        try {
+          await this.put('/config', { color: { execute_if_off: value } })
+        } catch (error) { this.warn(error) }
       })
     }
 
@@ -131,7 +135,7 @@ class Light extends DeconzService.LightsResource {
         const ct = Math.max(ctMin, Math.min(value, ctMax))
         if (fromHomeKit) {
           this.checkAdaptiveLighting()
-          this.put({ ct })
+          this.putState({ ct })
           this.values.colormode = 'ct'
         }
         if (this.capabilities.xy && this.values.colormode === 'ct') {
@@ -146,7 +150,9 @@ class Light extends DeconzService.LightsResource {
       if (
         this.resource.body?.capabilities?.color?.xy?.blue == null ||
         this.resource.body?.capabilities?.color?.xy?.green == null ||
-        this.resource.body?.capabilities?.color?.xy?.red == null
+        this.resource.body?.capabilities?.color?.xy?.red == null ||
+        this.resource.body?.capabilities?.color?.xy?.green?.[1] === 0 ||
+        this.resource.body?.capabilities?.color?.xy?.red?.[0] === 0
       ) {
         if (this.capabilities.on) {
           this.warn('using default xy gamut')
@@ -169,7 +175,7 @@ class Light extends DeconzService.LightsResource {
           const xy = hsvToXy(
             value, this.values.saturation, this.capabilities.gamut
           )
-          this.put({ xy })
+          this.putState({ xy })
           this.values.colormode = 'xy'
         }
       })
@@ -180,7 +186,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const xy = hsvToXy(this.values.hue, value, this.capabilities.gamut)
-          this.put({ xy })
+          this.putState({ xy })
           this.values.colormode = 'xy'
         }
       })
@@ -192,7 +198,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const hue = Math.round(this.values.hue * 65535.0 / 360.0)
-          this.put({ hue })
+          this.putState({ hue })
           this.values.colormode = 'hs'
         }
       })
@@ -203,7 +209,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const sat = Math.round(this.values.saturation * 254.0 / 100.0)
-          this.put({ sat })
+          this.putState({ sat })
           this.values.colormode = 'hs'
         }
       })
@@ -220,7 +226,7 @@ class Light extends DeconzService.LightsResource {
           if (value) {
             state.colorloopspeed = this.values.colorLoopSpeed
           }
-          this.put(state)
+          this.putState(state)
           this.values.colormode = 'hs'
         }
       })
@@ -232,7 +238,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const effect = 'colorloop'
-          this.put({ effect, colorloopspeed: value })
+          this.putState({ effect, colorloopspeed: value })
           this.values.colormode = 'hs'
         }
       })
@@ -328,7 +334,7 @@ class Light extends DeconzService.LightsResource {
         }).on('didSet', (value, fromHomeKit) => {
           if (fromHomeKit) {
             this.checkAdaptiveLighting()
-            this.put({ effect: value ? effect : 'none' })
+            this.putState({ effect: value ? effect : 'none' })
             this.values.effectString = value ? effect : 'none'
           }
         })
@@ -492,10 +498,8 @@ class Light extends DeconzService.LightsResource {
           this.checkAdaptiveLighting()
           if (fromHomeKit && value) {
             try {
-              const path = this.resource.rpath + '/scenes/' + scene.id + '/recall'
-              this.debug('PUT %s', path)
-              await this.client.put(path)
-            } catch (error) { this.error(error) }
+              await this.put('/scenes/' + scene.id + '/recall')
+            } catch (error) { this.warn(error) }
             await timeout(this.platform.config.waitTimeReset)
             service.values.on = false
           }
@@ -560,7 +564,7 @@ class Light extends DeconzService.LightsResource {
       return
     }
     this.debug('adaptive lighting: set Color Temperature to %d mired', ct)
-    this.put({ ct })
+    this.putState({ ct })
     this.fromAdaptiveLighting = true
     this.values.colormode = 'ct'
     if (ct !== this.values.colorTemperature) {

package/lib/DeconzService/LightsResource.js

@@ -6,16 +6,13 @@
 'use strict'
 
 const { timeout } = require('homebridge-lib')
-const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { HttpError } = ApiClient
-
 class LightsResource extends DeconzService {
   constructor (accessory, resource, params) {
     super(accessory, resource, params)
     this.stateKey = resource.rtype === 'groups' ? 'action' : 'state'
-    this.rpathState = this.rpath + '/' + this.stateKey
+    this.statePath = '/' + this.stateKey
 
     this.updating = 0
     this.targetState = {}
@@ -49,28 +46,25 @@ class LightsResource extends DeconzService {
   }
 
   async identify () {
-    if (this.capabilities.alert) {
-      if (this.capabilities.breathe) {
-        await this.put({ alert: 'breathe' })
-        await timeout(1000)
-        await this.put({ alert: 'stop' })
-      } else {
-        await this.put({ alert: 'select' })
-      }
+    if (this.resource.body?.capabilities?.alerts?.includes('breathe')) {
+      await this.put(this.statePath, { alert: 'breathe' })
+      await timeout(1000)
+      return this.put(this.statePath, { alert: 'finish' })
     }
+    return this.put(this.statePath, { alert: 'select' })
   }
 
-  // Collect changes into a combined request.
-  async put (state) {
+  // Collect state changes into a combined request.
+  async putState (state) {
     for (const key in state) {
       this.resource.body[this.stateKey][key] = state[key]
       this.targetState[key] = state[key]
     }
-    return this._put()
+    return this._putState()
   }
 
-  // Send the request (for the combined changes) to the gateway.
-  async _put () {
+  // Send the request (for the combined state changes) to the gateway.
+  async _putState () {
     try {
       if (this.platform.config.waitTimeUpdate > 0) {
         this.updating++
@@ -88,7 +82,7 @@ class LightsResource extends DeconzService {
         targetState.transitiontime = this.gateway.transitionTime * 10
         this.gateway.resetTransitionTime()
       }
-      if (this.capabilities.noTransition) {
+      if (this.resource.body?.capabilities?.transition_block) {
         if (
           (
             targetState.on != null || targetState.bri != null ||
@@ -102,16 +96,11 @@ class LightsResource extends DeconzService {
           targetState.transitiontime = 0
         }
       }
-      this.debug('PUT %s %j', this.rpathState, targetState)
-      await this.client.put(this.rpathState, targetState)
+      await this.put(this.statePath, targetState)
       this.recentlyUpdated = true
       await timeout(500)
       this.recentlyUpdated = false
-    } catch (error) {
-      if (!(error instanceof HttpError)) {
-        this.warn(error)
-      }
-    }
+    } catch (error) { this.warn(error) }
   }
 }
 

package/lib/DeconzService/Motion.js

@@ -63,9 +63,6 @@ class Motion extends DeconzService.SensorsResource {
     if (state.vibration != null) {
       this.values.motion = state.vibration
     }
-    if (state.tampered != null) {
-      this.values.tampered = state.tampered
-    }
     super.updateState(state)
   }
 

package/lib/DeconzService/Outlet.js

@@ -20,7 +20,7 @@ class Outlet extends DeconzService.LightsResource {
         : this.resource.body.state.all_on
     }).on('didSet', (value, fromHomeKit) => {
       if (fromHomeKit) {
-        this.put({ on: value })
+        this.putState({ on: value })
       }
     })
 
@@ -31,7 +31,7 @@ class Outlet extends DeconzService.LightsResource {
         value: this.resource.body.state.any_on
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
-          this.put({ on: value })
+          this.putState({ on: value })
         }
       })
     }
@@ -42,13 +42,14 @@ class Outlet extends DeconzService.LightsResource {
       value: 1 // Eve interpretes OutletInUse as: device is physically plugged in.
     })
 
-    this.addCharacteristicDelegates()
-
-    this.settings = {
-      resetTimeout: this.platform.config.resetTimeout,
-      waitTimeUpdate: this.platform.config.waitTimeUpdate,
-      wallSwitch: false
+    if (this.resource.rtype === 'lights') {
+      this.addCharacteristicDelegate({
+        key: 'wallSwitch',
+        value: false
+      })
     }
+
+    this.addCharacteristicDelegates()
   }
 
   updateState (state) {
@@ -63,6 +64,13 @@ class Outlet extends DeconzService.LightsResource {
           this.values.anyOn = value
           break
         case 'on':
+          if (this.values.wallSwitch && !state.reachable) {
+            if (this.values.on) {
+              this.log('not reachable: force On to false')
+            }
+            this.values.on = false
+            break
+          }
           this.values.on = value
           break
         default:

package/lib/DeconzService/SensorsResource.js

@@ -8,7 +8,7 @@
 const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { dateToString, HttpError } = ApiClient
+const { dateToString } = ApiClient
 
 /**
   * @memberof DeconzService
@@ -57,12 +57,6 @@ class SensorsResource extends DeconzService {
     }
   }
 
-  async identify () {
-    if (this.resource.body.config.alert) {
-      return this.put('/config', { alert: 'select' })
-    }
-  }
-
   updateState (state) {
     if (state.lastupdated != null) {
       this.values.lastUpdated = dateToString(state.lastupdated)
@@ -85,13 +79,9 @@ class SensorsResource extends DeconzService {
     }
   }
 
-  async put (resource, body) {
-    try {
-      await this.client.put(this.rpath + resource, body)
-    } catch (error) {
-      if (!(error instanceof HttpError)) {
-        this.warn(error)
-      }
+  async identify () {
+    if (this.resource.body.config.alert) {
+      return this.put('/config', { alert: 'select' })
     }
   }
 }

package/lib/DeconzService/Switch.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const DeconzService = require('.')
+const DeconzService = require('../DeconzService')
 
 class Switch extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -20,7 +20,7 @@ class Switch extends DeconzService.LightsResource {
         : this.resource.body.state.all_on
     }).on('didSet', (value, fromHomeKit) => {
       if (fromHomeKit) {
-        this.put({ on: value })
+        this.putState({ on: value })
       }
     })
 
@@ -31,18 +31,19 @@ class Switch extends DeconzService.LightsResource {
         value: this.resource.body.state.any_on
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
-          this.put({ on: value })
+          this.putState({ on: value })
         }
       })
     }
 
-    this.addCharacteristicDelegates()
-
-    this.settings = {
-      resetTimeout: this.platform.config.resetTimeout,
-      waitTimeUpdate: this.platform.config.waitTimeUpdate,
-      wallSwitch: false
+    if (this.resource.rtype === 'lights') {
+      this.addCharacteristicDelegate({
+        key: 'wallSwitch',
+        value: false
+      })
     }
+
+    this.addCharacteristicDelegates()
   }
 
   updateState (state) {
@@ -57,6 +58,13 @@ class Switch extends DeconzService.LightsResource {
           this.values.anyOn = value
           break
         case 'on':
+          if (this.values.wallSwitch && !state.reachable) {
+            if (this.values.on) {
+              this.log('not reachable: force On to false')
+            }
+            this.values.on = false
+            break
+          }
           this.values.on = value
           break
         default:

package/lib/DeconzService/Temperature.js

@@ -19,7 +19,11 @@ class Temperature extends DeconzService.SensorsResource {
       key: 'temperature',
       Characteristic: this.Characteristics.hap.CurrentTemperature,
       unit: '°C',
-      props: { minValue: -40, maxValue: 100, minStep: 0.1 },
+      props: {
+        minValue: Math.round(resource.body.capabilities?.measured_value?.min ?? -40),
+        maxValue: Math.round(resource.body.capabilities?.measured_value?.max ?? 100),
+        minStep: 0.1
+      },
       value: 0
     })
 
@@ -47,7 +51,9 @@ class Temperature extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (state.temperature != null) {
+    if (state.measured_value != null) {
+      this.values.temperature = Math.round(state.measured_value * 10) / 10
+    } else if (state.temperature != null) {
       this.values.temperature = Math.round(state.temperature / 10) / 10
     }
     super.updateState(state)

package/lib/DeconzService/Valve.js

@@ -0,0 +1,125 @@
+// homebridge-deconz/lib/DeconzService/Valve.js
+// Copyright© 2022-2023 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const DeconzService = require('../DeconzService')
+// const timeout = require('homebridge-lib')
+
+class Switch extends DeconzService.LightsResource {
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.Valve
+    super(accessory, resource, params)
+
+    this.addCharacteristicDelegate({
+      key: 'active',
+      Characteristic: this.Characteristics.hap.Active,
+      value: this.capabilities.on
+        ? this.resource.body.state.on
+        : this.resource.body.state.all_on
+    }).on('didSet', async (value, fromHomeKit) => {
+      try {
+        if (fromHomeKit) {
+          await this.put(this.statePath, { on: value === this.Characteristics.hap.Active.ACTIVE })
+        }
+        if (this.values.active) {
+          this.values.inUse = this.Characteristics.hap.InUse.IN_USE
+          if (this.values.setDuration > 0) {
+            this.values.remainingDuration = this.values.setDuration
+            this.autoInActive = new Date().valueOf() + this.values.setDuration * 1000
+            this.autoInActiveTimeout = setTimeout(async () => {
+              try {
+                await this.put(this.statePath, { on: false })
+              } catch (error) { this.warn(error) }
+            }, this.values.setDuration * 1000)
+          }
+        } else {
+          this.values.inUse = this.Characteristics.hap.InUse.NOT_IN_USE
+          if (this.autoInActiveTimeout != null) {
+            clearTimeout(this.autoInActiveTimeout)
+            delete this.autoInActiveTimeout
+            delete this.autoInActive
+            this.values.remainingDuration = 0
+          }
+        }
+      } catch (error) { this.warn(error) }
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'inUse',
+      Characteristic: this.Characteristics.hap.InUse,
+      value: this.Characteristics.hap.InUse.NOT_IN_USE
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'remainingDuration',
+      Characteristic: this.Characteristics.hap.RemainingDuration,
+      value: 0,
+      props: {
+        maxValue: 4 * 3600
+      },
+      getter: async () => {
+        const remaining = this.autoInActive - new Date().valueOf()
+        return remaining > 0 ? Math.round(remaining / 1000) : 0
+      }
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'setDuration',
+      Characteristic: this.Characteristics.hap.SetDuration,
+      value: 300,
+      props: {
+        maxValue: 4 * 3600
+      }
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'valveType',
+      Characteristic: this.Characteristics.hap.ValveType,
+      value: this.Characteristics.hap.ValveType.GENERIC_VALVE
+    })
+
+    if (this.resource.rtype === 'lights') {
+      this.addCharacteristicDelegate({
+        key: 'wallSwitch',
+        value: false
+      })
+    }
+
+    this.addCharacteristicDelegates()
+
+    this.values.active = this.Characteristics.hap.Active.INACTIVE
+  }
+
+  updateState (state) {
+    for (const key in state) {
+      const value = state[key]
+      this.resource.body.state[key] = value
+      switch (key) {
+        case 'on':
+          if (this.values.wallSwitch && !state.reachable) {
+            this.log('not reachable: force Active to false')
+            this.values.active = this.Characteristics.hap.Active.INACTIVE
+            this.values.inUse = this.Characteristics.hap.InUse.NOT_IN_USE
+            break
+          }
+          // falls through
+        case 'all_on':
+          this.values.active = value
+            ? this.Characteristics.hap.Active.ACTIVE
+            : this.Characteristics.hap.Active.INACTIVE
+          this.values.inUse = value
+            ? this.Characteristics.hap.InUse.IN_USE
+            : this.Characteristics.hap.InUse.NOT_IN_USE
+          break
+        default:
+          break
+      }
+    }
+    super.updateState(state)
+  }
+}
+
+module.exports = Switch

package/lib/DeconzService/WarningDevice.js

@@ -6,6 +6,7 @@
 'use strict'
 
 const DeconzService = require('../DeconzService')
+const { timeout } = require('homebridge-lib')
 
 class WarningDevice extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -33,11 +34,10 @@ class WarningDevice extends DeconzService.LightsResource {
             body = { alert: 'lselect', ontime: onTime }
           }
         }
-        this.put(body)
+        await this.put(this.statePath, body)
         if (value) {
-          this.timer = setTimeout(() => {
-            this.values.on = false
-          }, onTime * 1000)
+          await timeout(onTime * 1000)
+          this.values.on = false
         }
       }
     })

package/lib/DeconzService/WindowCovering.js

@@ -5,8 +5,8 @@
 
 'use strict'
 
-const { timeout } = require('homebridge-lib')
 const DeconzService = require('../DeconzService')
+const { timeout } = require('homebridge-lib')
 
 class WindowCovering extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -34,7 +34,7 @@ class WindowCovering extends DeconzService.LightsResource {
         return
       }
       this.values.targetPosition = Math.round(this.values.targetPosition / 5) * 5
-      await this.setPosition()
+      return this.setPosition()
     })
 
     this.addCharacteristicDelegate({
@@ -46,8 +46,8 @@ class WindowCovering extends DeconzService.LightsResource {
     this.addCharacteristicDelegate({
       key: 'holdPosition',
       Characteristic: this.Characteristics.hap.HoldPosition
-    }).on('didSet', () => {
-      this.put({ stop: true })
+    }).on('didSet', async () => {
+      await this.put(this.statePath, { stop: true })
       this.values.positionState = this.Characteristics.hap.PositionState.STOPPED
     })
 
@@ -60,7 +60,7 @@ class WindowCovering extends DeconzService.LightsResource {
           return
         }
         if (this.values.currentPosition !== 100) {
-          await this.setPosition()
+          return this.setPosition()
         }
       })
     }
@@ -80,7 +80,7 @@ class WindowCovering extends DeconzService.LightsResource {
         if (!fromHomeKit) {
           return
         }
-        await this.put({ speed: value })
+        await this.put('/config', { speed: value })
       })
     }
 
@@ -90,7 +90,7 @@ class WindowCovering extends DeconzService.LightsResource {
         Characteristic: this.Characteristics.my.PositionChange
       }).on('didSet', async (value) => {
         if (value !== 0) {
-          this.put({ lift_inc: -value })
+          await this.put(this.statePath, { lift_inc: -value })
           await timeout(this.platform.config.waitTimeReset)
           this.values.positionChange = 0
         }
@@ -120,7 +120,7 @@ class WindowCovering extends DeconzService.LightsResource {
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
     this.moving = new Date()
-    await this.put({ lift })
+    return this.put(this.statePath, { lift })
   }
 
   updateState (state) {

package/lib/DeconzService/index.js

@@ -8,7 +8,7 @@
 const { ApiClient } = require('hb-deconz-tools')
 const { ServiceDelegate } = require('homebridge-lib')
 
-const { dateToString } = ApiClient
+const { HttpError, dateToString } = ApiClient
 
 /** Service delegates.
   * @extends ServiceDelegate
@@ -42,6 +42,7 @@ class DeconzService extends ServiceDelegate {
   static get Switch () { return require('./Switch') }
   static get Temperature () { return require('./Temperature') }
   static get Thermostat () { return require('./Thermostat') }
+  static get Valve () { return require('./Valve') }
   static get WarningDevice () { return require('./WarningDevice') }
   static get WindowCovering () { return require('./WindowCovering') }
 
@@ -115,6 +116,17 @@ class DeconzService extends ServiceDelegate {
       }
     }
   }
+
+  async put (path, body) {
+    this.debug('PUT %s %j', path, body)
+    try {
+      await this.client.put(this.rpath + path, body)
+    } catch (error) {
+      if (!(error instanceof HttpError)) {
+        this.warn(error)
+      }
+    }
+  }
 }
 
 module.exports = DeconzService

package/package.json

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