homebridge-adt-pulse 3.0.0-beta.9 → 3.0.0

package/build/src/lib/api.js

@@ -5,8 +5,8 @@ import _ from 'lodash';
 import { serializeError } from 'serialize-error';
 import { CookieJar } from 'tough-cookie';
 import { detectedNewDoSubmitHandlers, detectedNewGatewayInformation, detectedNewOrbSecurityButtons, detectedNewPanelInformation, detectedNewPanelStatus, detectedNewPortalVersion, detectedNewSensorsInformation, detectedNewSensorsStatus, } from './detect.js';
-import { paramNetworkId, paramSat, requestPathAccessSignIn, requestPathAccessSignInENsPartnerAdt, requestPathAccessSignInNetworkIdXxPartnerAdt, requestPathAjaxSyncCheckServTXx, requestPathKeepAlive, requestPathMfaMfaSignInWorkflowChallenge, requestPathQuickControlArmDisarm, requestPathQuickControlServRunRraCommand, requestPathSummarySummary, requestPathSystemDeviceId1, requestPathSystemGateway, requestPathSystemSystem, textPanelEmergencyKeys, } from './regex.js';
-import { debugLog, fetchErrorMessage, fetchMissingSatCode, fetchTableCells, findNullKeys, generateDynatracePCHeaderValue, generateHash, isPortalSyncCode, parseArmDisarmMessage, parseDoSubmitHandlers, parseOrbSecurityButtons, parseOrbSensors, parseOrbTextSummary, parseSensorsTable, sleep, stackTracer, } from './utility.js';
+import { paramNetworkId, paramSat, requestPathAccessSignIn, requestPathAccessSignInEXxPartnerAdt, requestPathAccessSignInNetworkIdXxPartnerAdt, requestPathAjaxSyncCheckServTXx, requestPathKeepAlive, requestPathMfaMfaSignInWorkflowChallenge, requestPathQuickControlArmDisarm, requestPathQuickControlServRunRraCommand, requestPathSummarySummary, requestPathSystemDeviceId1, requestPathSystemGateway, requestPathSystemSystem, textPanelEmergencyKeys, } from './regex.js';
+import { debugLog, fetchErrorMessage, fetchMissingSatCode, fetchTableCells, findNullKeys, generateDynatracePCHeaderValue, generateFakeReadyButtons, generateHash, isPortalSyncCode, parseArmDisarmMessage, parseDoSubmitHandlers, parseOrbSecurityButtons, parseOrbSensors, parseOrbTextSummary, parseSensorsTable, sleep, stackTracer, } from './utility.js';
 export class ADTPulse {
     #credentials;
     #internal;
@@ -25,19 +25,39 @@ export class ADTPulse {
             reportedHashes: [],
             testMode: {
                 enabled: internalConfig.testMode?.enabled ?? false,
-                isDisarmChecked: internalConfig.testMode?.isDisarmChecked ?? false,
+                isSystemDisarmedBeforeTest: internalConfig.testMode?.isSystemDisarmedBeforeTest ?? false,
             },
+            waitTimeAfterArm: 5000,
         };
         this.#session = {
             backupSatCode: null,
             httpClient: wrapper(axios.create({
                 jar: new CookieJar(),
+                validateStatus: () => true,
             })),
             isAuthenticated: false,
             isCleanState: true,
             networkId: null,
             portalVersion: null,
         };
