@switchbot/homebridge-switchbot 2.0.0-beta.19 → 2.0.0-beta.20

package/dist/device/bot.js

@@ -20,30 +20,18 @@ class Bot {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        // Connection
+        this.BLE = (this.device.connectionType === 'BLE' || this.device.connectionType === 'Both');
+        this.OpenAPI = (this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'Both');
         // default placeholders
         this.logs(device);
-        this.openAPI();
         this.scan(device);
         this.refreshRate(device);
         this.PressOrSwitch(device);
         this.allowPushChanges(device);
         this.config(device);
-        if (this.On === undefined) {
-            this.On = false;
-            this.accessory.context.On = this.On;
-        }
-        else {
-            this.On = this.accessory.context.On;
-        }
-        if (device.bot?.doublePress) {
-            this.doublePress = device.bot?.doublePress;
-            this.accessory.context.doublePress = this.doublePress;
-        }
-        else {
-            this.doublePress = 1;
-        }
-        this.BatteryLevel = 100;
-        this.StatusLowBattery = 0;
+        this.context();
+        this.DoublePress(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doBotUpdate = new rxjs_1.Subject();
         this.botUpdateInProgress = false;
@@ -75,7 +63,7 @@ class Bot {
                 `${accessory.displayName} Switch`;
             this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Switch`);
             this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
+            this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (device.bot?.deviceType === 'garagedoor') {
             this.removeFanService(accessory);
@@ -93,7 +81,7 @@ class Bot {
                 `${accessory.displayName} Garage Door Opener`;
             this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Garage Door Opener`);
             this.garageDoorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.garageDoorService.getCharacteristic(this.platform.Characteristic.TargetDoorState).onSet(this.handleOnSet.bind(this));
+            this.garageDoorService.getCharacteristic(this.platform.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
             this.garageDoorService.setCharacteristic(this.platform.Characteristic.ObstructionDetected, false);
         }
         else if (device.bot?.deviceType === 'door') {
@@ -119,7 +107,7 @@ class Bot {
                 maxValue: 100,
                 minStep: 100,
             })
-                .onSet(this.handleOnSet.bind(this));
+                .onSet(this.OnSet.bind(this));
             this.doorService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
         else if (device.bot?.deviceType === 'window') {
@@ -145,7 +133,7 @@ class Bot {
                 maxValue: 100,
                 minStep: 100,
             })
-                .onSet(this.handleOnSet.bind(this));
+                .onSet(this.OnSet.bind(this));
             this.windowService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
         else if (device.bot?.deviceType === 'windowcovering') {
@@ -172,7 +160,7 @@ class Bot {
                 maxValue: 100,
                 minStep: 100,
             })
-                .onSet(this.handleOnSet.bind(this));
+                .onSet(this.OnSet.bind(this));
             this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
         else if (device.bot?.deviceType === 'lock') {
@@ -190,7 +178,7 @@ class Bot {
                 `${accessory.displayName} Lock`;
             this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Lock`);
             this.lockService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.lockService.getCharacteristic(this.platform.Characteristic.LockTargetState).onSet(this.handleOnSet.bind(this));
+            this.lockService.getCharacteristic(this.platform.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
         }
         else if (device.bot?.deviceType === 'faucet') {
             this.removeFanService(accessory);
@@ -207,7 +195,7 @@ class Bot {
                 `${accessory.displayName} Faucet`;
             this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Faucet`);
             this.faucetService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.faucetService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.handleOnSet.bind(this));
+            this.faucetService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.OnSet.bind(this));
         }
         else if (device.bot?.deviceType === 'fan') {
             this.removeLockService(accessory);
@@ -224,7 +212,7 @@ class Bot {
                 `${accessory.displayName} Fan`;
             this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Fan`);
             this.fanService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.fanService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
+            this.fanService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (device.bot?.deviceType === 'stateful') {
             this.removeFanService(accessory);
@@ -245,7 +233,7 @@ class Bot {
             this.statefulProgrammableSwitchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
             this.statefulProgrammableSwitchService
                 .getCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState)
-                .onSet(this.handleOnSet.bind(this));
+                .onSet(this.OnSet.bind(this));
         }
         else {
             this.removeFanService(accessory);
@@ -262,15 +250,15 @@ class Bot {
                 `${accessory.displayName} Outlet`;
             this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Outlet`);
             this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
+            this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         // Battery Service
-        if (!device.ble) {
+        if (!this.BLE) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Battery Service`);
             this.batteryService = this.accessory.getService(this.platform.Service.Battery);
             accessory.removeService(this.batteryService);
         }
-        else if (device.ble && !this.batteryService) {
+        else if (this.BLE && !this.batteryService) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Battery Service`);
             (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || this.accessory.addService(this.platform.Service.Battery)),
                 `${accessory.displayName} Battery`;
@@ -288,28 +276,23 @@ class Bot {
             await this.refreshStatus();
         });
         // Watch for Bot change events
