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

package/src/device/bot.ts

@@ -40,9 +40,9 @@ export class Bot {
   // BLE Others
   connected?: boolean;
   switchbot!: switchbot;
-  SwitchToOpenAPI?: boolean;
   serviceData!: serviceData;
   address!: ad['address'];
+  SwitchToOpenAPI?: boolean;
   mode!: serviceData['mode'];
   state!: serviceData['state'];
   battery!: serviceData['battery'];
@@ -53,7 +53,6 @@ export class Bot {
   scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
-  OpenAPI?: boolean;
 
   // Others
   doublePress!: number;
@@ -62,29 +61,20 @@ export class Bot {
   botUpdateInProgress!: boolean;
   doBotUpdate!: Subject<void>;
 
+  // Connection
+  private readonly BLE = (this.device.connectionType === 'BLE' || this.device.connectionType === 'Both');
+  private readonly OpenAPI = (this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'Both');
+
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: device & devicesConfig) {
     // 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 Subject();
@@ -122,7 +112,7 @@ export class Bot {
       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);
       this.removeLockService(accessory);
@@ -141,7 +131,7 @@ export class Bot {
       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') {
       this.removeFanService(accessory);
@@ -168,7 +158,7 @@ export 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') {
       this.removeFanService(accessory);
@@ -195,7 +185,7 @@ export 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') {
       this.removeFanService(accessory);
@@ -223,7 +213,7 @@ export 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') {
       this.removeFanService(accessory);
@@ -242,7 +232,7 @@ export class Bot {
       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);
       this.removeLockService(accessory);
@@ -260,7 +250,7 @@ export class Bot {
       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);
       this.removeDoorService(accessory);
@@ -278,7 +268,7 @@ export class Bot {
       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);
       this.removeLockService(accessory);
@@ -300,7 +290,7 @@ export 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);
       this.removeLockService(accessory);
@@ -318,15 +308,15 @@ export class Bot {
       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`;
@@ -347,30 +337,25 @@ export class Bot {
       });
 
     // 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(
         tap(() => {
           this.botUpdateInProgress = true;
         }),
-        debounceTime(100),
+        debounceTime(this.platform.config.options!.pushRate! * 1000),
       )
       .subscribe(async () => {
         try {
-          interval(100)
+          interval(15000)
             .pipe(take(this.doublePress!))
             .subscribe(async () => {
               await this.pushChanges();
             });
         } catch (e: any) {
-          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: ${superStringify(e.message)}`);
-          }
-          if (this.platform.debugMode) {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${superStringify(e)}`);
-          }
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
+              + ` Error Message: ${superStringify(e.message)}`);
         }
         this.botUpdateInProgress = false;
       });
@@ -380,15 +365,19 @@ export class Bot {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus(): Promise<void> {
-    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(): Promise<void> {
-    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;
@@ -415,37 +404,35 @@ export class Bot {
   }
 
   async openAPIparseStatus(): Promise<void> {
-    if (this.device.ble) {
-      this.SwitchToOpenAPI = false;
-    }
-    if (this.platform.config.credentials?.token) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI parseStatus`);
-      if (this.botMode === 'press') {
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+    if (this.botMode === 'press') {
+      this.On = false;
+      this.accessory.context.On = this.On;
+    } 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(): Promise<void> {
-    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(): Promise<void> {
-    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
@@ -455,157 +442,113 @@ export 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(() => {
+    if (switchbot !== false) {
+      switchbot
+        .startScan({
+          model: 'H',
+          id: this.device.bleMac,
+        })
+        .then(() => {
         // Set an event hander
-        switchbot.onadvertisement = (ad: 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: ${superStringify(ad.serviceData)}`);
-          this.debugLog(
-            `${this.device.deviceType}: ${this.accessory.displayName}, model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName},` +
+          switchbot.onadvertisement = (ad: 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: ${superStringify(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 () => {
+            );
+
+            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();
+          switchbot.stopScan();
+          if (this.connected) {
+            this.parseStatus();
+            this.updateHomeKitCharacteristics();
+          } else {
+            await this.BLEconnection(switchbot);
           }
-        }
-      })
-      .catch(async (e: any) => {
-        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: ${superStringify(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: any) {
-    if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-      (async () => {
-        // Start to monitor advertisement packets
-        await switchbot.startScan({
-          model: 'H',
+        })
+        .catch(async (e: any) => {
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}`
+              + ` Connection, Error Message: ${superStringify(e.message)}`);
+          await this.BLEconnection(switchbot);
         });
-        // Set an event handler
-        switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${superStringify(ad, null, '  ')}`);
-        };
-        await switchbot.wait(10000);
-        // Stop to monitor
-        switchbot.stopScan();
-      })();
+    } else {
+      await this.BLEconnection(switchbot);
     }
   }
 
   async openAPIRefreshStatus(): Promise<void> {
-    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.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: HostDomain,
-          port: 443,
-          path: `${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.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: ${superStringify(this.deviceStatus)}`);
-              this.power = this.deviceStatus.body.power;
-              this.parseStatus();
-              this.updateHomeKitCharacteristics();
-            } catch (e: any) {
-              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.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: HostDomain,
+        port: 443,
+        path: `${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.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: any) => {
-          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: ${superStringify(this.deviceStatus)}`);
+            this.power = this.deviceStatus.body.power;
+            this.parseStatus();
+            this.updateHomeKitCharacteristics();
+          } catch (e: any) {
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+          }
         });
-        req.end();
-      } catch (e: any) {
-        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: ${superStringify(e.message)}`,
-          );
-        }
-        if (this.platform.debugMode) {
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
-          + ` Error: ${superStringify(e)}`);
-        }
-        this.apiError(e);
-      }
-    } else {
-      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
+      });
+      req.on('error', (e: any) => {
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+      });
+      req.end();
+    } catch (e: any) {
+      this.apiError(e);
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
+            + ` Connection, Error Message: ${superStringify(e.message)}`);
     }
   }
 