+        if (config.speed !== 1) {
+            if (this.#internal.debug) {
+                debugLog(this.#internal.logger, 'api.ts / ADTPulse.constructor()', 'warn', `Plugin is now running under ${config.speed}x operational speed. You may see slower device updates`);
+            }
+            switch (config.speed) {
+                case 0.75:
+                    this.#internal.waitTimeAfterArm = 6000;
+                    break;
+                case 0.5:
+                    this.#internal.waitTimeAfterArm = 7000;
+                    break;
+                case 0.25:
+                    this.#internal.waitTimeAfterArm = 8000;
+                    break;
+                default:
+                    break;
+            }
+        }
     }
     async login() {
         let errorObject;
@@ -45,15 +65,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.login()', 'info', `Attempting to login to "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'LOGIN',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             if (this.isAuthenticated()) {
                 if (this.#internal.debug) {
                     debugLog(this.#internal.logger, 'api.ts / ADTPulse.login()', 'info', [
@@ -224,15 +236,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.logout()', 'info', `Attempting to logout of "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'LOGOUT',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             if (!this.isAuthenticated()) {
                 if (this.#internal.debug) {
                     debugLog(this.#internal.logger, 'api.ts / ADTPulse.logout()', 'info', [
@@ -341,15 +345,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.getGatewayInformation()', 'info', `Attempting to retrieve gateway information from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'GET_GATEWAY_INFORMATION',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosSystemGateway = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/system/gateway.jsp`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/system/system.jsp`,
@@ -429,10 +425,10 @@ export class ADTPulse {
             ], 1, 1);
             const gatewayInformation = {
                 communication: {
-                    primaryConnectionType: _.get(fetchedTableCells, ['Primary Connection Type:', 0], null),
                     broadbandConnectionStatus: _.get(fetchedTableCells, ['Broadband Connection Status:', 0], null),
                     cellularConnectionStatus: _.get(fetchedTableCells, ['Cellular Connection Status:', 0], null),
                     cellularSignalStrength: _.get(fetchedTableCells, ['Cellular Signal Strength:', 0], null),
+                    primaryConnectionType: _.get(fetchedTableCells, ['Primary Connection Type:', 0], null),
                 },
                 manufacturer: _.get(fetchedTableCells, ['Manufacturer:', 0], null),
                 model: _.get(fetchedTableCells, ['Model:', 0], null),
@@ -492,15 +488,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.getPanelInformation()', 'info', `Attempting to retrieve panel information from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'GET_PANEL_INFORMATION',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosSystemDeviceId1 = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/system/device.jsp?id=1`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/system/system.jsp`,
@@ -565,13 +553,13 @@ export class ADTPulse {
                 'Type/Model:',
             ], 1, 1);
             const emergencyKeys = _.get(fetchedTableCells, ['Emergency Keys:', 0], null);
-            const parsedEmergencyKeys = (typeof emergencyKeys === 'string') ? emergencyKeys.match(textPanelEmergencyKeys) : null;
+            const parsedEmergencyKeys = (emergencyKeys !== null) ? emergencyKeys.match(textPanelEmergencyKeys) : null;
             const manufacturerProvider = _.get(fetchedTableCells, ['Manufacturer/Provider:', 0], null);
-            const parsedManufacturer = (typeof manufacturerProvider === 'string') ? manufacturerProvider.split(' - ')[0] ?? null : null;
-            const parsedProvider = (typeof manufacturerProvider === 'string') ? manufacturerProvider.split(' - ')[1] ?? null : null;
+            const parsedManufacturer = (manufacturerProvider !== null) ? manufacturerProvider.split(' - ')[0] ?? null : null;
+            const parsedProvider = (manufacturerProvider !== null) ? manufacturerProvider.split(' - ')[1] ?? null : null;
             const typeModel = _.get(fetchedTableCells, ['Type/Model:', 0], null);
-            const parsedType = (typeof typeModel === 'string') ? typeModel.split(' - ')[0] ?? null : null;
-            const parsedModel = (typeof typeModel === 'string') ? typeModel.split(' - ')[1] ?? null : null;
+            const parsedType = (typeModel !== null) ? typeModel.split(' - ')[0] ?? null : null;
+            const parsedModel = (typeModel !== null) ? typeModel.split(' - ')[1] ?? null : null;
             const panelInformation = {
                 emergencyKeys: parsedEmergencyKeys,
                 manufacturer: parsedManufacturer,
@@ -612,15 +600,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.getPanelStatus()', 'info', `Attempting to retrieve panel status from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'GET_PANEL_STATUS',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosSummary = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`,
@@ -712,10 +692,22 @@ export class ADTPulse {
             },
         };
     }
-    async setPanelStatus(armTo) {
+    async setPanelStatus(armFrom, armTo, isAlarmActive) {
         let errorObject;
         if (this.#internal.debug) {
-            debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'info', `Attempting to update panel status to "${armTo}" at "${this.#internal.baseUrl}"`);
+            debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'info', `Attempting to update panel status from "${armFrom}" to "${armTo}" at "${this.#internal.baseUrl}"`);
+        }
+        if (armFrom !== 'away'
+            && armFrom !== 'night'
+            && armFrom !== 'off'
+            && armFrom !== 'stay') {
+            return {
+                action: 'SET_PANEL_STATUS',
+                success: false,
+                info: {
+                    message: `"${armFrom}" is an invalid arm from state`,
+                },
+            };
         }
         if (armTo !== 'away'
             && armTo !== 'night'
@@ -729,16 +721,41 @@ export class ADTPulse {
                 },
             };
         }
+        if (typeof isAlarmActive !== 'boolean') {
+            return {
+                action: 'SET_PANEL_STATUS',
+                success: false,
+                info: {
+                    message: 'You must specify if the system\'s alarm is currently ringing (true) or not (false)',
+                },
+            };
+        }
+        if ((armFrom === 'away'
+            && armTo === 'away')
+            || (armFrom === 'night'
+                && armTo === 'night')
+            || (armFrom === 'stay'
+                && armTo === 'stay')
+            || (armFrom === 'off'
+                && armTo === 'off'
+                && !isAlarmActive)) {
+            if (this.#internal.debug) {
+                debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'info', `No need to change arm state from "${armFrom}" to "${armTo}" due to its equivalence`);
+            }
+            return {
+                action: 'SET_PANEL_STATUS',
+                success: true,
+                info: {
+                    forceArmRequired: false,
+                },
+            };
+        }
+        if (this.#internal.debug && isAlarmActive) {
+            debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'warn', `Alarm is currently ringing and arm state is being changed from "${armFrom}" to "${armTo}"`);
+        }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'SET_PANEL_STATUS',
-                    success: false,
-                    info: internet.info,
-                };
-            }
+            let isAlarmCurrentlyActive = isAlarmActive;
             sessions.axiosSummary = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`,
@@ -806,34 +823,33 @@ export class ADTPulse {
             const jsdomSummaryOrbSecurityButtons = sessions.jsdomSummary.window.document.querySelectorAll('#divOrbSecurityButtons input');
             const parsedOrbSecurityButtons = parseOrbSecurityButtons(jsdomSummaryOrbSecurityButtons);
             await this.newInformationDispatcher('orb-security-buttons', parsedOrbSecurityButtons);
-            const armingNightButtonIndex = parsedOrbSecurityButtons.findIndex((parsedOrbSecurityButton) => {
-                const parsedOrbSecurityButtonButtonDisabled = parsedOrbSecurityButton.buttonDisabled;
-                const parsedOrbSecurityButtonButtonText = parsedOrbSecurityButton.buttonText;
-                return (parsedOrbSecurityButtonButtonDisabled && parsedOrbSecurityButtonButtonText === 'Arming Night');
-            });
-            if (this.#session.backupSatCode !== null
-                && armingNightButtonIndex >= 0) {
-                if (this.#internal.debug) {
-                    debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'warn', 'Replacing the stuck "Arming Night" button with a fake "Disarm" button');
-                }
-                parsedOrbSecurityButtons[armingNightButtonIndex] = {
-                    buttonDisabled: false,
-                    buttonId: 'security_button_0',
-                    buttonIndex: 0,
-                    buttonText: 'Disarm',
-                    changeAccessCode: false,
-                    loadingText: 'Disarming',
+            let readyButtons = parsedOrbSecurityButtons.filter((parsedOrbSecurityButton) => !parsedOrbSecurityButton.buttonDisabled);
+            if (readyButtons.length === 0 && this.#session.backupSatCode !== null) {
+                readyButtons = generateFakeReadyButtons(parsedOrbSecurityButtons, this.#session.isCleanState, {
                     relativeUrl: 'quickcontrol/armDisarm.jsp',
-                    totalButtons: 1,
-                    urlParams: {
-                        arm: 'off',
-                        armState: (this.#session.isCleanState) ? 'night' : 'night+stay',
-                        href: 'rest/adt/ui/client/security/setArmState',
-                        sat: this.#session.backupSatCode,
+                    href: 'rest/adt/ui/client/security/setArmState',
+                    sat: this.#session.backupSatCode,
+                });
+                if (this.#internal.debug) {
+                    debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'warn', 'No security buttons were found. Replacing stuck orb security buttons with fake buttons');
+                    stackTracer('fake-ready-buttons', {
+                        before: parsedOrbSecurityButtons,
+                        after: readyButtons,
+                    });
+                }
+            }
+            if (readyButtons.length === 0 && this.#session.backupSatCode === null) {
+                if (this.#internal.debug) {
+                    debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'error', 'No security buttons were found and replacement failed because no backup sat code exists');
+                }
+                return {
+                    action: 'SET_PANEL_STATUS',
+                    success: false,
+                    info: {
+                        message: 'No security buttons were found and replacement failed because no backup sat code exists',
                     },
                 };
             }
-            let readyButtons = parsedOrbSecurityButtons.filter((parsedOrbSecurityButton) => !parsedOrbSecurityButton.buttonDisabled);
             if (readyButtons.length < 1) {
                 if (this.#internal.debug) {
                     debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'error', 'Security buttons are not found on the summary page');
@@ -847,7 +863,7 @@ export class ADTPulse {
                 };
             }
             if (this.#internal.testMode.enabled
-                && !this.#internal.testMode.isDisarmChecked) {
+                && !this.#internal.testMode.isSystemDisarmedBeforeTest) {
                 if (!['off', 'disarmed'].includes(readyButtons[0].urlParams.armState)) {
                     if (this.#internal.debug) {
                         debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'error', 'Test mode is active and system is not disarmed');
@@ -860,10 +876,16 @@ export class ADTPulse {
                         },
                     };
                 }
-                this.#internal.testMode.isDisarmChecked = true;
+                this.#internal.testMode.isSystemDisarmedBeforeTest = true;
             }
-            while (!['off', 'disarmed'].includes(readyButtons[0].urlParams.armState)) {
-                const armDisarmResponse = await this.armDisarmHandler(readyButtons[0].relativeUrl, readyButtons[0].urlParams.href, readyButtons[0].urlParams.armState, 'off', readyButtons[0].urlParams.sat);
+            while (isAlarmCurrentlyActive || !['off', 'disarmed'].includes(readyButtons[0].urlParams.armState)) {
+                const armDisarmResponse = await this.armDisarmHandler(isAlarmCurrentlyActive, {
+                    relativeUrl: readyButtons[0].relativeUrl,
+                    href: readyButtons[0].urlParams.href,
+                    armState: readyButtons[0].urlParams.armState,
+                    arm: 'off',
+                    sat: readyButtons[0].urlParams.sat,
+                });
                 if (!armDisarmResponse.success) {
                     if (this.#internal.debug) {
                         debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'error', 'An error occurred in the arm disarm handler (while disarming)');
@@ -887,10 +909,19 @@ export class ADTPulse {
                     };
                 }
                 readyButtons = armDisarmResponse.info.readyButtons;
+                if (isAlarmCurrentlyActive) {
+                    isAlarmCurrentlyActive = false;
+                }
             }
             let forceArmRequired = false;
             if (armTo !== 'off') {
-                const armDisarmResponse = await this.armDisarmHandler(readyButtons[0].relativeUrl, readyButtons[0].urlParams.href, readyButtons[0].urlParams.armState, armTo, readyButtons[0].urlParams.sat);
+                const armDisarmResponse = await this.armDisarmHandler(false, {
+                    relativeUrl: readyButtons[0].relativeUrl,
+                    href: readyButtons[0].urlParams.href,
+                    armState: readyButtons[0].urlParams.armState,
+                    arm: armTo,
+                    sat: readyButtons[0].urlParams.sat,
+                });
                 if (!armDisarmResponse.success) {
                     if (this.#internal.debug) {
                         debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'error', 'An error occurred in the arm disarm handler (while arming)');
@@ -904,7 +935,7 @@ export class ADTPulse {
                 forceArmRequired = armDisarmResponse.info.forceArmRequired;
             }
             if (this.#internal.debug) {
-                debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'success', `Successfully updated panel status to "${armTo}" at "${this.#internal.baseUrl}"`);
+                debugLog(this.#internal.logger, 'api.ts / ADTPulse.setPanelStatus()', 'success', `Successfully updated panel status from "${armFrom}" to "${armTo}" at "${this.#internal.baseUrl}"`);
             }
             return {
                 action: 'SET_PANEL_STATUS',
@@ -935,15 +966,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.getSensorsInformation()', 'info', `Attempting to retrieve sensors information from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'GET_SENSORS_INFORMATION',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosSystem = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/system/system.jsp`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`,
@@ -999,7 +1022,7 @@ export class ADTPulse {
                 contentType: 'text/html',
                 pretendToBeVisual: true,
             });
