homebridge-deconz 1.1.2 → 1.2.2

package/lib/Deconz/Resource.js

@@ -49,6 +49,25 @@ const hueTapMap = {
   99: 0 // release 3 and 4
 }
 
+const hkEvent = {
+  SINGLE: 0x01,
+  DOUBLE: 0x02,
+  LONG: 0x04
+}
+
+const buttonEventMap = {
+  0: 0, // PRESS
+  1: hkEvent.LONG, // HOLD
+  2: hkEvent.SINGLE, // SHORT_RELEASE
+  3: hkEvent.LONG, // LONG_RELEASE
+  4: hkEvent.DOUBLE, // DOUBLE_PRESS
+  5: hkEvent.LONG, // TRIPLE_PRESS
+  6: hkEvent.LONG, // QUADRUPLE_PRESS
+  7: hkEvent.LONG, // SHAKE
+  8: hkEvent.DOUBLE, // DROP
+  9: 0 // TILT
+}
+
 const ancillaryControlMap = {
   disarmed: 1002,
   already_disarmed: 1002,
@@ -437,6 +456,30 @@ class Resource {
   * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
   patchLabel (gateway) {
+    // FIX_ME: use introspect until buttons and events are reported as capability
+    if (this.body.introspect?.buttons != null) {
+      this.capabilities._introspect = true
+      this.capabilities._buttons = {}
+      let dots = 0
+      for (const button in this.body.introspect.buttons) {
+        const label = this.body.introspect.buttons[button].name
+        this.capabilities._buttons[button] = { label, events: 0 }
+        if (label.includes(' Dot')) {
+          dots++
+        }
+      }
+      this.capabilities._namespace = dots === this.body.introspect.buttons.length
+        ? gateway.Characteristics.hap.ServiceLabelNamespace.DOTS
+        : gateway.Characteristics.hap.ServiceLabelNamespace.ARABIC_NUMERALS
+      for (const value in this.body.introspect.values) {
+        const button = Math.round(value / 1000)
+        const event = value % 1000
+        if (this.capabilities._buttons[button] != null) {
+          this.capabilities._buttons[button].events |= buttonEventMap[event]
+        }
+      }
+    }
+    // End FIX_ME
     const buttons = []
     let dots = false
     switch (this.manufacturer) {
@@ -551,15 +594,11 @@ class Resource {
             buttons.push([3, 'Previous', SINGLE | LONG])
             buttons.push([4, 'Next', SINGLE | LONG])
             break
-          case 'RODRET Dimmer':
-            buttons.push([1, 'Dim Up', SINGLE | LONG])
-            buttons.push([2, 'Dim Down', SINGLE | LONG])
-            break
-          case 'SOMRIG shortcut button':
-            dots = true
-            buttons.push([1, '1', SINGLE | DOUBLE | LONG])
-            buttons.push([2, '2', SINGLE | DOUBLE | LONG])
-            break
+          // case 'SOMRIG shortcut button':
+          //   dots = true
+          //   buttons.push([1, '1', SINGLE | DOUBLE | LONG])
+          //   buttons.push([2, '2', SINGLE | DOUBLE | LONG])
+          //   break
           case 'SYMFONISK Sound Controller':
             if (this.cluster === '1000') {
               buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
@@ -584,17 +623,6 @@ class Resource {
             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
-          case 'TRADFRI on/off switch':
-            buttons.push([1, 'On', SINGLE | LONG])
-            buttons.push([2, 'Off', SINGLE | LONG])
-            break
-          case 'TRADFRI open/close remote':
-            buttons.push([1, 'Open', SINGLE | LONG])
-            buttons.push([2, 'Close', SINGLE | LONG])
-            break
           case 'TRADFRI remote control':
             buttons.push([1, 'Power', SINGLE])
             buttons.push([2, 'Dim Up', SINGLE | LONG])
@@ -676,7 +704,6 @@ class Resource {
           case 'lumi.remote.b186acn02':
             buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
             break
-          case 'lumi.remote.b28ac1':
           case 'lumi.remote.b286acn01':
           case 'lumi.remote.b286acn02':
             buttons.push([1, 'Left', SINGLE | DOUBLE | LONG])
@@ -751,7 +778,7 @@ class Resource {
             }
             break
           case 'lumi.sensor_switch': // Xiaomi Mi wireless switch
-          case 'lumi.sensor_switch.aq2': // Xiaomi Aqara smart wireless switch
+          // fallthrough
           case 'lumi.sensor_switch.aq3': // Xiaomi Aqara smart wireless switch with gyro
             buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
             break
@@ -822,11 +849,6 @@ class Resource {
         break
       case 'OSRAM':
         switch (this.model) {
-          case 'Lightify Switch Mini':
-            buttons.push([1, 'Up', SINGLE | LONG])
-            buttons.push([2, 'Down', SINGLE | LONG])
-            buttons.push([3, 'Middle', SINGLE | LONG])
-            break
           case 'Switch 4x EU-LIGHTIFY':
           case 'Switch 4x-LIGHTIFY':
             buttons.push([1, 'Top Left', SINGLE | LONG])
@@ -1037,18 +1059,6 @@ class Resource {
             break
         }
         break
-      case '_TZ3000_mh9px7cq':
-        switch (this.model) {
-          case 'TS0044':
-            buttons.push([1, 'Button 1', SINGLE | DOUBLE | LONG])
-            buttons.push([2, 'Button 2', SINGLE | DOUBLE | LONG])
-            buttons.push([3, 'Button 3', SINGLE | DOUBLE | LONG])
-            buttons.push([4, 'Button 4', SINGLE | DOUBLE | LONG])
-            break
-          default:
-            break
-        }
-        break
       case '_TZ3000_pzui3skt':
         switch (this.model) {
           case 'TS0041': // Tuya 1-button switch
@@ -1234,30 +1244,6 @@ class Resource {
             break
         }
         break
-      case 'ubisys':
-        switch (this.model) {
-          case 'C4 (5504)':
-          case 'C4-R (5604)':
-            buttons.push([1, '1', SINGLE | LONG])
-            buttons.push([2, '2', SINGLE | LONG])
-            buttons.push([3, '3', SINGLE | LONG])
-            buttons.push([4, '4', SINGLE | LONG])
-            break
-          case 'D1 (5503)':
-          case 'D1-R (5603)':
-          case 'S1-R (5601)':
-          case 'S2 (5502)':
-          case 'S2-R (5602)':
-            buttons.push([1, '1', SINGLE | LONG])
-            buttons.push([2, '2', SINGLE | LONG])
-            break
-          case 'S1 (5501)':
-            buttons.push([1, '1', SINGLE | LONG])
-            break
-          default:
-            break
-        }
-        break
       default:
         if (this.body.type === 'ZHAAncillaryControl') {
           buttons.push([1, 'Disarm', SINGLE])
@@ -1279,13 +1265,20 @@ class Resource {
       for (const button of buttons) {
         this.capabilities.buttons[button[0]] = {
           label: button[1],
-          events: button[2],
-          hasRepeat: button[3]
+          events: button[2]
+        }
+        if (button[3]) {
+          this.capabilities.buttons[button[0]].hasRepeat = button[3]
         }
       }
       this.capabilities.namespace = dots
         ? gateway.Characteristics.hap.ServiceLabelNamespace.DOTS
         : gateway.Characteristics.hap.ServiceLabelNamespace.ARABIC_NUMERALS
+    } else if (this.capabilities._buttons != null) {
+      this.capabilities.buttons = this.capabilities._buttons
+      this.capabilities.namespace = this.capabilities._namespace
+      delete this.capabilities._buttons
+      delete this.capabilities._namespace
     }
   }
 
@@ -1304,7 +1297,8 @@ class Resource {
   patchThermostat () {
     if (
       (this.manufacturer === 'Danfoss' && ['eTRV0100', 'eTRV0103'].includes(this.model)) ||
-      (this.manufacturer === 'ELKO' && this.model === 'Super TR')
+      (this.manufacturer === 'ELKO' && this.model === 'Super TR') ||
+      (this.manufacturer === 'LUMI' && this.model === 'lumi.airrtc.agl001')
     ) {
       this.capabilities.heatValue = 'heat'
     } else {

package/lib/DeconzAccessory/Gateway.js

@@ -78,12 +78,12 @@ class Gateway extends AccessoryDelegate {
     if (this.context.settingsById == null) {
       this.context.settingsById = {}
     }
-    if (this.context.fullState != null) {
-      this.analyseFullState(this.context.fullState, {
-        analyseOnly: true,
-        logUnsupported: true
-      })
-    }
+    // if (this.context.fullState != null) {
+    //   this.analyseFullState(this.context.fullState, {
+    //     analyseOnly: true,
+    //     logUnsupported: true
+    //   })
+    // }
 
     this.addPropertyDelegate({
       key: 'apiKey',
@@ -997,8 +997,22 @@ class Gateway extends AccessoryDelegate {
         } catch (error) {
           fullState.alarmsystems = {}
         }
+        // FIX_ME: use introspect until buttons and events are reported as capability
+        fullState.introspectByRid = {}
+        for (const rid in fullState.sensors) {
+          const sensor = fullState.sensors[rid]
+          if (sensor.type === 'ZHASwitch') {
+            try {
+              fullState.introspectByRid[rid] = await this.client.get(
+                '/devices/' + sensor.uniqueid + '/state/buttonevent/introspect'
+              )
+            } catch (error) { }
+          }
+        }
+        // End FIX_ME
         this.context.fullState = fullState
         this.pollFullState = false
+        await this.analyseFullState(this.context.fullState, { logUnsupported: true })
       } else {
         const config = await this.client.get('/config')
         if (config.bridgeid === this.id && config.UTC == null) {
@@ -1027,8 +1041,8 @@ class Gateway extends AccessoryDelegate {
         if (this.values.exposeSchedules) {
           this.context.fullState.schedules = await this.client.get('/schedules')
         }
+        await this.analyseFullState(this.context.fullState)
       }
-      await this.analyseFullState(this.context.fullState)
     } catch (error) {
       this.error('poll error: %s', error)
     } finally {
@@ -1316,8 +1330,39 @@ class Gateway extends AccessoryDelegate {
     const warn = (logUnsupported ? this.warn : this.vdebug).bind(this)
     const debug = (logUnsupported ? this.debug : this.vdebug).bind(this)
 
+    // FIX_ME: use introspect until buttons and events are reported as capability
+    if (this.context.fullState.introspectByRid?.[rid] != null) {
+      body.introspect = this.context.fullState.introspectByRid[rid]
+    }
+    // End FIX_ME
     const resource = new Deconz.Resource(this, rtype, rid, body)
     const { id, serviceName } = resource
+    // FIX_ME: check introspect against whitelist
+    if (logUnsupported && resource.body.type === 'ZHASwitch') {
+      if (!resource.capabilities._introspect) {
+        this.warn(
+          '%s: /sensors/%d: %s by %s: no introspect',
+          id, rid, resource.model, resource.manufacturer
+        )
+      }
+    } else if (resource.capabilities._buttons != null) {
+      if (
+        JSON.stringify(resource.capabilities._buttons) !==
+          JSON.stringify(resource.capabilities.buttons) ||
+        resource.capabilities._namespace !== resource.capabilities.namespace
+      ) {
+        this.debug(
+          '%s: /sensors/%d: %s by %s: whitelist vs introspect mismatch: %j',
+          id, rid, resource.model, resource.manufacturer, resource.capabilities
+        )
+      } else {
+        this.warn(
+          '%s: /sensors/%d: %s by %s: whitelist matches introspect',
+          id, rid, resource.model, resource.manufacturer
+        )
+      }
+    }
+    // End FIX_ME
     if (this.blacklist[rtype]?.[rid]) {
       debug('%s: /%s/%d: ignoring blacklisted resource', id, rtype, rid)
       return

package/lib/DeconzPlatform.js

@@ -253,11 +253,6 @@ class DeconzPlatform extends Platform {
         ) {
           this.gatewayMap[id] = new DeconzAccessory.Gateway(this, context)
         }
-      } else {
-        const gateway = this.gatewayMap[context.gid]
-        if (gateway != null) {
-          gateway.addAccessory(id)
-        }
       }
     } catch (error) { this.error(error) }
   }

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -26,13 +26,13 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.29.5",
-    "homebridge": "^1.9.0||^2.0.0-beta",
-    "node": "^22||^20||^18"
+    "deCONZ": "2.30.2",
+    "homebridge": "^1.11.0||^2.0.0-beta",
+    "node": "^22||^20"
   },
   "dependencies": {
-    "hb-deconz-tools": "~2.0.10",
-    "homebridge-lib": "~7.1.5"
+    "hb-deconz-tools": "~2.0.14",
+    "homebridge-lib": "~7.1.7"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",