homebridge-deconz 1.0.4 → 1.0.5

package/lib/DeconzAccessory/Gateway.js

@@ -5,10 +5,9 @@
 
 'use strict'
 
-const {
-  AccessoryDelegate, HttpClient, OptionParser, timeout
-} = require('homebridge-lib')
+const { AccessoryDelegate, OptionParser, timeout } = require('homebridge-lib')
 const { ApiClient, ApiError, WsClient } = require('hb-deconz-tools')
+const { HttpError } = ApiClient
 const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
@@ -399,7 +398,7 @@ class Gateway extends AccessoryDelegate {
     })
     this.client
       .on('error', (error) => {
-        if (error instanceof HttpClient.HttpError) {
+        if (error instanceof HttpError) {
           if (error.request.id !== this.requestId) {
             this.log(
               'request %d: %s %s%s', error.request.id,
@@ -1113,12 +1112,26 @@ class Gateway extends AccessoryDelegate {
       const rids = Object.keys(this.deviceByRidByRtype[rtype]).sort()
       for (const rid of rids) {
         try {
-          const { id, zigbee } = this.deviceByRidByRtype[rtype][rid]
+          const { id, resource, zigbee } = this.deviceByRidByRtype[rtype][rid]
           if (this.context.settingsById[id] == null) {
             this.context.settingsById[id] = { expose: zigbee && this.values.autoExpose }
           }
           if (this.context.settingsById[id].expose) {
             if (this.accessoryById[id] == null) {
+              const name = resource.body.name
+              if (zigbee && resource.body.type !== 'ZGPSwitch') {
+                const mac = resource.body.uniqueid.split('-')[0]
+                try {
+                  const ddf = await this.client.get('/devices/' + mac + '/ddf')
+                  if (ddf.status !== 'Gold') {
+                    this.warn('%s: exposed by %s ddf', name, ddf.status.toLowerCase())
+                  } else {
+                    this.debug('%s: exposed by %s ddf', name, ddf.status.toLowerCase())
+                  }
+                } catch (error) { }
+              } else {
+                this.debug('%s: exposed by legacy code', name)
+              }
               this.addAccessory(id)
               changed = true
             }

package/lib/DeconzAccessory/Light.js

@@ -133,8 +133,9 @@ class Light extends DeconzAccessory {
           key: 'index',
           Characteristic: this.Characteristics.hap.ServiceLabelIndex,
           silent: true,
-          value: Number(i)
+          value: Number(i) + 1
         })
+        service.values.index = Number(i) + 1
         if (i === '0') {
           continue
         }

package/lib/DeconzAccessory/Sensor.js

@@ -100,7 +100,7 @@ class Sensor extends DeconzAccessory {
       const service = this.servicesByServiceName.AirPressure[0]
       params.airPressureDelegate = service.characteristicDelegate('airPressure')
     }
-    if (this.servicesByServiceName.AirQuality?.length === 1) {
+    if (this.servicesByServiceName.AirQuality?.length >= 1) {
       const service = this.servicesByServiceName.AirQuality[0]
       if (service.characteristicDelegate('vocDensity') != null) {
         params.vocDensityDelegate = service.characteristicDelegate('vocDensity')

package/lib/DeconzService/AirQuality.js

@@ -22,7 +22,10 @@ class AirQuality extends DeconzService.SensorsResource {
       })
     }
 
-    if (resource.body.state.measured_value !== undefined) {
+    if (
+      resource.body.state.measured_value !== undefined &&
+      resource.body.capabilities?.measured_value != null
+    ) {
       const cmv = resource.body.capabilities.measured_value
       switch (cmv.substance) {
         case 'PM2.5':

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -24,11 +24,11 @@
   "engines": {
     "deCONZ": "2.23.2",
     "homebridge": "^1.6.1",
-    "node": "20.8.0||^20||^18"
+    "node": "20.8.1||^20||^18"
   },
   "dependencies": {
-    "hb-deconz-tools": "~1.0.8",
-    "homebridge-lib": "~6.6.1"
+    "hb-deconz-tools": "~1.0.9",
+    "homebridge-lib": "~6.6.3"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",