-            const jsdomSystemSensorsTable = sessions.jsdomSystem.window.document.querySelectorAll('#systemContentList tr[onclick^="goToUrl(\'device.jsp?id="]');
+            const jsdomSystemSensorsTable = sessions.jsdomSystem.window.document.querySelectorAll('#systemContentList tr[class^=\'p_row\'] tr.p_listRow');
             const parsedSensorsTable = parseSensorsTable(jsdomSystemSensorsTable);
             await this.newInformationDispatcher('sensors-information', parsedSensorsTable);
             if (this.#internal.debug) {
@@ -1034,15 +1057,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.getSensorsStatus()', 'info', `Attempting to retrieve sensors status from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'GET_SENSORS_STATUS',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosSummary = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`,
@@ -1142,15 +1157,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.performSyncCheck()', 'info', `Attempting to perform a sync check from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'PERFORM_SYNC_CHECK',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosSyncCheck = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/Ajax/SyncCheckServ?t=${Date.now()}`, this.getRequestConfig({
                 headers: {
                     Accept: '*/*',
@@ -1249,15 +1256,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.performKeepAlive()', 'info', `Attempting to perform a keep alive from "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'PERFORM_KEEP_ALIVE',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             sessions.axiosKeepAlive = await this.#session.httpClient.post(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/KeepAlive`, '', this.getRequestConfig({
                 headers: {
                     Accept: '*/*',
@@ -1330,16 +1329,40 @@ export class ADTPulse {
     isAuthenticated() {
         return this.#session.isAuthenticated;
     }
-    async armDisarmHandler(relativeUrl, href, armState, arm, sat) {
+    resetSession() {
+        this.#session = {
+            backupSatCode: null,
+            httpClient: wrapper(axios.create({
+                jar: new CookieJar(),
+                validateStatus: () => true,
+            })),
+            isAuthenticated: false,
+            isCleanState: true,
+            networkId: null,
+            portalVersion: null,
+        };
+    }
+    async armDisarmHandler(isAlarmActive, options) {
         let errorObject;
         if (this.#internal.debug) {
-            debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'info', `Attempting to update arm state from "${armState}" to "${arm}" on "${this.#internal.baseUrl}"`);
+            debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'info', `Attempting to update arm state from "${options.armState}" to "${options.arm}" on "${this.#internal.baseUrl}"`);
         }
-        if (armState === arm
-            || (armState === 'disarmed'
-                && arm === 'off')) {
+        if ((options.armState === 'away'
+            && options.arm === 'away')
+            || (options.armState === 'night'
+                && options.arm === 'night')
+            || (options.armState === 'night+stay'
+                && options.arm === 'night')
+            || (options.armState === 'stay'
+                && options.arm === 'stay')
+            || (options.armState === 'disarmed'
+                && options.arm === 'off'
+                && !isAlarmActive)
+            || (options.armState === 'off'
+                && options.arm === 'off'
+                && !isAlarmActive)) {
             if (this.#internal.debug) {
-                debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'info', `No need to change arm state from "${armState}" to "${arm}" due to its equivalence`);
+                debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'info', `No need to change arm state from "${options.armState}" to "${options.arm}" due to its equivalence`);
             }
             return {
                 action: 'ARM_DISARM_HANDLER',
@@ -1351,21 +1374,13 @@ export class ADTPulse {
             };
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'ARM_DISARM_HANDLER',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             const armDisarmForm = new URLSearchParams();
-            armDisarmForm.append('href', href);
-            armDisarmForm.append('armstate', armState);
-            armDisarmForm.append('arm', arm);
-            armDisarmForm.append('sat', sat);
-            sessions.axiosSetArmMode = await this.#session.httpClient.post(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/${relativeUrl}`, armDisarmForm, this.getRequestConfig({
+            armDisarmForm.append('href', options.href);
+            armDisarmForm.append('armstate', options.armState);
+            armDisarmForm.append('arm', options.arm);
+            armDisarmForm.append('sat', options.sat);
+            sessions.axiosSetArmMode = await this.#session.httpClient.post(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/${options.relativeUrl}`, armDisarmForm, this.getRequestConfig({
                 headers: {
                     'Cache-Control': 'max-age=0',
                     'Content-Type': 'application/x-www-form-urlencoded',
@@ -1409,8 +1424,8 @@ export class ADTPulse {
                 };
             }
             let forceArmRequired = false;
-            if (arm !== 'off') {
-                const forceArmResponse = await this.forceArmHandler(sessions.axiosSetArmMode, relativeUrl);
+            if (options.arm !== 'off') {
+                const forceArmResponse = await this.forceArmHandler(sessions.axiosSetArmMode, options.relativeUrl);
                 if (!forceArmResponse.success) {
                     if (this.#internal.debug) {
                         debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'error', 'An error occurred in the force arm handler');
@@ -1424,7 +1439,7 @@ export class ADTPulse {
                 forceArmRequired = forceArmResponse.info.forceArmRequired;
             }
             this.#session.isCleanState = false;
-            await sleep(6000);
+            await sleep(this.#internal.waitTimeAfterArm);
             sessions.axiosSummary = await this.#session.httpClient.get(`${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`, this.getRequestConfig({
                 headers: {
                     Referer: `${this.#internal.baseUrl}/myhome/${this.#session.portalVersion}/summary/summary.jsp`,
@@ -1493,30 +1508,22 @@ export class ADTPulse {
             const parsedOrbSecurityButtons = parseOrbSecurityButtons(jsdomSummaryOrbSecurityButtons);
             await this.newInformationDispatcher('orb-security-buttons', parsedOrbSecurityButtons);
             let readyButtons = parsedOrbSecurityButtons.filter((parsedOrbSecurityButton) => !parsedOrbSecurityButton.buttonDisabled);
-            if (['disarmed', 'off'].includes(armState)
-                && ['night'].includes(arm)
-                && readyButtons.length === 0) {
-                readyButtons = [
-                    {
-                        buttonDisabled: false,
-                        buttonId: 'security_button_0',
-                        buttonIndex: 0,
-                        buttonText: 'Disarm',
-                        changeAccessCode: false,
-                        loadingText: 'Disarming',
-                        relativeUrl,
-                        totalButtons: 1,
-                        urlParams: {
-                            arm: 'off',
-                            armState: (this.#session.isCleanState) ? 'night' : 'night+stay',
-                            href,
-                            sat,
-                        },
-                    },
-                ];
+            if (readyButtons.length === 0) {
+                readyButtons = generateFakeReadyButtons(parsedOrbSecurityButtons, this.#session.isCleanState, {
+                    relativeUrl: options.relativeUrl,
+                    href: options.href,
+                    sat: options.sat,
+                });
+                if (this.#internal.debug) {
+                    debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'warn', 'No security buttons were found. Replacing stuck orb security buttons with fake buttons');
+                    stackTracer('fake-ready-buttons', {
+                        before: parsedOrbSecurityButtons,
+                        after: readyButtons,
+                    });
+                }
             }
             if (this.#internal.debug) {
-                debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'success', `Successfully updated arm state from "${armState}" to "${arm}" on "${this.#internal.baseUrl}"`);
+                debugLog(this.#internal.logger, 'api.ts / ADTPulse.armDisarmHandler()', 'success', `Successfully updated arm state from "${options.armState}" to "${options.arm}" on "${this.#internal.baseUrl}"`);
             }
             return {
                 action: 'ARM_DISARM_HANDLER',
@@ -1548,15 +1555,7 @@ export class ADTPulse {
             debugLog(this.#internal.logger, 'api.ts / ADTPulse.forceArmHandler()', 'info', `Attempting to force arm on "${this.#internal.baseUrl}"`);
         }
         try {
-            const internet = await this.isPortalAccessible();
             const sessions = {};
-            if (!internet.success) {
-                return {
-                    action: 'FORCE_ARM_HANDLER',
-                    success: false,
-                    info: internet.info,
-                };
-            }
             if (typeof response.data !== 'string') {
                 if (this.#internal.debug) {
                     debugLog(this.#internal.logger, 'api.ts / ADTPulse.forceArmHandler()', 'error', 'The response body of the arm disarm page is not of type "string"');
@@ -1731,49 +1730,6 @@ export class ADTPulse {
             },
         };
     }
-    async isPortalAccessible() {
-        let errorObject;
-        if (this.#internal.debug) {
-            debugLog(this.#internal.logger, 'api.ts / ADTPulse.isPortalAccessible()', 'info', `Attempting to check if "${this.#internal.baseUrl}" is accessible`);
-        }
-        try {
-            const response = await axios.head(this.#internal.baseUrl, this.getRequestConfig());
-            if (response.status !== 200 || response.statusText !== 'OK') {
-                if (this.#internal.debug) {
-                    debugLog(this.#internal.logger, 'api.ts / ADTPulse.isPortalAccessible()', 'error', `The portal at "${this.#internal.baseUrl}" is not accessible`);
-                }
-                return {
-                    action: 'IS_PORTAL_ACCESSIBLE',
-                    success: false,
-                    info: {
-                        message: `The portal at "${this.#internal.baseUrl}" is not accessible`,
-                    },
-                };
-            }
-            if (this.#internal.debug) {
-                debugLog(this.#internal.logger, 'api.ts / ADTPulse.isPortalAccessible()', 'success', `Successfully checked if "${this.#internal.baseUrl}" is accessible`);
-            }
-            return {
-                action: 'IS_PORTAL_ACCESSIBLE',
-                success: true,
-                info: null,
-            };
-        }
-        catch (error) {
-            errorObject = serializeError(error);
-        }
-        if (this.#internal.debug) {
-            debugLog(this.#internal.logger, 'api.ts / ADTPulse.isPortalAccessible()', 'error', 'Method encountered an error during execution');
-            stackTracer('serialize-error', errorObject);
-        }
-        return {
-            action: 'IS_PORTAL_ACCESSIBLE',
-            success: false,
-            info: {
-                error: errorObject,
-            },
-        };
-    }
     async newInformationDispatcher(type, data) {
         const dataHash = generateHash(`${type}: ${JSON.stringify(data)}`);
         if (this.#internal.reportedHashes.find((reportedHash) => dataHash === reportedHash) === undefined) {
@@ -1818,8 +1774,10 @@ export class ADTPulse {
                 Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
                 'Accept-Encoding': 'gzip, deflate, br',
                 'Accept-Language': 'en-US,en;q=0.9',
+                'Cache-Control': 'no-cache',
                 Connection: 'keep-alive',
                 Host: `${this.#credentials.subdomain}.adtpulse.com`,
+                Pragma: 'no-cache',
                 'Sec-Fetch-Dest': 'document',
                 'Sec-Fetch-Mode': 'navigate',
                 'Sec-Fetch-Site': 'none',
@@ -1831,7 +1789,6 @@ export class ADTPulse {
                 'sec-ch-ua-platform': '"macOS"',
             },
             timeout: 15000,
-            validateStatus: undefined,
         };
         if (extraConfig === undefined) {
             return defaultConfig;
@@ -1843,11 +1800,11 @@ export class ADTPulse {
             return;
         }
         if (requestPathAccessSignIn.test(requestPath)
-            || requestPathAccessSignInENsPartnerAdt.test(requestPath)
+            || requestPathAccessSignInEXxPartnerAdt.test(requestPath)
             || requestPathMfaMfaSignInWorkflowChallenge.test(requestPath)) {
             if (this.#internal.debug) {
                 const errorMessage = fetchErrorMessage(session);
-                if (requestPathAccessSignIn.test(requestPath) || requestPathAccessSignInENsPartnerAdt.test(requestPath)) {
+                if (requestPathAccessSignIn.test(requestPath) || requestPathAccessSignInEXxPartnerAdt.test(requestPath)) {
                     debugLog(this.#internal.logger, 'api.ts / ADTPulse.handleLoginFailure()', 'error', 'Either the username or password is incorrect, fingerprint format is invalid, or was signed out due to inactivity');
                 }
                 if (requestPathMfaMfaSignInWorkflowChallenge.test(requestPath)) {
@@ -1860,17 +1817,5 @@ export class ADTPulse {
             this.resetSession();
         }
     }
-    resetSession() {
-        this.#session = {
-            backupSatCode: null,
-            httpClient: wrapper(axios.create({
-                jar: new CookieJar(),
-            })),
-            isAuthenticated: false,
-            isCleanState: true,
-            networkId: null,
-            portalVersion: null,
-        };
-    }
 }
 //# sourceMappingURL=api.js.map