homebridge-deconz 1.0.26 → 1.1.0

package/lib/Deconz/Resource.js

@@ -16,7 +16,7 @@ import '../DeconzService/Button.js'
 const { toInstance, toInt, toObject, toString } = OptionParser
 const { buttonEvent } = ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button
-const rtypes = ['lights', 'sensors', 'groups']
+const rtypes = ['lights', 'sensors', 'groups', 'alarmsystems']
 
 const patterns = {
   clipId: /^(S[0-9]{1,3})-([0-9a-z]{2})-([0-9a-z]{4})$/i,
@@ -49,6 +49,19 @@ const hueTapMap = {
   99: 0 // release 3 and 4
 }
 
+const ancillaryControlMap = {
+  disarmed: 1002,
+  already_disarmed: 1002,
+  armed_stay: 2002,
+  armed_night: 3002,
+  armed_away: 4002,
+  invalid_code: 5002,
+  not_ready: 0,
+  emergency: 6002,
+  fire: 7002,
+  panic: 8002
+}
+
 /** Delegate class for a resource on a deCONZ gateway.
   *
   * @memberof Deconz
@@ -115,6 +128,9 @@ class Resource {
     body.name = body.name.replace(/[^\p{L}\p{N} ']/ug, ' ')
       .replace(/^[ ']*/, '')
       .replace(/[ ']*$/, '')
+    if (rtype === 'alarmsystems') {
+      body.type = 'AlarmSystem'
+    }
     toString('body.type', body.type, true)
 
     let realDevice = false
@@ -297,12 +313,15 @@ class Resource {
         case 'Window covering device': return 'WindowCovering'
         default: return null
       }
+    } else if (this.rtype === 'alarmsystems') {
+      return 'AlarmSystem'
     } else { // (this.rtype === 'sensors')
       const type = /^(CLIP|ZHA|ZGP)?([A-Za-z]*)$/.exec(this.body.type)?.[2]
       switch (type) {
         case 'AirPurifier': return 'AirPurifier'
         case 'AirQuality': return 'AirQuality'
         case 'Alarm': return 'Alarm'
+        case 'AncillaryControl': return 'Label'
         case 'Battery': return 'Battery'
         case 'CarbonMonoxide': return 'CarbonMonoxide'
         case 'Consumption': return 'Consumption'
@@ -421,6 +440,16 @@ class Resource {
     const buttons = []
     let dots = false
     switch (this.manufacturer) {
+      case 'Aqara':
+        switch (this.model) {
+          case 'lumi.switch.acn047': // Aqara T2 Module
+            buttons.push(1, 'S1', SINGLE)
+            buttons.push(2, 'S2', SINGLE)
+            break
+          default:
+            break
+        }
+        break
       case 'Bitron Home':
         switch (this.model) {
           case '902010/23': // Bitron remote, see #639.
@@ -1117,6 +1146,25 @@ class Resource {
             break
         }
         break
+      case 'frient AS':
+        switch (this.model) {
+          case 'KEPZB-110':
+            buttons.push([1, 'Disarm', SINGLE])
+            buttons.push([2, 'Armed Stay', SINGLE])
+            buttons.push([3, 'Armed Night', SINGLE])
+            buttons.push([4, 'Armed Away', SINGLE])
+            buttons.push([5, 'Invalid Code', SINGLE])
+            buttons.push([6, 'SOS', SINGLE])
+            // buttons.push([7, 'Fire', SINGLE])
+            // buttons.push([8, 'Panic', SINGLE])
+            this.capabilities.toButtonEvent = (v) => {
+              return ancillaryControlMap[v]
+            }
+            break
+          default:
+            break
+        }
+        break
       case 'icasa':
         switch (this.model) {
           case 'ICZB-KPD12':
@@ -1211,6 +1259,19 @@ class Resource {
         }
         break
       default:
+        if (this.body.type === 'ZHAAncillaryControl') {
+          buttons.push([1, 'Disarm', SINGLE])
+          buttons.push([2, 'Armed Stay', SINGLE])
+          buttons.push([3, 'Armed Night', SINGLE])
+          buttons.push([4, 'Armed Away', SINGLE])
+          buttons.push([5, 'Invalid Code', SINGLE])
+          buttons.push([6, 'Emergency', SINGLE])
+          buttons.push([7, 'Fire', SINGLE])
+          buttons.push([8, 'Panic', SINGLE])
+          this.capabilities.toButtonEvent = (v) => {
+            return ancillaryControlMap[v]
+          }
+        }
         break
     }
     if (buttons.length > 0) {

package/lib/DeconzAccessory/Gateway.js

@@ -29,7 +29,7 @@ const migration = {
   classid: 1
 }
 
-const rtypes = ['lights', 'sensors', 'groups']
+const rtypes = ['lights', 'sensors', 'groups', 'alarmsystems']
 
 const periodicEvents = [
   { rate: 60, event: 1002 },
@@ -992,6 +992,11 @@ class Gateway extends AccessoryDelegate {
         try {
           fullState.groups[0] = await this.client.get('/groups/0')
         } catch (error) {}
+        try {
+          fullState.alarmsystems = await this.client.get('/alarmsystems')
+        } catch (error) {
+          fullState.alarmsystems = {}
+        }
         this.context.fullState = fullState
         this.pollFullState = false
       } else {
@@ -1016,6 +1021,9 @@ class Gateway extends AccessoryDelegate {
             this.context.fullState.groups[0] = await this.client.get('/groups/0')
           } catch (error) {}
         }
+        if (this.nDevicesByRtype.alarmsystems > 0) {
+          this.context.fullState.alarmsystems = await this.client.get('/alarmsystems')
+        }
         if (this.values.exposeSchedules) {
           this.context.fullState.schedules = await this.client.get('/schedules')
         }

package/lib/DeconzAccessory/index.js

@@ -235,6 +235,7 @@ class DeconzAccessory extends AccessoryDelegate {
             logLevel: this.values.logLevel,
             lowBatteryThreshold: this.servicesByServiceName?.Battery?.[0].values.lowBatteryThreshold,
             // offset: this.servicesByServiceName?.Temperature?.[0].values.offset,
+            pin: this.service.values.pin,
             serviceName: this.values.serviceName,
             venetianBlind: this.service.values.venetianBlind,
             useExternalTemperature: this.service.values.useExternalTemperature,
@@ -289,6 +290,14 @@ class DeconzAccessory extends AccessoryDelegate {
               continue
             }
             break
+          case 'pin':
+            if (this.service.values[key] != null) {
+              value = OptionParser.toString(key, body[key])
+              this.service.values[key] = value
+              responseBody[key] = value
+              continue
+            }
+            break
           case 'serviceName':
             if (this.values.serviceName != null) {
               value = OptionParser.toString(key, body[key])

package/lib/DeconzService/AlarmSystem.js

@@ -0,0 +1,87 @@
+// homebridge-deconz/lib/DeconzService/AlarmSystem.js
+// Copyright © 2022-2025 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+import { DeconzService } from '../DeconzService/index.js'
+
+let mapsInitialised = false
+const armModeMap = {}
+const armStateMap = {}
+const targetStateMap = {}
+
+function initMaps (currentState, targetState) {
+  if (mapsInitialised) {
+    return
+  }
+  armStateMap.disarmed = currentState.DISARMED
+  armStateMap.armed_away = currentState.AWAY_ARM
+  armStateMap.armed_stay = currentState.STAY_ARM
+  armStateMap.armed_night = currentState.NIGHT_ARM
+  armStateMap.in_alarm = currentState.ALARM_TRIGGERED
+  armModeMap.disarmed = targetState.DISARM
+  armModeMap.armed_away = targetState.AWAY_ARM
+  armModeMap.armed_stay = targetState.STAY_ARM
+  armModeMap.armed_night = targetState.NIGHT_ARM
+  targetStateMap[targetState.DISARM] = 'disarm'
+  targetStateMap[targetState.AWAY_ARM] = 'arm_away'
+  targetStateMap[targetState.STAY_ARM] = 'arm_stay'
+  targetStateMap[targetState.NIGHT_ARM] = 'arm_night'
+  mapsInitialised = true
+}
+
+/**
+  * @memberof DeconzService
+  */
+class AlarmSystem extends DeconzService {
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.SecuritySystem
+    super(accessory, resource, params)
+
+    initMaps(
+      this.Characteristics.hap.SecuritySystemCurrentState,
+      this.Characteristics.hap.SecuritySystemTargetState
+    )
+    this.addCharacteristicDelegate({
+      key: 'currentState',
+      Characteristic: this.Characteristics.hap.SecuritySystemCurrentState
+    })
+    this.addCharacteristicDelegate({
+      key: 'targetState',
+      Characteristic: this.Characteristics.hap.SecuritySystemTargetState
+    }).on('didSet', async (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        await this.put(`/${targetStateMap[value]}`, {
+          code0: this.values.pin
+        })
+      }
+    })
+    this.addCharacteristicDelegate({
+      key: 'alarmType',
+      Characteristic: this.Characteristics.hap.SecuritySystemAlarmType
+    })
+    this.addCharacteristicDelegate({
+      key: 'pin',
+      value: '0000'
+    })
+
+    this.update(resource.body, resource.rpath)
+  }
+
+  updateState (state) {
+    if (armStateMap[state.armstate] != null) {
+      this.values.currentState = armStateMap[state.armstate]
+    }
+    this.values.alarmType = state.armstate === 'in_alarm'
+      ? 1 // this.Characteristics.hap.SecuritySystemAlarmType.UNKNOWN
+      : 0 // this.Characteristics.hap.SecuritySystemAlarmType.NO_ALARM
+  }
+
+  updateConfig (config) {
+    if (armModeMap[config.armmode] != null) {
+      this.values.targetState = armModeMap[config.armmode]
+    }
+  }
+}
+
+DeconzService.AlarmSystem = AlarmSystem

package/lib/DeconzService/Daylight.js

@@ -76,7 +76,7 @@ class Daylight extends DeconzService.SensorsResource {
         minValue: 100,
         maxValue: 230,
         perms: [
-          this.Characteristic.Perms.READ,
+          this.Characteristic.Perms.PAIRED_READ,
           this.Characteristic.Perms.NOTIFY]
       },
       value: resource.body.state.status

package/lib/DeconzService/Flag.js

@@ -20,7 +20,7 @@ class Flag extends DeconzService.SensorsResource {
         Characteristic: this.Characteristics.hap.On,
         props: {
           perms: [
-            this.Characteristic.Perms.READ, this.Characteristic.Perms.NOTIFY
+            this.Characteristic.Perms.PAIRED_READ, this.Characteristic.Perms.NOTIFY
           ]
         }
       })

package/lib/DeconzService/Label.js

@@ -42,6 +42,12 @@ class Label extends DeconzService.SensorsResource {
         right: keys[0],
         left: keys[1]
       }
+    } else if (resource.body.type.endsWith('AncillaryControl')) {
+      this.buttonResources[resource.rpath] = {
+        buttonEvent: resource.body.state.action,
+        lastUpdated: new Date(),
+        toButtonEvent: resource.capabilities.toButtonEvent
+      }
     }
     for (const i in resource.capabilities.buttons) {
       const { label, events, hasRepeat } = resource.capabilities.buttons[i]
@@ -73,6 +79,8 @@ class Label extends DeconzService.SensorsResource {
           buttonResource.buttonEvent = buttonResource.toButtonEvent == null
             ? state.buttonevent
             : buttonResource.toButtonEvent(state.buttonevent)
+        } else if (state.action != null) {
+          buttonResource.buttonEvent = buttonResource.toButtonEvent(state.action)
         }
         // TODO handle repeat
         const i = Math.floor(buttonResource.buttonEvent / 1000)

package/lib/DeconzService/Status.js

@@ -44,7 +44,7 @@ class Status extends DeconzService.SensorsResource {
         Characteristic: this.Characteristics.my.Status,
         props: {
           perms: [
-            this.Characteristic.Perms.READ, this.Characteristic.Perms.NOTIFY
+            this.Characteristic.Perms.PAIRED_READ, this.Characteristic.Perms.NOTIFY
           ]
         }
       })

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.0.26",
+  "version": "1.1.0",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -26,12 +26,12 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.28.1",
+    "deCONZ": "2.29.5",
     "homebridge": "^1.9.0||^2.0.0-beta",
     "node": "^22||^20||^18"
   },
   "dependencies": {
-    "hb-deconz-tools": "~2.0.8",
+    "hb-deconz-tools": "~2.0.9",
     "homebridge-lib": "~7.1.4"
   },
   "scripts": {