@switchbot/homebridge-switchbot 3.5.0-beta.7 → 3.5.0-beta.70

package/dist/device/bot.js

@@ -1,100 +1,84 @@
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * bot.ts: @switchbot/homebridge-switchbot.
+ */
 import { request } from 'undici';
-import { sleep } from '../utils.js';
+import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
-import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Devices } from '../settings.js';
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export class Bot {
+export class Bot extends deviceBase {
     platform;
-    accessory;
-    device;
-    api;
-    log;
-    config;
-    hap;
     // Services
-    fanService;
-    doorService;
-    lockService;
-    faucetService;
-    windowService;
-    switchService;
-    outletService;
-    batteryService;
-    garageDoorService;
-    windowCoveringService;
-    statefulProgrammableSwitchService;
-    // Characteristic Values
-    On;
-    BatteryLevel;
-    FirmwareRevision;
-    StatusLowBattery;
-    // OpenAPI Status
-    OpenAPI_On;
-    OpenAPI_BatteryLevel;
-    OpenAPI_FirmwareRevision;
-    // BLE Status
-    BLE_On;
-    BLE_Mode;
-    BLE_BatteryLevel;
-    //BLE Others
-    BLE_IsConnected;
+    Battery;
+    Switch;
+    GarageDoor;
+    Door;
+    Window;
+    WindowCovering;
+    LockMechanism;
+    Faucet;
+    Fan;
+    StatefulProgrammableSwitch;
+    Outlet;
     // Config
     botMode;
     allowPush;
     doublePress;
-    scanDuration;
     botDeviceType;
     pushRatePress;
-    deviceLogging;
     multiPressCount;
-    deviceRefreshRate;
     // Updates
     botUpdateInProgress;
     doBotUpdate;
-    // Connection
-    OpenAPI;
-    BLE;
     constructor(platform, accessory, device) {
+        super(platform, accessory, device);
         this.platform = platform;
-        this.accessory = accessory;
-        this.device = device;
-        this.api = this.platform.api;
-        this.log = this.platform.log;
-        this.config = this.platform.config;
-        this.hap = this.api.hap;
-        // Connection
-        this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
-        this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
         // default placeholders
-        this.deviceLogs(device);
-        this.deviceType(device);
-        this.scan(device);
-        this.refreshRate(device);
-        this.PressOrSwitch(device);
-        this.allowPushChanges(device);
-        this.deviceContext();
-        this.DoublePress(device);
-        this.deviceConfig(device);
-        this.multiPressCount = 0;
+        this.getBotConfigSettings(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doBotUpdate = new Subject();
         this.botUpdateInProgress = false;
-        // Retrieve initial values and updateHomekit
-        this.refreshStatus();
-        // set accessory information
-        accessory
-            .getService(this.hap.Service.AccessoryInformation)
-            .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.hap.Characteristic.Model, 'SWITCHBOT-BOT-S1')
-            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+        accessory.context.Battery = accessory.context.Battery ?? {};
+        // Initialize Battery property
+        this.Battery = {
+            Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+            Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery),
+            BatteryLevel: accessory.context.BatteryLevel ?? 100,
+            StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+        };
+        accessory.context.Battery = this.Battery;
+        // Initialize Battery Characteristics
+        this.Battery.Service
+            .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
+            .setCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery)
+            .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
         // deviceType
         if (this.botDeviceType === 'switch') {
+            // Initialize Switch Service
+            accessory.context.Switch = accessory.context.Switch ?? {};
+            this.Switch = {
+                Name: accessory.context.Switch.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Switch = this.Switch;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Switch`);
+            // Initialize Switch Characteristics
+            this.Switch.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.Switch.Name)
+                .setCharacteristic(this.hap.Characteristic.On, this.Switch.On)
+                .getCharacteristic(this.hap.Characteristic.On)
+                .onGet(() => {
+                return this.Switch.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -104,18 +88,32 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add switchService
-            const switchService = `${accessory.displayName} Switch`;
-            (this.switchService = accessory.getService(this.hap.Service.Switch)
-                || accessory.addService(this.hap.Service.Switch)), switchService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Switch`);
-            this.switchService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.switchService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.switchService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.switchService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.botDeviceType === 'garagedoor') {
+            // Initialize GarageDoor Service
+            accessory.context.GarageDoor = accessory.context.GarageDoor ?? {};
+            this.GarageDoor = {
+                Name: accessory.context.GarageDoor.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.GarageDoorOpener) ?? accessory.addService(this.hap.Service.GarageDoorOpener),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.GarageDoor = this.GarageDoor;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Garage Door Opener`);
+            // Initialize GarageDoor Characteristics
+            this.GarageDoor.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.GarageDoor.Name)
+                .setCharacteristic(this.hap.Characteristic.ObstructionDetected, false)
+                .getCharacteristic(this.hap.Characteristic.TargetDoorState).setProps({
+                validValues: [0, 100],
+                minValue: 0,
+                maxValue: 100,
+                minStep: 100,
+            })
+                .onGet(() => {
+                return this.GarageDoor.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -125,19 +123,32 @@ export class Bot {
             this.removeWindowService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add garageDoorService
-            const garageDoorService = `${accessory.displayName} Garage Door Opener`;
-            (this.garageDoorService = accessory.getService(this.hap.Service.GarageDoorOpener)
-                || accessory.addService(this.hap.Service.GarageDoorOpener)), garageDoorService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Garage Door Opener`);
-            this.garageDoorService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.garageDoorService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.garageDoorService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.garageDoorService.getCharacteristic(this.hap.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
-            this.garageDoorService.setCharacteristic(this.hap.Characteristic.ObstructionDetected, false);
         }
         else if (this.botDeviceType === 'door') {
+            // Initialize Door Service
+            accessory.context.Door = accessory.context.Door ?? {};
+            this.Door = {
+                Name: accessory.context.Door.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.Door) ?? accessory.addService(this.hap.Service.Door),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Door = this.Door;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Door`);
+            // Initialize Door Characteristics
+            this.Door.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.Door.Name)
+                .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
+                .getCharacteristic(this.hap.Characteristic.TargetPosition).setProps({
+                validValues: [0, 100],
+                minValue: 0,
+                maxValue: 100,
+                minStep: 100,
+            })
+                .onGet(() => {
+                return this.Door.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeOutletService(accessory);
@@ -147,27 +158,32 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add doorService
-            const doorService = `${accessory.displayName} Door`;
-            (this.doorService = accessory.getService(this.hap.Service.Door)
-                || accessory.addService(this.hap.Service.Door)), doorService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Door`);
-            this.doorService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.doorService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.doorService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.doorService
-                .getCharacteristic(this.hap.Characteristic.TargetPosition)
-                .setProps({
+        }
+        else if (this.botDeviceType === 'window') {
+            // Initialize Window Service
+            accessory.context.Window = accessory.context.Window ?? {};
+            this.Window = {
+                Name: accessory.context.Window.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.Window) ?? accessory.addService(this.hap.Service.Window),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Window = this.Window;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window`);
+            // Initialize Window Characteristics
+            this.Window.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.Window.Name)
+                .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
+                .getCharacteristic(this.hap.Characteristic.TargetPosition).setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
+            })
+                .onGet(() => {
+                return this.Window.On;
             })
                 .onSet(this.OnSet.bind(this));
-            this.doorService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-        }
-        else if (this.botDeviceType === 'window') {
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -177,27 +193,32 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add windowService
-            const windowService = `${accessory.displayName} Window`;
-            (this.windowService = accessory.getService(this.hap.Service.Window)
-                || accessory.addService(this.hap.Service.Window)), windowService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window`);
-            this.windowService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.windowService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.windowService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.windowService
-                .getCharacteristic(this.hap.Characteristic.TargetPosition)
-                .setProps({
+        }
+        else if (this.botDeviceType === 'windowcovering') {
+            // Initialize WindowCovering Service
+            accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
+            this.WindowCovering = {
+                Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.WindowCovering = this.WindowCovering;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window Covering`);
+            // Initialize WindowCovering Characteristics
+            this.WindowCovering.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name)
+                .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
+                .getCharacteristic(this.hap.Characteristic.TargetPosition).setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
+            })
+                .onGet(() => {
+                return this.WindowCovering.On;
             })
                 .onSet(this.OnSet.bind(this));
-            this.windowService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-        }
-        else if (this.botDeviceType === 'windowcovering') {
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -207,27 +228,26 @@ export class Bot {
             this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add windowCoveringService
-            const windowCoveringService = `${accessory.displayName} Window Covering`;
-            (this.windowCoveringService = accessory.getService(this.hap.Service.WindowCovering)
-                || accessory.addService(this.hap.Service.WindowCovering)), windowCoveringService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window Covering`);
-            this.windowCoveringService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.windowCoveringService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.windowCoveringService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.windowCoveringService
-                .getCharacteristic(this.hap.Characteristic.TargetPosition)
-                .setProps({
-                validValues: [0, 100],
-                minValue: 0,
-                maxValue: 100,
-                minStep: 100,
-            })
-                .onSet(this.OnSet.bind(this));
-            this.windowCoveringService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.botDeviceType === 'lock') {
+            // Initialize Lock Service
+            accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
+            this.LockMechanism = {
+                Name: accessory.context.LockMechanism.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.LockMechanism) ?? accessory.addService(this.hap.Service.LockMechanism),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.LockMechanism = this.LockMechanism;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Lock`);
+            // Initialize Lock Characteristics
+            this.LockMechanism.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.LockMechanism.Name)
+                .getCharacteristic(this.hap.Characteristic.LockTargetState)
+                .onGet(() => {
+                return this.LockMechanism.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
@@ -237,18 +257,26 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add lockService
-            const lockService = `${accessory.displayName} Lock`;
-            (this.lockService = accessory.getService(this.hap.Service.LockMechanism)
-                || accessory.addService(this.hap.Service.LockMechanism)), lockService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Lock`);
-            this.lockService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.lockService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.lockService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.lockService.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
         }
         else if (this.botDeviceType === 'faucet') {
+            // Initialize Faucet Service
+            accessory.context.Faucet = accessory.context.Faucet ?? {};
+            this.Faucet = {
+                Name: accessory.context.Faucet.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.Faucet) ?? accessory.addService(this.hap.Service.Faucet),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Faucet = this.Faucet;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Faucet`);
+            // Initialize Faucet Characteristics
+            this.Faucet.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.Faucet.Name)
+                .getCharacteristic(this.hap.Characteristic.Active)
+                .onGet(() => {
+                return this.Faucet.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -258,18 +286,26 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add faucetService
-            const faucetService = `${accessory.displayName} Faucet`;
-            (this.faucetService = accessory.getService(this.hap.Service.Faucet)
-                || accessory.addService(this.hap.Service.Faucet)), faucetService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Faucet`);
-            this.faucetService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.faucetService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.faucetService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.faucetService.getCharacteristic(this.hap.Characteristic.Active).onSet(this.OnSet.bind(this));
         }
         else if (this.botDeviceType === 'fan') {
+            // Initialize Fan Service
+            accessory.context.Fan = accessory.context.Fan ?? {};
+            this.Fan = {
+                Name: accessory.context.Fan.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.Fanv2) ?? accessory.addService(this.hap.Service.Fanv2),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Fan = this.Fan;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Fan`);
+            // Initialize Fan Characteristics
+            this.Fan.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.Fan.Name)
+                .getCharacteristic(this.hap.Characteristic.On)
+                .onGet(() => {
+                return this.Fan.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeFaucetService(accessory);
@@ -279,18 +315,27 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add fanService
-            const fanService = `${accessory.displayName} Fan`;
-            (this.fanService = accessory.getService(this.hap.Service.Fan)
-                || accessory.addService(this.hap.Service.Fan)), fanService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Fan`);
-            this.fanService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.fanService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.fanService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.fanService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.botDeviceType === 'stateful') {
+            // Initialize StatefulProgrammableSwitch Service
+            accessory.context.StatefulProgrammableSwitch = accessory.context.StatefulProgrammableSwitch ?? {};
+            this.StatefulProgrammableSwitch = {
+                Name: accessory.context.StatefulProgrammableSwitch.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+                    ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.StatefulProgrammableSwitch = this.StatefulProgrammableSwitch;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
+            // Initialize StatefulProgrammableSwitch Characteristics
+            this.StatefulProgrammableSwitch.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.StatefulProgrammableSwitch.Name)
+                .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+                .onGet(() => {
+                return this.StatefulProgrammableSwitch.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -300,20 +345,26 @@ export class Bot {
             this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
-            // Add statefulProgrammableSwitchService
-            const statefulProgrammableSwitchService = `${accessory.displayName} Stateful Programmable Switch`;
-            (this.statefulProgrammableSwitchService = accessory.getService(this.hap.Service.StatefulProgrammableSwitch) ||
-                accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), statefulProgrammableSwitchService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
-            this.statefulProgrammableSwitchService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.statefulProgrammableSwitchService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.statefulProgrammableSwitchService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.statefulProgrammableSwitchService
-                .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
-                .onSet(this.OnSet.bind(this));
         }
         else {
+            // Initialize Switch property
+            accessory.context.Outlet = accessory.context.Outlet ?? {};
+            this.Outlet = {
+                Name: accessory.context.Outlet.Name ?? accessory.displayName,
+                Service: accessory.getService(this.hap.Service.Outlet) ?? accessory.addService(this.hap.Service.Outlet),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Outlet = this.Outlet;
+            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Outlet`);
+            // Initialize Outlet Characteristics
+            this.Outlet.Service
+                .setCharacteristic(this.hap.Characteristic.Name, this.Outlet.Name)
+                .getCharacteristic(this.hap.Characteristic.On)
+                .onGet(() => {
+                return this.Outlet.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -323,26 +374,9 @@ export class Bot {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add outletService
-            const outletService = `${accessory.displayName} Outlet`;
-            (this.outletService = accessory.getService(this.hap.Service.Outlet)
-                || accessory.addService(this.hap.Service.Outlet)), outletService;
-            this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Outlet`);
-            this.outletService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.outletService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.outletService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.outletService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
-        // batteryService
-        const batteryService = `${accessory.displayName} Battery`;
-        (this.batteryService = this.accessory.getService(this.hap.Service.Battery)
-            || accessory.addService(this.hap.Service.Battery)), batteryService;
-        this.batteryService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
-        if (!this.batteryService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-            this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
-        }
-        this.batteryService.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+        // Retrieve initial values and updateHomekit
+        this.refreshStatus();
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -352,19 +386,21 @@ export class Bot {
             await this.refreshStatus();
         });
         //regisiter webhook event handler
-        if (this.device.webhook) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+        if (device.webhook) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
             this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
                 try {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
                     const { power, battery, deviceMode } = context;
-                    const { On, BatteryLevel, botMode } = this;
+                    const { botMode } = this;
+                    const On = await this.getOn();
+                    const { BatteryLevel } = this.Battery;
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
                         '(power, battery, deviceMode) = ' +
                         `Webhook:(${power}, ${battery}, ${deviceMode}), ` +
                         `current:(${On}, ${BatteryLevel}, ${botMode})`);
-                    this.On = power;
-                    this.BatteryLevel = battery;
+                    await this.setOn(power);
+                    this.Battery.BatteryLevel = battery;
                     this.botMode = deviceMode;
                     this.updateHomeKitCharacteristics();
                 }
@@ -402,80 +438,81 @@ export class Bot {
         });
     }
     /**
-     * Parse the device status from the SwitchBot api
+     * Parse the device status from the SwitchBotBLE API
      */
