homebridge-deconz 0.0.8 → 0.0.9

package/cli/deconz.js

@@ -517,7 +517,7 @@ class Main extends homebridgeLib.CommandLineTool {
         'missing API key - unlock gateway and run "deconz%s getApiKey"', args
       )
     }
-    this.client = new Deconz.Client(this.clargs.options)
+    this.client = new Deconz.ApiClient(this.clargs.options)
     this.client
       .on('error', (error) => {
         if (error.request.id !== this.requestId) {
@@ -688,10 +688,9 @@ class Main extends homebridgeLib.CommandLineTool {
     this.jsonFormatter = new homebridgeLib.JsonFormatter(
       mode === 'service' ? { noWhiteSpace: true } : {}
     )
-    const WsMonitor = require('../lib/DeconzWsClient')
     const { websocketport } = await this.client.get('/config')
     options.host = this.client.host + ':' + websocketport
-    this.wsMonitor = new WsMonitor(options)
+    this.wsMonitor = new Deconz.WsClient(options)
     this.setOptions({ mode: mode })
     this.wsMonitor
       .on('error', (error) => { this.error(error) })

package/lib/Deconz/Resource.js

@@ -7,7 +7,10 @@
 
 const homebridgeLib = require('homebridge-lib')
 
-const { toInt, toObject, toString } = homebridgeLib.OptionParser
+const { toInstance, toInt, toObject, toString } = homebridgeLib.OptionParser
+const { defaultGamut } = homebridgeLib.Colour
+
+const DeconzAccessory = require('../DeconzAccessory')
 
 const rtypes = ['lights', 'sensors', 'groups']
 
@@ -26,6 +29,53 @@ const sensorsPrios = [
   'Thermostat'
 ]
 
+// =============================================================================
+
+// See: http://www.developers.meethue.com/documentation/supported-lights
+
+const hueGamutType = { // Color gamut per light model.
+  A: { // Color Lights
+    r: [0.7040, 0.2960],
+    g: [0.2151, 0.7106],
+    b: [0.1380, 0.0800]
+  },
+  B: { // Extended Color Lights
+    r: [0.6750, 0.3220],
+    g: [0.4090, 0.5180],
+    b: [0.1670, 0.0400]
+  },
+  C: { // next gen Extended Color Lights
+    r: [0.6920, 0.3080],
+    g: [0.1700, 0.7000],
+    b: [0.1530, 0.0480]
+  }
+}
+
+const hueGamutTypeByModel = {
+  LCT001: 'B', // Hue bulb A19
+  LCT002: 'B', // Hue Spot BR30
+  LCT003: 'B', // Hue Spot GU10
+  LCT007: 'B', // Hue bulb A19
+  LCT010: 'C', // Hue bulb A19
+  LCT011: 'C', // Hue BR30
+  LCT012: 'C', // Hue Color Candle
+  LCT014: 'C', // Hue bulb A19
+  LCT015: 'C', // Hue bulb A19
+  LCT016: 'C', // Hue bulb A19
+  LLC005: 'A', // Living Colors Gen3 Bloom, Aura
+  LLC006: 'A', // Living Colors Gen3 Iris
+  LLC007: 'A', // Living Colors Gen3 Bloom, Aura
+  LLC010: 'A', // Hue Living Colors Iris
+  LLC011: 'A', // Hue Living Colors Bloom
+  LLC012: 'A', // Hue Living Colors Bloom
+  LLC013: 'A', // Disney Living Colors
+  LLC014: 'A', // Living Colors Gen3 Bloom, Aura
+  LLC020: 'C', // Hue Go
+  LLM001: 'B', // Color Light Module
+  LST001: 'A', // Hue LightStrips
+  LST002: 'C' // Hue LightStrips Plus
+}
+
 /** Delegate class for a resource on a deCONZ gateway.
   *
   * @memberof Deconz
@@ -47,14 +97,14 @@ class Resource {
 
   /** Create a new instance of a delegate of a resource.
     *
-    * @param {string} gid - The device ID of the gateway.
+    * @param {DeconzAccessory.Gateway} gateway - The gateway.
     * @param {string} rtype - The resource type of the resource:
     * `groups`, `lights`, or `sensors`.
     * @param {integer} rid - The resource ID of the resource.
     * @param {object} body - The body of the resource.
     */
-  constructor (gid, rtype, rid, body) {
-    toString('gid', gid, true)
+  constructor (gateway, rtype, rid, body) {
+    toInstance('gateway', gateway, DeconzAccessory.Gateway)
 
     /** The resource type of the resource: `groups`, `lights`, or `sensors`.
       * @type {string}
@@ -112,9 +162,78 @@ class Resource {
       this.zigbee = true
     } else {
       this.subtype = '-' + rtype[0].toUpperCase() + rid
-      this.id = gid + this.subtype
+      this.id = gateway.id + this.subtype
       this.zigbee = false
     }
+
+    /** The associated Homekit _Manufacturer_.
+      *
+      * For Zigbee devices, this is the sanitised `manufacturername` in the
+      * resource body.
+      * For virtual devices, this is the _Manufacturer_ for the gateway.
+      * @type {string}
+      */
+    this.manufacturer = this.zigbee
+      ? body.manufacturername
+      : gateway.values.manufacturer
+
+    /** The associated HomeKit _Model_.
+      *
+      * For Zigbee devices, this is the sanitised `modelid` in the
+      * resource body.
+      * For virtual devices, this is the `type` in the resource body.
+      * @type {string}
+      */
+    this.model = this.zigbee ? body.modelid : body.type
+
+    /** The associated HomeKit _Firmware Version_.
+      *
+      * For Zigbee devices, this is the sanitised `swversion` in the
+      * resource body.
+      * For virtual devices, this is the _Firmware Version_ for the gateway.
+      */
+    this.firmware = this.zigbee
+      ? body.swversion == null ? '0.0.0' : body.swversion
+      : gateway.values.software
+
+    switch (this.serviceName) {
+      case 'Light': {
+        if (body.action != null) {
+          Object.assign(body.state, body.action)
+          delete body.state.on
+        }
+        this.capabilities = {
+          on: body.state.on !== undefined,
+          bri: body.state.bri !== undefined,
+          ct: body.state.ct !== undefined,
+          ctMax: (body.ctmax != null && body.ctmax !== 0 && body.ctmax !== 65535)
+            ? body.ctmax
+            : 500,
+          ctMin: (body.ctmin != null && body.ctmin !== 0)
+            ? body.ctmin
+            : 153,
+          xy: body.state.xy !== undefined,
+          gamut: defaultGamut,
+          alert: body.state.alert !== undefined,
+          colorLoop: body.state.effect !== undefined
+        }
+        break
+      }
+      case 'WarningDevice':
+        this.capabilities = {}
+        break
+      case 'WindowCovering':
+        this.capabilities = {}
+        break
+      default:
+        this.capabilities = {}
+        break
+    }
+
+    const f = 'patch' + this.serviceName
+    if (typeof this[f] === 'function') {
+      this[f](gateway)
+    }
   }
 
   /** The priority of the resource, when determining the primary resource for a
@@ -143,7 +262,7 @@ class Resource {
     */
   get serviceName () {
     if (this.rtype === 'groups') {
-      return 'Group'
+      return 'Light'
     } else if (this.rtype === 'lights') {
       switch (this.body.type) {
         case 'Color dimmable light': return 'Light'
@@ -222,6 +341,141 @@ class Resource {
       }
     }
   }
+
+  /** Patch a resource corresponding to a `Light` service.
+  * @param {DeconzAccessory.Gateway} gateway - The gateway.
+    */
+  patchLight (gateway) {
+    switch (this.manufacturer) {
+      case 'Busch-Jaeger':
+        // See: https://www.busch-jaeger.de/en/products/product-solutions/dimmer/busch-radio-controlled-dimmer-zigbee-light-link/
+        if (
+          this.model === 'RM01' && // 6715 U-500 with 6736-84.
+          this.capabilities.bri && this.body.type === 'On/Off light' // Issue #241
+        ) {
+          gateway.debug(
+            '%s: ignoring state.bri for %s', this.rpath, this.body.type
+          )
+          this.capabilities.bri = false
+        }
+        break
+      case 'dresden elektronik':
+        // See: https://www.dresden-elektronik.de/funktechnik/solutions/wireless-light-control/wireless-ballasts/?L=1
+        this.capabilities.computesXy = true
+        break
+      case 'FeiBit':
+        if (this.model === 'FNB56-SKT1EHG1.2') { // issue #361
+          this.body.type = 'On/Off plug-in unit'
+        }
+        break
+      case 'GLEDOPTO':
+        // See: https://www.led-trading.de/zigbee-kompatibel-controller-led-lichtsteuerung
+        this.capabilities.gamut = {
+          r: [0.7006, 0.2993],
+          g: [0.1387, 0.8148],
+          b: [0.1510, 0.0227]
+        }
+        if (this.model === 'GLEDOPTO') { // Issue #244
+          if (
+            this.subtype === '0a' &&
+            this.body.type === 'Dimmable light' &&
+            this.firmware === '1.0.2'
+          ) {
+            this.model = 'RGBW'
+          } else if (
+            this.subtype === '0b' &&
+            this.body.type === 'Color temperature light' &&
+            this.firmware === '1.3.002'
+          ) {
+            this.model = 'WW/CW'
+          } else if (
+            this.subtype === '0b' &&
+            this.body.type === 'Extended color light' &&
+            this.firmware === '1.0.2'
+          ) {
+            this.model = 'RGB+CCT'
+            const device = gateway.resourceById[this.id]
+            if (device != null && device.resourceBySubtype.length > 1) {
+              this.model = 'RGBW'
+              this.capabilities.ct = false
+            }
+          } else {
+            return
+          }
+          gateway.debug('%s: set model to %j', this.rpath, this.model)
+        }
+        break
+      case 'IKEA of Sweden':
+        // See: http://www.ikea.com/us/en/catalog/categories/departments/lighting/smart_lighting/
+        this.capabilities.gamut = defaultGamut // Issue #956
+        this.capabilities.noTransition = true
+        if (this.model === 'TRADFRI bulb E27 CWS 806lm') {
+          this.capabilities.computesXy = true
+          this.capabilities.gamut = {
+            r: [0.68, 0.31],
+            g: [0.11, 0.82],
+            b: [0.13, 0.04]
+          }
+        }
+        break
+      case 'innr':
+        // See: https://shop.innrlighting.com/en/shop
+        this.capabilities.gamut = { // Issue #152
+          r: [0.8817, 0.1033],
+          g: [0.2204, 0.7758],
+          b: [0.0551, 0.1940]
+        }
+        if (this.model === 'SP 120') { // smart plug
+          this.capabilities.bri = false
+        }
+        break
+      case 'LIDL Livarno Lux':
+        this.capabilities.ctMax = 454 // 2200 K
+        this.capabilities.ctMin = 153 // 6500 K
+        if (this.model === 'HG06467') { // Xmas light strip
+          this.capabilities.colorLoop = false
+          this.capabilities.hs = true
+          this.capabilities.effects = [
+            'Steady', 'Snow', 'Rainbow', 'Snake',
+            'Twinkle', 'Fireworks', 'Flag', 'Waves',
+            'Updown', 'Vintage', 'Fading', 'Collide',
+            'Strobe', 'Sparkles', 'Carnival', 'Glow'
+          ]
+        }
+        break
+      case 'MLI': // Issue #439
+        this.capabilities.gamut = {
+          r: [0.68, 0.31],
+          g: [0.11, 0.82],
+          b: [0.13, 0.04]
+        }
+        if (this.capabilities.colorloop) {
+          this.capabilities.effects = [
+            'Sunset', 'Party', 'Worklight', 'Campfire', 'Romance', 'Nightlight'
+          ]
+        }
+        break
+      case 'OSRAM':
+        this.capabilities.gamut = {
+          r: [0.6877, 0.3161],
+          g: [0.1807, 0.7282],
+          b: [0.1246, 0.0580]
+        }
+        break
+      case 'Philips':
+      case 'Signify Netherlands B.V.': {
+        // See: http://www.developers.meethue.com/documentation/supported-lights
+        this.manufacturer = 'Signify Netherlands B.V.'
+        this.capabilities.breathe = true
+        this.capabilities.computesXy = true
+        const gamut = hueGamutTypeByModel[this.model] || 'C'
+        this.capabilities.gamut = hueGamutType[gamut]
+      }
+        break
+      default:
+        break
+    }
+  }
 }
 
 module.exports = Resource

package/lib/DeconzAccessory/Gateway.js

@@ -119,6 +119,8 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       */
     this.accessoryByRpath = {}
 
+    this.defaultTransitionTime = 0.4
+
     /** Map of errors by device ID trying to expose the corresponding accessory.
       * @type {Object<string, Error>}
       */
@@ -158,6 +160,18 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       .on('shutdown', this.shutdown)
   }
 
+  get transitionTime () { return this.service.values.transitionTime }
+
+  async resetTransitionTime () {
+    if (this.resetting) {
+      return
+    }
+    this.resetting = true
+    await homebridgeLib.timeout(this.platform.config.waitTimeUpdate)
+    this.service.values.transitionTime = this.defaultTransitionTime
+    this.resetting = false
+  }
+
   /** Log debug messages.
     */
   identify () {
@@ -772,7 +786,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         this.deleteService(id)
         changed = true
       } else {
-        /** Emitted when the didSetway has been polled.
+        /** Emitted when the gateway has been polled.
           * @event DeconzAccessory.Device#polled
           * @param {Deconz.Device} device - The updated device.
           */
@@ -851,7 +865,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     * unsupported resources.
     */
   analyseResource (rtype, rid, body, logUnsupported) {
-    const resource = new Deconz.Resource(this.id, rtype, rid, body)
+    const resource = new Deconz.Resource(this, rtype, rid, body)
     const { id, serviceName } = resource
     if (id === this.id || serviceName === '') {
       const debug = (logUnsupported ? this.debug : this.vdebug).bind(this)

package/lib/DeconzAccessory/Light.js

@@ -0,0 +1,65 @@
+// homebridge-deconz/lib/DeconzAccessory/Device.js
+// Copyright © 2022 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const DeconzAccessory = require('.')
+const DeconzService = require('../DeconzService')
+
+/** Delegate class for a HomeKit accessory,
+  * corresponding to a Zigbee or virtual device on a deCONZ gateway,
+  * that is not yet supported.
+  * @extends DeconzAccessory
+  * @memberof DeconzAccessory
+  */
+class Light 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) {
+    super(gateway, device)
+
+    this.identify()
+
+    this.service = new DeconzService.Light(this, device.resource)
+
+    this.settingsService = new DeconzService.DeviceSettings(this, {
+      name: this.name + ' Settings',
+      subtype: this.id,
+      resource: this.device.rpaths.join(', '),
+      expose: true,
+      logLevel: gateway.logLevel
+    })
+
+    this
+      .on('polled', (device) => {
+        this.debug('%s: polled: %j', device.resource.rpath, device.resource.body)
+        this.service.update(device.resource.body)
+        this.service.checkAdaptiveLighting()
+      })
+      .on('changed', (rpath, body) => {
+        if (rpath === device.resource.rpath) {
+          this.debug('%s: changed: %j', rpath, body)
+          this.service.update(body)
+        }
+      })
+      .on('identify', this.identify)
+
+    setImmediate(() => {
+      this.debug('initialised')
+      this.emit('initialised')
+    })
+  }
+
+  async identify () {
+    super.identify()
+    if (this.service != null) {
+      await this.service.identify()
+    }
+  }
+}
+
+module.exports = Light

package/lib/DeconzAccessory/index.js

@@ -11,25 +11,23 @@ const homebridgeLib = require('homebridge-lib')
   * corresponding to a Zigbee or virtual device on a deCONZ gateway.
   */
 class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
-  static get Gateway () { return require('./Gateway') }
   static get Device () { return require('./Device') }
+  static get Light () { return require('./Light') }
+  static get Gateway () { return require('./Gateway') }
 
   /** Instantiate a delegate for an accessory corresponding to a device.
     * @param {DeconzAccessory.Gateway} gateway - The gateway.
     * @param {Deconz.Device} device - The device.
+    * @param {Accessory.Category} category - The HomeKit accessory category.
     */
-  constructor (gateway, device) {
-    const { body, category } = device.resource
+  constructor (gateway, device, category) {
+    // TODO device settings
     super(gateway.platform, {
       id: device.id,
-      name: body.name,
-      manufacturer: device.zigbee
-        ? body.manufacturername
-        : gateway.values.manufacturer,
-      model: device.zigbee ? body.modelid : body.type,
-      firmware: device.zigbee
-        ? body.swversion == null ? '0.0.0' : body.swversion
-        : gateway.values.software,
+      name: device.resource.body.name,
+      manufacturer: device.resource.manufacturer,
+      model: device.resource.model,
+      firmware: device.resource.firmware,
       category: category,
       logLevel: gateway.logLevel
     })
@@ -50,6 +48,11 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
       * @type {Deconz.Device}
       */
     this.device = device
+
+    /** The API client instance for the gateway.
+      * @type {Deconz.ApiClient}
+      */
+    this.client = gateway.client
   }
 
   /** The primary resource of the device.

package/lib/DeconzService/GatewaySettings.js

@@ -129,10 +129,11 @@ class GatewaySettings extends homebridgeLib.ServiceDelegate {
     })
 
     this.addCharacteristicDelegate({
-      key: 'transitiontime',
+      key: 'transitionTime',
       Characteristic: this.Characteristics.my.TransitionTime,
-      value: 0.4
+      value: this.gateway.defaultTransitionTime
     })
+    this.values.transitionTime = this.gateway.defaultTransitionTime
 
     this.addCharacteristicDelegate({
       key: 'unlock',

package/lib/DeconzService/Light.js

@@ -0,0 +1,469 @@
+// homebridge-deconz/lib/DeconzService/Sensor.js
+// Copyright © 2022 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const homebridgeLib = require('homebridge-lib')
+const Deconz = require('../Deconz')
+
+const { dateToString } = Deconz.ApiClient
+const { timeout } = homebridgeLib
+const { xyToHsv, hsvToXy, ctToXy } = homebridgeLib.Colour
+
+class Light extends homebridgeLib.ServiceDelegate {
+  constructor (accessory, resource) {
+    super(accessory, {
+      id: resource.id,
+      name: resource.body.name,
+      subtype: resource.subtype,
+      Service: accessory.Services.hap.Lightbulb
+    })
+    this.id = resource.id
+    this.gateway = accessory.gateway
+    this.client = accessory.client
+    this.resource = resource
+    this.rtype = resource.rtype
+    this.rid = resource.rid
+    this.rpath = resource.rpath +
+      (resource.rtype === 'groups' ? '/action' : '/state')
+    this.capabilities = resource.capabilities
+
+    this.debug('%s: capabilities: %j', this.resource.rpath, this.capabilities)
+
+    this.targetState = {}
+    this.deferrals = []
+
+    this.addCharacteristicDelegate({
+      key: 'on',
+      Characteristic: this.Characteristics.hap.On,
+      value: this.capabilities.on
+        ? this.resource.body.state.on
+        : this.resource.body.state.all_on,
+      setter: async (value) => { return this.put({ on: value }) }
+    }).on('didSet', (value, fromHomekit) => {
+      this.checkAdaptiveLighting()
+    })
+
+    if (!this.capabilities.on) {
+      this.addCharacteristicDelegate({
+        key: 'anyOn',
+        Characteristic: this.Characteristics.my.AnyOn,
+        value: this.resource.body.state.any_on,
+        setter: async (value) => { return this.put({ on: value }) }
+      }).on('didSet', (value, fromHomekit) => {
+        this.checkAdaptiveLighting()
+      })
+    }
+
+    if (this.capabilities.bri) {
+      this.brightnessDelegate = this.addCharacteristicDelegate({
+        key: 'brightness',
+        Characteristic: this.Characteristics.hap.Brightness,
+        unit: '%',
+        value: this.resource.body.state.bri,
+        setter: async (value) => {
+          const bri = Math.round(value * 254.0 / 100.0)
+          return this.put({ bri: bri })
+        }
+      }).on('didSet', (value, fromHomekit) => {
+        this.checkAdaptiveLighting()
+      })
+
+      this.addCharacteristicDelegate({
+        key: 'brightnessChange',
+        Characteristic: this.Characteristics.my.BrightnessChange,
+        value: 0,
+        setter: async (value) => {
+          return this.put({ bri_inc: Math.round(value * 254.0 / 100.0) })
+        }
+      }).on('didSet', async () => {
+        await timeout(this.platform.config.waitTimeReset)
+        this.values.brightnessChange = 0
+      })
+      this.values.brightnessChange = 0
+    }
+
+    if (this.capabilities.ct || this.capabilities.xy || this.capabilities.hs) {
+      this.addCharacteristicDelegate({
+        key: 'colormode',
+        value: this.resource.body.state.colormode
+      })
+    }
+
+    if (this.capabilities.ct) {
+      this.colorTemperatureDelegate = this.addCharacteristicDelegate({
+        key: 'colorTemperature',
+        Characteristic: this.Characteristics.hap.ColorTemperature,
+        unit: ' mired',
+        props: {
+          minValue: this.capabilities.ctMin,
+          maxValue: this.capabilities.ctMax
+        },
+        value: this.resource.body.state.ct,
+        setter: async (value) => {
+          const ct = Math.max(
+            this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
+          )
+          return this.put({ ct: ct })
+        }
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          this.values.activeTransitionCount = 0
+        }
+        if (
+          this.capabilities.xy && !this.capabilities.computesXy &&
+          this.values.colormode === 'ct'
+        ) {
+          const { h, s } = xyToHsv(ctToXy(value), this.capabilities.gamut)
+          this.values.hue = h
+          this.values.saturation = s
+        }
+      })
+
+      if (this.capabilities.bri) {
+        this.addCharacteristicDelegate({
+          key: 'supportedTransitionConfiguration',
+          Characteristic: this.Characteristics.hap
+            .SupportedCharacteristicValueTransitionConfiguration,
+          silent: true
+        })
+        this.addCharacteristicDelegate({
+          key: 'transitionControl',
+          Characteristic: this.Characteristics.hap
+            .CharacteristicValueTransitionControl,
+          silent: true,
+          getter: async () => {
+            await this.initAdaptiveLighting()
+            return this.adaptiveLighting.generateControl()
+          },
+          setter: async (value) => {
+            await this.initAdaptiveLighting()
+            this.adaptiveLighting.parseControl(value)
+            const response = this.adaptiveLighting.generateControlResponse()
+            this.values.activeTransitionCount = 1
+            return response
+          }
+        })
+        this.addCharacteristicDelegate({
+          key: 'activeTransitionCount',
+          Characteristic: this.Characteristics.hap
+            .CharacteristicValueActiveTransitionCount,
+          value: 0
+        }).on('didSet', (value) => {
+          if (!value) {
+            this.adaptiveLighting.deactivate()
+          } else {
+            this.checkAdaptiveLighting()
+          }
+        })
+      }
+    }
+
+    if (this.capabilities.xy) {
+      this.addCharacteristicDelegate({
+        key: 'hue',
+        Characteristic: this.Characteristics.hap.Hue,
+        unit: '°',
+        setter: async (value) => {
+          const xy = hsvToXy(value, this.values.saturation, this.capabilities.gamut)
+          return this.put({ xy: xy })
+        }
+      }).on('didSet', (value, fromHomekit) => {
+        if (fromHomekit) {
+          this.values.activeTransitionCount = 0
+        }
+      })
+      this.addCharacteristicDelegate({
+        key: 'saturation',
+        Characteristic: this.Characteristics.hap.Saturation,
+        unit: '%',
+        setter: async (value) => {
+          const xy = hsvToXy(this.values.hue, value, this.capabilities.gamut)
+          return this.put({ xy: xy })
+        }
+      }).on('didSet', (value, fromHomekit) => {
+        if (fromHomekit) {
+          this.values.activeTransitionCount = 0
+        }
+      })
+    } else if (this.capabilities.hs) {
+      this.addCharacteristicDelegate({
+        key: 'hue',
+        Characteristic: this.Characteristics.hap.Hue,
+        unit: '°',
+        setter: async (value) => {
+          const hue = Math.round(this.hk.hue * 65535.0 / 360.0)
+          return this.put({ hue: hue })
+        }
+      }).on('didSet', (value, fromHomekit) => {
+        if (fromHomekit) {
+          this.values.activeTransitionCount = 0
+        }
+      })
+      this.addCharacteristicDelegate({
+        key: 'saturation',
+        Characteristic: this.Characteristics.hap.Saturation,
+        unit: '%',
+        setter: async (value) => {
+          const sat = Math.round(this.hk.sat * 254.0 / 100.0)
+          return this.put({ sat: sat })
+        }
+      }).on('didSet', (value, fromHomekit) => {
+        if (fromHomekit) {
+          this.values.activeTransitionCount = 0
+        }
+      })
+    }
+
+    if (this.capabilities.colorLoop) {
+      this.addCharacteristicDelegate({
+        key: 'colorLoop',
+        Characteristic: this.Characteristics.my.ColorLoop,
+        setter: async (value) => {
+          const effect = value ? 'colorloop' : 'none'
+          const state = { effect: effect }
+          if (value) {
+            state.colorloopspeed = this.values.colorLoopSpeed
+          }
+          return this.put(state)
+        }
+      })
+      this.addCharacteristicDelegate({
+        key: 'colorLoopSpeed',
+        Characteristic: this.Characteristics.my.ColorLoopSpeed,
+        unit: 's',
+        value: 25,
+        setter: async (value) => {
+          return this.put({ effect: 'colorloop', colorloopspeed: value })
+        }
+      })
+    }
+
+    this.addCharacteristicDelegate({
+      key: 'lastSeen',
+      Characteristic: this.Characteristics.my.LastSeen
+    })
+
+    this.addCharacteristicDelegate({
+      key: 'statusFault',
+      Characteristic: this.Characteristics.hap.StatusFault
+    })
+
+    this.settings = {
+      brightnessAdjustment: 1,
+      resetTimeout: this.platform.config.resetTimeout,
+      waitTimeUpdate: this.platform.config.waitTimeUpdate,
+      wallSwitch: false
+    }
+
+    this.update(this.resource.body)
+  }
+
+  update (body) {
+    for (const key in body) {
+      const value = body[key]
+      switch (key) {
+        case 'action':
+          // Copied to `state` by `Resource` during polling.
+          break
+        case 'state':
+          this.updateState(value)
+          break
+        case 'lastannounced':
+          // this.values.lastBoot = dateToString(value)
+          break
+        case 'lastseen':
+          this.values.lastSeen = dateToString(value)
+          break
+        case 'colorcapabilities':
+        case 'ctmax':
+        case 'ctmin':
+        case 'devicemembership':
+        case 'etag':
+        case 'id':
+        case 'lights':
+        case 'hascolor':
+        case 'manufacturername':
+        case 'modelid':
+        case 'name':
+        case 'powerup':
+        case 'scenes':
+        case 'swversion':
+        case 'type':
+        case 'uniqueid':
+          break
+        default:
+          this.warn('%s: unknown %s attribute', key, this.rtype)
+          break
+      }
+    }
+  }
+
+  updateState (state) {
+    for (const key in state) {
+      const value = state[key]
+      switch (key) {
+        case 'all_on':
+          this.values.on = value
+          break
+        case 'any_on':
+          this.values.anyOn = value
+          break
+        case 'alert':
+          break
+        case 'bri':
+          this.values.brightness = Math.round(value * 100.0 / 254.0)
+          break
+        case 'colormode':
+          this.values.colormode = value
+          break
+        case 'ct':
+          this.values.colorTemperature = value
+          break
+        case 'effect':
+          break
+        case 'hue':
+          if (!this.capabilities.xy) {
+            this.values.hue = value
+          }
+          break
+        case 'on':
+          this.values.on = value
+          break
+        case 'reachable':
+          this.values.statusFault = value
+            ? this.Characteristics.hap.StatusFault.NO_FAULT
+            : this.Characteristics.hap.StatusFault.GENERAL_FAULT
+          break
+        case 'sat':
+          if (!this.capabilities.xy) {
+            this.values.hue = value
+          }
+          break
+        case 'scene':
+          break
+        case 'xy':
+          if (this.values.colormode !== 'ct' || this.capabilities.computesXy) {
+            const { h, s } = xyToHsv(value, this.capabilities.gamut)
+            this.values.hue = h
+            this.values.saturation = s
+          }
+          break
+        default:
+          this.warn('state.%s: unknown %s attribute', key, this.rtype)
+          break
+      }
+    }
+  }
+
+  async identify () {
+    try {
+      if (this.capabilities.alert) {
+        if (this.capabilities.breathe) {
+          await this.put({ alert: 'breathe' })
+          await timeout(1500)
+          return this.put({ alert: 'stop' })
+        }
+        return this.put({ alert: 'select' })
+      }
+    } catch (error) { this.warn(error) }
+  }
+
+  async initAdaptiveLighting () {
+    if (this.adaptiveLighting == null) {
+      this.adaptiveLighting = new homebridgeLib.AdaptiveLighting(
+        this.brightnessDelegate, this.colorTemperatureDelegate
+      )
+      this.values.supportedTransitionConfiguration =
+        this.adaptiveLighting.generateConfiguration()
+      if (
+        this.values.activeTransitionCount === 1 &&
+        this.values.transitionControl != null
+      ) {
+        this.adaptiveLighting.parseControl(this.values.transitionControl)
+      }
+    }
+  }
+
+  async checkAdaptiveLighting () {
+    if (this.adaptiveLighting == null || !this.values.on) {
+      return
+    }
+    const ct = this.adaptiveLighting.getCt(
+      this.values.brightness * this.settings.brightnessAdjustment
+    )
+    if (ct == null || ct === this.values.ct) {
+      return
+    }
+    return this.put({ ct: ct })
+  }
+
+  // Collect changes into a combined request.
+  async put (state) {
+    return new Promise((resolve, reject) => {
+      for (const key in state) {
+        this.targetState[key] = state[key]
+      }
+      const d = { resolve: resolve, reject: reject }
+      this.deferrals.push(d)
+      if (this.updating) {
+        return
+      }
+      this.updating = true
+      if (this.settings.waitTimeUpdate > 0) {
+        setTimeout(() => {
+          this._put()
+        }, this.settings.waitTimeUpdate)
+      } else {
+        this._put()
+      }
+    })
+  }
+
+  // Send the request (for the combined changes) to the gateway.
+  async _put () {
+    const targetState = this.targetState
+    const deferrals = this.deferrals
+    this.targetState = {}
+    this.deferrals = []
+    this.updating = false
+    if (
+      this.gateway.transitionTime !== this.gateway.defaultTransitionTime &&
+      targetState.transitiontime === undefined
+    ) {
+      targetState.transitiontime = this.gateway.transitionTime * 10
+      this.gateway.resetTransitionTime()
+    }
+    if (this.capabilities.noTransition) {
+      if (
+        (
+          targetState.on != null || targetState.bri != null ||
+          targetState.bri_inc != null
+        ) && (
+          targetState.xy != null || targetState.ct != null ||
+          targetState.hue != null || targetState.sat != null ||
+          targetState.effect != null
+        )
+      ) {
+        targetState.transitiontime = 0
+      }
+    }
+    this.client.put(this.rpath, targetState).then((obj) => {
+      this.recentlyUpdated = true
+      for (const d of deferrals) {
+        d.resolve(true)
+      }
+      setTimeout(() => {
+        this.recentlyUpdated = false
+      }, 500)
+    }).catch((error) => {
+      for (const d of deferrals) {
+        d.reject(error)
+      }
+    })
+  }
+}
+
+module.exports = Light

package/lib/DeconzService/Sensor.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const homebridgeLib = require('homebridge-lib')
-const deconzClient = require('../deconzClient')
+const Deconz = require('../Deconz')
 
 /**
   * @memberof DeconzService
@@ -46,7 +46,7 @@ class Sensor extends homebridgeLib.ServiceDelegate {
   }
 
   update (sensor) {
-    this.values.lastUpdated = deconzClient.dateToString(sensor.state.lastupdated)
+    this.values.lastUpdated = Deconz.Client.dateToString(sensor.state.lastupdated)
     this.values.enabled = sensor.config.on
     this.values.statusFault = sensor.config.reachable === false
       ? this.Characteristics.hap.StatusFault.GENERAL_FAULT

package/lib/DeconzService/index.js

@@ -22,7 +22,7 @@ class DeconzService {
   static get GatewaySettings () { return require('./GatewaySettings') }
   // static get Humidity () { return require('./Humidity') }
   // static get Light () { return require('./Light') }
-  // static get LightBulb () { return require('./LightBulb') }
+  static get Light () { return require('./Light') }
   // static get LightLevel () { return require('./LightLevel') }
   // static get Outlet () { return require('./Outlet') }
   // static get OpenClose () { return require('./OpenClose') }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -25,7 +25,7 @@
     "node": "^16.13.2"
   },
   "dependencies": {
-    "homebridge-lib": "~5.1.24-5",
+    "homebridge-lib": "~5.1.24-6",
     "semver": "^7.3.5",
     "ws": "^8.4.2",
     "xml2js": "~0.4.23"