-        // We put in a debounce of 100ms so we don't make duplicate calls
+        // We put in a debounce of 1000ms so we don't make duplicate calls
         this.doBotUpdate
             .pipe((0, operators_1.tap)(() => {
             this.botUpdateInProgress = true;
-        }), (0, operators_1.debounceTime)(100))
+        }), (0, operators_1.debounceTime)(this.platform.config.options.pushRate * 1000))
             .subscribe(async () => {
             try {
-                (0, rxjs_1.interval)(100)
+                (0, rxjs_1.interval)(15000)
                     .pipe((0, operators_1.take)(this.doublePress))
                     .subscribe(async () => {
                     await this.pushChanges();
                 });
             }
             catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                if (this.platform.debugMode) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${(0, super_stringify_1.default)(e)}`);
-                }
+                this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
+                    + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
             }
             this.botUpdateInProgress = false;
         });
@@ -318,15 +301,20 @@ class Bot {
      * Parse the device status from the SwitchBot api
      */
     async parseStatus() {
-        if (this.SwitchToOpenAPI || !this.device.ble) {
+        if (this.BLE && !this.SwitchToOpenAPI) {
+            await this.BLEparseStatus();
+        }
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
+            this.SwitchToOpenAPI = false;
             await this.openAPIparseStatus();
         }
         else {
-            await this.BLEparseStatus();
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, parseStatus will not happen.`);
         }
     }
     async BLEparseStatus() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // BLEmode (true if Switch Mode) | (false if Press Mode)
         if (this.mode) {
             this.accessory.context.On = this.On;
@@ -353,37 +341,36 @@ class Bot {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
     }
     async openAPIparseStatus() {
-        if (this.device.ble) {
-            this.SwitchToOpenAPI = false;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+        if (this.botMode === 'press') {
+            this.On = false;
+            this.accessory.context.On = this.On;
         }
-        if (this.platform.config.credentials?.token) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI parseStatus`);
-            if (this.botMode === 'press') {
+        else {
+            this.accessory.context.On = this.On;
+            if (this.On === undefined) {
                 this.On = false;
-                this.accessory.context.On = this.On;
-            }
-            else {
-                this.accessory.context.On = this.On;
-                if (this.On === undefined) {
-                    this.On = false;
-                }
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
         }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
     }
     /**
      * Asks the SwitchBot API for the latest device information
      */
     async refreshStatus() {
-        if (this.device.ble) {
+        if (this.BLE) {
             await this.BLERefreshStatus();
         }
-        else {
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIRefreshStatus();
         }
+        else {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, refreshStatus will not happen.`);
+        }
     }
     async BLERefreshStatus() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE refreshStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
         const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
         this.device.bleMac = this.device
