homebridge-deconz 0.0.14 → 0.0.17

package/cli/deconz.js

@@ -703,7 +703,7 @@ class Main extends homebridgeLib.CommandLineTool {
     const { websocketport } = await this.client.get('/config')
     options.host = this.client.host + ':' + websocketport
     this.wsMonitor = new Deconz.WsClient(options)
-    this.setOptions({ mode: mode })
+    this.setOptions({ mode })
     this.wsMonitor
       .on('error', (error) => { this.error(error) })
       .on('listening', (url) => { this.log('listening on %s', url) })
@@ -813,7 +813,7 @@ class Main extends homebridgeLib.CommandLineTool {
       .parse(...args)
     const apiKey = await this.client.getApiKey('deconz')
     this.print(jsonFormatter.stringify(apiKey))
-    this.gateways[this.bridgeid] = { apiKey: apiKey }
+    this.gateways[this.bridgeid] = { apiKey }
     if (this.client.fingerprint != null) {
       this.gateways[this.bridgeid].fingerprint = this.client.fingerprint
     }

package/lib/Deconz/ApiClient.js

@@ -81,9 +81,8 @@ class ApiClient extends homebridgeLib.HttpClient {
     * @return {integer} lux - The value in lux.
     */
   static lightLevelToLux (v) {
-    let lux = v ? Math.pow(10, (v - 1) / 10000) : 0.0001
-    lux = Math.round(lux * 10000) / 10000
-    return Math.max(0.0001, Math.min(lux, 100000))
+    v = Math.max(0, Math.min(v, 60001))
+    return v ? Math.round(Math.pow(10, (v - 1) / 10000) * 10) / 10 : 0.0001
   }
 
   /** Create a new instance of a Deconz.Client.
@@ -149,7 +148,7 @@ class ApiClient extends homebridgeLib.HttpClient {
       maxSockets: _options.maxSockets,
       path: '/api',
       timeout: _options.timeout,
-      validStatusCodes: [200, 400, 403, 404]
+      validStatusCodes: [200, 400, 403] //, 404]
     }
     if (_options.phoscon) {
       // options.headers = { Accept: 'application/vnd.ddel.v1' }

package/lib/Deconz/Discovery.js

@@ -44,7 +44,7 @@ class Discovery extends events.EventEmitter {
     */
   async config (host) {
     const client = new homebridgeLib.HttpClient({
-      host: host,
+      host,
       json: true,
       path: '/api',
       timeout: this._options.timeout
@@ -96,7 +96,7 @@ class Discovery extends events.EventEmitter {
     */
   async description (host) {
     const options = {
-      host: host,
+      host,
       timeout: this._options.timeout
     }
     const client = new homebridgeLib.HttpClient(options)

package/lib/Deconz/Resource.js

@@ -21,8 +21,9 @@ const sensorsPrios = [
   'Power',
   'Consumption',
   'Temperature',
-  'Presence',
+  'Motion',
   'OpenClose',
+  'AirPurifier',
   'Thermostat'
 ]
 
@@ -256,7 +257,7 @@ class Resource {
   get prio () {
     if (this.rtype === 'groups') return -1
     if (this.rtype === 'lights') return this.endpoint
-    return sensorsPrios.indexOf(this.type)
+    return sensorsPrios.indexOf(this.serviceName)
   }
 
   /** The resource path of the resource, e.g. `/lights/1`.
@@ -270,7 +271,7 @@ class Resource {
     * corresponding HomeKit service, or `null` for unsupported and unknown
     * resources.
     *
-    * This is derived from the resource type and`type` in the resource body.
+    * This is derived from the resource type and `type` in the resource body.
     * @type {string}
     */
   get serviceName () {
@@ -305,6 +306,8 @@ class Resource {
       }
     } else { // (this.rtype === 'sensors')
       switch (this.body.type) {
+        case 'CLIPAirPurifier':
+        case 'ZHAAirPurifier': return 'AirPurifier'
         case 'ZHAAirQuality':
         case 'CLIPAirQuality': return 'AirQuality'
         case 'ZHAAlarm':

package/lib/DeconzAccessory/AirPurifier.js

@@ -0,0 +1,38 @@
+// homebridge-deconz/lib/DeconzAccessory/Thermostat.js
+// Copyright © 2022 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const DeconzAccessory = require('../DeconzAccessory')
+
+class AirPurifier extends DeconzAccessory {
+  /** Instantiate a delegate for an accessory corresponding to a device.
+    * @param {DeconzAccessory.Gateway} gateway - The gateway.
+    * @param {Deconz.Device} device - The device.
+    */
+  constructor (gateway, device, settings = {}) {
+    super(gateway, device, gateway.Accessory.Categories.AIR_PURIFIER)
+    this.identify()
+
+    this.service = this.createService(device.resource, { primaryService: true })
+
+    for (const subtype in device.resourceBySubtype) {
+      const resource = device.resourceBySubtype[subtype]
+      if (subtype === device.primary) {
+        continue
+      }
+      this.createService(resource)
+    }
+
+    this.createSettingsService()
+
+    setImmediate(() => {
+      this.debug('initialised')
+      this.emit('initialised')
+    })
+  }
+}
+
+module.exports = AirPurifier

package/lib/DeconzAccessory/Gateway.js

@@ -44,6 +44,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
 
     this.gateway = this
     this.id = params.config.bridgeid
+    this.recommendedSoftware = this.platform.packageJson.engines.deCONZ
 
     /** Persisted properties.
       * @type {Object}
@@ -53,12 +54,20 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       * devices.
       * @property {Object} fullState - The gateway's full state, from the
       * last time the gateway was polled.
+      * @property {Object} settings - The persisted settings, maintained through
+      * the Homebridge UI.
       */
     this.context // eslint-disable-line no-unused-expressions
     this.context.host = params.host
     this.context.config = params.config
-    if (this.context.blacklist == null) {
-      this.context.blacklist = {}
+    if (this.context.settingsById == null) {
+      this.context.settingsById = {}
+      // migration
+      for (const id in this.context.blacklist) {
+        this.context.settingsById[id] = { expose: false }
+      }
+      delete this.context.blacklist
+      // end migration
     }
     if (this.context.fullState != null) {
       this.analyseFullState(this.context.fullState, { analyseOnly: true })
@@ -109,6 +118,9 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       '%s %s gateway v%s', this.values.manufacturer, this.values.model,
       this.values.software
     )
+    if (this.values.software !== this.recommendedSoftware) {
+      this.warn('recommended version: deCONZ v%s', this.recommendedSoftware)
+    }
 
     /** Map of Accessory delegates by id for the gateway.
       * @type {Object<string, DeconzAccessory.Device>}
@@ -157,7 +169,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     this.heartbeatEnabled = true
     this
       .on('identify', this.identify)
-      .once('heartbeat', this.init)
+      .once('heartbeat', (beat) => { this.initialBeat = beat })
       .on('heartbeat', this.heartbeat)
       .on('shutdown', this.shutdown)
   }
@@ -182,6 +194,15 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.values.manufacturer, this.values.model, this.values.software,
       this.nAccessories, this.nDevices, this.nResourcesMonitored
     )
+    if (this.values.software !== this.recommendedSoftware) {
+      this.warn('recommended version: deCONZ v%s', this.recommendedSoftware)
+    }
+    if (this.context.migration != null) {
+      this.log(
+        'migration: %s: %d resources',
+        this.context.migration, this.nResourcesMonitored
+      )
+    }
     if (this.logLevel > 2) {
       this.vdebug(
         '%d gateway resouces: %j', this.nResources,
@@ -204,34 +225,30 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         '%d accessories with expose errors: %j', exposeErrors.length,
         exposeErrors
       )
-      const blacklist = Object.keys(this.context.blacklist).sort()
+      const settings = Object.keys(this.context.settingsById).sort()
       this.vdebug(
-        'blacklist: %d devices: %j', blacklist.length, blacklist)
+        'settings: %d devices: %j', settings.length, settings)
     }
   }
 
-  /** Initialise the gateway delegate.
-    */
-  async init (beat) {
-    try {
-      this.debug('initialising...')
-      this.initialBeat = beat
-      await this.connect()
-      this.initialised = true
-      this.debug('initialised')
-      this.emit('initialised')
-    } catch (error) { this.error(error) }
-  }
-
   /** Update properties from gateway announcement.
     * @param {string} host - The gateway hostname or IP address and port.
     * @param {Object} config - The response body of an unauthenticated
     * GET `/config` (from {@link DeconzDiscovery#config config()}.
     */
-  found (host, config) {
-    this.values.host = host
-    this.context.config = config
-    this.values.software = config.swversion
+  async found (host, config) {
+    try {
+      this.context.host = host
+      this.values.host = host
+      this.context.config = config
+      this.values.software = config.swversion
+      if (!this.initialised) {
+        this.debug('initialising...')
+        await this.connect()
+      }
+    } catch (error) {
+      this.error(error)
+    }
   }
 
   async shutdown () {
@@ -412,8 +429,8 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       for (const id in this.exposeErrorById) {
         this.resetExposeError(id)
       }
-      this.context.fullState = null
       this.pollNext = true
+      this.pollFullState = true
     } catch (error) {
       if (
         error instanceof Deconz.ApiError && error.type === 101 && retry < 8
@@ -456,7 +473,14 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         this.deleteService(id)
       }
       this.exposeErrors = {}
-      this.context.blacklist = {}
+      this.context.settingsById = {}
+      this.context.settingsById[this.id] = {
+        autoExposeGroups: false,
+        autoExposeLights: false,
+        autoExposeSensors: false,
+        autoExposeSchedules: false,
+        logLevel: 2
+      }
       this.context.fullState = null
       this.context.migration = null
       this.service.values.lights = false
@@ -485,11 +509,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     if (this.deviceById[id] == null) {
       throw new RangeError(`${id}: unknown device ID`)
     }
-    if (expose) {
-      delete this.context.blacklist[id]
-    } else {
-      this.context.blacklist[id] = true
-    }
+    this.context.settingsById[id].expose = expose
     this.pollNext = true
   }
 
@@ -605,7 +625,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         name: body.name + ' Settings',
         subtype: id,
         resource: rpaths.join(', '),
-        expose: this.context.blacklist[id] == null
+        expose: this.context.settingsById[id].expose
       })
       this.serviceById[id] = service
     }
@@ -678,9 +698,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     try {
       this.polling = true
       this.vdebug('%spolling...', this.pollNext ? 'priority ' : '')
-      if (this.context.fullState == null) {
-        this.context.fullState = await this.client.get('/')
-        this.context.fullState.groups[0] = await this.client.get('/groups/0')
+      if (this.context.fullState == null || this.pollFullState) {
+        const fullState = await this.client.get('/')
+        fullState.groups[0] = await this.client.get('/groups/0')
+        this.context.fullState = fullState
+        this.pollFullState = false
       } else {
         const config = await this.client.get('/config')
         if (config.bridgeid === this.id && config.UTC == null) {
@@ -713,6 +735,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.pollNext = false
       this.polling = false
     }
+    if (!this.initialised) {
+      this.initialised = true
+      this.debug('initialised')
+      this.emit('initialised')
+    }
   }
 
   /** Analyse the peristed full state of the gateway,
@@ -838,7 +865,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         if (
           this.deviceById[id] == null
         ) {
-          delete this.context.blacklist[id]
+          delete this.context.settingsById[id]
           this.deleteAccessory(id)
           this.deleteService(id)
           changed = true
@@ -872,7 +899,10 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       for (const rid of rids) {
         try {
           const { id } = this.deviceByRidByRtype[rtype][rid]
-          if (this.context.blacklist[id] == null) {
+          if (this.context.settingsById[id] == null) {
+            this.context.settingsById[id] = { expose: true }
+          }
+          if (this.context.settingsById[id].expose) {
             if (this.accessoryById[id] == null) {
               this.addAccessory(id)
               changed = true
@@ -896,6 +926,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
 
     this.nAccessories = Object.keys(this.accessoryById).length
+    this.nResourcesMonitored = Object.keys(this.accessoryByRpath).length
     this.nExposeErrors = Object.keys(this.exposeErrorById).length
     if (this.nExposeErrors === 0) {
       this.vdebug('%d accessories', this.nAccessories)
@@ -906,8 +937,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
 
     if (changed) {
-      this.nResourcesMonitored = Object.keys(this.accessoryByRpath).length
-      this.identify()
       if (this.context.migration == null) {
         const response = await this.client.post('/resourcelinks', {
           name: 'homebridge-deconz',
@@ -921,10 +950,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
           links: Object.keys(this.accessoryByRpath).sort()
         })
       }
-      this.log(
-        'migration: %s: %d resources',
-        this.context.migration, this.nResourcesMonitored
-      )
+      this.identify()
     }
   }
 

package/lib/DeconzAccessory/Motion.js

@@ -34,6 +34,9 @@ class Motion extends DeconzAccessory {
       this, {},
       this.service.characteristicDelegate('motion'),
       this.service.characteristicDelegate('lastActivation'),
+      this.serviceByServiceName.LightLevel == null
+        ? null
+        : this.serviceByServiceName.LightLevel.characteristicDelegate('lightlevel'),
       this.serviceByServiceName.Temperature == null
         ? null
         : this.serviceByServiceName.Temperature.characteristicDelegate('temperature')

package/lib/DeconzAccessory/index.js

@@ -39,7 +39,7 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
       manufacturer: device.resource.manufacturer,
       model: device.resource.model,
       firmware: device.resource.firmware,
-      category: category
+      category
     })
 
     this.context.gid = gateway.id

package/lib/DeconzPlatform.js

@@ -70,13 +70,17 @@ class DeconzPlatform extends homebridgeLib.Platform {
       })
       this.discovery
         .on('error', (error) => {
-          this.log(
-            '%s: request %d: %s %s', error.request.name,
-            error.request.id, error.request.method, error.request.resource
-          )
-          this.warn(
-            '%s: request %d: %s', error.request.name, error.request.id, error
-          )
+          if (error instanceof homebridgeLib.HttpClient.HttpError) {
+            this.log(
+              '%s: request %d: %s %s', error.request.name,
+              error.request.id, error.request.method, error.request.resource
+            )
+            this.warn(
+              '%s: request %d: %s', error.request.name, error.request.id, error
+            )
+            return
+          }
+          this.warn(error)
         })
         .on('request', (request) => {
           this.debug(
@@ -105,12 +109,10 @@ class DeconzPlatform extends homebridgeLib.Platform {
   async foundGateway (host, config) {
     const id = config.bridgeid
     if (this.gatewayMap[id] == null) {
-      this.gatewayMap[id] = new DeconzAccessory.Gateway(this, {
-        config: config,
-        host: host
-      })
+      this.gatewayMap[id] = new DeconzAccessory.Gateway(this, { config, host })
     }
-    this.gatewayMap[id].found(host, config)
+    await this.gatewayMap[id].found(host, config)
+    await events.once(this.gatewayMap[id], 'initialised')
     this.emit('found')
   }
 
@@ -128,17 +130,25 @@ class DeconzPlatform extends homebridgeLib.Platform {
   async init () {
     try {
       const jobs = []
-      this.debug('job %d: find at least one gateway', jobs.length)
-      jobs.push(events.once(this, 'found'))
       if (this.config.hosts.length > 0) {
         for (const host of this.config.hosts) {
           this.debug('job %d: find gateway at %s', jobs.length, host)
           jobs.push(this.findHost(host))
         }
       } else {
+        this.debug('job %d: find at least one gateway', jobs.length)
+        jobs.push(events.once(this, 'found'))
         for (const id in this.gatewayMap) {
+          const gateway = this.gatewayMap[id]
+          const host = gateway.context.host
           this.debug('job %d: find gateway %s', jobs.length, id)
-          jobs.push(this.gatewayMap[id].init())
+          jobs.push(events.once(gateway, 'initialised'))
+          try {
+            const config = await this.discovery.config(host)
+            await this.foundGateway(host, config)
+          } catch (error) {
+            this.warn('%s: %s', id, error)
+          }
         }
       }
 
@@ -154,6 +164,15 @@ class DeconzPlatform extends homebridgeLib.Platform {
 
       this.log('%d gateways', Object.keys(this.gatewayMap).length)
       this.emit('initialised')
+      const dumpInfo = {
+        config: this.config,
+        gatewayMap: {}
+      }
+      for (const id in this.gatewayMap) {
+        const gateway = this.gatewayMap[id]
+        dumpInfo.gatewayMap[id] = gateway.context
+      }
+      await this.createDumpFile(dumpInfo)
     } catch (error) { this.error(error) }
   }
 
@@ -172,7 +191,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
             gatewayByHost[gateway.context.host] = {
               config: gateway.context.config,
               host: gateway.context.host,
-              id: id
+              id
             }
           }
           return {

package/lib/DeconzService/AirPurifier.js

@@ -0,0 +1,216 @@
+// homebridge-deconz/lib/DeconzService/AirPurifier.js
+// Copyright © 2022 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const DeconzService = require('../DeconzService')
+
+class FilterMaintenance extends DeconzService.SensorsResource {
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.FilterMaintenance
+    super(accessory, resource, params)
+
+    this.addCharacteristicDelegate({
+      key: 'filterChange',
+      Characteristic: this.Characteristics.hap.FilterChangeIndication
+    })
+
+    if (
+      resource.body.config.filterlifetime !== undefined &&
+      resource.body.state.filterruntime !== undefined
+    ) {
+      this.addCharacteristicDelegate({
+        key: 'filterLifeLevel',
+        Characteristic: this.Characteristics.hap.FilterLifeLevel,
+        unit: '%'
+      })
+      this.addCharacteristicDelegate({
+        key: 'resetFilter',
+        Characteristic: this.Characteristics.hap.ResetFilterIndication,
+        props: { adminOnlyAccess: [this.Characteristic.Access.WRITE] },
+        value: 0
+      }).on('didSet', async (value, fromHomeKit) => {
+        await this.put('/config', { filterlifetime: 6 * 30 * 24 * 60 })
+      })
+      this.values.filterLifeTime = resource.body.config.filterlifetime
+    }
+
+    this.update(resource.body)
+  }
+
+  updateState (state) {
+    if (this.values.filterLifeTime != null && state.filterruntime != null) {
+      this.values.filterLifeLevel = 100 - Math.round(
+        100 * state.filterruntime / this.values.filterLifeTime
+      )
+    }
+    if (state.replacefilter != null) {
+      this.values.filterChange = state.filterChange
+        ? this.Characteristics.hap.FilterChangeIndication.CHANGE_FILTER
+        : this.Characteristics.hap.FilterChangeIndication.FILTER_OK
+    }
+  }
+
+  updateConfig (config) {
+    if (config.filterlifetime != null) {
+      this.values.filterLifeTime = config.filterlifetime
+    }
+  }
+}
+
+/**
+  * @memberof DeconzService
+  */
+class AirPurifier extends DeconzService.SensorsResource {
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.AirPurifier
+    super(accessory, resource, params)
+
+    this.addCharacteristicDelegate({
+      key: 'active',
+      Characteristic: this.Characteristics.hap.Active
+    }).on('didSet', async (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        await this.put('/config', { mode: this.modeValue(value) })
+      }
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'currentState',
+      Characteristic: this.Characteristics.hap.CurrentAirPurifierState
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'targetState',
+      Characteristic: this.Characteristics.hap.TargetAirPurifierState
+    }).on('didSet', async (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        await this.put('/config', { mode: this.modeValue(null, value) })
+      }
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'rotationSpeed',
+      Characteristic: this.Characteristics.hap.RotationSpeed,
+      unit: '%'
+    }).on('didSet', async (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        await this.put('/config', { mode: this.modeValue(null, null, value) })
+      }
+    })
+
+    if (resource.body.state.airquality !== undefined) {
+      this.airQualityService = new DeconzService.AirQuality(accessory, resource, {
+        linkedServiceDelegate: this
+      })
+    }
+
+    if (resource.body.state.replacefilter !== undefined) {
+      this.filterService = new FilterMaintenance(accessory, resource, {
+        linkedServiceDelegate: this
+      })
+    }
+
+    if (resource.body.state.deviceruntime !== undefined) {
+      // TODO
+    }
+
+    if (resource.body.config.ledindication !== undefined) {
+      // TODO
+    }
+
+    if (resource.body.config.locked !== undefined) {
+      this.addCharacteristicDelegate({
+        key: 'lockPhysicalControls',
+        Characteristic: this.Characteristics.hap.LockPhysicalControls
+      }).on('didSet', async (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          await this.put('/config', {
+            locked: value === this.Characteristics.hap.LockPhysicalControls
+              .CONTROL_LOCK_ENABLED
+          })
+        }
+      })
+    }
+
+    super.addCharacteristicDelegates()
+
+    this.update(resource.body)
+  }
+
+  modeValue (
+    active = this.values.active,
+    targetState = this.values.targetState,
+    rotationSpeed = this.values.rotationSpeed
+  ) {
+    if (active === this.Characteristics.hap.Active.INACTIVE) {
+      return 'off'
+    }
+    if (
+      targetState === this.Characteristics.hap.TargetAirPurifierState.AUTO ||
+      rotationSpeed === 0
+    ) {
+      return 'auto'
+    }
+    return 'speed_' + Math.round(rotationSpeed / 20)
+  }
+
+  updateState (state) {
+    if (this.values.filterLifeTime != null && state.filterruntime != null) {
+      this.values.filterLifeLevel = 100 - Math.round(
+        100 * state.filterruntime / this.values.filterLifeTime
+      )
+    }
+    if (state.replacefilter != null) {
+      this.values.filterChange = state.filterChange
+        ? this.Characteristics.hap.FilterChangeIndication.CHANGE_FILTER
+        : this.Characteristics.hap.FilterChangeIndication.FILTER_OK
+    }
+    if (state.speed != null) {
+      this.values.active = state.speed > 0
+        ? this.Characteristics.hap.Active.ACTIVE
+        : this.Characteristics.hap.Active.INACTIVE
+      this.values.currentState = state.speed === 0
+        ? this.Characteristics.hap.CurrentAirPurifierState.INACTIVE
+        : this.Characteristics.hap.CurrentAirPurifierState.PURIFYING_AIR
+      this.values.rotationSpeed = state.speed
+    }
+    super.updateState(state)
+    if (this.airQualityService != null) {
+      this.airQualityService.updateState(state)
+    }
+    if (this.filterService != null) {
+      this.filterService.updateState(state)
+    }
+  }
+
+  updateConfig (config) {
+    if (config.filterlifetime != null) {
+      this.values.filterLifeTime = config.filterlifetime
+    }
+    if (config.ledindication != null) {
+      // TODO
+    }
+    if (config.locked != null) {
+      this.values.lockPhysicalControls = config.locked
+        ? this.Characteristics.hap.LockPhysicalControls.CONTROL_LOCK_ENABLED
+        : this.Characteristics.hap.LockPhysicalControls.CONTROL_LOCK_DISABLED
+    }
+    if (config.mode != null) {
+      this.values.targetState = config.mode === 'auto'
+        ? this.Characteristics.hap.TargetAirPurifierState.AUTO
+        : this.Characteristics.hap.TargetAirPurifierState.MANUAL
+    }
+    super.updateConfig(config)
+    if (this.airQualityService != null) {
+      this.airQualityService.updateConfig(config)
+    }
+    if (this.filterService != null) {
+      this.filterService.updateConfig(config)
+    }
+  }
+}
+
+module.exports = AirPurifier

package/lib/DeconzService/AirQuality.js

@@ -20,14 +20,27 @@ class AirQuality extends DeconzService.SensorsResource {
       Characteristic: this.Characteristics.hap.AirQuality
     })
 
-    this.addCharacteristicDelegate({
-      key: 'vocDensity',
-      Characteristic: this.Characteristics.hap.VOCDensity,
-      unit: ' µg/m³',
-      props: { minValue: 0, maxValue: 65535, minStep: 1 }
-    })
+    if (resource.body.state.airqualityppb !== undefined) {
+      this.addCharacteristicDelegate({
+        key: 'vocDensity',
+        Characteristic: this.Characteristics.hap.VOCDensity,
+        unit: ' µg/m³',
+        props: { minValue: 0, maxValue: 65535, minStep: 1 }
+      })
+    }
 
-    super.addCharacteristicDelegates()
+    if (resource.body.state.pm2_5 !== undefined) {
+      this.addCharacteristicDelegate({
+        key: 'pm2_5Density',
+        Characteristic: this.Characteristics.hap.PM2_5Density,
+        unit: ' µg/m³',
+        props: { minValue: 0, maxValue: 65535, minStep: 1 }
+      })
+    }
+
+    if (params.linkedServiceDelegate == null) {
+      super.addCharacteristicDelegates()
+    }
 
     this.update(resource.body)
   }
@@ -56,6 +69,9 @@ class AirQuality extends DeconzService.SensorsResource {
     if (state.airqualityppb != null) {
       this.values.vocDensity = Math.round(state.airqualityppb * 4.57)
     }
+    if (state.pm2_5 != null) {
+      this.values.pm2_5Density = state.pm2_5
+    }
     super.updateState(state)
   }
 }

package/lib/DeconzService/Consumption.js

@@ -57,7 +57,7 @@ class Consumption extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    Consumption.updateResourceState(this.service, state)
+    Consumption.updateResourceState(this, state)
     super.updateState(state)
   }
 }

package/lib/DeconzService/Contact.js

@@ -45,6 +45,8 @@ class Contact extends DeconzService.SensorsResource {
     })
 
     this.addCharacteristicDelegates({ noTampered: true })
+
+    this.update(resource.body)
   }
 
   updateState (state) {

package/lib/DeconzService/Light.js

@@ -51,7 +51,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const bri = Math.round(value * 2.54)
-          this.put({ bri: bri })
+          this.put({ bri })
           this.updateAdaptiveLighting()
         }
       })
