Minor changes and fixes

### FIXED - HOOBS devices are not able to start plugin due because it does not support the `exports` key in `package.json` ### ADDED - Panic button for configuration UI ### NOTES - HOOBS currently caches configuration UIs, so users won't be able to see the latest configuration UI. Please re-configure the plugin manually until this is fixed by the HOOBS team.
mrjackyliang · Dec 20, 2023 · caba4c1 · caba4c1
1 parent bd94cd9
commit caba4c1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/config.schema.json b/config.schema.json
@@ -175,6 +175,12 @@
                     "fire"
                   ]
                 },
+                {
+                  "title": "Water/Flood Sensor",
+                  "enum": [
+                    "flood"
+                  ]
+                },
                 {
                   "title": "Glass Break Detector",
                   "enum": [
@@ -194,15 +200,15 @@
                   ]
                 },
                 {
-                  "title": "Temperature Sensor",
+                  "title": "Audible Panic Button/Pendant or Silent Panic Button/Pendant",
                   "enum": [
-                    "temperature"
+                    "panic"
                   ]
                 },
                 {
-                  "title": "Water/Flood Sensor",
+                  "title": "Temperature Sensor",
                   "enum": [
-                    "flood"
+                    "temperature"
                   ]
                 }
               ]

diff --git a/package.json b/package.json
@@ -1,8 +1,9 @@
 {
   "name": "homebridge-adt-pulse",
   "displayName": "Homebridge ADT Pulse",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-beta.9",
   "description": "Homebridge security system platform for ADT Pulse",
+  "main": "./build/src/index.js",
   "exports": "./build/src/index.js",
   "type": "module",
   "private": false,

diff --git a/src/lib/api.ts b/src/lib/api.ts
@@ -1861,9 +1861,10 @@ export class ADTPulse {
        * NOTICE: Parts NOT SHOWN below will NOT be tracked, documented, or tested.
        * PATENT: https://patents.google.com/patent/US20170070361A1/en
        *
-       * deviceType: 'Door Sensor'
-       *             'Door/Window Sensor'
+       * deviceType: 'Audible Panic Button/Pendant'
        *             'Carbon Monoxide Detector'
+       *             'Door/Window Sensor'
+       *             'Door Sensor'
        *             'Fire (Smoke/Heat) Detector'
        *             'Glass Break Detector'
        *             'Keypad/Touchpad'

diff --git a/src/lib/detect.ts b/src/lib/detect.ts
@@ -728,9 +728,10 @@ export async function detectedNewPortalVersion(version: DetectedNewPortalVersion
  */
 export async function detectedNewSensorsInformation(sensors: DetectedNewSensorsInformationSensors, logger: DetectedNewSensorsInformationLogger, debugMode: DetectedNewSensorsInformationDebugMode): DetectedNewSensorsInformationReturns {
   const knownDeviceTypes: DetectedNewSensorsInformationKnownDeviceTypes = [
-    'Door Sensor',
-    'Door/Window Sensor',
+    'Audible Panic Button/Pendant',
     'Carbon Monoxide Detector',
+    'Door/Window Sensor',
+    'Door Sensor',
     'Fire (Smoke/Heat) Detector',
     'Glass Break Detector',
     'Keypad/Touchpad',

diff --git a/src/lib/utility.ts b/src/lib/utility.ts
@@ -150,18 +150,22 @@ export function clearWhitespace(data: ClearWhitespaceData): ClearWhitespaceRetur
 export function condenseSensorType(sensorType: CondenseSensorTypeSensorType): CondenseSensorTypeReturns {
   let condensed: CondenseSensorTypeCondensed;
 
+  // Sort by "condensed" first, then switch cases, both in alphabet order.
   switch (sensorType) {
     case 'Carbon Monoxide Detector':
       condensed = 'co';
       break;
+    case 'Door/Window Sensor':
     case 'Door Sensor':
     case 'Window Sensor':
-    case 'Door/Window Sensor':
       condensed = 'doorWindow';
       break;
     case 'Fire (Smoke/Heat) Detector':
       condensed = 'fire';
       break;
+    case 'Water/Flood Sensor':
+      condensed = 'flood';
+      break;
     case 'Glass Break Detector':
       condensed = 'glass';
       break;
@@ -172,15 +176,13 @@ export function condenseSensorType(sensorType: CondenseSensorTypeSensorType): Co
     case 'Motion Sensor (Notable Events Only)':
       condensed = 'motion';
       break;
+    case 'Audible Panic Button/Pendant':
     case 'Silent Panic Button/Pendant':
       condensed = 'panic';
       break;
     case 'Temperature Sensor':
       condensed = 'temperature';
       break;
-    case 'Water/Flood Sensor':
-      condensed = 'flood';
-      break;
     default:
       break;
   }

diff --git a/src/types/constant.d.ts b/src/types/constant.d.ts
@@ -227,9 +227,10 @@ export type PortalPanelStatusSensorsOpen =
  * @since 1.0.0
  */
 export type PortalSensorDeviceType =
-  'Door Sensor'
-  | 'Door/Window Sensor'
+  'Audible Panic Button/Pendant'
   | 'Carbon Monoxide Detector'
+  | 'Door/Window Sensor'
+  | 'Door Sensor'
   | 'Fire (Smoke/Heat) Detector'
   | 'Glass Break Detector'
   | 'Keypad/Touchpad'