@@ -393,153 +380,114 @@ class Bot {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         this.getCustomBLEAddress(switchbot);
         // Start to monitor advertisement packets
-        if (switchbot === false) {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
-        }
-        switchbot
-            .startScan({
-            model: 'H',
-            id: this.device.bleMac,
-        })
-            .then(() => {
-            // Set an event hander
-            switchbot.onadvertisement = (ad) => {
-                this.address = ad.address;
-                if (this.deviceLogging.includes('debug')) {
-                    this.infoLog(this.address);
-                    this.infoLog(this.device.bleMac);
-                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
-                }
-                this.serviceData = ad.serviceData;
-                this.mode = ad.serviceData.mode;
-                this.state = ad.serviceData.state;
-                this.battery = ad.serviceData.battery;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(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 (this.serviceData) {
-                    this.connected = true;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-                }
-                else {
-                    this.connected = false;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-                }
-            };
-            // Wait 2 seconds
-            return switchbot.wait(this.scanDuration * 1000);
-        })
-            .then(async () => {
-            // Stop to monitor
-            switchbot.stopScan();
-            if (this.connected) {
-                this.parseStatus();
-                this.updateHomeKitCharacteristics();
-            }
-            else {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    this.SwitchToOpenAPI = true;
-                    await this.openAPIRefreshStatus();
-                }
-            }
-        })
-            .catch(async (e) => {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-                    + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-            }
-            if (this.platform.config.credentials?.token) {
-                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-                this.SwitchToOpenAPI = true;
-                await this.openAPIRefreshStatus();
-            }
-            this.apiError(e);
-        });
-    }
-    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
+        if (switchbot !== false) {
+            switchbot
+                .startScan({
+                model: 'H',
+                id: this.device.bleMac,
+            })
+                .then(() => {
+                // Set an event hander
                 switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${(0, super_stringify_1.default)(ad, null, '  ')}`);
+                    this.address = ad.address;
+                    if (this.deviceLogging.includes('debug')) {
+                        this.infoLog(this.address);
+                        this.infoLog(this.device.bleMac);
+                        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
+                        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
+                    }
+                    this.serviceData = ad.serviceData;
+                    this.mode = ad.serviceData.mode;
+                    this.state = ad.serviceData.state;
+                    this.battery = ad.serviceData.battery;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(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 (this.serviceData) {
+                        this.connected = true;
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+                    }
+                    else {
+                        this.connected = false;
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+                    }
                 };
-                await switchbot.wait(10000);
+                // Wait 2 seconds
+                return switchbot.wait(this.scanDuration * 1000);
+            })
+                .then(async () => {
                 // Stop to monitor
                 switchbot.stopScan();
-            })();
+                if (this.connected) {
+                    this.parseStatus();
+                    this.updateHomeKitCharacteristics();
+                }
+                else {
+                    await this.BLEconnection(switchbot);
+                }
+            })
+                .catch(async (e) => {
+                this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}`
+                    + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                await this.BLEconnection(switchbot);
+            });
+        }
+        else {
+            await this.BLEconnection(switchbot);
         }
     }
     async openAPIRefreshStatus() {
-        if (this.platform.config.credentials?.token && this.OpenAPI) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI refreshStatus`);
-            try {
-                const t = Date.now();
-                const nonce = 'requestID';
-                const data = this.platform.config.credentials?.token + t + nonce;
-                const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
-                const sign = signTerm.toString('base64');
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
-                const options = {
-                    hostname: settings_1.HostDomain,
-                    port: 443,
-                    path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
-                    method: 'GET',
-                    headers: {
-                        Authorization: this.platform.config.credentials?.token,
-                        sign: sign,
-                        nonce: nonce,
-                        t: t,
-                        'Content-Type': 'application/json',
-                    },
-                };
-                const req = https_1.default.request(options, (res) => {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Refresh statusCode: ${res.statusCode}`);
-                    let rawData = '';
-                    res.on('data', (d) => {
-                        rawData += d;
-                        this.debugLog(`d: ${d}`);
-                    });
-                    res.on('end', () => {
-                        try {
-                            this.deviceStatus = JSON.parse(rawData);
-                            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
-                            this.power = this.deviceStatus.body.power;
-                            this.parseStatus();
-                            this.updateHomeKitCharacteristics();
-                        }
-                        catch (e) {
-                            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
-                        }
-                    });
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
+        try {
+            const t = Date.now();
+            const nonce = 'requestID';
+            const data = this.platform.config.credentials?.token + t + nonce;
+            const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+            const sign = signTerm.toString('base64');
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+            const options = {
+                hostname: settings_1.HostDomain,
+                port: 443,
+                path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
+                method: 'GET',
+                headers: {
+                    Authorization: this.platform.config.credentials?.token,
+                    sign: sign,
+                    nonce: nonce,
+                    t: t,
+                    'Content-Type': 'application/json',
+                },
+            };
+            const req = https_1.default.request(options, (res) => {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus statusCode: ${res.statusCode}`);
+                let rawData = '';
+                res.on('data', (d) => {
+                    rawData += d;
+                    this.debugLog(`d: ${d}`);
                 });
-                req.on('error', (e) => {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                res.on('end', () => {
+                    try {
+                        this.deviceStatus = JSON.parse(rawData);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
+                        this.power = this.deviceStatus.body.power;
+                        this.parseStatus();
+                        this.updateHomeKitCharacteristics();
+                    }
+                    catch (e) {
+                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                    }
                 });
-                req.end();
-            }
-            catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                if (this.platform.debugMode) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
-                        + ` Error: ${(0, super_stringify_1.default)(e)}`);
-                }
-                this.apiError(e);
-            }
+            });
+            req.on('error', (e) => {
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+            });
+            req.end();
         }
-        else {
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
+        catch (e) {
+            this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     /**
@@ -550,12 +498,16 @@ class Bot {
      * Bot   -    "command"     "press"     "default"	  =        trigger press
      */
     async pushChanges() {
-        if (this.device.ble) {
-            await this.BLEpushChanges();
+        if (this.BLE) {
+            await this.BLERefreshStatus();
         }
-        else {
+        else if (this.OpenAPI) {
             await this.openAPIpushChanges();
         }
+        else {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, pushChanges will not happen.`);
+        }
         (0, rxjs_1.interval)(5000)
             .pipe((0, operators_1.take)(1))
             .subscribe(async () => {
@@ -563,9 +515,9 @@ class Bot {
         });
     }
     async BLEpushChanges() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+        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} BLE pushChanges`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
             const switchbot = await this.platform.connectBLE();
             // Convert to BLE Address
             this.device.bleMac = this.device
@@ -596,20 +548,13 @@ class Bot {
                     }, 500);
                 })
                     .catch(async (e) => {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                    if (this.deviceLogging.includes('debug')) {
-                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                            + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                    }
-                    if (this.platform.debugMode) {
-                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                            + ` Error: ${(0, super_stringify_1.default)(e)}`);
-                    }
-                    if (this.platform.config.credentials?.token) {
+                    this.apiError(e);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+                        + ` Connection & botMode: ${this.botMode}, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                    if (this.platform.config.credentials?.token && this.device.connectionType !== 'Both') {
                         this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
                         await this.openAPIpushChanges();
                     }
