homebridge-deconz 0.1.14 → 0.1.16

package/lib/Deconz/Resource.js

@@ -129,10 +129,17 @@ class Resource {
         * @type {boolean}
         */
       this.zigbee = true
-    } else if (this.isMultiClip()) {
-      const a = body.uniqueid.split('-')
-      this.id = gateway.id + '-M' + a[0]
-      this.subtype = a[1]
+    } else if (this.rtype === 'sensors') {
+      const { mac, endpoint, cluster } = Resource.parseUniqueid(body.uniqueid)
+      if (mac != null && endpoint != null && cluster != null) {
+        this.id = mac
+        this.subtype = endpoint + (cluster == null ? '' : '-' + cluster)
+        this.endpoint = endpoint
+        this.cluster = cluster
+      } else {
+        this.subtype = rtype[0].toUpperCase() + rid
+        this.id = gateway.id + '-' + this.subtype
+      }
       this.zigbee = false
     } else {
       this.subtype = rtype[0].toUpperCase() + rid
@@ -147,8 +154,8 @@ class Resource {
       * For virtual devices, this is the _Manufacturer_ for the gateway.
       * @type {string}
       */
-    this.manufacturer = this.zigbee
-      ? body.manufacturername
+    this.manufacturer = this.endpoint != null
+      ? body.manufacturername.replace(/\//g, '')
       : gateway.values.manufacturer
 
     /** The associated HomeKit _Model_.
@@ -158,7 +165,7 @@ class Resource {
       * For virtual devices, this is the `type` in the resource body.
       * @type {string}
       */
-    this.model = this.zigbee ? body.modelid : body.type
+    this.model = this.endpoint != null ? body.modelid : body.type
 
     /** The associated HomeKit _Firmware Version_.
       *
@@ -166,7 +173,7 @@ class Resource {
       * resource body.
       * For virtual devices, this is the _Firmware Version_ for the gateway.
       */
-    this.firmware = this.zigbee
+    this.firmware = this.endpoint != null
       ? body.swversion == null ? '0.0.0' : body.swversion
       : gateway.values.software
 
@@ -195,7 +202,7 @@ class Resource {
     if (this.rtype === 'groups') {
       return -1
     }
-    if (this.rtype === 'lights' || this.isMultiClip()) {
+    if (this.rtype === 'lights') {
       return 0xFF - this.endpoint
     }
     return sensorsPrios.indexOf(this.serviceName)
@@ -327,36 +334,20 @@ 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'
-    )
-  }
-
-  isMultiClip () {
-    return this.isDeconzClip() && /^[0-9]+-[0-9]+$/.test(this.body.uniqueid)
-  }
-
   /** Patch a resource corresponding to a `Flag` service.
     */
   patchFlag () {
-    if (this.isDeconzClip() && this.body.swversion === '0') {
-      this.capabilities.readonly = true
+    if (this.endpoint != null && this.cluster === '0006') {
+      if (this.body.swversion === '0') {
+        this.capabilities.readonly = true
+      }
     }
   }
 
   /** Patch a resource corresponding to a `Status` service.
     */
   patchStatus () {
-    if (this.isDeconzClip()) {
+    if (this.endpoint != null && this.cluster === '0012') {
       const a = this.body.swversion.split(',')
       const min = parseInt(a[0])
       const max = parseInt(a[1])
@@ -1059,6 +1050,16 @@ class Resource {
     }
   }
 
+  /** Patch a resource corresponding to a `Motion` service.
+    */
+  patchMotion () {
+    if (this.manufacturer === 'Aqara' && this.model === 'PS-S02D') {
+      if (this.endpoint !== '01') {
+        this.id += '-' + this.endpoint
+      }
+    }
+  }
+
   /** Patch a resource corresponding to a `Thermostat` service.
     */
   patchThermostat () {

package/lib/DeconzAccessory/Gateway.js

@@ -637,7 +637,6 @@ class Gateway extends AccessoryDelegate {
             '%s: resetting after expose error: %s', id, this.exposeErrorById[id]
           )
           this.deleteAccessory(id)
-          this.deleteService(id)
         }
       }
     }
@@ -672,7 +671,6 @@ class Gateway extends AccessoryDelegate {
       '%s: resetting after expose error: %s', id, this.exposeErrorById[id]
     )
     this.deleteAccessory(id)
-    this.deleteService(id)
   }
 
   /** Assert that migration resourcelink exists and is valid.
@@ -921,6 +919,10 @@ class Gateway extends AccessoryDelegate {
           await this.wsClient.close()
           return
         }
+        if (config.fwversion === '0x00000000') {
+          this.warn('deCONZ not ready')
+          return
+        }
         this.context.fullState.config = config
         this.context.fullState.lights = await this.client.get('/lights')
         this.context.fullState.sensors = await this.client.get('/sensors')
@@ -964,16 +966,10 @@ class Gateway extends AccessoryDelegate {
     * {@link DeconzAccessory.Gateway#deleteAccessory deleteAccessory()} for
     * stale accessories, corresponding to devices that have been deleted from
     * the gateway, blacklisted, or excluded by device primary resource type.
-    * 3. Analyse (pre-existing) _Device Settings_ services, calling
-    * {@link DeconzAccessory.Gateway#deleteService deleteService()}
-    * for stale services, corresponding to devices that have been deleted from
-    * the gateway, un-blacklisted, or excluded by device primary resource type.
-    * 4. Analysing supported devices with enabled device primary resource types,
-    * calling {@link DeconzAccessory.Gateway#addAccessory addAccessory()} and
-    * {@link DeconzAccessory.Gateway#deleteService deleteService()} for new
+    * 3. Analysing supported devices with enabled device primary resource types,
+    * calling {@link DeconzAccessory.Gateway#addAccessory addAccessory()} for new
     * _Device_ accessories, corresponding to devices added to the gateway,
     * un-blacklisted, or included by device primary resource type, and calling
-    * {@link DeconzAccessory.Gateway#addService addService()} and
     * {@link DeconzAccessory.Gateway#deleteAccessory deleteAccessory()} for
     * accessories, corresponding to devices have been blacklisted.
     * @param {Object} fullState - The gateway full state, as returned by
@@ -1072,7 +1068,6 @@ class Gateway extends AccessoryDelegate {
         ) {
           delete this.context.settingsById[id]
           this.deleteAccessory(id)
-          // this.deleteService(id)
           changed = true
         } else {
           /** Emitted when the gateway has been polled.

package/lib/DeconzAccessory/WarningDevice.js

@@ -5,6 +5,7 @@
 
 'use strict'
 
+const { ServiceDelegate } = require('homebridge-lib')
 const DeconzAccessory = require('../DeconzAccessory')
 
 /** Delegate class for a HomeKit accessory, corresponding to a light device
@@ -32,6 +33,23 @@ class WarningDevice extends DeconzAccessory {
       this.createService(resource)
     }
 
+    const params = {}
+    if (this.servicesByServiceName.WarningDevice?.length === 1) {
+      params.switchOnDelegate = this.service.characteristicDelegate('on')
+      params.lastSwitchOnDelegate = this.service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
+      })
+    }
+    if (this.servicesByServiceName.Temperature?.length === 1) {
+      const service = this.servicesByServiceName.Temperature[0]
+      params.temperatureDelegate = service.characteristicDelegate('temperature')
+    }
+    if (Object.keys(params).length > 0) {
+      this.historyService = new ServiceDelegate.History(this, params)
+    }
+
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')

package/lib/DeconzService/Smoke.js

@@ -16,10 +16,15 @@ class Smoke extends DeconzService.SensorsResource {
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({
-      key: 'fire',
+      key: 'smoke',
       Characteristic: this.Characteristics.hap.SmokeDetected
     })
 
+    this.addCharacteristicDelegate({
+      key: 'deviceStatus',
+      Characteristic: this.Characteristics.eve.ElgatoDeviceStatus
+    })
+
     super.addCharacteristicDelegates(params)
 
     this.update(resource.body, resource.rpath)
@@ -27,9 +32,17 @@ class Smoke extends DeconzService.SensorsResource {
 
   updateState (state) {
     if (state.fire != null || state.test != null) {
-      this.values.fire = state.fire || state.test
+      this.values.smoke = state.fire
         ? this.Characteristics.hap.SmokeDetected.SMOKE_DETECTED
         : this.Characteristics.hap.SmokeDetected.SMOKE_NOT_DETECTED
+      let status = 0
+      if (state.fire) {
+        status |= this.Characteristics.eve.ElgatoDeviceStatus.SMOKE_DETECTED
+      }
+      if (state.test) {
+        status |= this.Characteristics.eve.ElgatoDeviceStatus.ALARM_TEST_ACTIVE
+      }
+      this.values.deviceStatus = status
     }
     super.updateState(state)
   }

package/lib/DeconzService/WarningDevice.js

@@ -9,7 +9,7 @@ const DeconzService = require('../DeconzService')
 
 class WarningDevice extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.hap.Outlet
+    params.Service = accessory.Services.hap.Switch
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -26,7 +26,7 @@
     "node": "^18.16.0"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.15",
+    "homebridge-lib": "~6.3.17",
     "ws": "^8.13.0",
     "xml2js": "~0.5.0"
   },