@@ -97,7 +97,7 @@ class Light extends DeconzService.LightsResource {
           this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
         )
         if (fromHomeKit) {
-          this.put({ ct: ct })
+          this.put({ ct })
           this.values.colormode = 'ct'
         }
         if (this.capabilities.xy && this.values.colormode === 'ct') {
@@ -118,7 +118,7 @@ class Light extends DeconzService.LightsResource {
           const xy = hsvToXy(
             value, this.values.saturation, this.capabilities.gamut
           )
-          this.put({ xy: xy })
+          this.put({ xy })
           this.values.colormode = 'xy'
         }
       })
@@ -129,7 +129,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: xy })
+          this.put({ xy })
           this.values.colormode = 'xy'
         }
       })
@@ -141,7 +141,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: hue })
+          this.put({ hue })
           this.values.colormode = 'hs'
         }
       })
@@ -152,7 +152,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: sat })
+          this.put({ sat })
           this.values.colormode = 'hs'
         }
       })
@@ -165,7 +165,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const effect = value ? 'colorloop' : 'none'
-          const state = { effect: effect }
+          const state = { effect }
           if (value) {
             state.colorloopspeed = this.values.colorLoopSpeed
           }
@@ -181,7 +181,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const effect = 'colorloop'
-          this.put({ effect: effect, colorloopspeed: value })
+          this.put({ effect, colorloopspeed: value })
           this.values.colormode = 'hs'
         }
       })