-                    this.apiError(e);
                 });
             }
             else if (this.botMode === 'switch') {
@@ -625,128 +570,157 @@ class Bot {
                     this.accessory.context.On = this.On;
                 })
                     .catch(async (e) => {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                    if (this.deviceLogging.includes('debug')) {
-                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                            + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                    }
-                    if (this.platform.debugMode) {
-                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                            + ` Error: ${(0, super_stringify_1.default)(e)}`);
-                    }
-                    if (this.platform.config.credentials?.token) {
+                    this.apiError(e);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+                        + ` Connection & botMode: ${this.botMode}, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                    if (this.platform.config.credentials?.token && this.device.connectionType !== 'Both') {
                         this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
                         await this.openAPIpushChanges();
                     }
-                    this.apiError(e);
                 });
             }
             else {
-                throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
             }
         }
-        this.accessory.context.On = this.On;
+        else {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, `
+                + `OnCached: ${this.accessory.context.On}`);
+        }
     }
-    async turnOnOff(device_list) {
-        return await this.retry({
-            max: await this.maxRetry(),
-            fn: () => {
-                if (this.On) {
-                    return device_list[0].turnOn({ id: this.device.bleMac });
+    async openAPIpushChanges() {
+        try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
+            if (this.On !== this.accessory.context.On || this.allowPush) {
+                // Make Push On request to the API
+                const t = Date.now();
+                const nonce = 'requestID';
+                const data = this.platform.config.credentials?.token + t + nonce;
+                const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret)
+                    .update(Buffer.from(data, 'utf-8'))
+                    .digest();
+                const sign = signTerm.toString('base64');
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+                let command = '';
+                if (this.botMode === 'switch' && this.On) {
+                    command = 'turnOn';
+                    this.On = true;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
+                }
+                else if (this.botMode === 'switch' && !this.On) {
+                    command = 'turnOff';
+                    this.On = false;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
+                }
+                else if (this.botMode === 'press') {
+                    command = 'press';
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode`);
+                    this.On = false;
                 }
                 else {
-                    return device_list[0].turnOff({ id: this.device.bleMac });
+                    throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
                 }
-            },
-        });
-    }
-    async openAPIpushChanges() {
-        if (this.platform.config.credentials?.token && this.OpenAPI) {
-            try {
-                if (this.On !== this.accessory.context.On || this.allowPush) {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI pushChanges`);
-                    // Make Push On request to the API
-                    const t = Date.now();
-                    const nonce = 'requestID';
-                    const data = this.platform.config.credentials?.token + t + nonce;
-                    const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret)
-                        .update(Buffer.from(data, 'utf-8'))
-                        .digest();
-                    const sign = signTerm.toString('base64');
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
-                    let command = '';
-                    if (this.botMode === 'switch' && this.On) {
-                        command = 'turnOn';
-                        this.On = true;
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
-                    }
-                    else if (this.botMode === 'switch' && !this.On) {
-                        command = 'turnOff';
-                        this.On = false;
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
-                    }
-                    else if (this.botMode === 'press') {
-                        command = 'press';
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode`);
-                        this.On = false;
-                    }
-                    else {
-                        throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
-                    }
-                    const body = (0, super_stringify_1.default)({
-                        'command': `${command}`,
-                        'parameter': 'default',
-                        'commandType': 'command',
-                    });
-                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
-                    const options = {
-                        hostname: settings_1.HostDomain,
-                        port: 443,
-                        path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
-                        method: 'POST',
-                        headers: {
-                            'Authorization': this.platform.config.credentials?.token,
-                            'sign': sign,
-                            'nonce': nonce,
-                            't': t,
-                            'Content-Type': 'application/json',
-                            'Content-Length': body.length,
-                        },
-                    };
-                    const req = https_1.default.request(options, res => {
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-                        this.statusCode({ res });
-                        res.on('data', d => {
-                            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
-                        });
-                    });
-                    req.on('error', (e) => {
-                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                const body = (0, super_stringify_1.default)({
+                    'command': `${command}`,
+                    'parameter': 'default',
+                    'commandType': 'command',
+                });
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                const options = {
+                    hostname: settings_1.HostDomain,
+                    port: 443,
+                    path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
+                    method: 'POST',
+                    headers: {
+                        'Authorization': this.platform.config.credentials?.token,
+                        'sign': sign,
+                        'nonce': nonce,
+                        't': t,
+                        'Content-Type': 'application/json',
+                        'Content-Length': body.length,
+                    },
+                };
+                const req = https_1.default.request(options, res => {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges statusCode: ${res.statusCode}`);
+                    this.statusCode({ res });
+                    res.on('data', d => {
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
-                    req.write(body);
-                    req.end();
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
-                    this.accessory.context.On = this.On;
-                }
+                });
+                req.on('error', (e) => {
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                });
+                req.write(body);
+                req.end();
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
             }
-            catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                if (this.platform.debugMode) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-                        + ` Error: ${(0, super_stringify_1.default)(e)}`);
-                }
-                this.apiError(e);
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `On: ${this.On}, `
+                    + `OnCached: ${this.accessory.context.On}`);
             }
         }