@@ -617,10 +560,13 @@ export class Bot {
    * Bot   -    "command"     "press"     "default"	  =        trigger press
    */
   async pushChanges(): Promise<void> {
-    if (this.device.ble) {
-      await this.BLEpushChanges();
-    } else {
+    if (this.BLE) {
+      await this.BLERefreshStatus();
+    } 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.`);
     }
     interval(5000)
       .pipe(take(1))
@@ -630,9 +576,9 @@ export class Bot {
   }
 
   async BLEpushChanges(): Promise<void> {
-    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
@@ -662,22 +608,13 @@ export class Bot {
             }, 500);
           })
           .catch(async (e: any) => {
-            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: ${superStringify(e.message)}`,
-              );
-            }
-            if (this.platform.debugMode) {
-              this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-              + ` Error: ${superStringify(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: ${superStringify(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') {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
@@ -692,127 +629,145 @@ export class Bot {
             this.accessory.context.On = this.On;
           })
           .catch(async (e: any) => {
-            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: ${superStringify(e.message)}`,
-              );
-            }
-            if (this.platform.debugMode) {
-              this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-              + ` Error: ${superStringify(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: ${superStringify(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}`);
       }
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, `
+        +`OnCached: ${this.accessory.context.On}`);
     }
-    this.accessory.context.On = this.On;
   }
 
-  async turnOnOff(device_list: any): Promise<any> {
-    return await this.retry({
-      max: await this.maxRetry(),
-      fn: () => {
-        if (this.On) {
-          return device_list[0].turnOn({ id: this.device.bleMac });
+  async openAPIpushChanges(): Promise<void> {
+    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.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.`);
         }
-      },
-    });
+        const body = superStringify({
+          'command': `${command}`,
+          'parameter': 'default',
+          'commandType': 'command',
+        });
+        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        const options = {
+          hostname: HostDomain,
+          port: 443,
+          path: `${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.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.on('error', (e: any) => {
+          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: ${superStringify(req)}`);
+      } else {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `On: ${this.On}, `
+          +`OnCached: ${this.accessory.context.On}`);
+      }
+    } catch (e: any) {
+      this.apiError(e);
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+            + ` Connection, Error Message: ${superStringify(e.message)}`,
+      );
+    }
   }
 