-    async parseStatus() {
-        if (!this.device.enableCloudService && this.OpenAPI) {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
-        }
-        else if (this.BLE) {
-            await this.BLEparseStatus();
-        }
-        else if (this.OpenAPI && this.platform.config.credentials?.token) {
-            await this.openAPIparseStatus();
-        }
-        else {
-            await this.offlineOff();
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
-        }
-    }
-    async BLEparseStatus() {
+    async BLEparseStatus(serviceData) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // BLEmode (true if Switch Mode) | (false if Press Mode)
-        if (this.BLE_Mode) {
-            this.accessory.context.On = this.On;
-            if (this.On === undefined) {
-                this.On = Boolean(this.BLE_On);
+        if (serviceData.mode) {
+            this.accessory.context.On = await this.getOn();
+            if (this.getOn() === undefined) {
+                this.setOn(Boolean(serviceData.state));
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, mode: ${this.BLE_Mode}, On: ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode,`
+                + ` mode: ${serviceData.mode}, On: ${this.accessory.context.On}`);
         }
         else {
-            this.On = false;
-            this.accessory.context.On = this.On;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode, mode: ${this.BLE_Mode}, On: ${this.On}`);
+            this.setOn(false);
+            this.accessory.context.On = await this.getOn();
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode,`
+                + ` mode: ${serviceData.mode}, On: ${this.accessory.context.On}`);
         }
-        this.BatteryLevel = Number(this.BLE_BatteryLevel);
-        if (this.BatteryLevel < 10) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        this.Battery.BatteryLevel = Number(serviceData.battery);
+        if (this.Battery.BatteryLevel < 10) {
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-        if (Number.isNaN(this.BatteryLevel)) {
-            this.BatteryLevel = 100;
+        if (Number.isNaN(this.Battery.BatteryLevel)) {
+            this.Battery.BatteryLevel = 100;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-            + ` StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+            + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
-    async openAPIparseStatus() {
+    /**
+     * Parse the device status from the SwitchBot OpenAPI
+     */
+    async openAPIparseStatus(deviceStatus) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
         if (this.botMode === 'press') {
-            this.On = false;
-            this.accessory.context.On = this.On;
+            this.setOn(false);
+            this.accessory.context.On = await this.getOn();
         }
         else {
-            this.accessory.context.On = this.On;
-            if (this.On === undefined) {
-                this.On = false;
+            this.accessory.context.On = await this.getOn();
+            if (this.getOn() === undefined) {
+                this.setOn(false);
             }
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.accessory.context.On}`);
         // Battery
-        this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
-        if (this.BatteryLevel < 10) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
+        if (this.Battery.BatteryLevel < 10) {
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-        }
-        if (Number.isNaN(this.BatteryLevel)) {
-            this.BatteryLevel = 100;
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+        }
+        if (Number.isNaN(this.Battery.BatteryLevel)) {
+            this.Battery.BatteryLevel = 100;
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+            + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+        // Firmware Version
+        const version = deviceStatus.body.version?.toString();
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+        if (deviceStatus.body.version) {
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
+            this.accessory
+                .getService(this.hap.Service.AccessoryInformation)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
+                .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-            + ` StatusLowBattery: ${this.StatusLowBattery}`);
-        // FirmwareRevision
-        this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
-        this.accessory.context.FirmwareRevision = this.FirmwareRevision;
     }
     /**
      * Asks the SwitchBot API for the latest device information
@@ -509,99 +546,42 @@ export class Bot {
         // Start to monitor advertisement packets
         (async () => {
             // Start to monitor advertisement packets
-            await switchbot.startScan({
-                model: 'H',
-                id: this.device.bleMac,
-            });
+            await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
             // Set an event handler
             switchbot.onadvertisement = (ad) => {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
-                if (this.device.bleMac === ad.address && ad.model === 'H') {
+                if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                    this.BLE_Mode = ad.serviceData.mode;
-                    this.BLE_On = ad.serviceData.state;
-                    this.BLE_BatteryLevel = ad.serviceData.battery;
                 }
                 else {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
                 }
             };
-            // Wait 1 seconds
+            // Wait 10 seconds
             await switchbot.wait(this.scanDuration * 1000);
             // Stop to monitor
             await switchbot.stopScan();
             // Update HomeKit
-            await this.BLEparseStatus();
+            await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
             await this.updateHomeKitCharacteristics();
         })();
-        /*if (switchbot !== false) {
-          switchbot
-            .startScan({
-              model: 'H',
-              id: this.device.bleMac,
-            })
-            .then(async () => {
-              // Set an event handler
-              switchbot.onadvertisement = async (ad: ad) => {
-                this.debugLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-                  ` BLE Address Found: ${ad.address}`,
-                );
-                this.BLE_Mode = ad.serviceData.mode;
-                this.BLE_On = ad.serviceData.state;
-                this.BLE_BatteryLevel = ad.serviceData.battery;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                this.debugLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName}, model: ${ad.serviceData.model}, modelName: ` +
-                  `${ad.serviceData.modelName}, mode: ${ad.serviceData.mode}, state: ${ad.serviceData.state}, battery: ${ad.serviceData.battery}`,
-                );
-    
-                if (ad.serviceData) {
-                  this.BLE_IsConnected = true;
-                  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-                  await this.stopScanning(switchbot);
-                } else {
-                  this.BLE_IsConnected = false;
-                  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-                }
-              };
-              // Wait
-              return await sleep(this.scanDuration * 1000);
-            })
-            .then(async () => {
-              // Stop to monitor
-              await this.stopScanning(switchbot);
-            })
-            .catch(async (e: any) => {
-              this.apiError(e);
-              this.errorLog(
-                `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
-                ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-              );
-              await this.BLERefreshConnection(switchbot);
-            });
-        } else {
-          await this.BLERefreshConnection(switchbot);
-        }*/
+        if (switchbot === undefined) {
+            await this.BLERefreshConnection(switchbot);
+        }
     }
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
-                headers: this.platform.generateHeaders(),
-            });
+            const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
             const deviceStatus = await body.json();
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
             if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-                this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
                     + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-                this.OpenAPI_On = deviceStatus.body.power;
-                this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
-                this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-                this.openAPIparseStatus();
+                this.openAPIparseStatus(deviceStatus);
                 this.updateHomeKitCharacteristics();
             }
             else {
@@ -646,8 +626,9 @@ export class Bot {
     }
     async BLEpushChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
-        if (this.On !== this.accessory.context.On || this.allowPush) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+        const On = await this.getOn();
+        if (On !== this.accessory.context.On || this.allowPush) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${On} OnCached: ${this.accessory.context.On}`);
             const switchbot = await this.platform.connectBLE();
             // Convert to BLE Address
             this.device.bleMac = this.device
@@ -661,20 +642,22 @@ export class Bot {
                 switchbot
                     .discover({ model: 'H', quick: true, id: this.device.bleMac })
                     .then(async (device_list) => {
-                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${On}`);
                     return await device_list[0].press({ id: this.device.bleMac });
                 })
                     .then(() => {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-                    this.accessory.context.On = this.On;
+                    this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                        + `On: ${On} sent over BLE,  sent successfully`);
+                    this.accessory.context.On = On;
                     setTimeout(() => {
                         if (this.botDeviceType === 'switch') {
-                            this.switchService?.getCharacteristic(this.hap.Characteristic.On).updateValue(this.On);
+                            this.Switch?.Service.getCharacteristic(this.hap.Characteristic.On).updateValue(On);
                         }
                         else {
-                            this.outletService?.getCharacteristic(this.hap.Characteristic.On).updateValue(this.On);
+                            this.Outlet?.Service.getCharacteristic(this.hap.Characteristic.On).updateValue(On);
                         }
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${On}, Switch Timeout`);
                     }, 500);
                 })
                     .catch(async (e) => {
@@ -689,11 +672,11 @@ export class Bot {
                 switchbot
                     .discover({ model: 'H', quick: true, id: this.device.bleMac })
                     .then(async (device_list) => {
-                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
-                    return await this.retry({
-                        max: this.maxRetry(),
+                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${On}`);
+                    return await this.retryBLE({
+                        max: await this.maxRetryBLE(),
                         fn: async () => {
-                            if (this.On) {
+                            if (On) {
                                 return await device_list[0].turnOn({ id: this.device.bleMac });
                             }
                             else {
@@ -704,12 +687,12 @@ export class Bot {
                 })
                     .then(() => {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-                    this.accessory.context.On = this.On;
+                    this.accessory.context.On = On;
                 })
                     .catch(async (e) => {
                     this.apiError(e);
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}` +
-                        ` Connection & botMode: ${this.botMode}, Error Message: ${JSON.stringify(e.message)}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+                        + ` Connection & botMode: ${this.botMode}, Error Message: ${JSON.stringify(e.message)}`);
                     await this.BLEPushConnection();
                 });
             }
@@ -718,31 +701,32 @@ export class Bot {
             }
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, ` + `OnCached: ${this.accessory.context.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges, On: ${On}, OnCached: ${this.accessory.context.On}`);
         }
     }
     async openAPIpushChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
+        let On = await this.getOn();
         if (this.multiPressCount > 0) {
             this.debugLog(`${this.device.deviceType}: ${this.multiPressCount} request(s) queued.`);
-            this.On = true;
+            On = true;
         }
-        if (this.On !== this.accessory.context.On || this.allowPush || this.multiPressCount > 0) {
+        if (On !== this.accessory.context.On || this.allowPush || this.multiPressCount > 0) {
             let command = '';
-            if (this.botMode === 'switch' && this.On) {
+            if (this.botMode === 'switch' && On) {
                 command = 'turnOn';
-                this.On = true;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
+                On = true;
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${On}`);
             }
-            else if (this.botMode === 'switch' && !this.On) {
+            else if (this.botMode === 'switch' && !On) {
                 command = 'turnOff';
-                this.On = false;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
+                On = false;
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${On}`);
             }
             else if (this.botMode === 'press' || this.botMode === 'multipress') {
                 command = 'press';
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode`);
-                this.On = false;
+                On = false;
             }
             else {
                 throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Device Parameters not set for this Bot.`);
@@ -765,8 +749,10 @@ export class Bot {
                 this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
                 this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
                 if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-                    this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
                         + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+                    this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                        + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
                 }
                 else {
                     this.statusCode(statusCode);
@@ -776,21 +762,20 @@ export class Bot {
                     this.multiPressCount--;
                     if (this.multiPressCount > 0) {
                         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Multi Press Count: ${this.multiPressCount}`);
-                        this.On = true;
+                        On = true;
                         this.openAPIpushChanges();
                     }
                 }
             }
             catch (e) {
                 this.apiError(e);
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}` +
-                    ` Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+                    + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` +
-                `On: ${this.On}, ` +
-                `OnCached: ${this.accessory.context.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges,`
+                + ` On: ${On}, OnCached: ${this.accessory.context.On}`);
         }
     }
     /**
@@ -798,61 +783,121 @@ export class Bot {
      */
     async OnSet(value) {
         if (this.botDeviceType === 'garagedoor') {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetDoorState: ${value}`);
-            if (value === this.hap.Characteristic.TargetDoorState.CLOSED) {
-                this.On = false;
+            if (this.GarageDoor) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetDoorState: ${value}`);
+                if (value === this.hap.Characteristic.TargetDoorState.CLOSED) {
+                    await this.setOn(false);
+                    this.GarageDoor.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.GarageDoor.On = true;
+                }
             }
-            else {
-                this.On = true;
+        }
+        else if (this.botDeviceType === 'door') {
+            if (this.Door) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+                if (value === 0) {
+                    await this.setOn(false);
+                    this.Door.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.Door.On = true;
+                }
             }
         }
-        else if (this.botDeviceType === 'door' ||
-            this.botDeviceType === 'window' ||
-            this.botDeviceType === 'windowcovering') {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
-            if (value === 0) {
-                this.On = false;
+        else if (this.botDeviceType === 'window') {
+            if (this.Window) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+                if (value === 0) {
+                    await this.setOn(false);
+                    this.Window.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.Window.On = true;
+                }
             }
-            else {
-                this.On = true;
+        }
+        else if (this.botDeviceType === 'windowcovering') {
+            if (this.WindowCovering) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+                if (value === 0) {
+                    await this.setOn(false);
+                    this.WindowCovering.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.WindowCovering.On = true;
+                }
             }
         }
         else if (this.botDeviceType === 'lock') {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
-            if (value === this.hap.Characteristic.LockTargetState.SECURED) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
+            if (this.LockMechanism) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
+                if (value === this.hap.Characteristic.LockTargetState.SECURED) {
+                    await this.setOn(false);
+                    this.LockMechanism.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.LockMechanism.On = true;
+                }
             }
         }
         else if (this.botDeviceType === 'faucet') {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Active: ${value}`);
-            if (value === this.hap.Characteristic.Active.INACTIVE) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
+            if (this.Faucet) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Active: ${value}`);
+                if (value === this.hap.Characteristic.Active.INACTIVE) {
+                    await this.setOn(false);
+                    this.Faucet.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.Faucet.On = true;
+                }
             }
         }
         else if (this.botDeviceType === 'stateful') {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ProgrammableSwitchOutputState: ${value}`);
-            if (value === 0) {
-                this.On = false;
+            if (this.StatefulProgrammableSwitch) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ProgrammableSwitchOutputState: ${value}`);
+                if (value === 0) {
+                    await this.setOn(false);
+                    this.StatefulProgrammableSwitch.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.StatefulProgrammableSwitch.On = true;
+                }
             }
-            else {
-                this.On = true;
+        }
+        else if (this.botDeviceType === 'switch') {
+            if (this.Switch) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ProgrammableSwitchOutputState: ${value}`);
+                if (value === 0) {
+                    await this.setOn(false);
+                    this.Switch.On = false;
+                }
+                else {
+                    await this.setOn(true);
+                    this.Switch.On = true;
+                }
             }
         }
         else {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
-            if (this.device.bot?.mode === 'multipress') {
-                if (value === true) {
-                    this.multiPressCount++;
-                    this.debugLog(`${this.device.deviceType} set to Multi-Press. Multi-Press count: ${this.multiPressCount}`);
-                }
+            if (this.Outlet) {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
+                await this.setOn(Boolean(value));
+                this.Outlet.On = value;
+            }
+        }
+        if (this.device.bot?.mode === 'multipress') {
+            if (value === true) {
+                this.multiPressCount++;
+                this.debugLog(`${this.device.deviceType} set to Multi-Press. Multi-Press count: ${this.multiPressCount}`);
             }
-            this.On = value;
         }
         this.doBotUpdate.next();
     }
@@ -862,508 +907,380 @@ export class Bot {
     async updateHomeKitCharacteristics() {
         // State
         if (this.botDeviceType === 'garagedoor') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.GarageDoor?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.GarageDoor?.On}`);
             }
             else {
-                if (this.On) {
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.OPEN);
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.OPEN);
-                    this.debugLog(`${this.device.deviceType}: ` + `${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+                if (this.GarageDoor.On) {
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.OPEN);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.OPEN);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetDoorState: Open, CurrentDoorState: Open (${this.GarageDoor.On})`);
                 }
                 else {
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSED);
-                    this.debugLog(`${this.device.deviceType}: ` + `${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetDoorState: Open, CurrentDoorState: Open (${this.GarageDoor.On})`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Garage Door On: ${this.On}`);
+            await this.setOn(Boolean(this.GarageDoor?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Garage Door On: ${this.GarageDoor?.On}`);
         }
         else if (this.botDeviceType === 'door') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Door?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Door?.On}`);
             }
             else {
-                if (this.On) {
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+                if (this.Door.On) {
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetPosition: 100, CurrentPosition: 100 (${this.Door.On})`);
                 }
                 else {
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetPosition: 0, CurrentPosition: 0 (${this.Door.On})`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Door On: ${this.On}`);
+            await this.setOn(Boolean(this.Door?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Door On: ${this.Door?.On}`);
         }
         else if (this.botDeviceType === 'window') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Window?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Window?.On}`);
             }
             else {
-                if (this.On) {
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+                if (this.Window.On) {
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetPosition: 100, CurrentPosition: 100 (${this.Window.On})`);
                 }
                 else {
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetPosition: 0, CurrentPosition: 0 (${this.Window.On})`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Window On: ${this.On}`);
+            await this.setOn(Boolean(this.Window?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Window On: ${this.Window?.On}`);
         }
         else if (this.botDeviceType === 'windowcovering') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.WindowCovering?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.WindowCovering?.On}`);
             }
             else {
-                if (this.On) {
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+                if (this.WindowCovering.On) {
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetPosition: 100, CurrentPosition: 100 (${this.WindowCovering.On})`);
                 }
                 else {
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` TargetPosition: 0, CurrentPosition: 0 (${this.WindowCovering.On})`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Window Covering On: ${this.On}`);
+            await this.setOn(Boolean(this.WindowCovering?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Window Covering On: ${this.WindowCovering?.On}`);
         }
         else if (this.botDeviceType === 'lock') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.LockMechanism?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LockMechanism?.On}`);
             }
             else {
-                if (this.On) {
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
-                    this.debugLog(`${this.device.deviceType}: ` +
-                        `${this.accessory.displayName} updateCharacteristic LockTargetState: UNSECURED, LockCurrentState: UNSECURED`);
+                if (this.LockMechanism.On) {
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristicc`
+                        + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURED (${this.LockMechanism.On})`);
                 }
                 else {
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
-                    this.debugLog(`${this.device.deviceType}: ` + `${this.accessory.displayName} updateCharacteristic LockTargetState: SECURED, LockCurrentState: SECURED`);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` LockTargetState: SECURED, LockCurrentState: SECURED  (${this.LockMechanism.On})`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Lock On: ${this.On}`);
+            await this.setOn(Boolean(this.LockMechanism?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Lock On: ${this.LockMechanism?.On}`);
         }
         else if (this.botDeviceType === 'faucet') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Faucet?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Faucet?.On}`);
             }
             else {
-                if (this.On) {
-                    this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.ACTIVE);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+                if (this.Faucet.On) {
+                    this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.ACTIVE);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Faucet.On}`);
                 }
                 else {
-                    this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+                    this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Faucet.On}`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Faucet On: ${this.On}`);
+            await this.setOn(Boolean(this.Faucet?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Faucet On: ${this.Faucet?.On}`);
         }
         else if (this.botDeviceType === 'fan') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Fan?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Fan?.On}`);
             }
             else {
-                if (this.On) {
-                    this.fanService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                if (this.Fan.On) {
+                    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, this.Fan.On);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Fan.On}`);
                 }
                 else {
-                    this.fanService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, this.Fan.On);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Fan.On}`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Fan On: ${this.On}`);
+            await this.setOn(Boolean(this.Fan?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Fan On: ${this.Fan?.On}`);
         }
         else if (this.botDeviceType === 'stateful') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.StatefulProgrammableSwitch?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.StatefulProgrammableSwitch?.On}`);
             }
             else {
-                if (this.On) {
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 1);
-                    this.debugLog(`${this.device.deviceType}: ` +
-                        `${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1`);
+                if (this.StatefulProgrammableSwitch.On) {
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 1);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1 (${this.StatefulProgrammableSwitch.On})`);
                 }
                 else {
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
-                    this.debugLog(`${this.device.deviceType}: ` +
-                        `${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0`);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0 (${this.StatefulProgrammableSwitch.On})`);
                 }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.On}`);
+            await this.setOn(Boolean(this.StatefulProgrammableSwitch?.On));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.StatefulProgrammableSwitch?.On}`);
         }
         else if (this.botDeviceType === 'switch') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Switch?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Switch?.On}`);
             }
             else {
-                this.switchService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Switch.On}`);
             }