-        else {
-            if (this.deviceLogging.includes('debug')) {
-                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, device status will not be sent.`);
+        catch (e) {
+            this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+        }
+    }
+    /**
+     * Handle requests to set the "On" characteristic
+     */
+    async OnSet(value) {
+        if (this.device.bot?.deviceType === 'garagedoor') {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetDoorState: ${value}`);
+            if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
+            }
+        }
+        else if (this.device.bot?.deviceType === 'door' ||
+            this.device.bot?.deviceType === 'window' ||
+            this.device.bot?.deviceType === 'windowcovering') {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+            if (value === 0) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
+            }
+        }
+        else if (this.device.bot?.deviceType === 'lock') {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
+            if (value === this.platform.Characteristic.LockTargetState.SECURED) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
+            }
+        }
+        else if (this.device.bot?.deviceType === 'faucet') {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Active: ${value}`);
+            if (value === this.platform.Characteristic.Active.INACTIVE) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
+            }
+        }
+        else if (this.device.bot?.deviceType === 'stateful') {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ProgrammableSwitchOutputState: ${value}`);
+            if (value === 0) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
             }
         }
+        else {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
+            this.On = value;
+        }
+        this.doBotUpdate.next();
     }
     /**
      * Updates the status for each of the HomeKit Characteristics
@@ -923,7 +897,7 @@ class Bot {
             }
         }
         this.accessory.context.On = this.On;
-        if (this.device.ble) {
+        if (this.BLE) {
             if (this.BatteryLevel === undefined) {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
             }
@@ -942,52 +916,194 @@ class Bot {
             }
         }
     }
-    async apiError(e) {
-        if (this.device.bot?.deviceType === 'garagedoor') {
-            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.ObstructionDetected, e);
-        }
-        else if (this.device.bot?.deviceType === 'door') {
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+    async removeOutletService(accessory) {
+        // If outletService still pressent, then remove first
+        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
+        if (this.outletService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
         }
-        else if (this.device.bot?.deviceType === 'window') {
-            this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-            this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-            this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+        accessory.removeService(this.outletService);
+    }
+    async removeGarageDoorService(accessory) {
+        // If garageDoorService still pressent, then remove first
+        this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
+        if (this.garageDoorService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
         }
-        else if (this.device.bot?.deviceType === 'windowcovering') {
-            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+        accessory.removeService(this.garageDoorService);
+    }
+    async removeDoorService(accessory) {
+        // If doorService still pressent, then remove first
+        this.doorService = this.accessory.getService(this.platform.Service.Door);
+        if (this.doorService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
         }
-        else if (this.device.bot?.deviceType === 'lock') {
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
+        accessory.removeService(this.doorService);
+    }
+    async removeLockService(accessory) {
+        // If lockService still pressent, then remove first
+        this.lockService = this.accessory.getService(this.platform.Service.LockMechanism);
+        if (this.lockService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
         }
-        else if (this.device.bot?.deviceType === 'faucet') {
-            this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, e);
+        accessory.removeService(this.lockService);
+    }
+    async removeFaucetService(accessory) {
+        // If faucetService still pressent, then remove first
+        this.faucetService = this.accessory.getService(this.platform.Service.Faucet);
+        if (this.faucetService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Faucet Service`);
         }
-        else if (this.device.bot?.deviceType === 'fan') {
-            this.fanService?.updateCharacteristic(this.platform.Characteristic.On, e);
+        accessory.removeService(this.faucetService);
+    }
+    async removeFanService(accessory) {
+        // If fanService still pressent, then remove first
+        this.fanService = this.accessory.getService(this.platform.Service.Fan);
+        if (this.fanService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
         }
-        else if (this.device.bot?.deviceType === 'stateful') {
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent, e);
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, e);
+        accessory.removeService(this.fanService);
+    }
+    async removeWindowService(accessory) {
+        // If windowService still pressent, then remove first
+        this.windowService = this.accessory.getService(this.platform.Service.Window);
+        if (this.windowService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
         }
-        else if (this.device.bot?.deviceType === 'switch') {
-            this.switchService?.updateCharacteristic(this.platform.Characteristic.On, e);
+        accessory.removeService(this.windowService);
+    }
+    async removeWindowCoveringService(accessory) {
+        // If windowCoveringService still pressent, then remove first
+        this.windowCoveringService = this.accessory.getService(this.platform.Service.WindowCovering);
+        if (this.windowCoveringService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
+        }
+        accessory.removeService(this.windowCoveringService);
+    }
+    async removeStatefulProgrammableSwitchService(accessory) {
+        // If statefulProgrammableSwitchService still pressent, then remove first
+        this.statefulProgrammableSwitchService = this.accessory.getService(this.platform.Service.StatefulProgrammableSwitch);
+        if (this.statefulProgrammableSwitchService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
+        }
+        accessory.removeService(this.statefulProgrammableSwitchService);
+    }
+    async removeSwitchService(accessory) {
+        // If switchService still pressent, then remove first
+        this.switchService = this.accessory.getService(this.platform.Service.Switch);
+        if (this.switchService) {
+            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover 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.outletService?.updateCharacteristic(this.platform.Characteristic.On, e);
+            this.doublePress = 1;
         }
-        if (this.device.ble) {
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
+    }
+    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: ${(0, super_stringify_1.default)(ad, null, '  ')}`);
+                };
+                await switchbot.wait(10000);
+                // Stop to monitor
+                switchbot.stopScan();
+            })();
+        }
+    }
+    async BLEconnection(switchbot) {
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+        if (this.platform.config.credentials?.token && this.device.connectionType !== 'Both') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
+            this.SwitchToOpenAPI = true;
+            await this.openAPIRefreshStatus();
+        }
+    }
+    async turnOnOff(device_list) {
+        return await this.retry({
+            max: await this.maxRetry(),
+            fn: () => {
+                if (this.On) {
+                    return device_list[0].turnOn({ id: this.device.bleMac });
+                }
+                else {
+                    return device_list[0].turnOff({ id: this.device.bleMac });
+                }
+            },
+        });
+    }
+    async retry({ max, fn }) {
+        return fn().catch(async (err) => {
+            if (max === 0) {
+                throw err;
+            }
+            this.infoLog(err);
+            this.infoLog('Retrying');
+            await this.switchbot.wait(1000);
+            return this.retry({ max: max - 1, fn });
+        });
+    }
+    async maxRetry() {
+        let maxRetry;
+        if (this.device.bot?.maxRetry) {
+            maxRetry = this.device.bot?.maxRetry;
+        }
+        else {
+            maxRetry = 5;
+        }
+        return maxRetry;
+    }
+    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 (device.bot?.mode === 'switch') {
+            this.botMode = 'switch';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+        }
+        else if (device.bot?.mode === 'press') {
+            this.botMode = 'press';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+        }
+        else {
+            throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+        }
+    }
+    async allowPushChanges(device) {
+        if (device.bot?.allowPush) {
+            this.allowPush = true;
+        }
+        else {
+            this.allowPush = 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 {
+            this.scanDuration = this.accessory.context.scanDuration = 1;
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+            }
         }
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
     async statusCode({ res }) {
         switch (res.statusCode) {
@@ -1028,96 +1144,111 @@ class Bot {
             else {
                 this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
             }
+            await this.updateHomeKitCharacteristics();
         }
     }
-    /**
-     * Handle requests to set the "On" characteristic
-     */
-    async handleOnSet(value) {
+    async apiError(e) {
         if (this.device.bot?.deviceType === 'garagedoor') {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetDoorState: ${value}`);
-            if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
-            }
+            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, e);
+            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, e);
+            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.ObstructionDetected, e);
         }
-        else if (this.device.bot?.deviceType === 'door' ||
-            this.device.bot?.deviceType === 'window' ||
-            this.device.bot?.deviceType === 'windowcovering') {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${value}`);
-            if (value === 0) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
-            }
+        else if (this.device.bot?.deviceType === 'door') {
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+        }
+        else if (this.device.bot?.deviceType === 'window') {
+            this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
+            this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
+            this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+        }
+        else if (this.device.bot?.deviceType === 'windowcovering') {
+            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
+            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
+            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
         }
         else if (this.device.bot?.deviceType === 'lock') {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockTargetState: ${value}`);
-            if (value === this.platform.Characteristic.LockTargetState.SECURED) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
-            }
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
         }
         else if (this.device.bot?.deviceType === 'faucet') {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${value}`);
-            if (value === this.platform.Characteristic.Active.INACTIVE) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
-            }
+            this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, e);
+        }
+        else if (this.device.bot?.deviceType === 'fan') {
+            this.fanService?.updateCharacteristic(this.platform.Characteristic.On, e);
         }
         else if (this.device.bot?.deviceType === 'stateful') {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ProgrammableSwitchOutputState: ${value}`);
-            if (value === 0) {
-                this.On = false;
-            }
-            else {
-                this.On = true;
-            }
+            this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent, e);
+            this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, e);
+        }
+        else if (this.device.bot?.deviceType === 'switch') {
+            this.switchService?.updateCharacteristic(this.platform.Characteristic.On, e);
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${value}`);
-            this.On = value;
+            this.outletService?.updateCharacteristic(this.platform.Characteristic.On, e);
+        }
+        if (this.BLE) {
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
         }