@@ -467,7 +467,7 @@ class Light extends DeconzService.LightsResource {
     if (this.values.colormode === 'ct' && ct === this.values.colorTemperature) {
       return
     }
-    this.put({ ct: ct })
+    this.put({ ct })
     this.fromAdaptiveLighting = true
     this.values.colormode = 'ct'
     if (ct !== this.values.colorTemperature) {

package/lib/DeconzService/LightLevel.js

@@ -35,6 +35,8 @@ class LightLevel extends DeconzService.SensorsResource {
     })
 
     this.addCharacteristicDelegates()
+
+    this.update(resource.body)
   }
 
   updateState (state) {

package/lib/DeconzService/Motion.js

@@ -35,7 +35,7 @@ class Motion extends DeconzService.SensorsResource {
           : value === this.Characteristics.eve.Sensitivity.LOW
             ? 0
             : Math.round(this.sensitivitymax / 2)
-        await this.put('/config', { sensitivity: sensitivity })
+        await this.put('/config', { sensitivity })
       }
     })
 

package/lib/DeconzService/Power.js

@@ -75,7 +75,7 @@ class Power extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    Power.updateResourceState(this.service, state)
+    Power.updateResourceState(this, state)
     super.updateState(state)
   }
 }

package/lib/DeconzService/Switch.js

