homebridge-deconz 0.1.18 → 0.1.19

package/lib/Deconz/Resource.js

@@ -16,7 +16,6 @@ const { SINGLE, DOUBLE, LONG } = DeconzService.Button
 const rtypes = ['lights', 'sensors', 'groups']
 
 const patterns = {
-  uniqueid: /^([0-9a-f]{1,2}(?:[:-]?(?:[0-9a-f]{1,2})){7})-([0-9a-z]{2})(?:-([0-9a-z]{4}))?$/i,
   clipId: /^(S[0-9]{1,3})-([0-9a-z]{2})-([0-9a-z]{4})$/i,
   swversion: /^([0-9]+)(?:\.([0-9]+)(?:\.([0-9]+)(?:_([0-9]{4}))?)?)?$/
 }
@@ -52,20 +51,6 @@ const hueTapMap = {
   * @memberof Deconz
   */
 class Resource {
-  /** Parse the `uniqueid` in the resource body of a resource for a Zigbee device.
-    * @param {string} uniqueid - The `uniqueid`.
-    * @return {object} The Zigbee `mac`, `endpoint`, and `cluster`.
-    */
-  static parseUniqueid (uniqueid) {
-    toString('uniqueid', uniqueid, true)
-    const a = patterns.uniqueid.exec(uniqueid.replace(/:/g, '').toUpperCase())
-    return {
-      mac: a?.[1],
-      endpoint: a?.[2],
-      cluster: a?.[3]
-    }
-  }
-
   /** Parse the `uniqueid` in the resource body of a resource for a CLIP sensor.
     * @param {string} uniqueid - The `uniqueid`.
     * @return {object} The MultiCLIP `id`, `endpoint`, and `cluster`.
@@ -132,7 +117,7 @@ class Resource {
       this.rtype === 'lights' ||
       (this.rtype === 'sensors' && this.body.type.startsWith('Z'))
     ) {
-      const { mac, endpoint, cluster } = Resource.parseUniqueid(body.uniqueid)
+      const { mac, endpoint, cluster } = ApiClient.parseUniqueid(body.uniqueid)
 
       /** The device ID.
         *
@@ -170,7 +155,7 @@ class Resource {
 
       realDevice = true
     } else if (this.rtype === 'sensors') {
-      const { mac, endpoint, cluster } = Resource.parseUniqueid(body.uniqueid)
+      const { mac, endpoint, cluster } = ApiClient.parseUniqueid(body.uniqueid)
       if (mac != null && endpoint != null && cluster != null) {
         // uniqueid for proxy device has proper mac, endpoint, cluster
         this.id = mac

package/lib/DeconzService/Motion.js

@@ -26,8 +26,7 @@ class Motion extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegate({
       key: 'sensitivity',
-      Characteristic: this.Characteristics.eve.Sensitivity,
-      value: this.Characteristics.hap.TemperatureDisplayUnits.CELSIUS
+      Characteristic: this.Characteristics.eve.Sensitivity
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {
         const sensitivity = value === this.Characteristics.eve.Sensitivity.HIGH

package/lib/DeconzService/SensorsResource.js

@@ -30,8 +30,11 @@ class SensorsResource extends DeconzService {
     this.addCharacteristicDelegate({
       key: 'enabled',
       Characteristic: this.Characteristics.my.Enabled
-    }).on('didSet', (value) => {
+    }).on('didSet', async (value, fromHomeKit) => {
       this.values.statusActive = value
+      if (fromHomeKit) {
+        await this.put('/config', { on: value })
+      }
     })
 
     this.addCharacteristicDelegate({

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -23,13 +23,11 @@
   "engines": {
     "deCONZ": "2.21.2",
     "homebridge": "^1.6.1",
-    "node": "^18.16.0"
+    "node": "^18.16.1"
   },
   "dependencies": {
-    "hb-deconz-tools": "~1.0.2",
-    "homebridge-lib": "~6.3.17",
-    "ws": "^8.13.0",
-    "xml2js": "~0.5.0"
+    "hb-deconz-tools": "~1.0.3",
+    "homebridge-lib": "~6.3.18"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",