-        this.doBotUpdate.next();
     }
-    async retry({ max, fn }) {
-        return fn().catch(async (err) => {
-            if (max === 0) {
-                throw err;
-            }
-            this.infoLog(err);
-            this.infoLog('Retrying');
-            await this.switchbot.wait(1000);
-            return this.retry({ max: max - 1, fn });
-        });
+    FirmwareRevision(accessory, device) {
+        let FirmwareRevision;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
+        if (accessory.context.FirmwareRevision) {
+            FirmwareRevision = accessory.context.FirmwareRevision;
+        }
+        else if (device.firmware) {
+            FirmwareRevision = device.firmware;
+        }
+        else {
+            FirmwareRevision = this.platform.version;
+        }
+        return FirmwareRevision;
     }
-    async maxRetry() {
-        let maxRetry;
-        if (this.device.bot?.maxRetry) {
-            maxRetry = this.device.bot?.maxRetry;
+    context() {
+        if (this.On === undefined) {
+            this.On = false;
+            this.accessory.context.On = this.On;
         }
         else {
-            maxRetry = 5;
+            this.On = this.accessory.context.On;
+        }
+        if (this.BatteryLevel === undefined) {
+            this.BatteryLevel = 100;
+        }
+        else {
+            this.BatteryLevel = this.accessory.context.BatteryLevel;
+        }
+        if (this.StatusLowBattery === undefined) {
+            this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            this.accessory.context.StatusLowBattery = this.StatusLowBattery;
+        }
+        else {
+            this.StatusLowBattery = this.accessory.context.StatusLowBattery;
+        }
+    }
+    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}`);
+        }
+        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}`);
         }