-  async openAPIpushChanges(): Promise<void> {
-    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.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 = superStringify({
-            'command': `${command}`,
-            'parameter': 'default',
-            'commandType': 'command',
-          });
-          this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
-          const options = {
-            hostname: HostDomain,
-            port: 443,
-            path: `${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.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: any) => {
-            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: ${superStringify(req)}`);
-          this.accessory.context.On = this.On;
-        }
-      } catch (e: any) {
-        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: ${superStringify(e.message)}`,
-          );
-        }
-        if (this.platform.debugMode) {
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-          + ` Error: ${superStringify(e)}`);
-        }
-        this.apiError(e);
+  /**
+   * Handle requests to set the "On" characteristic
+   */
+  async OnSet(value: CharacteristicValue): Promise<void> {
+    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.deviceLogging.includes('debug')) {
-        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, device status will not be sent.`);
+    } 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();
   }
 
   /**
@@ -996,7 +951,7 @@ export 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}`);
       } else {
@@ -1014,137 +969,143 @@ export class Bot {
     }
   }
 
-  async apiError(e: any): Promise<void> {
-    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);
-    } 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.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
-      this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
-    } else if (this.device.bot?.deviceType === 'faucet') {
-      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.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.outletService?.updateCharacteristic(this.platform.Characteristic.On, e);
+  async removeOutletService(accessory: PlatformAccessory): Promise<void> {
+    // 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`);
     }
-    if (this.device.ble) {
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
+    accessory.removeService(this.outletService!);
+  }
+
+  async removeGarageDoorService(accessory: PlatformAccessory): Promise<void> {
+    // 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`);
     }
-    //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+    accessory.removeService(this.garageDoorService!);
   }
 
-  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
-    switch (res.statusCode) {
-      case 151:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
-        break;
-      case 152:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
-        break;
-      case 160:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
-        break;
-      case 161:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
-        break;
-      case 171:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. 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: ${superStringify(res)} format is invalid`,
-        );
-        break;
-      case 100:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
-        break;
-      default:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
+  async removeDoorService(accessory: PlatformAccessory): Promise<void> {
+    // 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 offlineOff(): Promise<void> {
-    if (this.device.offline) {
-      this.On = false;
-      if (this.device.bot?.deviceType === 'switch') {
-        this.switchService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
-      } else {
-        this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
-      }
+  async removeLockService(accessory: PlatformAccessory): Promise<void> {
+    // 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!);
   }
 
-  /**
-   * Handle requests to set the "On" characteristic
-   */
-  async handleOnSet(value: CharacteristicValue): Promise<void> {
-    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;
-      }
-    } 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 === '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;
-      }
-    } 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;
-      }
-    } 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;
-      }
+  async removeFaucetService(accessory: PlatformAccessory): Promise<void> {
+    // 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: PlatformAccessory): Promise<void> {
+    // 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: PlatformAccessory): Promise<void> {
+    // 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: PlatformAccessory): Promise<void> {
+    // 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: PlatformAccessory): Promise<void> {
+    // 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: PlatformAccessory): Promise<void> {
+    // 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!);
+  }
+
+  private DoublePress(device: device & devicesConfig) {
+    if (device.bot?.doublePress) {
+      this.doublePress = device.bot?.doublePress;
+      this.accessory.context.doublePress = this.doublePress;
     } else {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${value}`);
-      this.On = value;
+      this.doublePress = 1;
+    }
+  }
+
+  async getCustomBLEAddress(switchbot: any) {
+    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: any) => {
+          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${superStringify(ad, null, '  ')}`);
+        };
+        await switchbot.wait(10000);
+        // Stop to monitor
+        switchbot.stopScan();
+      })();
+    }
+  }
+
+  async BLEconnection(switchbot: any): Promise<void> {
+    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();
     }
