homebridge-deconz 0.1.10 → 0.1.11

package/cli/deconz.js

@@ -514,10 +514,7 @@ class Main extends CommandLineTool {
 
     this.bridgeid = this.gatewayConfig.bridgeid
     if (this.clargs.options.apiKey == null) {
-      if (
-        this.gateways[this.bridgeid] != null &&
-        this.gateways[this.bridgeid].apiKey != null
-      ) {
+      if (this.gateways[this.bridgeid]?.apiKey != null) {
         this.clargs.options.apiKey = this.gateways[this.bridgeid].apiKey
       } else if (process.env.DECONZ_API_KEY != null) {
         this.clargs.options.apiKey = process.env.DECONZ_API_KEY

package/homebridge-ui/public/index.old.html

@@ -32,8 +32,7 @@ async function showFormPluginConfig () {
       console.log('%s: cachedAccessories: %o', config.name, cachedAccessories)
       const cachedGateways = cachedAccessories.filter((accessory) => {
         return accessory.plugin === 'homebridge-deconz' &&
-          accessory.context != null &&
-          accessory.context.className === 'Gateway'
+          accessory.context?.className === 'Gateway'
       })
       const result = {}
       for (const gateway of cachedGateways) {
@@ -207,8 +206,7 @@ async function showFormGateways (gateway) {
   const cachedAccessories = await homebridge.getCachedAccessories()
   const cachedGateways = cachedAccessories.filter((accessory) => {
     return accessory.plugin === 'homebridge-deconz' &&
-      accessory.context != null &&
-      accessory.context.className === 'Gateway'
+      accessory.context?.className === 'Gateway'
   })
   const result = {}
   for (const gateway of cachedGateways) {
@@ -249,7 +247,7 @@ async function showFormGateways (gateway) {
   //   layout: null,
   //   form: null
   // }, {
-  //   gateway: gateway != null ? gateway : gateways[0]
+  //   gateway: gateway ?? gateways[0]
   // }, 'Gateway Settings', 'Homebridge Settings')
   const form = homebridge.createForm({
     footerDisplay: 'For a detailed description, see the [wiki](https://github.com/ebaauw/homebridge-deconz/wiki/Configuration).',

package/lib/Deconz/Resource.js

@@ -5,13 +5,12 @@
 
 'use strict'
 
-const { Colour, OptionParser } = require('homebridge-lib')
+const { OptionParser } = require('homebridge-lib')
 const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
 
 const { toInstance, toInt, toObject, toString } = OptionParser
-const { defaultGamut } = Colour
 const { buttonEvent } = Deconz.ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button
 const rtypes = ['lights', 'sensors', 'groups']
@@ -54,9 +53,9 @@ class Resource {
     toString('uniqueid', uniqueid, true)
     const a = uniqueid.replace(/:/g, '').toUpperCase().split('-')
     return {
-      mac: a.length > 0 ? a[0] : null,
-      endpoint: a.length > 1 ? a[1] : null,
-      cluster: a.length > 2 ? a[2] : null
+      mac: a?.[0],
+      endpoint: a?.[1],
+      cluster: a?.[2]
     }
   }
 
@@ -130,6 +129,11 @@ class Resource {
         * @type {boolean}
         */
       this.zigbee = true
+    } else if (this.isDeconzClip()) {
+      const a = body.uniqueid.split('-')
+      this.id = gateway.id + '-M' + a?.[0]
+      this.subtype = a?.[1]
+      this.zigbee = false
     } else {
       this.subtype = rtype[0].toUpperCase() + rid
       this.id = gateway.id + '-' + this.subtype
@@ -166,58 +170,16 @@ class Resource {
       ? 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
-        }
-        if (body.capabilities != null) {
-          const cap = body.capabilities
-          if (cap.color != null) {
-            if (cap.color.ct != null) {
-              this.capabilities.ctMax = cap.color.ct.max
-              this.capabilities.ctMin = cap.color.ct.min
-            }
-            if (cap.color.effects != null && cap.color.effects.length > 2) {
-              this.capabilities.effects = cap.color.effects.slice(2)
-            }
-            if (cap.color.xy != null) {
-              this.capabilities.gamut = {
-                r: cap.color.xy.red,
-                g: cap.color.xy.green,
-                b: cap.color.xy.blue
-              }
-            }
-          }
-        }
-        break
-      }
-      case 'WarningDevice':
-        this.capabilities = {}
-        break
-      case 'WindowCovering':
-        this.capabilities = {}
-        break
-      default:
-        this.capabilities = {}
-        break
-    }
+    /** The name of the {@link DeconzService} subclass of the delegate of the
+      * corresponding HomeKit service, or `null` for unsupported and unknown
+      * resources.
+      *
+      * This is derived from the resource type and `type` in the resource body.
+      * @type {string}
+      */
+    this.serviceName = this._serviceName
+
+    this.capabilities = {}
 
     const f = 'patch' + this.serviceName
     if (typeof this[f] === 'function') {
@@ -230,8 +192,12 @@ class Resource {
     * @type {integer}
     */
   get prio () {
-    if (this.rtype === 'groups') return -1
-    if (this.rtype === 'lights') return 0xFF - this.endpoint
+    if (this.rtype === 'groups') {
+      return -1
+    }
+    if (this.rtype === 'lights' || this.isDeconzClip()) {
+      return 0xFF - this.endpoint
+    }
     return sensorsPrios.indexOf(this.serviceName)
   }
 
@@ -242,14 +208,7 @@ class Resource {
     */
   get rpath () { return '/' + this.rtype + '/' + this.rid }
 
-  /** The name of the {@link DeconzService} subclass of the delegate of the
-    * corresponding HomeKit service, or `null` for unsupported and unknown
-    * resources.
-    *
-    * This is derived from the resource type and `type` in the resource body.
-    * @type {string}
-    */
-  get serviceName () {
+  get _serviceName () {
     if (this.rtype === 'groups') {
       return 'Light'
     } else if (this.rtype === 'lights') {
@@ -267,11 +226,11 @@ class Resource {
         // case 'Door Lock': return null
         // case 'Door Lock Unit': return null
         case 'Fan': return 'Light'
-        case 'On/Off light switch': return 'Light'
+        case 'On/Off light switch': return 'Switch'
         case 'On/Off light': return 'Light'
-        case 'On/Off output': return 'Light'
-        case 'On/Off plug-in unit': return 'Light'
-        case 'Smart plug': return 'Light'
+        case 'On/Off output': return 'Outlet'
+        case 'On/Off plug-in unit': return 'Outlet'
+        case 'Smart plug': return 'Outlet'
         case 'Configuration tool': return ''
         case 'Range extender': return ''
         case 'Warning device': return 'WarningDevice'
@@ -280,55 +239,34 @@ class Resource {
         default: return null
       }
     } else { // (this.rtype === 'sensors')
-      switch (this.body.type) {
-        case 'CLIPAirPurifier':
-        case 'ZHAAirPurifier': return 'AirPurifier'
-        case 'ZHAAirQuality':
-        case 'CLIPAirQuality': return 'AirQuality'
-        case 'ZHAAlarm':
-        case 'CLIPAlarm': return 'Alarm'
-        case 'ZHABattery':
-        case 'CLIPBattery': return 'Battery'
-        case 'ZHACarbonMonoxide':
-        case 'CLIPCarbonMonoxide': return 'CarbonMonoxide'
-        case 'ZHAConsumption':
-        case 'CLIPConsumption': return 'Consumption'
-        // case 'ZHADoorLock':
-        // case 'CLIPDoorLock': return null
+      const type = /^(CLIP|ZHA|ZGP)?([A-Za-z]*)$/.exec(this.body.type)?.[2]
+      switch (type) {
+        case 'AirPurifier': return 'AirPurifier'
+        case 'AirQuality': return 'AirQuality'
+        case 'Alarm': return 'Alarm'
+        case 'Battery': return 'Battery'
+        case 'CarbonMonoxide': return 'CarbonMonoxide'
+        case 'Consumption': return 'Consumption'
+        // case 'DoorLock': return null
         case 'Daylight': return 'Daylight'
-        case 'ZHAFire':
-        case 'CLIPFire': return 'Smoke'
-        case 'CLIPGenericFlag': return 'Flag'
-        case 'CLIPGenericStatus': return 'Status'
-        case 'ZHAHumidity':
-        case 'CLIPHumidity': return 'Humidity'
-        case 'ZHALightLevel':
-        case 'CLIPLightLevel': return 'LightLevel'
-        // case 'ZHAMoisture':
-        // case 'CLIPMoisture': return null
-        case 'ZHAOpenClose':
-        case 'CLIPOpenClose': return 'Contact'
-        case 'ZHAPower':
-        case 'CLIPPower': return 'Power'
-        case 'ZHAPresence':
-        case 'CLIPPresence': return 'Motion'
-        case 'ZHAPressure':
-        case 'CLIPPressure': return 'AirPressure'
-        case 'ZHARelativeRotary': return 'Switch'
-        case 'ZHASpectral': return ''
-        case 'ZGPSwitch':
-        case 'ZHASwitch':
-        case 'CLIPSwitch': return 'Switch'
-        case 'ZHATemperature':
-        case 'CLIPTemperature': return 'Temperature'
-        case 'ZHAThermostat':
-        case 'CLIPThermostat': return 'Thermostat'
-        case 'ZHATime':
-        case 'CLIPTime': return ''
-        case 'ZHAVibration':
-        case 'CLIPVibration': return 'Motion'
-        case 'ZHAWater':
-        case 'CLIPWater': return 'Leak'
+        case 'Fire': return 'Smoke'
+        case 'GenericFlag': return 'Flag'
+        case 'GenericStatus': return 'Status'
+        case 'Humidity': return 'Humidity'
+        case 'LightLevel': return 'LightLevel'
+        case 'Moisture': return 'Humidity'
+        case 'OpenClose': return 'Contact'
+        case 'Power': return 'Power'
+        case 'Presence': return 'Motion'
+        case 'Pressure': return 'AirPressure'
+        case 'RelativeRotary': return 'Label'
+        case 'Spectral': return ''
+        case 'Switch': return 'Label'
+        case 'Temperature': return 'Temperature'
+        case 'Thermostat': return 'Thermostat'
+        case 'Time': return ''
+        case 'Vibration': return 'Motion'
+        case 'Water': return 'Leak'
         default: return null
       }
     }
@@ -389,63 +327,48 @@ class Resource {
     }
   }
 
+  /** Check whether resource is a CLIP sensor for Homebridge deCONZ.
+    * For these, we use the following conventions:
+    * - Use `uniqueid` to indicate device ID and subtype;
+    * - Use `swversion` to indicate readonly and range for `Flag` and `Status`.
+    */
+  isDeconzClip () {
+    return this.rtype === 'sensors' &&
+    this.body.type.startsWith('CLIP') &&
+    this.body.modelid === this.body.type && (
+      this.body.manufacturername === 'homebridge-deconz' ||
+      this.body.manufacturername === 'homebridge-hue'
+    )
+  }
+
   /** Patch a resource corresponding to a `Flag` service.
-  * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
-  patchFlag (gateway) {
-    if (
-      this.body.manufacturername === 'homebridge-hue' &&
-      this.body.modelid === 'CLIPGenericFlag' &&
-      this.body.swversion === '0'
-    ) {
+  patchFlag () {
+    if (this.isDeconzClip() && this.body.swversion === '0') {
       this.capabilities.readonly = true
     }
   }
 
-  /** Patch a resource corresponding to a `Flag` service.
-  * @param {DeconzAccessory.Gateway} gateway - The gateway.
+  /** Patch a resource corresponding to a `Status` service.
     */
-  patchStatus (gateway) {
-    if (
-      this.body.manufacturername === 'homebridge-hue' &&
-      this.body.modelid === 'CLIPGenericStatus'
-    ) {
+  patchStatus () {
+    if (this.isDeconzClip()) {
       const a = this.body.swversion.split(',')
       const min = parseInt(a[0])
       const max = parseInt(a[1])
-      const step = parseInt(a[2])
-      // Eve 3.1 displays the following controls, depending on the properties:
-      // 1. {minValue: 0, maxValue: 1, minStep: 1}                    switch
-      // 2. {minValue: a, maxValue: b, minStep: 1}, 1 < b - a <= 20   down|up
-      // 3. {minValue: a, maxValue: b}, (a, b) != (0, 1)              slider
-      // 4. {minValue: a, maxValue: b, minStep: 1}, b - a > 20        slider
-      // Avoid the following bugs:
-      // 5. {minValue: 0, maxValue: 1}                                nothing
-      // 6. {minValue: a, maxValue: b, minStep: 1}, b - a = 1         switch*
-      //    *) switch sends values 0 and 1 instead of a and b;
       if (min === 0 && max === 0) {
         this.capabilities.readonly = true
       } else if (min >= -127 && max <= 127 && min < max) {
-        if (min === 0 && max === 1) {
-          // Workaround Eve bug (case 5 above).
-          this.capabilities.props = { minValue: min, maxValue: max, minStep: 1 }
-        } else if (max - min === 1) {
-          // Workaround Eve bug (case 6 above).
-          this.capabilities.props = { minValue: min, maxValue: max }
-        } else if (step !== 1) {
-          // Default to slider for backwards compatibility.
-          this.capabilities.props = { minValue: min, maxValue: max }
-        } else {
-          this.capabilities.props = { minValue: min, maxValue: max, minStep: 1 }
-        }
+        this.capabilities.min = min
+        this.capabilities.max = max
       }
     }
   }
 
-  /** Patch a resource corresponding to a `Switch` service.
+  /** Patch a resource corresponding to a `Label` service.
   * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
-  patchSwitch (gateway) {
+  patchLabel (gateway) {
     const buttons = []
     let dots = false
     switch (this.manufacturer) {
@@ -536,6 +459,15 @@ class Resource {
               buttons.push([3, 'Turn Left', SINGLE])
             }
             break
+          case 'SYMFONISK sound remote gen2':
+            buttons.push([1, 'Play', SINGLE])
+            buttons.push([2, 'Plus', SINGLE | LONG, true])
+            buttons.push([3, 'Minus', SINGLE | LONG, true])
+            buttons.push([4, 'Previous', SINGLE])
+            buttons.push([5, 'Next', SINGLE])
+            buttons.push([6, 'One Dot', SINGLE | DOUBLE | LONG])
+            buttons.push([7, 'Two Dots', SINGLE | DOUBLE | LONG])
+            break
           case 'TRADFRI SHORTCUT Button':
             buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
             break
@@ -1124,9 +1056,8 @@ class Resource {
   }
 
   /** Patch a resource corresponding to a `Thermostat` service.
-  * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
-  patchThermostat (gateway) {
+  patchThermostat () {
     if (this.manufacturer === 'ELKO' && this.model === 'Super TR') {
       this.capabilities.heatValue = 'heat'
     } else {
@@ -1135,9 +1066,8 @@ class Resource {
   }
 
   /** Patch a resource corresponding to a `WindowCovering` service.
-  * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
-  patchWindowCovering (gateway) {
+  patchWindowCovering () {
     if (this.manufacturer === 'LUMI' && this.model === 'lumi.curtain.acn002') {
       this.capabilities.maxSpeed = 2
       this.capabilities.positionChange = true

package/lib/DeconzAccessory/Gateway.js

@@ -13,6 +13,12 @@ const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
 
+const migration = {
+  name: 'homebridge-deconz',
+  description: 'migration',
+  classid: 1
+}
+
 const rtypes = ['lights', 'sensors', 'groups']
 
 const periodicEvents = [
@@ -516,9 +522,7 @@ class Gateway extends AccessoryDelegate {
     }
     try {
       try {
-        if (this.context.migration != null) {
-          await this.client.delete(this.context.migration)
-        }
+        await this.deleteMigration()
         await this.client.deleteApiKey()
       } catch (error) {}
       this.values.apiKey = null
@@ -531,7 +535,6 @@ class Gateway extends AccessoryDelegate {
       this.exposeErrors = {}
       this.context.settingsById = {}
       this.context.fullState = null
-      this.context.migration = null
       this.values.logLevel = 2
     } catch (error) { this.error(error) }
   }
@@ -669,6 +672,60 @@ class Gateway extends AccessoryDelegate {
     this.deleteService(id)
   }
 
+  /** Assert that migration resourcelink exists and is valid.
+    */
+  async checkMigration () {
+    if (this.context.migration != null) {
+      try {
+        const response = await this.client.get(this.context.migration)
+        if (
+          response.name !== migration.name ||
+          response.description !== migration.description ||
+          response.classid !== migration.classid ||
+          response.owner !== this.client.apiKey
+        ) {
+          // not my migration resourcelink
+          this.warn('%s: migration resourcelink no longer valid', this.context.migration)
+          this.context.migration = null
+        }
+      } catch (error) {
+        if (error.statusCode === 404) {
+          this.warn('%s: migration resourcelink no longer exists', this.context.migration)
+          this.context.migration = null
+        }
+      }
+    }
+  }
+
+  /** Create or update migration resourcelink.
+    */
+  async updateMigration () {
+    await this.checkMigration()
+    if (this.context.migration == null) {
+      const response = await this.client.post('/resourcelinks', {
+        name: migration.name,
+        description: migration.description,
+        classid: migration.classid,
+        links: Object.keys(this.accessoryByRpath).sort()
+      })
+      this.context.migration = '/resourcelinks/' + response.success.id
+    } else {
+      await this.client.put(this.context.migration, {
+        links: Object.keys(this.accessoryByRpath).sort()
+      })
+    }
+  }
+
+  /** Delete migration resourcelink.
+    */
+  async deleteMigration () {
+    await this.checkMigration()
+    if (this.context.migration != null) {
+      await this.client.delete(this.context.migration)
+      this.context.migration = null
+    }
+  }
+
   // ===========================================================================
 
   _deviceToMap (id, details = false) {
@@ -733,7 +790,7 @@ class Gateway extends AccessoryDelegate {
         return { status: 200, body }
       }
       if (path.length === 2) {
-        const id = path[1]
+        const id = path[1].replace(/:/g, '').toUpperCase()
         if (this.accessoryById[id] == null) {
           return { status: 404 } // Not Found
         }
@@ -749,7 +806,7 @@ class Gateway extends AccessoryDelegate {
         return { status: 200, body }
       }
       if (path.length === 2) {
-        return this._deviceToMap(path[1], true)
+        return this._deviceToMap(path[1].replace(/:/g, '').toUpperCase(), true)
       }
     }
     return { status: 403 } // Forbidden
@@ -808,7 +865,7 @@ class Gateway extends AccessoryDelegate {
         return { status: 405 } // Method Not Allowed
       }
       if (path.length === 3 && path[2] === 'settings') {
-        const id = path[1]
+        const id = path[1].replace(/:/g, '').toUpperCase()
         if (this.accessoryById[id] == null) {
           return { status: 404 } // Not Found
         }
@@ -820,7 +877,7 @@ class Gateway extends AccessoryDelegate {
         return { status: 405 } // Method Not Allowed
       }
       if (path.length === 3 && path[2] === 'settings') {
-        const id = path[1]
+        const id = path[1].replace(/:/g, '').toUpperCase()
         if (this.deviceById[id] == null) {
           return { status: 404 } // Not Found
         }
@@ -1060,19 +1117,7 @@ class Gateway extends AccessoryDelegate {
     }
 
     if (changed) {
-      if (this.context.migration == null) {
-        const response = await this.client.post('/resourcelinks', {
-          name: 'homebridge-deconz',
-          description: 'migration',
-          classid: 1,
-          links: Object.keys(this.accessoryByRpath).sort()
-        })
-        this.context.migration = '/resourcelinks/' + response.success.id
-      } else {
-        await this.client.put(this.context.migration, {
-          links: Object.keys(this.accessoryByRpath).sort()
-        })
-      }
+      await this.updateMigration()
       this.identify()
     }
   }

package/lib/DeconzAccessory/Light.js

@@ -25,7 +25,7 @@ class Light extends DeconzAccessory {
 
     this.addPropertyDelegate({
       key: 'serviceName',
-      value: device.resource.capabilities.bri ? 'Light' : 'Outlet'
+      value: device.resource.serviceName
     })
 
     this.service = this.createService(device.resource, {
@@ -65,7 +65,7 @@ class Light extends DeconzAccessory {
         silent: true
       })
     }
-    if (this.serviceByServiceName.Consumption != null) {
+    if (this.servicesByServiceName.Consumption?.[0] != null) {
       params.totalConsumptionDelegate = this.service.characteristicDelegate('totalConsumption')
       if (this.service.values.consumption === undefined) {
         // Power to be computed by history if not exposed by device
@@ -75,7 +75,7 @@ class Light extends DeconzAccessory {
           unit: ' W'
         })
       }
-    } else if (this.serviceByServiceName.Power != null) {
+    } else if (this.servicesByServiceName.Power?.[0] != null) {
       params.consumptionDelegate = this.service.characteristicDelegate('consumption')
       // Total Consumption to be computed by history
       params.computedTotalConsumptionDelegate = this.service.addCharacteristicDelegate({

package/lib/DeconzAccessory/Sensor.js

@@ -3,6 +3,11 @@
 //
 // Homebridge plugin for deCONZ.
 
+// Keep separate for Eve History
+// Switch/Outlet/Lightbulb
+// Stateless Programmable Switch (Eve button)
+// Sensors
+
 'use strict'
 
 const { ServiceDelegate } = require('homebridge-lib')
@@ -51,8 +56,8 @@ class Sensor extends DeconzAccessory {
     }
 
     const params = {}
-    if (this.serviceByServiceName.Contact != null) {
-      const service = this.serviceByServiceName.Contact
+    if (this.servicesByServiceName.Contact?.length === 1) {
+      const service = this.servicesByServiceName.Contact[0]
       params.contactDelegate = service.characteristicDelegate('contact')
       params.lastContactDelegate = service.addCharacteristicDelegate({
         key: 'lastActivation',
@@ -66,8 +71,8 @@ class Sensor extends DeconzAccessory {
         silent: true
       })
     }
-    if (this.serviceByServiceName.Motion != null) {
-      const service = this.serviceByServiceName.Motion
+    if (this.servicesByServiceName.Motion?.length === 1) {
+      const service = this.servicesByServiceName.Motion[0]
       params.motionDelegate = service.characteristicDelegate('motion')
       params.lastMotionDelegate = service.addCharacteristicDelegate({
         key: 'lastActivation',
@@ -75,34 +80,34 @@ class Sensor extends DeconzAccessory {
         silent: true
       })
     }
-    if (this.serviceByServiceName.LightLevel != null) {
-      const service = this.serviceByServiceName.LightLevel
+    if (this.servicesByServiceName.LightLevel?.length === 1) {
+      const service = this.servicesByServiceName.LightLevel[0]
       params.lightLevelDelegate = service.characteristicDelegate('lightLevel')
     }
-    if (this.serviceByServiceName.Daylight != null) {
-      const service = this.serviceByServiceName.Daylight
+    if (this.servicesByServiceName.Daylight?.length === 1) {
+      const service = this.servicesByServiceName.Daylight[0]
       params.lightLevelDelegate = service.characteristicDelegate('lightLevel')
     }
-    if (this.serviceByServiceName.Temperature != null) {
-      const service = this.serviceByServiceName.Temperature
+    if (this.servicesByServiceName.Temperature?.length === 1) {
+      const service = this.servicesByServiceName.Temperature[0]
       params.temperatureDelegate = service.characteristicDelegate('temperature')
     }
-    if (this.serviceByServiceName.Humidity != null) {
-      const service = this.serviceByServiceName.Humidity
+    if (this.servicesByServiceName.Humidity?.length === 1) {
+      const service = this.servicesByServiceName.Humidity[0]
       params.humidityDelegate = service.characteristicDelegate('humidity')
     }
-    if (this.serviceByServiceName.AirPressure != null) {
-      const service = this.serviceByServiceName.AirPressure
+    if (this.servicesByServiceName.AirPressure?.length === 1) {
+      const service = this.servicesByServiceName.AirPressure[0]
       params.airPressureDelegate = service.characteristicDelegate('airPressure')
     }
-    if (this.serviceByServiceName.AirQuality != null) {
-      const service = this.serviceByServiceName.AirQuality
+    if (this.servicesByServiceName.AirQuality?.length === 1) {
+      const service = this.servicesByServiceName.AirQuality[0]
       if (service.characteristicDelegate('vocDensity') != null) {
         params.vocDensityDelegate = service.characteristicDelegate('vocDensity')
       }
     }
-    if (this.serviceByServiceName.Flag != null) {
-      const service = this.serviceByServiceName.Flag
+    if (this.servicesByServiceName.Flag != null) {
+      const service = this.servicesByServiceName.Flag[0]
       params.switchOnDelegate = service.characteristicDelegate('on')
       params.lastSwitchOnDelegate = service.addCharacteristicDelegate({
         key: 'lastActivation',

package/lib/DeconzAccessory/index.js

@@ -19,7 +19,9 @@ const { SINGLE, DOUBLE, LONG } = DeconzService.Button
 class DeconzAccessory extends AccessoryDelegate {
   static get Light () { return require('./Light') }
   static get Gateway () { return require('./Gateway') }
+  static get Outlet () { return DeconzAccessory.Light }
   static get Sensor () { return require('./Sensor') }
+  static get Switch () { return DeconzAccessory.Light }
   static get WarningDevice () { return require('./WarningDevice') }
   static get WindowCovering () { return require('./WindowCovering') }
 
@@ -29,7 +31,6 @@ class DeconzAccessory extends AccessoryDelegate {
     * @param {Accessory.Category} category - The HomeKit accessory category.
     */
   constructor (gateway, device, category) {
-    // TODO device settings
     super(gateway.platform, {
       id: device.id,
       name: device.resource.body.name,
@@ -44,7 +45,7 @@ class DeconzAccessory extends AccessoryDelegate {
 
     this.serviceByRpath = {}
     this.serviceBySubtype = {}
-    this.serviceByServiceName = {}
+    this.servicesByServiceName = {}
 
     /** The gateway.
       * @type {DeconzAccessory.Gateway}
@@ -140,27 +141,27 @@ class DeconzAccessory extends AccessoryDelegate {
 
     let service
     if (params.serviceName === 'AirQuality') {
-      service = this.serviceByServiceName.AirQuality
+      service = this.servicesByServiceName.AirQuality?.[0]
       if (service != null) {
         service.addResource(resource)
       }
     } else if (params.serviceName === 'Battery') {
-      service = this.serviceByServiceName.Battery
+      service = this.servicesByServiceName.Battery?.[0]
     } else if (params.serviceName === 'Consumption') {
-      service = this.serviceByServiceName.Outlet ||
-        this.serviceByServiceName.Light ||
-        this.serviceByServiceName.Power
+      service = this.servicesByServiceName.Outlet?.[0] ||
+        this.servicesByServiceName.Light?.[0] ||
+        this.servicesByServiceName.Power?.[0]
       if (service != null) {
         service.addResource(resource)
       }
     } else if (params.serviceName === 'Power') {
-      service = this.serviceByServiceName.Outlet ||
-        this.serviceByServiceName.Light ||
-        this.serviceByServiceName.Consumption
+      service = this.servicesByServiceName.Outlet?.[0] ||
+        this.servicesByServiceName.Light?.[0] ||
+        this.servicesByServiceName.Consumption?.[0]
       if (service != null) {
         service.addResource(resource)
       }
-    } else if (params.serviceName === 'Switch') {
+    } else if (params.serviceName === 'Label') {
       // Default button
       if (resource.capabilities.buttons == null) {
         this.warn(
@@ -176,9 +177,9 @@ class DeconzAccessory extends AccessoryDelegate {
         resource.capabilities.namespace =
           this.Characteristics.hap.ServiceLabelNamespace.ARABIC_NUMERALS
       }
-      service = this.serviceByServiceName.Switch
+      service = this.servicesByServiceName.Label?.[0]
       if (service == null) {
-        service = new DeconzService.Switch(this, resource, {
+        service = new DeconzService.Label(this, resource, {
           primaryService: params.primaryService
         })
       }
@@ -191,17 +192,16 @@ class DeconzAccessory extends AccessoryDelegate {
     }
     this.serviceBySubtype[resource.subtype] = service
     this.serviceByRpath[resource.rpath] = service
-    if (this.serviceByServiceName[params.serviceName] == null) {
-      this.serviceByServiceName[params.serviceName] = service
+    if (this.servicesByServiceName[params.serviceName] == null) {
+      this.servicesByServiceName[params.serviceName] = [service]
+    } else {
+      this.servicesByServiceName[params.serviceName].push(service)
     }
-    if (
-      resource.body.config != null &&
-      resource.body.config.battery !== undefined
-    ) {
-      if (this.serviceByServiceName.Battery == null) {
-        this.serviceByServiceName.Battery = new DeconzService.Battery(this, resource)
+    if (resource.body.config?.battery !== undefined) {
+      if (this.servicesByServiceName.Battery?.[0] == null) {
+        this.servicesByServiceName.Battery = [new DeconzService.Battery(this, resource)]
       }
-      service.batteryService = this.serviceByServiceName.Battery
+      service.batteryService = this.servicesByServiceName.Battery[0]
     }
     return service
   }
@@ -237,12 +237,8 @@ class DeconzAccessory extends AccessoryDelegate {
             multiClip: undefined,
             multiLight: undefined,
             logLevel: this.values.logLevel,
-            lowBatteryThreshold: this.serviceByServiceName.Battery == null
-              ? undefined
-              : this.serviceByServiceName.Battery.values.lowBatteryThreshold,
-            // offset: this.serviceByServiceName.Temperature == null
-            //   ? undefined
-            //   : this.serviceByServiceName.Temperature.values.offset,
+            lowBatteryThreshold: this.servicesByServiceName?.Battery?.[0].values.lowBatteryThreshold,
+            // offset: this.servicesByServiceName?.Temperature?.[0].values.offset,
             serviceName: this.values.serviceName,
             splitLight: undefined,
             venetianBlind: this.service.values.venetianBlind,
@@ -290,21 +286,13 @@ class DeconzAccessory extends AccessoryDelegate {
             responseBody[key] = value
             continue
           case 'lowBatteryThreshold':
-            if (this.serviceByServiceName.Battery != null) {
+            if (this.servicesByServiceName.Battery?.[0] != null) {
               value = OptionParser.toInt(key, body[key], 10, 100)
-              this.serviceByServiceName.Battery.values[key] = value
+              this.servicesByServiceName.Battery[0].values[key] = value
               responseBody[key] = value
               continue
             }
             break
-          // case 'offset': // TODO: doesn't work because of fromHomeKit
-          //   if (this.serviceByServiceName.Temperature != null) {
-          //     const value = OptionParser.toNumber(key, body[key], -5, 5)
-          //     this.serviceByServiceName.Temperature.values[key] = value
-          //     responseBody[key] = value
-          //     continue
-          //   }
-          //   break
           case 'serviceName':
             if (this.values.serviceName != null) {
               value = OptionParser.toString(key, body[key])

package/lib/DeconzService/Humidity.js

@@ -30,6 +30,9 @@ class Humidity extends DeconzService.SensorsResource {
     if (state.humidity != null) {
       this.values.humidity = Math.round(state.humidity / 10) / 10
     }
+    if (state.moisture != null) {
+      this.values.humidity = Math.round(state.moisture / 10) / 10
+    }
     super.updateState(state)
   }
 }

package/lib/DeconzService/Label.js

@@ -0,0 +1,103 @@
+// homebridge-deconz/lib/DeconzService/Label.js
+// Copyright© 2022-2023 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+'use strict'
+
+const DeconzService = require('.')
+
+/**
+  * @memberof DeconzService
+  */
+class Label extends DeconzService.SensorsResource {
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.ServiceLabel
+    super(accessory, resource, params)
+
+    this.addCharacteristicDelegate({
+      key: 'namespace',
+      Characteristic: this.Characteristics.hap.ServiceLabelNamespace,
+      value: resource.capabilities.namespace
+    })
+
+    this.addCharacteristicDelegates({ noLastUpdated: true })
+
+    this.buttonResources = {}
+    this.buttonServices = {}
+    this.hasRepeat = false
+  }
+
+  createButtonServices (resource) {
+    if (resource.body.type.endsWith('Switch')) {
+      this.buttonResources[resource.rpath] = {
+        buttonEvent: resource.body.state.buttonevent,
+        lastUpdated: '',
+        toButtonEvent: resource.capabilities.toButtonEvent
+      }
+    } else if (resource.body.type.endsWith('RelativeRotary')) {
+      const keys = Object.keys(resource.capabilities.buttons)
+      this.buttonResources[resource.rpath] = {
+        lastUpdated: '',
+        right: keys[0],
+        left: keys[1]
+      }
+    }
+    for (const i in resource.capabilities.buttons) {
+      const { label, events, hasRepeat } = resource.capabilities.buttons[i]
+      if (hasRepeat) {
+        this.hasRepeat = hasRepeat
+      }
+      this.buttonServices[i] = new DeconzService.Button(this.accessoryDelegate, {
+        name: this.name + ' ' + label,
+        button: Number(i),
+        events,
+        hasRepeat
+      })
+    }
+  }
+
+  updateState (state, rpath) {
+    const buttonResource = this.buttonResources[rpath]
+    if (buttonResource.lastUpdated === '') {
+      buttonResource.lastUpdated = state.lastupdated
+    } else if (
+      state.lastupdated != null &&
+      state.lastupdated !== buttonResource.lastUpdated
+    ) {
+      buttonResource.lastUpdated = state.lastupdated
+      if (buttonResource.buttonEvent !== undefined) {
+        const oldValue = buttonResource.buttonEvent
+        if (state.buttonevent != null) {
+          buttonResource.buttonEvent = buttonResource.toButtonEvent == null
+            ? state.buttonevent
+            : buttonResource.toButtonEvent(state.buttonevent)
+        }
+        // TODO handle repeat
+        const i = Math.floor(buttonResource.buttonEvent / 1000)
+        this.buttonServices[i]?.update(
+          buttonResource.buttonEvent, oldValue,
+          false // this.accessoryDelegate.settingsService.values.repeat
+        )
+      } else {
+        const i = state.expectedrotation >= 0
+          ? buttonResource.right
+          : buttonResource.left
+        this.buttonServices[i].updateRotation()
+      }
+    }
+    super.updateState(state)
+  }
+
+  updateConfig (config) {
+    // TODO handle change in devicemode
+    super.updateConfig(config)
+  }
+
+  async identify () {
+    this.debug('hasRepeat: %j', this.hasRepeat)
+    return super.identify()
+  }
+}
+
+module.exports = Label

package/lib/DeconzService/Light.js

@@ -110,7 +110,9 @@ class Light extends DeconzService.LightsResource {
         this.resource.body?.capabilities?.color?.ct?.min == null ||
         this.resource.body?.capabilities?.color?.ct?.max == null
       ) {
-        this.warn('using default ct range')
+        if (this.capabilities.on) {
+          this.warn('using default ct range')
+        }
       }
       const ctMin = this.resource.body?.capabilities?.color?.ct?.min ?? 153
       const ctMax = this.resource.body?.capabilities?.color?.ct?.max ?? 500
@@ -144,7 +146,9 @@ class Light extends DeconzService.LightsResource {
         this.resource.body?.capabilities?.color?.xy?.green == null ||
         this.resource.body?.capabilities?.color?.xy?.red == null
       ) {
-        this.warn('using default xy gamut')
+        if (this.capabilities.on) {
+          this.warn('using default xy gamut')
+        }
         this.capabilities.gamut = defaultGamut
       } else {
         this.capabilities.gamut = {

package/lib/DeconzService/Outlet.js

@@ -24,7 +24,7 @@ class Outlet extends DeconzService.LightsResource {
       }
     })
 
-    if (!this.capabilities.on) {
+    if (this.resource.body.state.on === undefined) {
       this.addCharacteristicDelegate({
         key: 'anyOn',
         Characteristic: this.Characteristics.my.AnyOn,

package/lib/DeconzService/Status.js

@@ -11,6 +11,30 @@ const DeconzService = require('../DeconzService')
   * @memberof DeconzService
   */
 class Status extends DeconzService.SensorsResource {
+  props (caps) {
+    if (caps.min == null || caps.max == null) {
+      return undefined
+    }
+    // Eve 3.1 displays the following controls, depending on the properties:
+    // 1. {minValue: 0, maxValue: 1, minStep: 1}                    switch
+    // 2. {minValue: a, maxValue: b, minStep: 1}, 1 < b - a <= 20   down|up
+    // 3. {minValue: a, maxValue: b}, (a, b) != (0, 1)              slider
+    // 4. {minValue: a, maxValue: b, minStep: 1}, b - a > 20        slider
+    // Avoid the following bugs:
+    // 5. {minValue: 0, maxValue: 1}                                nothing
+    // 6. {minValue: a, maxValue: b, minStep: 1}, b - a = 1         switch*
+    //    *) switch sends values 0 and 1 instead of a and b;
+    if (caps.min === 0 && caps.max === 1) {
+      // Workaround Eve bug (case 5 above).
+      return { minValue: caps.min, maxValue: caps.max, minStep: 1 }
+    }
+    if (caps.max - caps.min === 1) {
+      // Workaround Eve bug (case 6 above).
+      return { minValue: caps.min, maxValue: caps.max }
+    }
+    return { minValue: caps.min, maxValue: caps.max, minStep: 1 }
+  }
+
   constructor (accessory, resource, params = {}) {
     params.Service = accessory.Services.my.Status
     super(accessory, resource, params)
@@ -29,7 +53,7 @@ class Status extends DeconzService.SensorsResource {
       this.addCharacteristicDelegate({
         key: 'status',
         Characteristic: this.Characteristics.my.Status,
-        props: resource.capabilities.props
+        props: this.props(resource.capabilities)
       }).on('didSet', async (value, fromHomeKit) => {
         if (fromHomeKit) {
           await this.put('/state', { status: value })

package/lib/DeconzService/Switch.js

@@ -5,101 +5,66 @@
 
 'use strict'
 
-const DeconzService = require('../DeconzService')
+const DeconzService = require('.')
 
-/**
-  * @memberof DeconzService
-  */
-class Switch extends DeconzService.SensorsResource {
+class Switch extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.hap.ServiceLabel
+    params.Service = accessory.Services.hap.Switch
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({
-      key: 'namespace',
-      Characteristic: this.Characteristics.hap.ServiceLabelNamespace,
-      value: resource.capabilities.namespace
+      key: 'on',
+      Characteristic: this.Characteristics.hap.On,
+      value: this.capabilities.on
+        ? this.resource.body.state.on
+        : this.resource.body.state.all_on
+    }).on('didSet', (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        this.put({ on: value })
+      }
     })
 
-    this.addCharacteristicDelegates({ noLastUpdated: true })
+    if (this.resource.body.state.on === undefined) {
+      this.addCharacteristicDelegate({
+        key: 'anyOn',
+        Characteristic: this.Characteristics.my.AnyOn,
+        value: this.resource.body.state.any_on
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          this.put({ on: value })
+        }
+      })
+    }
 
-    this.buttonResources = {}
-    this.buttonServices = {}
-    this.hasRepeat = false
-  }
+    this.addCharacteristicDelegates()
 
-  createButtonServices (resource) {
-    if (resource.body.type.endsWith('Switch')) {
-      this.buttonResources[resource.rpath] = {
-        buttonEvent: resource.body.state.buttonevent,
-        lastUpdated: '',
-        toButtonEvent: resource.capabilities.toButtonEvent
-      }
-    } else if (resource.body.type.endsWith('RelativeRotary')) {
-      const keys = Object.keys(resource.capabilities.buttons)
-      this.buttonResources[resource.rpath] = {
-        lastUpdated: '',
-        right: keys[0],
-        left: keys[1]
-      }
-    }
-    for (const i in resource.capabilities.buttons) {
-      const { label, events, hasRepeat } = resource.capabilities.buttons[i]
-      if (hasRepeat) {
-        this.hasRepeat = hasRepeat
-      }
-      this.buttonServices[i] = new DeconzService.Button(this.accessoryDelegate, {
-        name: this.name + ' ' + label,
-        button: Number(i),
-        events,
-        hasRepeat
-      })
+    this.settings = {
+      resetTimeout: this.platform.config.resetTimeout,
+      waitTimeUpdate: this.platform.config.waitTimeUpdate,
+      wallSwitch: false
     }
   }
 
   updateState (state, rpath) {
-    const buttonResource = this.buttonResources[rpath]
-    if (buttonResource.lastUpdated === '') {
-      buttonResource.lastUpdated = state.lastupdated
-    } else if (
-      state.lastupdated != null &&
-      state.lastupdated !== buttonResource.lastUpdated
-    ) {
-      buttonResource.lastUpdated = state.lastupdated
-      if (buttonResource.buttonEvent !== undefined) {
-        const oldValue = buttonResource.buttonEvent
-        if (state.buttonevent != null) {
-          buttonResource.buttonEvent = buttonResource.toButtonEvent == null
-            ? state.buttonevent
-            : buttonResource.toButtonEvent(state.buttonevent)
-        }
-        // TODO handle repeat
-        const i = Math.floor(buttonResource.buttonEvent / 1000)
-        if (this.buttonServices[i] != null) {
-          this.buttonServices[i].update(
-            buttonResource.buttonEvent, oldValue,
-            false // this.accessoryDelegate.settingsService.values.repeat
-          )
-        }
-      } else {
-        const i = state.expectedrotation >= 0
-          ? buttonResource.right
-          : buttonResource.left
-        this.buttonServices[i].updateRotation()
+    for (const key in state) {
+      const value = state[key]
+      this.resource.body.state[key] = value
+      switch (key) {
+        case 'all_on':
+          this.values.on = value
+          break
+        case 'any_on':
+          this.values.anyOn = value
+          break
+        case 'on':
+          this.values.on = value
+          break
+        default:
+          break
       }
     }
     super.updateState(state)
   }
-
-  updateConfig (config) {
-    // TODO handle change in devicemode
-    super.updateConfig(config)
-  }
-
-  async identify () {
-    this.debug('hasRepeat: %j', this.hasRepeat)
-    return super.identify()
-  }
 }
 
 module.exports = Switch

package/lib/DeconzService/index.js

@@ -27,6 +27,7 @@ class DeconzService extends ServiceDelegate {
   static get Flag () { return require('./Flag') }
   static get Gateway () { return require('./Gateway') }
   static get Humidity () { return require('./Humidity') }
+  static get Label () { return require('./Label') }
   static get Leak () { return require('./Leak') }
   static get Light () { return require('./Light') }
   static get LightsResource () { return require('./LightsResource') }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -21,13 +21,13 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.20.1",
+    "deCONZ": "2.21.2",
     "homebridge": "^1.6.0",
     "node": "^18.15.0"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.12",
-    "ws": "^8.12.1",
+    "homebridge-lib": "~6.3.13",
+    "ws": "^8.13.0",
     "xml2js": "~0.4.23"
   },
   "scripts": {