-        return maxRetry;
     }
     async config(device) {
         let config = {};
         if (device.bot) {
             config = device.bot;
         }
-        if (device.ble) {
-            config['ble'] = device.ble;
-        }
-        if (device.openAPI !== undefined) {
-            config['openAPI'] = device.openAPI;
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
         }
         if (device.logging !== undefined) {
             config['logging'] = device.logging;
@@ -1135,39 +1266,6 @@ class Bot {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
         }
     }
-    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}`);
-        }
-        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}`);
-        }
-    }
-    async openAPI() {
-        if (!this.device.openAPI) {
-            this.OpenAPI = true;
-        }
-        else {
-            this.OpenAPI = this.device.openAPI;
-        }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
-    }
-    async scan(device) {
-        if (device.scanDuration) {
-            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-            if (device.ble) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
-        }
-        else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.device.ble) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
-        }
-    }
     async logs(device) {
         if (this.platform.debugMode) {
             this.deviceLogging = this.accessory.context.logging = 'debugMode';
@@ -1186,130 +1284,6 @@ class Bot {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
-    FirmwareRevision(accessory, device) {
-        let FirmwareRevision;
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-            + ` accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-        if (accessory.context.FirmwareRevision) {
-            FirmwareRevision = accessory.context.FirmwareRevision;
-        }
-        else if (device.firmware) {
-            FirmwareRevision = device.firmware;
-        }
-        else {
-            FirmwareRevision = this.platform.version;
-        }
-        return FirmwareRevision;
-    }
-    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 (device.bot?.mode === 'switch') {
-            this.botMode = 'switch';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
-        }
-        else if (device.bot?.mode === 'press') {
-            this.botMode = 'press';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
-        }
-        else {
-            throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
-        }
-    }
-    async allowPushChanges(device) {
-        if (device.bot?.allowPush) {
-            this.allowPush = true;
-        }
-        else {
-            this.allowPush = false;
-        }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
-    }
-    async removeOutletService(accessory) {
-        // If outletService still pressent, then remove first
-        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
-        if (this.outletService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
-        }
-        accessory.removeService(this.outletService);
-    }
-    async removeGarageDoorService(accessory) {
-        // If garageDoorService still pressent, then remove first
-        this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
-        if (this.garageDoorService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
-        }
-        accessory.removeService(this.garageDoorService);
-    }
-    async removeDoorService(accessory) {
-        // If doorService still pressent, then remove first
-        this.doorService = this.accessory.getService(this.platform.Service.Door);
-        if (this.doorService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
-        }
-        accessory.removeService(this.doorService);
-    }
-    async removeLockService(accessory) {
-        // If lockService still pressent, then remove first
-        this.lockService = this.accessory.getService(this.platform.Service.LockMechanism);
-        if (this.lockService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
-        }
-        accessory.removeService(this.lockService);
-    }
-    async removeFaucetService(accessory) {
-        // If faucetService still pressent, then remove first
-        this.faucetService = this.accessory.getService(this.platform.Service.Faucet);
-        if (this.faucetService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Faucet Service`);
-        }
-        accessory.removeService(this.faucetService);
-    }
-    async removeFanService(accessory) {
-        // If fanService still pressent, then remove first
-        this.fanService = this.accessory.getService(this.platform.Service.Fan);
-        if (this.fanService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
-        }
-        accessory.removeService(this.fanService);
-    }
-    async removeWindowService(accessory) {
-        // If windowService still pressent, then remove first
-        this.windowService = this.accessory.getService(this.platform.Service.Window);
-        if (this.windowService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
-        }
-        accessory.removeService(this.windowService);
-    }
-    async removeWindowCoveringService(accessory) {
-        // If windowCoveringService still pressent, then remove first
-        this.windowCoveringService = this.accessory.getService(this.platform.Service.WindowCovering);
-        if (this.windowCoveringService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
-        }
-        accessory.removeService(this.windowCoveringService);
-    }
-    async removeStatefulProgrammableSwitchService(accessory) {
-        // If statefulProgrammableSwitchService still pressent, then remove first
-        this.statefulProgrammableSwitchService = this.accessory.getService(this.platform.Service.StatefulProgrammableSwitch);
-        if (this.statefulProgrammableSwitchService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
-        }
-        accessory.removeService(this.statefulProgrammableSwitchService);
-    }
-    async removeSwitchService(accessory) {
-        // If switchService still pressent, then remove first
-        this.switchService = this.accessory.getService(this.platform.Service.Switch);
-        if (this.switchService) {
-            this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Switch Service`);
-        }
-        accessory.removeService(this.switchService);
-    }
     /**
      * Logging for Device
      */