homebridge-adt-pulse 3.0.0-beta.23 → 3.0.0-beta.24

package/README.md

@@ -1,11 +1,6 @@
 ADT Pulse for Homebridge
 =========================
 
-### ⚠️ Please Install the Beta Version ⚠️
-This plugin is completely re-written from the ground up (supports v27.0.0-140), and I would love everyone on board! Please install the beta version, so I can quickly get a faster and more stable version to you!
-
-Please bear with me, as the beta version is being actively developed and tested. If you see any unusual or annoying bugs, please comment on this [GitHub issue](https://github.com/mrjackyliang/homebridge-adt-pulse/issues/124).
-
 [![NPM Package](https://img.shields.io/npm/v/homebridge-adt-pulse?style=flat-square&logo=npm&logoColor=%23ffffff&color=%23b25da6)](https://www.npmjs.com/package/homebridge-adt-pulse)
 [![NPM Downloads](https://img.shields.io/npm/dt/homebridge-adt-pulse?style=flat-square&logo=npm&logoColor=%23ffffff&color=%236688c3)](https://www.npmjs.com/package/homebridge-adt-pulse)
 [![GitHub License](https://img.shields.io/github/license/mrjackyliang/homebridge-adt-pulse?style=flat-square&logo=googledocs&logoColor=%23ffffff&color=%2348a56a)](https://github.com/mrjackyliang/homebridge-adt-pulse/blob/main/LICENSE)
@@ -71,7 +66,8 @@ This plugin can expose these devices (in read-only mode) based on your configura
 6. `heat` - Heat (Rate-of-Rise) Detector
 7. `motion` - Motion Sensor __::__ Motion Sensor (Notable Events Only)
 8. `shock` - Shock Sensor
-9. `temperature` - Temperature Sensor
+9. `supervisory` - System/Supervisory
+10. `temperature` - Temperature Sensor
 
 Due to implementation complexity and platform instability, all Z-Wave accessories connected to the ADT Pulse gateway will not be planned for development or be supported overall. Consider purchasing the [Hubitat Hub](https://hubitat.com) for a seamless setup experience, or read about the [Home Assistant Z-Wave](https://www.home-assistant.io/integrations/zwave_js/) integration.
 
@@ -162,6 +158,14 @@ Consumers would enable debug mode, but forget to also enable Homebridge debug mo
 
 To improve this, debug mode is now activated __ONLY when debug mode is enabled on Homebridge__ itself. This approach promotes isolation (logs can be separated for each bridge) and helps enhance the troubleshooting experience in case any issues arise.
 
+## Temperature Sensors in HAP Protocol
+The Temperature Sensor (`temperature`) functions differently compared to standard contact sensors when it comes to processing sensor statuses.
+
+In contrast to typical contact sensors that convey open or closed status, the temperature sensor exposed in the Home app (utilizing the HAP protocol) operates with temperature values. To accommodate this difference, the accessory converts these binary states into corresponding temperature degrees:
+- Cold temperatures are represented as __0°C__.
+- Normal temperatures are indicated as __20°C__.
+- Hot temperatures are reflected as __40°C__.
+
 ## Support for HOOBS
 Please note that HOOBS may use an outdated configuration UI. This issue that was reported by me, remains unresolved by the HOOBS team. For additional details, refer to this [GitHub issue](https://github.com/hoobs-org/HOOBS/issues/1873).
 

package/build/config.schema.json

@@ -205,6 +205,12 @@
                                         "shock"
                                     ]
                                 },
+                                {
+                                    "title": "System/Supervisory",
+                                    "enum": [
+                                        "supervisory"
+                                    ]
+                                },
                                 {
                                     "title": "Temperature Sensor",
                                     "enum": [

package/build/src/lib/accessory.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { condensedSensorTypeItems } from './items.js';
-import { condensePanelStates, stackTracer } from './utility.js';
+import { condensePanelStates, isPanelAlarmActive, stackTracer } from './utility.js';
 export class ADTPulseAccessory {
     #accessory;
     #api;
@@ -9,6 +9,7 @@ export class ADTPulseAccessory {
     #log;
     #services;
     #state;
+    #status;
     constructor(accessory, state, instance, service, characteristic, api, log) {
         this.#accessory = accessory;
         this.#api = api;
@@ -17,8 +18,12 @@ export class ADTPulseAccessory {
         this.#log = log;
         this.#services = {};
         this.#state = state;
+        this.#status = {
+            isBusy: false,
+            setValue: null,
+        };
         const { context } = this.#accessory;
-        const { firmware, hardware, id, manufacturer, model, name, serial, software, type, uuid, } = context;
+        const { firmware, hardware, manufacturer, model, name, serial, software, type, } = context;
         this.#services.Information = this.#accessory.getService(service.AccessoryInformation) ?? this.#accessory.addService(service.AccessoryInformation);
         this.#services.Information
             .setCharacteristic(this.#characteristic.Identify, false)
@@ -63,122 +68,11 @@ export class ADTPulseAccessory {
             case 'shock':
                 this.#services.Primary = this.#accessory.getService(service.OccupancySensor) ?? this.#accessory.addService(service.OccupancySensor);
                 break;
-            case 'temperature':
-                this.#services.Primary = this.#accessory.getService(service.TemperatureSensor) ?? this.#accessory.addService(service.TemperatureSensor);
-                break;
-            default:
-                break;
-        }
-        if (this.#services.Primary === undefined) {
-            if (type !== 'gateway') {
-                this.#log.error(`Failed to initialize ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory because the primary service does not exist ...`);
-            }
-            return;
-        }
-        switch (type) {
-            case 'gateway':
-                break;
-            case 'panel':
-                this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemCurrentState)
-                    .onGet(() => this.getPanelStatus('constructor', 'current'))
-                    .updateValue(this.getPanelStatus('updater', 'current'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemTargetState)
-                    .onGet(() => this.getPanelStatus('constructor', 'target'))
-                    .updateValue(this.getPanelStatus('updater', 'target'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemTargetState)
-                    .onSet(async (value) => this.setPanelStatus(value));
-                break;
-            default:
-                break;
-        }
-        switch (type) {
-            case 'gateway':
-                break;
-            case 'panel':
-                this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemAlarmType)
-                    .onGet(() => this.getPanelStatus('constructor', 'alarmType'))
-                    .updateValue(this.getPanelStatus('updater', 'alarmType'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.StatusFault)
-                    .onGet(() => this.getPanelStatus('constructor', 'fault'))
-                    .updateValue(this.getPanelStatus('updater', 'fault'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.StatusTampered)
-                    .onGet(() => this.getPanelStatus('constructor', 'tamper'))
-                    .updateValue(this.getPanelStatus('updater', 'tamper'));
-                break;
-            default:
-                break;
-        }
-        switch (type) {
-            case 'co':
-                this.#services.Primary.getCharacteristic(this.#characteristic.CarbonMonoxideDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'doorWindow':
-                this.#services.Primary.getCharacteristic(this.#characteristic.ContactSensorState)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'fire':
-                this.#services.Primary.getCharacteristic(this.#characteristic.SmokeDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'flood':
-                this.#services.Primary.getCharacteristic(this.#characteristic.LeakDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'glass':
-                this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'heat':
-                this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'motion':
-                this.#services.Primary.getCharacteristic(this.#characteristic.MotionDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            case 'shock':
-                this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
+            case 'supervisory':
+                this.#services.Primary = this.#accessory.getService(service.OccupancySensor) ?? this.#accessory.addService(service.OccupancySensor);
                 break;
             case 'temperature':
-                this.#services.Primary.getCharacteristic(this.#characteristic.CurrentTemperature)
-                    .onGet(() => this.getSensorStatus('constructor', 'status'))
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                break;
-            default:
-                break;
-        }
-        switch (type) {
-            case 'co':
-            case 'doorWindow':
-            case 'fire':
-            case 'flood':
-            case 'glass':
-            case 'heat':
-            case 'motion':
-            case 'shock':
-            case 'temperature':
-                this.#services.Primary.getCharacteristic(this.#characteristic.StatusActive)
-                    .onGet(() => this.getSensorStatus('constructor', 'active'))
-                    .updateValue(this.getSensorStatus('updater', 'active'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.StatusFault)
-                    .onGet(() => this.getSensorStatus('constructor', 'fault'))
-                    .updateValue(this.getSensorStatus('updater', 'fault'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.StatusLowBattery)
-                    .onGet(() => this.getSensorStatus('constructor', 'lowBattery'))
-                    .updateValue(this.getSensorStatus('updater', 'lowBattery'));
-                this.#services.Primary.getCharacteristic(this.#characteristic.StatusTampered)
-                    .onGet(() => this.getSensorStatus('constructor', 'tamper'))
-                    .updateValue(this.getSensorStatus('updater', 'tamper'));
+                this.#services.Primary = this.#accessory.getService(service.TemperatureSensor) ?? this.#accessory.addService(service.TemperatureSensor);
                 break;
             default:
                 break;
@@ -198,11 +92,11 @@ export class ADTPulseAccessory {
                 break;
             case 'panel':
                 this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemCurrentState)
-                    .updateValue(this.getPanelStatus('updater', 'current'));
+                    .updateValue(this.getPanelStatus('current'));
                 this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemTargetState)
-                    .updateValue(this.getPanelStatus('updater', 'target'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.SecuritySystemCurrentState, this.getPanelStatus('constructor', 'current'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.SecuritySystemTargetState, this.getPanelStatus('constructor', 'target'));
+                    .updateValue(this.getPanelStatus('target'));
+                this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemTargetState)
+                    .onSet(async (value) => this.setPanelStatus(value));
                 break;
             default:
                 break;
@@ -212,14 +106,11 @@ export class ADTPulseAccessory {
                 break;
             case 'panel':
                 this.#services.Primary.getCharacteristic(this.#characteristic.SecuritySystemAlarmType)
-                    .updateValue(this.getPanelStatus('updater', 'alarmType'));
+                    .updateValue(this.getPanelStatus('alarmType'));
                 this.#services.Primary.getCharacteristic(this.#characteristic.StatusFault)
-                    .updateValue(this.getPanelStatus('updater', 'fault'));
+                    .updateValue(this.getPanelStatus('fault'));
                 this.#services.Primary.getCharacteristic(this.#characteristic.StatusTampered)
-                    .updateValue(this.getPanelStatus('updater', 'tamper'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.SecuritySystemAlarmType, this.getPanelStatus('constructor', 'alarmType'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.StatusFault, this.getPanelStatus('constructor', 'fault'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.StatusTampered, this.getPanelStatus('constructor', 'tamper'));
+                    .updateValue(this.getPanelStatus('tamper'));
                 break;
             default:
                 break;
@@ -227,48 +118,43 @@ export class ADTPulseAccessory {
         switch (type) {
             case 'co':
                 this.#services.Primary.getCharacteristic(this.#characteristic.CarbonMonoxideDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.CarbonMonoxideDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'doorWindow':
                 this.#services.Primary.getCharacteristic(this.#characteristic.ContactSensorState)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.ContactSensorState, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'fire':
                 this.#services.Primary.getCharacteristic(this.#characteristic.SmokeDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.SmokeDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'flood':
                 this.#services.Primary.getCharacteristic(this.#characteristic.LeakDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.LeakDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'glass':
                 this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.OccupancyDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'heat':
                 this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.OccupancyDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'motion':
                 this.#services.Primary.getCharacteristic(this.#characteristic.MotionDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.MotionDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'shock':
                 this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.OccupancyDetected, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
+                break;
+            case 'supervisory':
+                this.#services.Primary.getCharacteristic(this.#characteristic.OccupancyDetected)
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             case 'temperature':
                 this.#services.Primary.getCharacteristic(this.#characteristic.CurrentTemperature)
-                    .updateValue(this.getSensorStatus('updater', 'status'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.CurrentTemperature, this.getSensorStatus('constructor', 'status'));
+                    .updateValue(this.getSensorStatus('status'));
                 break;
             default:
                 break;
@@ -282,52 +168,46 @@ export class ADTPulseAccessory {
             case 'heat':
             case 'motion':
             case 'shock':
+            case 'supervisory':
             case 'temperature':
                 this.#services.Primary.getCharacteristic(this.#characteristic.StatusActive)
-                    .updateValue(this.getSensorStatus('updater', 'active'));
+                    .updateValue(this.getSensorStatus('active'));
                 this.#services.Primary.getCharacteristic(this.#characteristic.StatusFault)
-                    .updateValue(this.getSensorStatus('updater', 'fault'));
+                    .updateValue(this.getSensorStatus('fault'));
                 this.#services.Primary.getCharacteristic(this.#characteristic.StatusLowBattery)
-                    .updateValue(this.getSensorStatus('updater', 'lowBattery'));
+                    .updateValue(this.getSensorStatus('lowBattery'));
                 this.#services.Primary.getCharacteristic(this.#characteristic.StatusTampered)
-                    .updateValue(this.getSensorStatus('updater', 'tamper'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.StatusActive, this.getSensorStatus('constructor', 'active'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.StatusFault, this.getSensorStatus('constructor', 'fault'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.StatusLowBattery, this.getSensorStatus('constructor', 'lowBattery'));
-                this.#services.Primary.updateCharacteristic(this.#characteristic.StatusTampered, this.getSensorStatus('constructor', 'tamper'));
+                    .updateValue(this.getSensorStatus('tamper'));
                 break;
             default:
                 break;
         }
     }
-    getSensorStatus(caller, mode) {
+    getSensorStatus(mode) {
         const { context } = this.#accessory;
         const { id, name, originalName, type, uuid, zone, } = context;
         const matchedSensorStatus = this.#state.data.sensorsStatus.find((sensorStatus) => originalName === sensorStatus.name && zone !== null && sensorStatus.zone === zone);
-        let hapStatus = new this.#api.hap.HapStatusError(0);
+        let hapStatus;
         if (matchedSensorStatus === undefined
             || type === 'gateway'
             || type === 'panel'
             || !condensedSensorTypeItems.includes(type)) {
             hapStatus = new this.#api.hap.HapStatusError(-70409);
             this.#log.error(`Attempted to get sensor status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but sensor is not found or sensor type is not supported.`);
-            switch (caller) {
-                case 'updater':
-                    return hapStatus;
-                default:
-                    throw hapStatus;
-            }
+            return hapStatus;
         }
         const { icon, statuses } = matchedSensorStatus;
         if (mode === 'active') {
-            return !statuses.includes('Offline')
+            return (!statuses.includes('Offline')
                 && !statuses.includes('Unknown')
                 && icon !== 'devStatOffline'
-                && icon !== 'devStatUnknown';
+                && icon !== 'devStatUnknown');
         }
         if (mode === 'fault') {
-            if (statuses.includes('Bypassed')
-                || statuses.includes('Trouble')) {
+            if (statuses.includes('ALARM')
+                || statuses.includes('Bypassed')
+                || statuses.includes('Trouble')
+                || icon === 'devStatAlarm') {
                 return this.#characteristic.StatusFault.GENERAL_FAULT;
             }
             return this.#characteristic.StatusFault.NO_FAULT;
@@ -355,7 +235,7 @@ export class ADTPulseAccessory {
                 }
                 break;
             case 'doorWindow':
-                if (statuses.includes('Open')) {
+                if (statuses.includes('ALARM') || statuses.includes('Open')) {
                     return this.#characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
                 }
                 if (statuses.includes('Closed')) {
@@ -363,6 +243,9 @@ export class ADTPulseAccessory {
                 }
                 break;
             case 'fire':
+                if (statuses.includes('ALARM') || statuses.includes('Tripped')) {
+                    return this.#characteristic.SmokeDetected.SMOKE_DETECTED;
+                }
                 if (statuses.includes('Okay')) {
                     return this.#characteristic.SmokeDetected.SMOKE_NOT_DETECTED;
                 }
@@ -373,7 +256,7 @@ export class ADTPulseAccessory {
                 }
                 break;
             case 'glass':
-                if (statuses.includes('Tripped')) {
+                if (statuses.includes('ALARM') || statuses.includes('Tripped')) {
                     return this.#characteristic.OccupancyDetected.OCCUPANCY_DETECTED;
                 }
                 if (statuses.includes('Okay')) {
@@ -386,16 +269,21 @@ export class ADTPulseAccessory {
                 }
                 break;
             case 'motion':
+                if (statuses.includes('ALARM') || statuses.includes('Motion')) {
+                    return true;
+                }
                 if (statuses.includes('No Motion') || statuses.includes('Okay')) {
                     return false;
                 }
-                if (statuses.includes('Motion')) {
-                    return true;
-                }
                 break;
             case 'shock':
                 break;
+            case 'supervisory':
+                break;
             case 'temperature':
+                if (statuses.includes('ALARM') || statuses.includes('Tripped')) {
+                    return 0;
+                }
                 if (statuses.includes('Okay')) {
                     return 20;
                 }
@@ -406,55 +294,31 @@ export class ADTPulseAccessory {
         if (statuses.includes('Offline') || statuses.includes('Unknown')) {
             hapStatus = new this.#api.hap.HapStatusError(-70412);
             this.#log.warn(`Attempted to get sensor status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but sensor is currently "Offline" or "Unknown".`);
-            switch (caller) {
-                case 'updater':
-                    return hapStatus;
-                default:
-                    throw hapStatus;
-            }
+            return hapStatus;
         }
         hapStatus = new this.#api.hap.HapStatusError(-70410);
         this.#log.warn(`Attempted to get sensor status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but actions have not been implemented yet.`);
-        switch (caller) {
-            case 'updater':
-                return hapStatus;
-            default:
-                throw hapStatus;
-        }
+        return hapStatus;
     }
-    getPanelStatus(caller, mode) {
+    getPanelStatus(mode) {
         const { context } = this.#accessory;
         const { id, name, type, uuid, } = context;
-        let hapStatus = new this.#api.hap.HapStatusError(0);
+        let hapStatus;
         if (type !== 'panel') {
             hapStatus = new this.#api.hap.HapStatusError(-70410);
             this.#log.error(`Attempted to get panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but device is not a security panel.`);
-            switch (caller) {
-                case 'updater':
-                    return hapStatus;
-                default:
-                    throw hapStatus;
-            }
+            return hapStatus;
         }
         if (this.#state.data.panelStatus === null
             || this.#state.data.panelStatus.panelStates.length === 0
             || this.#state.data.panelStatus.panelStatuses.length === 0) {
             hapStatus = new this.#api.hap.HapStatusError(-70403);
             this.#log.debug(`Attempted to get panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but panel status has not been retrieved yet.`);
-            switch (caller) {
-                case 'updater':
-                    return hapStatus;
-                default:
-                    throw hapStatus;
-            }
+            return hapStatus;
         }
         const { panelStates, panelStatuses } = this.#state.data.panelStatus;
         if (mode === 'alarmType') {
-            if (panelStatuses.includes('BURGLARY ALARM')
-                || panelStatuses.includes('Carbon Monoxide Alarm')
-                || panelStatuses.includes('FIRE ALARM')
-                || panelStatuses.includes('Uncleared Alarm')
-                || panelStatuses.includes('WATER ALARM')) {
+            if (isPanelAlarmActive(panelStatuses)) {
                 return 1;
             }
             return 0;
@@ -466,19 +330,20 @@ export class ADTPulseAccessory {
             return this.#characteristic.StatusFault.NO_FAULT;
         }
         if (mode === 'tamper') {
+            if (panelStatuses.includes('Sensor Problem') || panelStatuses.includes('Sensor Problems')) {
+                return this.#characteristic.StatusTampered.TAMPERED;
+            }
             return this.#characteristic.StatusTampered.NOT_TAMPERED;
         }
         switch (true) {
-            case mode === 'current' && panelStatuses.includes('BURGLARY ALARM'):
-            case mode === 'current' && panelStatuses.includes('Carbon Monoxide Alarm'):
-            case mode === 'current' && panelStatuses.includes('FIRE ALARM'):
-            case mode === 'current' && panelStatuses.includes('Uncleared Alarm'):
-            case mode === 'current' && panelStatuses.includes('WATER ALARM'):
+            case mode === 'current' && isPanelAlarmActive(panelStatuses):
                 return this.#characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED;
-            case mode === 'current' && panelStates.includes('Armed Away'):
-                return this.#characteristic.SecuritySystemCurrentState.AWAY_ARM;
+            case mode === 'current' && this.#status.isBusy && this.#status.setValue !== null:
+                return this.#status.setValue;
             case mode === 'current' && panelStates.includes('Armed Stay'):
                 return this.#characteristic.SecuritySystemCurrentState.STAY_ARM;
+            case mode === 'current' && panelStates.includes('Armed Away'):
+                return this.#characteristic.SecuritySystemCurrentState.AWAY_ARM;
             case mode === 'current' && panelStates.includes('Armed Night'):
                 return this.#characteristic.SecuritySystemCurrentState.NIGHT_ARM;
             case mode === 'current' && panelStates.includes('Disarmed'):
@@ -487,10 +352,14 @@ export class ADTPulseAccessory {
                 break;
         }
         switch (true) {
-            case mode === 'target' && panelStates.includes('Armed Away'):
-                return this.#characteristic.SecuritySystemTargetState.AWAY_ARM;
+            case mode === 'target' && panelStates.includes('Disarmed') && isPanelAlarmActive(panelStatuses):
+                return this.#characteristic.SecuritySystemTargetState.STAY_ARM;
+            case mode === 'target' && this.#status.isBusy && this.#status.setValue !== null:
+                return this.#status.setValue;
             case mode === 'target' && panelStates.includes('Armed Stay'):
                 return this.#characteristic.SecuritySystemTargetState.STAY_ARM;
+            case mode === 'target' && panelStates.includes('Armed Away'):
+                return this.#characteristic.SecuritySystemTargetState.AWAY_ARM;
             case mode === 'target' && panelStates.includes('Armed Night'):
                 return this.#characteristic.SecuritySystemTargetState.NIGHT_ARM;
             case mode === 'target' && panelStates.includes('Disarmed'):
@@ -501,68 +370,78 @@ export class ADTPulseAccessory {
         if (panelStates.includes('Status Unavailable')) {
             hapStatus = new this.#api.hap.HapStatusError(-70403);
             this.#log.warn(`Attempted to get panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but panel state is "Status Unavailable".`);
-            switch (caller) {
-                case 'updater':
-                    return hapStatus;
-                default:
-                    throw hapStatus;
-            }
+            return hapStatus;
         }
         hapStatus = new this.#api.hap.HapStatusError(-70402);
         this.#log.warn(`Attempted to get panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but actions have not been implemented yet.`);
-        switch (caller) {
-            case 'updater':
-                return hapStatus;
-            default:
-                throw hapStatus;
-        }
+        return hapStatus;
     }
     async setPanelStatus(arm) {
         const { context } = this.#accessory;
         const { id, name, type, uuid, } = context;
+        let hapStatus;
         let result = {
             success: false,
         };
         let unknownArmValue = false;
         if (type !== 'panel') {
+            hapStatus = new this.#api.hap.HapStatusError(-70410);
             this.#log.error(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but device is not a security panel.`);
-            throw new this.#api.hap.HapStatusError(-70410);
+            throw hapStatus;
         }
         if (this.#state.data.panelStatus === null || this.#state.data.panelStatus.panelStates.length === 0) {
+            hapStatus = new this.#api.hap.HapStatusError(-70403);
             this.#log.warn(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but panel status has not been retrieved yet.`);
-            throw new this.#api.hap.HapStatusError(-70403);
+            throw hapStatus;
         }
         const { panelStates } = this.#state.data.panelStatus;
-        const armFrom = condensePanelStates(panelStates);
+        const armFrom = condensePanelStates(this.#characteristic, panelStates);
+        const isAlarmActive = isPanelAlarmActive(this.#state.data.panelStatus.panelStatuses);
         if (armFrom === undefined) {
+            hapStatus = new this.#api.hap.HapStatusError(-70403);
             this.#log.warn(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but panel status cannot be found or most likely "Status Unavailable".`);
-            throw new this.#api.hap.HapStatusError(-70403);
-        }
-        switch (arm) {
-            case this.#characteristic.SecuritySystemTargetState.STAY_ARM:
-                result = await this.#instance.setPanelStatus(armFrom, 'stay');
-                break;
-            case this.#characteristic.SecuritySystemTargetState.AWAY_ARM:
-                result = await this.#instance.setPanelStatus(armFrom, 'away');
-                break;
-            case this.#characteristic.SecuritySystemTargetState.NIGHT_ARM:
-                result = await this.#instance.setPanelStatus(armFrom, 'night');
-                break;
-            case this.#characteristic.SecuritySystemTargetState.DISARM:
-                result = await this.#instance.setPanelStatus(armFrom, 'off');
-                break;
-            default:
-                unknownArmValue = true;
-                break;
-        }
-        if (unknownArmValue) {
-            this.#log.error(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but request has unknown arm value.`);
-            throw new this.#api.hap.HapStatusError(-70410);
-        }
-        if (!result.success) {
-            this.#log.error(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but request was not successful.`);
-            stackTracer('api-response', result);
-            throw new this.#api.hap.HapStatusError(-70408);
+            throw hapStatus;
+        }
+        if (armFrom.characteristicValue !== arm
+            || (armFrom.armValue === 'off'
+                && arm === this.#characteristic.SecuritySystemTargetState.DISARM
+                && isAlarmActive)) {
+            this.#status = {
+                isBusy: true,
+                setValue: arm,
+            };
+            switch (arm) {
+                case this.#characteristic.SecuritySystemTargetState.STAY_ARM:
+                    result = await this.#instance.setPanelStatus(armFrom.armValue, 'stay', isAlarmActive);
+                    break;
+                case this.#characteristic.SecuritySystemTargetState.AWAY_ARM:
+                    result = await this.#instance.setPanelStatus(armFrom.armValue, 'away', isAlarmActive);
+                    break;
+                case this.#characteristic.SecuritySystemTargetState.NIGHT_ARM:
+                    result = await this.#instance.setPanelStatus(armFrom.armValue, 'night', isAlarmActive);
+                    break;
+                case this.#characteristic.SecuritySystemTargetState.DISARM:
+                    result = await this.#instance.setPanelStatus(armFrom.armValue, 'off', isAlarmActive);
+                    break;
+                default:
+                    unknownArmValue = true;
+                    break;
+            }
+            this.#status = {
+                isBusy: false,
+                setValue: null,
+            };
+            if (unknownArmValue) {
+                hapStatus = new this.#api.hap.HapStatusError(-70410);
+                this.#log.error(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but request has unknown arm value.`);
+                throw hapStatus;
+            }
+            if (!result.success) {
+                hapStatus = new this.#api.hap.HapStatusError(-70408);
+                this.#log.error(`Attempted to set panel status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but request was not successful.`);
+                stackTracer('api-response', result);
+                throw hapStatus;
+            }
         }
     }
 }