### UPDATED

- Simplify directory traversal towards the `./build` folder structure to not include `src`.
- Readme instructions to include `panelSwitch` and better directions toward manual setting up of the `adtType`.
- The "Alarm Ringing" switch now applies to all alarm scenarios instead of just "Disarmed" mode. Since the naming convention of "Alarm Ringing while Disarmed" is simply too long.

Author: mrjackyliang

README.md

@@ -56,6 +56,7 @@ While named "ADT Pulse for Homebridge," this Homebridge plugin exclusively accom
 This plugin will expose these devices by default:
 1. ADT Pulse Gateway (`gateway`)
 2. Security Panel (`panel`)
+3. Alarm Ringing Switch (`panelSwitch`)
 
 This plugin can expose these devices (in read-only mode) based on your configuration:
 1. `co` - Carbon Monoxide Detector
@@ -126,7 +127,7 @@ All sensors are now organized within an array of objects, with each object conta
   - Must match the name shown under the "Name" column in the "System" tab when logged into the portal.
 - __ADT Type__ (`adtType`)
   - Must match the type shown under the "Device Type" column in the "System" tab when logged into the portal.
-  - Contingent to the devices shown under the [Supported Devices](#supported-devices) section.
+  - For example, if the type is "Door/Window Sensor", the value should be `doorWindow`. Read the [Supported Devices](#supported-devices) section for more information.
 - __ADT Zone__ (`adtZone`)
   - Must match the zone shown under the "Zone" column in the "System" tab when logged into the portal.
 

package.json

@@ -1,10 +1,10 @@
 {
   "name": "homebridge-adt-pulse",
   "displayName": "Homebridge ADT Pulse",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Homebridge security system platform for ADT Pulse",
-  "main": "./build/src/index.js",
-  "exports": "./build/src/index.js",
+  "main": "./build/index.js",
+  "exports": "./build/index.js",
   "type": "module",
   "private": false,
   "scripts": {
@@ -16,8 +16,8 @@
     "build:fix-paths": "tsconfig-replace-paths --project tsconfig.json",
     "prepare": "npm run build",
     "prepublishOnly": "npm run build",
-    "repl": "node ./build/src/scripts/repl.js",
-    "test-api": "node ./build/src/scripts/test-api.js"
+    "repl": "node ./build/scripts/repl.js",
+    "test-api": "node ./build/scripts/test-api.js"
   },
   "repository": {
     "type": "git",

src/lib/accessory.ts

@@ -720,27 +720,23 @@ export class ADTPulseAccessory {
     let hapStatus;
 
     // If panel status has not been retrieved yet.
-    if (
-      this.#state.data.panelStatus === null
-      || this.#state.data.panelStatus.panelStates.length === 0
-      || this.#state.data.panelStatus.panelStatuses.length === 0
-    ) {
+    if (this.#state.data.panelStatus === null || this.#state.data.panelStatus.panelStatuses.length === 0) {
       hapStatus = new this.#api.hap.HapStatusError(this.#api.hap.HAPStatus.RESOURCE_BUSY);
 
       this.#log.debug(`Attempted to get panel switch status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but panel switch status has not been retrieved yet.`);
 
       return hapStatus;
     }
 
-    const { panelStates, panelStatuses } = this.#state.data.panelStatus;
+    const { panelStatuses } = this.#state.data.panelStatus;
 
     // If system is busy setting the state.
     if (this.#activity.isBusy && this.#activity.setValue !== null) {
       return this.#activity.setValue;
     }
 
-    // Only show as "On" if panel is "Disarmed" and alarm is ringing.
-    return panelStates.includes('Disarmed') && isPanelAlarmActive(panelStatuses);
+    // Only show as "On" if alarm is ringing.
+    return isPanelAlarmActive(panelStatuses);
   }
 
   /**
@@ -921,7 +917,7 @@ export class ADTPulseAccessory {
     if (on === true) {
       hapStatus = new this.#api.hap.HapStatusError(this.#api.hap.HAPStatus.SUCCESS);
 
-      this.#log.error(`Attempted to set panel switch status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but switch is only used for turning off ringing alarm while system is "Disarmed".`);
+      this.#log.error(`Attempted to set panel switch status on ${chalk.underline(name)} (id: ${id}, uuid: ${uuid}) accessory but switch is only used for turning off ringing alarm and clearing alarm.`);
 
       throw hapStatus;
     }
@@ -942,7 +938,6 @@ export class ADTPulseAccessory {
 
     if (
       !this.#activity.isBusy // The system isn't busy setting a state.
-      && condensedPanelStates.armValue === 'off' // If the system is disarmed.
       && isAlarmActive // If system alarm is ringing.
     ) {
       // Set accessory activity to "busy" before arming.

src/lib/utility.ts

@@ -788,7 +788,7 @@ export function getDetectReportUrl(): GetDetectReportUrlReturns {
  */
 export function getPackageVersion(): GetPackageVersionReturns {
   const require = createRequire(import.meta.url);
-  const packageJson = require('../../../package.json'); // Assumes it is running in the "build" folder.
+  const packageJson = require('../../package.json');
 
   return packageJson.version;
 }

tsconfig.json

@@ -21,6 +21,7 @@
     },
     "removeComments": true,
     "resolveJsonModule": true,
+    "rootDir": "./src",
     "sourceMap": true,
     "strict": true,
     "target": "ESNext",
@@ -32,7 +33,6 @@
     ]
   },
   "include": [
-    "./src",
-    "config.schema.json"
+    "./src"
   ]
 }