-    this.doBotUpdate.next();
+  }
+
+  async turnOnOff(device_list: any): Promise<any> {
+    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 }: { max: number; fn: { (): any; (): Promise<any> } }): Promise<null> {
@@ -1169,80 +1130,125 @@ export class Bot {
     return maxRetry;
   }
 
-  async config(device: device & devicesConfig): Promise<void> {
-    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.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;
-    }
-    if (Object.entries(config).length !== 0) {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
-    }
-  }
-
-  async refreshRate(device: device & devicesConfig): Promise<void> {
-    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 PressOrSwitch(device: device & devicesConfig): Promise<void> {
+    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 openAPI() {
-    if (!this.device.openAPI) {
-      this.OpenAPI = true;
+  async allowPushChanges(device: device & devicesConfig): Promise<void> {
+    if (device.bot?.allowPush) {
+      this.allowPush = true;
     } else {
-      this.OpenAPI = this.device.openAPI;
+      this.allowPush = false;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
   }
 
   async scan(device: device & devicesConfig): Promise<void> {
     if (device.scanDuration) {
       this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-      if (device.ble) {
+      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.device.ble) {
+      if (this.BLE) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
       }
     }
   }
 
-  async logs(device: device & devicesConfig): Promise<void> {
-    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}`);
-    } 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}`);
-    } 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}`);
+  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
+    switch (res.statusCode) {
+      case 151:
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
+        break;
+      case 152:
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
+        break;
+      case 160:
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
+        break;
+      case 161:
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
+        this.offlineOff();
+        break;
+      case 171:
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. 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: ${superStringify(res)} format is invalid`,
+        );
+        break;
+      case 100:
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
+        break;
+      default:
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
+    }
+  }
+
+  async offlineOff(): Promise<void> {
+    if (this.device.offline) {
+      this.On = false;
+      if (this.device.bot?.deviceType === 'switch') {
+        this.switchService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+      } else {
+        this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+      }
+      await this.updateHomeKitCharacteristics();
+    }
+  }
+
+  async apiError(e: any): Promise<void> {
+    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);
+    } 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.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
+      this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
+    } else if (this.device.bot?.deviceType === 'faucet') {
+      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.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.deviceLogging = this.accessory.context.logging = 'standard';
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+      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);
     }
   }
 
@@ -1262,119 +1268,75 @@ export class Bot {
     return FirmwareRevision;
   }
 
-  async PressOrSwitch(device: device & devicesConfig): Promise<void> {
-    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}`);
+  private context() {
+    if (this.On === undefined) {
+      this.On = false;
+      this.accessory.context.On = this.On;
     } else {
-      throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+      this.On = this.accessory.context.On;
     }
-  }
-
-  async allowPushChanges(device: device & devicesConfig): Promise<void> {
-    if (device.bot?.allowPush) {
-      this.allowPush = true;
+    if (this.BatteryLevel === undefined) {
+      this.BatteryLevel = 100;
     } else {
-      this.allowPush = false;
+      this.BatteryLevel = this.accessory.context.BatteryLevel;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
-  }
-
-  async removeOutletService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    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;
     }
-    accessory.removeService(this.outletService!);
   }
 
-  async removeGarageDoorService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+  async refreshRate(device: device & devicesConfig): Promise<void> {
+    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}`);
     }
-    accessory.removeService(this.garageDoorService!);
   }
 
-  async removeDoorService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+  async config(device: device & devicesConfig): Promise<void> {
+    let config = {};
+    if (device.bot) {
+      config = device.bot;
     }
-    accessory.removeService(this.doorService!);
-  }
-
-  async removeLockService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    if (device.connectionType !== undefined) {
+      config['connectionType'] = device.connectionType;
     }
-    accessory.removeService(this.lockService!);
-  }
-
-  async removeFaucetService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    if (device.logging !== undefined) {
+      config['logging'] = device.logging;
     }
-    accessory.removeService(this.faucetService!);
-  }
-
-  async removeFanService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    if (device.refreshRate !== undefined) {
+      config['refreshRate'] = device.refreshRate;
     }
-    accessory.removeService(this.fanService!);
-  }
-
-  async removeWindowService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    if (device.scanDuration !== undefined) {
+      config['scanDuration'] = device.scanDuration;
     }
-    accessory.removeService(this.windowService!);
-  }
-
-  async removeWindowCoveringService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    if (device.offline !== undefined) {
+      config['offline'] = device.offline;
     }
-    accessory.removeService(this.windowCoveringService!);
-  }
-
-  async removeStatefulProgrammableSwitchService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+    if (Object.entries(config).length !== 0) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
-    accessory.removeService(this.statefulProgrammableSwitchService!);
   }
 
-  async removeSwitchService(accessory: PlatformAccessory): Promise<void> {
-    // 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`);
+  async logs(device: device & devicesConfig): Promise<void> {
+    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}`);
+    } 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}`);
+    } 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 {
+      this.deviceLogging = this.accessory.context.logging = 'standard';
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
     }
-    accessory.removeService(this.switchService!);
   }
 
   /**