@@ -42,8 +42,8 @@ class Switch extends DeconzService.SensorsResource {
       this.buttonServices[i] = new DeconzService.Button(this.accessoryDelegate, {
         name: this.name + ' ' + label,
         button: Number(i),
-        events: events,
-        hasRepeat: hasRepeat
+        events,
+        hasRepeat
       })
     }
   }

package/lib/DeconzService/Temperature.js

@@ -27,6 +27,7 @@ class Temperature extends DeconzService.SensorsResource {
       key: 'offset',
       Characteristic: this.Characteristics.my.Offset,
       unit: '°C',
+      props: { minValue: -5, maxValue: 5, minStep: 0.1 },
       value: 0
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {

package/lib/DeconzService/Thermostat.js

@@ -77,6 +77,7 @@ class Thermostat extends DeconzService.SensorsResource {
       key: 'offset',
       Characteristic: this.Characteristics.my.Offset,
       unit: '°C',
+      props: { minValue: -5, maxValue: 5, minStep: 0.1 },
       value: 0
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {

package/lib/DeconzService/WindowCovering.js

@@ -114,7 +114,7 @@ class WindowCovering extends DeconzService.LightsResource {
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
     this.moving = new Date()
-    await this.put({ lift: lift })
+    await this.put({ lift })
   }
 
   updateState (state) {
@@ -135,7 +135,7 @@ class WindowCovering extends DeconzService.LightsResource {
         this.values.closeUpwards = closeUpwards
       }
       if (
-        this.moving == null || new Date() - this.moving >= 15000 || (
+        this.moving == null || new Date() - this.moving >= 30000 || (
           position === this.values.targetPosition &&
           (closeUpwards == null || closeUpwards === this.targetCloseUpwards)
         )

package/lib/DeconzService/index.js

@@ -15,6 +15,7 @@ const { dateToString } = Deconz.ApiClient
   */
 class DeconzService extends homebridgeLib.ServiceDelegate {
   static get AirPressure () { return require('./AirPressure') }
+  static get AirPurifier () { return require('./AirPurifier') }
   static get AirQuality () { return require('./AirQuality') }
   static get Alarm () { return require('./Alarm') }
   static get Battery () { return require('./Battery') }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.14",
+  "version": "0.0.17",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -20,14 +20,14 @@
     "deconz": "cli/deconz.js"
   },
   "engines": {
-    "deCONZ": "2.14.1",
-    "homebridge": "^1.4.0",
-    "node": "^16.14.0"
+    "deCONZ": "2.16.1",
+    "homebridge": "^1.4.1",
+    "node": "^16.15.1"
   },
   "dependencies": {
-    "homebridge-lib": "~5.3.0",
-    "semver": "^7.3.5",
-    "ws": "^8.5.0",
+    "homebridge-lib": "~5.6.0",
+    "semver": "^7.3.7",
+    "ws": "^8.8.0",
     "xml2js": "~0.4.23"
   },
   "scripts": {