homebridge-deconz 1.0.15 → 1.0.18

package/lib/Deconz/Resource.js

@@ -135,6 +135,9 @@ class Resource {
         * @type {string}
         */
       this.id = mac
+      if (gateway.splitdevice[this.rtype]?.[this.rid]) {
+        this.id += '-' + endpoint
+      }
 
       /** The subtype of the corresponding HomeKit service.
         *

package/lib/DeconzAccessory/Gateway.js

@@ -665,9 +665,12 @@ class Gateway extends AccessoryDelegate {
       let { serviceName } = device.resource
       await this.importAccessoryType(serviceName)
       if (DeconzAccessory[serviceName] == null) {
-        // this.warn('%s: %s: not yet supported %s type', body.name, body.type, rtype)
+        // this.warn('%s: %s: accessory type not available', body.name, serviceName)
         serviceName = 'Sensor'
       }
+      if (this.context.settingsById[id]?.serviceName != null) {
+        await this.importServiceType(this.context.settingsById[id].serviceName)
+      }
       for (const resourceServiceName of Object.keys(device.subtypesByServiceName)) {
         await this.importServiceType(resourceServiceName)
       }
@@ -1007,6 +1010,7 @@ class Gateway extends AccessoryDelegate {
         this.context.fullState.config = config
         this.context.fullState.lights = await this.client.get('/lights')
         this.context.fullState.sensors = await this.client.get('/sensors')
+        this.context.fullState.resourcelinks = await this.client.get('/resourcelinks')
         if (this.nDevicesByRtype.groups > 0) {
           this.context.fullState.groups = await this.client.get('/groups')
           this.context.fullState.groups[0] = await this.client.get('/groups/0')
@@ -1030,6 +1034,54 @@ class Gateway extends AccessoryDelegate {
     }
   }
 
+  /* Analyse blacklist resourcelinks.
+   */
+  analyseResourcelinks (logUnsupported = false) {
+    const warn = (logUnsupported ? this.warn : this.vdebug).bind(this)
+    /** Blacklisted resources.
+      *
+      * Updated by
+      * {@link DeconzAccessory.Gateway#analyseBlacklist analyseBlacklist()}.
+      * @type {Object<string, boolean>}
+      */
+    this.blacklist = {
+      lights: {},
+      sensors: {}
+    }
+    this.splitdevice = {
+      lights: {},
+      sensors: {}
+    }
+    for (const key in this.context.fullState.resourcelinks) {
+      const link = this.context.fullState.resourcelinks[key]
+      if (
+        link.name === 'homebridge-deconz' && link.links != null &&
+        link.description != null
+      ) {
+        const type = link.description.toLowerCase()
+        switch (type) {
+          case 'migration':
+            break
+          case 'splitdevice':
+          case 'blacklist':
+            this.debug('/resourcelinks/%d: %d %s entries', key, link.links.length, type)
+            for (const resource of link.links) {
+              const rtype = resource.split('/')[1]
+              const rid = resource.split('/')[2]
+              if (this[type][rtype] == null) {
+                warn('/resourcelinks/%d: %s: ignoring unsupported %s resource', key, resource, type)
+                continue
+              }
+              this[type][rtype][rid] = true
+            }
+            break
+          default:
+            warn('/resourcelinks/%d: %s: ignoring unsupported resourcelink', key, type)
+        }
+      }
+    }
+  }
+
   /** Analyse the peristed full state of the gateway,
     * adding, re-configuring, and deleting delegates for corresponding HomeKit
     * accessories and services.
@@ -1094,6 +1146,7 @@ class Gateway extends AccessoryDelegate {
     this.nDevicesByRtype = {}
 
     this.vdebug('analysing resources...')
+    this.analyseResourcelinks(params.logUnsupported)
     for (const rtype of rtypes) {
       this.deviceByRidByRtype[rtype] = {}
       for (const rid in fullState[rtype]) {
@@ -1251,10 +1304,16 @@ class Gateway extends AccessoryDelegate {
     * unsupported resources.
     */
   analyseResource (rtype, rid, body, logUnsupported) {
+    const warn = (logUnsupported ? this.warn : this.vdebug).bind(this)
+    const debug = (logUnsupported ? this.debug : this.vdebug).bind(this)
+
     const resource = new Deconz.Resource(this, rtype, rid, body)
     const { id, serviceName } = resource
+    if (this.blacklist[rtype]?.[rid]) {
+      debug('%s: /%s/%d: ignoring blacklisted resource', id, rtype, rid)
+      return
+    }
     if (id === this.id || serviceName === '') {
-      const debug = (logUnsupported ? this.debug : this.vdebug).bind(this)
       debug(
         '%s: /%s/%d: %s: ignoring unsupported %s type',
         id, rtype, rid, body.type, rtype
@@ -1262,7 +1321,6 @@ class Gateway extends AccessoryDelegate {
       return
     }
     if (serviceName == null) {
-      const warn = (logUnsupported ? this.warn : this.vdebug).bind(this)
       warn(
         '%s: /%s/%d: %s: ignoring unknown %s type',
         id, rtype, rid, body.type, rtype

package/lib/DeconzAccessory/Light.js

@@ -26,6 +26,8 @@ class Light extends DeconzAccessory {
     this.addPropertyDelegate({
       key: 'serviceName',
       value: device.resource.serviceName
+    }).on('didSet', (value) => {
+      gateway.context.settingsById[device.id].serviceName = value
     })
 
     this.service = this.createService(device.resource, {

package/lib/DeconzAccessory/index.js

@@ -139,8 +139,8 @@ class DeconzAccessory extends AccessoryDelegate {
     }
     if (DeconzService[params.serviceName] == null) {
       this.warn(
-        '%s: %s: not yet supported %s type',
-        resource.rpath, resource.body.type, resource.rtype
+        '%s: %s: service type not available',
+        resource.rpath, params.serviceName
       )
       return
     }
@@ -236,7 +236,6 @@ class DeconzAccessory extends AccessoryDelegate {
             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,
             useExternalTemperature: this.service.values.useExternalTemperature,
             wallSwitch: this.service.values.wallSwitch
@@ -293,7 +292,7 @@ class DeconzAccessory extends AccessoryDelegate {
           case 'serviceName':
             if (this.values.serviceName != null) {
               value = OptionParser.toString(key, body[key])
-              if (DeconzService[value] == null) {
+              if (['Light', 'Outlet', 'Switch', 'Valve'].includes(value) == null) {
                 throw new Error(`${value}: illegal serviceName`)
               }
               this.values.serviceName = value

package/lib/DeconzService/LightsResource.js

@@ -15,7 +15,6 @@ class LightsResource extends DeconzService {
 
     this.updating = 0
     this.targetState = {}
-    this.deferrals = []
   }
 
   addCharacteristicDelegates (params = {}) {

package/lib/DeconzService/Motion.js

@@ -23,6 +23,15 @@ class Motion extends DeconzService.SensorsResource {
       value: false
     })
 
+    if (resource.body.state.distance !== undefined) {
+      this.addCharacteristicDelegate({
+        key: 'distance',
+        Characteristic: this.Characteristics.my.Distance,
+        unit: ' cm',
+        value: 0
+      })
+    }
+
     this.addCharacteristicDelegate({
       key: 'sensitivity',
       Characteristic: this.Characteristics.eve.Sensitivity
@@ -50,6 +59,32 @@ class Motion extends DeconzService.SensorsResource {
       }
     })
 
+    if (resource.body.config.detectionrange !== undefined) {
+      this.addCharacteristicDelegate({
+        key: 'detectionRange',
+        Characteristic: this.Characteristics.my.DetectionRange,
+        unit: ' cm',
+        value: 600
+      }).on('didSet', async (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          const detectionrange = Math.max(0, Math.min(value, 600))
+          await this.putConfig({ detectionrange })
+        }
+      })
+    }
+
+    if (resource.body.config.resetpresence !== undefined) {
+      this.addCharacteristicDelegate({
+        key: 'reset',
+        Characteristic: this.Characteristics.my.Reset,
+        value: false
+      }).on('didSet', async (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          await this.put('/config', { resetpresence: value })
+        }
+      })
+    }
+
     this.addCharacteristicDelegates()
 
     this.update(resource.body, resource.rpath)
@@ -59,6 +94,9 @@ class Motion extends DeconzService.SensorsResource {
     if (state.presence != null) {
       this.values.motion = state.presence
     }
+    if (state.distance != null) {
+      this.values.distance = state.distance
+    }
     if (state.vibration != null) {
       this.values.motion = state.vibration
     }
@@ -83,6 +121,12 @@ class Motion extends DeconzService.SensorsResource {
           ? this.Characteristics.eve.Sensitivity.LOW
           : this.Characteristics.eve.Sensitivity.MEDIUM
     }
+    if (config.detectionrange != null) {
+      this.values.detectionRange = config.detectionrange
+    }
+    if (config.resetpresence != null) {
+      this.values.reset = config.resetpresence
+    }
     super.updateConfig(config)
   }
 }

package/lib/DeconzService/SensorsResource.js

@@ -3,6 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
+import { timeout } from 'homebridge-lib'
+
 import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
 import { DeconzService } from '../DeconzService/index.js'
@@ -13,9 +15,12 @@ const { dateToString } = ApiClient
   * @memberof DeconzService
   */
 class SensorsResource extends DeconzService {
-  // constructor (accessory, resource, params) {
-  //   super(accessory, resource, params)
-  // }
+  constructor (accessory, resource, params) {
+    super(accessory, resource, params)
+
+    this.updating = 0
+    this.targetConfig = {}
+  }
 
   addCharacteristicDelegates (params = {}) {
     if (!params.noLastUpdated) {
@@ -83,6 +88,34 @@ class SensorsResource extends DeconzService {
       return this.put('/config', { alert: 'select' })
     }
   }
+
+  // Collect config changes into a combined request.
+  async putConfig (config) {
+    for (const key in config) {
+      this.resource.body.config[key] = config[key]
+      this.targetConfig[key] = config[key]
+    }
+    return this._putConfig()
+  }
+
+  // Send the request (for the combined state changes) to the gateway.
+  async _putConfig () {
+    try {
+      if (this.platform.config.waitTimeUpdate > 0) {
+        this.updating++
+        await timeout(this.platform.config.waitTimeUpdate)
+        if (--this.updating > 0) {
+          return
+        }
+      }
+      const targetConfig = this.targetConfig
+      this.targetConfig = {}
+      await this.put('/config', targetConfig)
+      // this.recentlyUpdated = true
+      // await timeout(500)
+      // this.recentlyUpdated = false
+    } catch (error) { this.warn(error) }
+  }
 }
 
 DeconzService.SensorsResource = SensorsResource

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.0.15",
+  "version": "1.0.18",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -26,13 +26,13 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.27.6",
+    "deCONZ": "2.28.1",
     "homebridge": "^1.8.4||^2.0.0-beta",
     "node": "^20||^18"
   },
   "dependencies": {
     "hb-deconz-tools": "~2.0.3",
-    "homebridge-lib": "~7.0.6"
+    "homebridge-lib": "~7.0.8"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",