+            await this.setOn(Boolean(this.Switch?.On));
         }
         else {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Outlet?.On === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Outlet?.On}`);
             }
             else {
-                this.outletService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, this.Outlet.On);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Outlet.On}`);
             }
+            await this.setOn(Boolean(this.Outlet?.On));
         }
-        this.accessory.context.On = this.On;
+        this.accessory.context.On = await this.getOn();
         // BatteryLevel
-        if (this.BatteryLevel === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+        if (this.Battery.BatteryLevel === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
         }
         else {
-            this.accessory.context.BatteryLevel = this.BatteryLevel;
-            this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.BatteryLevel);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+            this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
+            this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
         }
         // StatusLowBattery
-        if (this.StatusLowBattery === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+        if (this.Battery.StatusLowBattery === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         }
         else {
-            this.accessory.context.StatusLowBattery = this.StatusLowBattery;
-            this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.StatusLowBattery);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+            this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
+            this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         }
     }
     async removeOutletService(accessory) {
         // If outletService still present, then remove first
-        this.outletService = this.accessory.getService(this.hap.Service.Outlet);
-        if (this.outletService) {
+        if (this.Outlet?.Service) {
+            this.Outlet.Service = this.accessory.getService(this.hap.Service.Outlet);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
+            accessory.removeService(this.Outlet.Service);
         }
-        accessory.removeService(this.outletService);
     }
     async removeGarageDoorService(accessory) {
         // If garageDoorService still present, then remove first
-        this.garageDoorService = this.accessory.getService(this.hap.Service.GarageDoorOpener);
-        if (this.garageDoorService) {
+        if (this.GarageDoor?.Service) {
+            this.GarageDoor.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
+            accessory.removeService(this.GarageDoor.Service);
         }
-        accessory.removeService(this.garageDoorService);
     }
     async removeDoorService(accessory) {
         // If doorService still present, then remove first
-        this.doorService = this.accessory.getService(this.hap.Service.Door);
-        if (this.doorService) {
+        if (this.Door?.Service) {
+            this.Door.Service = this.accessory.getService(this.hap.Service.Door);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
+            accessory.removeService(this.Door.Service);
         }
-        accessory.removeService(this.doorService);
     }
     async removeLockService(accessory) {
         // If lockService still present, then remove first
-        this.lockService = this.accessory.getService(this.hap.Service.LockMechanism);
-        if (this.lockService) {
+        if (this.LockMechanism?.Service) {
+            this.LockMechanism.Service = this.accessory.getService(this.hap.Service.LockMechanism);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
+            accessory.removeService(this.LockMechanism.Service);
         }
-        accessory.removeService(this.lockService);
     }
     async removeFaucetService(accessory) {
         // If faucetService still present, then remove first
-        this.faucetService = this.accessory.getService(this.hap.Service.Faucet);
-        if (this.faucetService) {
+        if (this.Faucet?.Service) {
+            this.Faucet.Service = this.accessory.getService(this.hap.Service.Faucet);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Faucet Service`);
+            accessory.removeService(this.Faucet.Service);
         }
-        accessory.removeService(this.faucetService);
     }
     async removeFanService(accessory) {
         // If fanService still present, then remove first
-        this.fanService = this.accessory.getService(this.hap.Service.Fan);
-        if (this.fanService) {
+        if (this.Fan?.Service) {
+            this.Fan.Service = this.accessory.getService(this.hap.Service.Fanv2);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
+            accessory.removeService(this.Fan.Service);
         }
-        accessory.removeService(this.fanService);
     }
     async removeWindowService(accessory) {
         // If windowService still present, then remove first
-        this.windowService = this.accessory.getService(this.hap.Service.Window);
-        if (this.windowService) {
+        if (this.Window?.Service) {
+            this.Window.Service = this.accessory.getService(this.hap.Service.Window);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
+            accessory.removeService(this.Window.Service);
         }
-        accessory.removeService(this.windowService);
     }
     async removeWindowCoveringService(accessory) {
         // If windowCoveringService still present, then remove first
-        this.windowCoveringService = this.accessory.getService(this.hap.Service.WindowCovering);
-        if (this.windowCoveringService) {
+        if (this.WindowCovering?.Service) {
+            this.WindowCovering.Service = this.accessory.getService(this.hap.Service.WindowCovering);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
+            accessory.removeService(this.WindowCovering.Service);
         }
-        accessory.removeService(this.windowCoveringService);
     }
     async removeStatefulProgrammableSwitchService(accessory) {
         // If statefulProgrammableSwitchService still present, then remove first
-        this.statefulProgrammableSwitchService = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
-        if (this.statefulProgrammableSwitchService) {
+        if (this.StatefulProgrammableSwitch?.Service) {
+            this.StatefulProgrammableSwitch.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
+            accessory.removeService(this.StatefulProgrammableSwitch.Service);
         }
-        accessory.removeService(this.statefulProgrammableSwitchService);
     }
     async removeSwitchService(accessory) {
         // If switchService still present, then remove first
-        this.switchService = this.accessory.getService(this.hap.Service.Switch);
-        if (this.switchService) {
+        if (this.Switch?.Service) {
+            this.Switch.Service = this.accessory.getService(this.hap.Service.Switch);
             this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Switch Service`);
+            accessory.removeService(this.Switch.Service);
         }
-        accessory.removeService(this.switchService);
     }
-    DoublePress(device) {
-        if (device.bot?.doublePress) {
-            this.doublePress = device.bot?.doublePress;
-            this.accessory.context.doublePress = this.doublePress;
-        }
-        else {
-            this.doublePress = 1;
-        }
-    }
-    async stopScanning(switchbot) {
-        switchbot.stopScan();
-        if (this.BLE_IsConnected) {
-            await this.BLEparseStatus();
-            await this.updateHomeKitCharacteristics();
-        }
-        else {
-            await this.BLERefreshConnection(switchbot);
-        }
-    }
-    async getCustomBLEAddress(switchbot) {
-        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: 'H',
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await sleep(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
-        }
-    }
-    async BLEPushConnection() {
-        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
-            await this.openAPIpushChanges();
-        }
-    }
-    async BLERefreshConnection(switchbot) {
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot:`
-            + ` ${JSON.stringify(switchbot)}`);
-        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Refresh Status`);
-            await this.openAPIRefreshStatus();
-        }
-    }
-    async retry({ max, fn }) {
-        return fn().catch(async (e) => {
-            if (max === 0) {
-                throw e;
-            }
-            this.infoLog(e);
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
-            await sleep(1000);
-            return this.retry({ max: max - 1, fn });
-        });
-    }
-    maxRetry() {
-        if (this.device.maxRetry) {
-            return this.device.maxRetry;
-        }
-        else {
-            return 5;
+    async getOn() {
+        let On;
+        if (this.botDeviceType === 'garagedoor') {
+            On = this.GarageDoor?.On ? true : false;
         }
-    }
-    async PressOrSwitch(device) {
-        if (!device.bot?.mode) {
-            this.botMode = 'switch';
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings,`);
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} is defaulting to "${this.botMode}" mode, you may experience issues.`);
+        else if (this.botDeviceType === 'door') {
+            On = this.Door?.On ? true : false;
         }
-        else if (device.bot?.mode === 'switch') {
-            this.botMode = 'switch';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+        else if (this.botDeviceType === 'window') {
+            On = this.Window?.On ? true : false;
         }
-        else if (device.bot?.mode === 'press') {
-            this.botMode = 'press';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+        else if (this.botDeviceType === 'windowcovering') {
+            On = this.WindowCovering?.On ? true : false;
         }
-        else if (device.bot?.mode === 'multipress') {
-            this.botMode = 'multipress';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+        else if (this.botDeviceType === 'lock') {
+            On = this.LockMechanism?.On ? true : false;
         }
-        else {
-            throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+        else if (this.botDeviceType === 'faucet') {
+            On = this.Faucet?.On ? true : false;
         }
-    }
-    async allowPushChanges(device) {
-        if (device.bot?.allowPush) {
-            this.allowPush = true;
+        else if (this.botDeviceType === 'fan') {
+            On = this.Fan?.On ? true : false;
         }
-        else {
-            this.allowPush = false;
+        else if (this.botDeviceType === 'stateful') {
+            On = this.StatefulProgrammableSwitch?.On ? true : false;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
-    }
-    async scan(device) {
-        if (device.scanDuration) {
-            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-            if (this.BLE) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
+        else if (this.botDeviceType === 'switch') {
+            On = this.Switch?.On ? true : false;
         }
         else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.BLE) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
-        }
-    }
-    async statusCode(statusCode) {
-        switch (statusCode) {
-            case 151:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
-                break;
-            case 152:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
-                break;
-            case 160:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
-                break;
-            case 161:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
-                this.offlineOff();
-                break;
-            case 171:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
-                    `Hub: ${this.device.hubDeviceId}`);
-                this.offlineOff();
-                break;
-            case 190:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command format is invalid, statusCode: ${statusCode}`);
-                break;
-            case 100:
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
-                break;
-            case 200:
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
-                break;
-            case 400:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
-                    + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
-                break;
-            case 401:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized,	Authorization for the API is required, `
-                    + `but the request has not been authenticated, statusCode: ${statusCode}`);
-                break;
-            case 403:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden,	The request has been authenticated but does not `
-                    + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
-                break;
-            case 404:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found,	Specifies the requested path does not exist, `
-                    + `statusCode: ${statusCode}`);
-                break;
-            case 406:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable,	The client has requested a MIME type via `
-                    + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
-                break;
-            case 415:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type,	The client has defined a contentType `
-                    + `header that is not supported by the server, statusCode: ${statusCode}`);
-                break;
-            case 422:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity,	The client has made a valid request, `
-                    + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
-                break;
-            case 429:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests,	The client has exceeded the number of `
-                    + `requests allowed for a given time window, statusCode: ${statusCode}`);
-                break;
-            case 500:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error,	An unexpected error on the SmartThings `
-                    + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
-                break;
-            default:
-                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
-                    `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+            On = this.Outlet?.On ? true : false;
         }
+        return On;
     }
-    async offlineOff() {
-        if (this.device.offline) {
-            await this.deviceContext();
-            await this.updateHomeKitCharacteristics();
-        }
-    }
-    async apiError(e) {
+    async setOn(On) {
         if (this.botDeviceType === 'garagedoor') {
-            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
+            if (this.GarageDoor) {
+                this.GarageDoor.On = On;
+            }
         }
         else if (this.botDeviceType === 'door') {
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            if (this.Door) {
+                this.Door.On = On;
+            }
         }
         else if (this.botDeviceType === 'window') {
-            this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-            this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-            this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            if (this.Window) {
+                this.Window.On = On;
+            }
         }
         else if (this.botDeviceType === 'windowcovering') {
-            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            if (this.WindowCovering) {
+                this.WindowCovering.On = On;
+            }
         }
         else if (this.botDeviceType === 'lock') {
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
+            if (this.LockMechanism) {
+                this.LockMechanism.On = On;
+            }
         }
         else if (this.botDeviceType === 'faucet') {
-            this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, e);
+            if (this.Faucet) {
+                this.Faucet.On = On;
+            }
         }
         else if (this.botDeviceType === 'fan') {
-            this.fanService?.updateCharacteristic(this.hap.Characteristic.On, e);
+            if (this.Fan) {
+                this.Fan.On = On;
+            }
         }
         else if (this.botDeviceType === 'stateful') {
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
+            if (this.StatefulProgrammableSwitch) {
+                this.StatefulProgrammableSwitch.On = On;
+            }
         }
         else if (this.botDeviceType === 'switch') {
-            this.switchService?.updateCharacteristic(this.hap.Characteristic.On, e);
+            if (this.Switch) {
+                this.Switch.On = On;
+            }
         }
         else {
-            this.outletService?.updateCharacteristic(this.hap.Characteristic.On, e);
+            if (this.Outlet) {
+                this.Outlet.On = On;
+            }
         }
-        this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
-        this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
     }
-    async deviceType(device) {
+    async getBotConfigSettings(device) {
+        //Bot Device Type
         if (!device.bot?.deviceType && this.accessory.context.deviceType) {
             this.botDeviceType = this.accessory.context.deviceType;
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Type: ${this.botDeviceType}, from Accessory Cache.`);
@@ -1379,43 +1296,36 @@ export class Bot {
             this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} No Device Type Set, deviceType: ${this.device.bot?.deviceType}`);
             this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using default deviceType: ${this.botDeviceType}`);
         }
-    }
-    async deviceContext() {
-        if (this.On === undefined) {
-            this.On = false;
-            this.accessory.context.On = this.On;
-        }
-        else {
-            this.On = this.accessory.context.On;
+        // Bot Mode
+        if (!device.bot?.mode) {
+            this.botMode = 'switch';
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings,`);
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} is defaulting to "${this.botMode}" mode, you may experience issues.`);
         }
-        if (this.BatteryLevel === undefined) {
-            this.BatteryLevel = 100;
+        else if (device.bot?.mode === 'switch') {
+            this.botMode = 'switch';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
         }
-        else {
-            this.BatteryLevel = this.accessory.context.BatteryLevel;
+        else if (device.bot?.mode === 'press') {
+            this.botMode = 'press';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
         }
-        if (this.StatusLowBattery === undefined) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-            this.accessory.context.StatusLowBattery = this.StatusLowBattery;
+        else if (device.bot?.mode === 'multipress') {
+            this.botMode = 'multipress';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
         }
         else {
-            this.StatusLowBattery = this.accessory.context.StatusLowBattery;
-        }
-        if (this.FirmwareRevision === undefined) {
-            this.FirmwareRevision = this.platform.version;
-            this.accessory.context.FirmwareRevision = this.FirmwareRevision;
+            throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
         }
-    }
-    async refreshRate(device) {
-        if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+        // Bot Double Press
+        if (device.bot?.doublePress) {
+            this.doublePress = device.bot?.doublePress;
+            this.accessory.context.doublePress = this.doublePress;
         }
-        else if (this.platform.config.options.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+        else {
+            this.doublePress = 1;
         }
-        // pushRatePress
+        // Bot Press PushRate
         if (device?.bot?.pushRatePress) {
             this.pushRatePress = device?.bot?.pushRatePress;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Bot pushRatePress: ${this.pushRatePress}`);
@@ -1424,102 +1334,158 @@ export class Bot {
             this.pushRatePress = 15;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default Bot pushRatePress: ${this.pushRatePress}`);
         }
-    }
-    async deviceConfig(device) {
-        let config = {};
-        if (device.bot) {
-            config = device.bot;
-        }
-        if (device.connectionType !== undefined) {
-            config['connectionType'] = device.connectionType;
-        }
-        if (device.external !== undefined) {
-            config['external'] = device.external;
-        }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
-        }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
-        }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
-        }
-        if (device.offline !== undefined) {
-            config['offline'] = device.offline;
+        // Bot Allow Push
+        if (device.bot?.allowPush) {
+            this.allowPush = true;
         }
-        if (device.maxRetry !== undefined) {
-            config['maxRetry'] = device.maxRetry;
+        else {
+            this.allowPush = false;
         }
-        if (device.webhook !== undefined) {
-            config['webhook'] = device.webhook;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
+        // Bot Multi Press Count
+        this.multiPressCount = 0;
+    }
+    async BLEPushConnection() {
+        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
+            await this.openAPIpushChanges();
         }
-        if (Object.entries(config).length !== 0) {
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+    }
+    async BLERefreshConnection(switchbot) {
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot:`
+            + ` ${JSON.stringify(switchbot)}`);
+        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Refresh Status`);
+            await this.openAPIRefreshStatus();
         }
     }
-    async deviceLogs(device) {
-        if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+    async offlineOff() {
+        if (this.device.offline) {
+            if (this.botDeviceType === 'garagedoor') {
+                if (this.GarageDoor) {
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSED);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, false);
+                }
+            }
+            else if (this.botDeviceType === 'door') {
+                if (this.Door) {
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                }
+            }
+            else if (this.botDeviceType === 'window') {
+                if (this.Window) {
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                }
+            }
+            else if (this.botDeviceType === 'windowcovering') {
+                if (this.WindowCovering) {
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                }
+            }
+            else if (this.botDeviceType === 'lock') {
+                if (this.LockMechanism) {
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
+                }
+            }
+            else if (this.botDeviceType === 'faucet') {
+                if (this.Faucet) {
+                    this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
+                }
+            }
+            else if (this.botDeviceType === 'fan') {
+                if (this.Fan) {
+                    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, false);
+                }
+            }
+            else if (this.botDeviceType === 'stateful') {
+                if (this.StatefulProgrammableSwitch) {
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
+                }
+            }
+            else if (this.botDeviceType === 'switch') {
+                if (this.Switch) {
+                    this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, false);
+                }
+            }
+            else {
+                if (this.Outlet) {
+                    this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, false);
+                }
+            }
         }
-        else if (device.logging) {
-            this.deviceLogging = this.accessory.context.logging = device.logging;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+    }
+    async apiError(e) {
+        if (this.botDeviceType === 'garagedoor') {
+            if (this.GarageDoor) {
+                this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
+                this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
+                this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
+            }
         }
-        else if (this.platform.config.options?.logging) {
-            this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
+        else if (this.botDeviceType === 'door') {
+            if (this.Door) {
+                this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+                this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+                this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            }
         }
-        else {
-            this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+        else if (this.botDeviceType === 'window') {
+            if (this.Window) {
+                this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+                this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+                this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            }
         }
-    }
-    /**
-     * Logging for Device
-     */
-    infoLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.info(String(...log));
+        else if (this.botDeviceType === 'windowcovering') {
+            if (this.WindowCovering) {
+                this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+                this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+                this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            }
         }
-    }
-    warnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.warn(String(...log));
+        else if (this.botDeviceType === 'lock') {
+            if (this.LockMechanism) {
+                this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
+                this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
+            }
         }
-    }
-    debugWarnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.warn('[DEBUG]', String(...log));
+        else if (this.botDeviceType === 'faucet') {
+            if (this.Faucet) {
+                this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
             }
         }
-    }
-    errorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.error(String(...log));
+        else if (this.botDeviceType === 'fan') {
+            if (this.Fan) {
+                this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+            }
         }
-    }
-    debugErrorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.error('[DEBUG]', String(...log));
+        else if (this.botDeviceType === 'stateful') {
+            if (this.StatefulProgrammableSwitch) {
+                this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
+                this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
             }
         }
-    }
-    debugLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging === 'debug') {
-                this.platform.log.info('[DEBUG]', String(...log));
+        else if (this.botDeviceType === 'switch') {
+            if (this.Switch) {
+                this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, e);
             }
-            else {
-                this.platform.log.debug(String(...log));
+        }
+        else {
+            if (this.Outlet) {
+                this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, e);
             }
         }
-    }
-    enablingDeviceLogging() {
-        return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
+        this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
+        this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
     }
 }
 //# sourceMappingURL=bot.js.map