@switchbot/homebridge-switchbot 1.6.4-beta.3 → 1.7.1-beta.0

package/src/devices/bots.ts

@@ -13,12 +13,17 @@ import { DeviceURL, device, devicesConfig, serviceData, ad, switchbot, deviceSta
  */
 export class Bot {
   // Services
-  private switchService?: Service;
+  private fanService?: Service;
   private doorService?: Service;
   private lockService?: Service;
-  private garageDoorService?: Service;
+  private faucetService?: Service;
+  private windowService?: Service;
+  private switchService?: Service;
   private outletService?: Service;
   private batteryService?: Service;
+  private garageDoorService?: Service;
+  private windowCoveringService?: Service;
+  private statefulProgrammableSwitchService?: Service;
 
 
   // Characteristic Values
@@ -98,10 +103,15 @@ export class Bot {
     // get the LightBulb service if it exists, otherwise create a new LightBulb service
     // you can create multiple services for each accessory
     if (device.bot?.deviceType === 'switch') {
+      this.removeFanService(accessory);
       this.removeLockService(accessory);
       this.removeDoorService(accessory);
+      this.removeFaucetService(accessory);
       this.removeOutletService(accessory);
+      this.removeWindowService(accessory);
       this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add switchService
       (this.switchService =
@@ -112,10 +122,15 @@ export class Bot {
       this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
     } else if (device.bot?.deviceType === 'garagedoor') {
+      this.removeFanService(accessory);
       this.removeLockService(accessory);
       this.removeDoorService(accessory);
+      this.removeFaucetService(accessory);
       this.removeOutletService(accessory);
       this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add switchService
       (this.garageDoorService =
@@ -127,10 +142,15 @@ export class Bot {
       this.garageDoorService.getCharacteristic(this.platform.Characteristic.TargetDoorState).onSet(this.handleOnSet.bind(this));
       this.garageDoorService.setCharacteristic(this.platform.Characteristic.ObstructionDetected, false);
     } else if (device.bot?.deviceType === 'door') {
+      this.removeFanService(accessory);
       this.removeLockService(accessory);
       this.removeOutletService(accessory);
+      this.removeFaucetService(accessory);
       this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
       this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add switchService
       (this.doorService =
@@ -147,11 +167,68 @@ export class Bot {
           minStep: 100,
         }).onSet(this.handleOnSet.bind(this));
       this.doorService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+    } else if (device.bot?.deviceType === 'window') {
+      this.removeFanService(accessory);
+      this.removeLockService(accessory);
+      this.removeDoorService(accessory);
+      this.removeOutletService(accessory);
+      this.removeFaucetService(accessory);
+      this.removeSwitchService(accessory);
+      this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
+
+      // Add switchService
+      (this.windowService =
+        accessory.getService(this.platform.Service.Window) ||
+        accessory.addService(this.platform.Service.Window)), `${accessory.displayName} Window`;
+      this.infoLog(`Bot: ${accessory.displayName} Displaying as Window`);
+
+      this.windowService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+      this.windowService.getCharacteristic(this.platform.Characteristic.TargetPosition)
+        .setProps({
+          validValues: [0, 100],
+          minValue: 0,
+          maxValue: 100,
+          minStep: 100,
+        }).onSet(this.handleOnSet.bind(this));
+      this.windowService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+    } else if (device.bot?.deviceType === 'windowcovering') {
+      this.removeFanService(accessory);
+      this.removeLockService(accessory);
+      this.removeDoorService(accessory);
+      this.removeOutletService(accessory);
+      this.removeFaucetService(accessory);
+      this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
+      this.removeGarageDoorService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
+
+      // Add switchService
+      (this.windowCoveringService =
+        accessory.getService(this.platform.Service.WindowCovering) ||
+        accessory.addService(this.platform.Service.WindowCovering)), `${accessory.displayName} Window Covering`;
+      this.infoLog(`Bot: ${accessory.displayName} Displaying as Window Covering`);
+
+      this.windowCoveringService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+      this.windowCoveringService.getCharacteristic(this.platform.Characteristic.TargetPosition)
+        .setProps({
+          validValues: [0, 100],
+          minValue: 0,
+          maxValue: 100,
+          minStep: 100,
+        }).onSet(this.handleOnSet.bind(this));
+      this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
     } else if (device.bot?.deviceType === 'lock') {
+      this.removeFanService(accessory);
       this.removeDoorService(accessory);
       this.removeOutletService(accessory);
       this.removeSwitchService(accessory);
+      this.removeFaucetService(accessory);
+      this.removeWindowService(accessory);
       this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add switchService
       (this.lockService =
@@ -161,11 +238,74 @@ export class Bot {
 
       this.lockService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.lockService.getCharacteristic(this.platform.Characteristic.LockTargetState).onSet(this.handleOnSet.bind(this));
+    } else if (device.bot?.deviceType === 'faucet') {
+      this.removeFanService(accessory);
+      this.removeLockService(accessory);
+      this.removeDoorService(accessory);
+      this.removeOutletService(accessory);
+      this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
+      this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
+
+      // Add switchService
+      (this.faucetService =
+        accessory.getService(this.platform.Service.Faucet) ||
+        accessory.addService(this.platform.Service.Faucet)), `${accessory.displayName} Faucet`;
+      this.infoLog(`Bot: ${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));
+    } else if (device.bot?.deviceType === 'fan') {
+      this.removeLockService(accessory);
+      this.removeDoorService(accessory);
+      this.removeFaucetService(accessory);
+      this.removeOutletService(accessory);
+      this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
+      this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
+
+      // Add switchService
+      (this.fanService =
+        accessory.getService(this.platform.Service.Fan) ||
+        accessory.addService(this.platform.Service.Fan)), `${accessory.displayName} Fan`;
+      this.infoLog(`Bot: ${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));
+    } else if (device.bot?.deviceType === 'stateful') {
+      this.removeFanService(accessory);
+      this.removeLockService(accessory);
+      this.removeDoorService(accessory);
+      this.removeFaucetService(accessory);
+      this.removeOutletService(accessory);
+      this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
+      this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+
+      // Add switchService
+      (this.statefulProgrammableSwitchService =
+        accessory.getService(this.platform.Service.StatefulProgrammableSwitch) ||
+        accessory.addService(this.platform.Service.StatefulProgrammableSwitch)), `${accessory.displayName} Stateful Programmable Switch`;
+      this.infoLog(`Bot: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
+
+      this.statefulProgrammableSwitchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+      this.statefulProgrammableSwitchService.getCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState)
+        .onSet(this.handleOnSet.bind(this));
     } else {
+      this.removeFanService(accessory);
       this.removeLockService(accessory);
       this.removeDoorService(accessory);
+      this.removeFaucetService(accessory);
       this.removeSwitchService(accessory);
+      this.removeWindowService(accessory);
       this.removeGarageDoorService(accessory);
+      this.removeWindowCoveringService(accessory);
+      this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add outletService
       (this.outletService =
@@ -226,48 +366,93 @@ export class Bot {
       });
   }
 
-  private removeOutletService(accessory: PlatformAccessory) {
+  public removeOutletService(accessory: PlatformAccessory) {
     // If outletService still pressent, then remove first
+    this.outletService = this.accessory.getService(this.platform.Service.Outlet);
     if (this.outletService) {
-      this.debugLog(`Bot: ${accessory.displayName} Removing Leftover outletService first`);
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Outlet Service`);
     }
-    this.outletService = this.accessory.getService(this.platform.Service.Outlet);
     accessory.removeService(this.outletService!);
   }
 
-  private removeGarageDoorService(accessory: PlatformAccessory) {
+  public removeGarageDoorService(accessory: PlatformAccessory) {
     // If garageDoorService still pressent, then remove first
+    this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
     if (this.garageDoorService) {
-      this.debugLog(`Bot: ${accessory.displayName} Removing Leftover garageDoorService first`);
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Garage Door Service`);
     }
-    this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
     accessory.removeService(this.garageDoorService!);
   }
 
-  private removeDoorService(accessory: PlatformAccessory) {
+  public removeDoorService(accessory: PlatformAccessory) {
     // If doorService still pressent, then remove first
+    this.doorService = this.accessory.getService(this.platform.Service.Door);
     if (this.doorService) {
-      this.debugLog(`Bot: ${accessory.displayName} Removing Leftover doorService first`);
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Door Service`);
     }
-    this.doorService = this.accessory.getService(this.platform.Service.Door);
     accessory.removeService(this.doorService!);
   }
 
-  private removeLockService(accessory: PlatformAccessory) {
+  public removeLockService(accessory: PlatformAccessory) {
     // If lockService still pressent, then remove first
+    this.lockService = this.accessory.getService(this.platform.Service.LockMechanism);
     if (this.lockService) {
-      this.debugLog(`Bot: ${accessory.displayName} Removing Leftover lockService first`);
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Lock Service`);
     }
-    this.lockService = this.accessory.getService(this.platform.Service.Door);
     accessory.removeService(this.lockService!);
   }
 
-  private removeSwitchService(accessory: PlatformAccessory) {
+  public removeFaucetService(accessory: PlatformAccessory) {
+    // If faucetService still pressent, then remove first
+    this.faucetService = this.accessory.getService(this.platform.Service.Faucet);
+    if (this.faucetService) {
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Faucet Service`);
+    }
+    accessory.removeService(this.faucetService!);
+  }
+
+  public removeFanService(accessory: PlatformAccessory) {
+    // If fanService still pressent, then remove first
+    this.fanService = this.accessory.getService(this.platform.Service.Fan);
+    if (this.fanService) {
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Fan Service`);
+    }
+    accessory.removeService(this.fanService!);
+  }
+
+  public removeWindowService(accessory: PlatformAccessory) {
+    // If windowService still pressent, then remove first
+    this.windowService = this.accessory.getService(this.platform.Service.Window);
+    if (this.windowService) {
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Window Service`);
+    }
+    accessory.removeService(this.windowService!);
+  }
+
+  public removeWindowCoveringService(accessory: PlatformAccessory) {
+    // If windowCoveringService still pressent, then remove first
+    this.windowCoveringService = this.accessory.getService(this.platform.Service.WindowCovering);
+    if (this.windowCoveringService) {
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Window Covering Service`);
+    }
+    accessory.removeService(this.windowCoveringService!);
+  }
+
+  public removeStatefulProgrammableSwitchService(accessory: PlatformAccessory) {
+    // If statefulProgrammableSwitchService still pressent, then remove first
+    this.statefulProgrammableSwitchService = this.accessory.getService(this.platform.Service.StatefulProgrammableSwitch);
+    if (this.statefulProgrammableSwitchService) {
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
+    }
+    accessory.removeService(this.statefulProgrammableSwitchService!);
+  }
+
+  public removeSwitchService(accessory: PlatformAccessory) {
     // If switchService still pressent, then remove first
+    this.switchService = this.accessory.getService(this.platform.Service.Switch);
     if (this.switchService) {
-      this.debugLog(`Bot: ${accessory.displayName} Removing Leftover switchService first`);
+      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Switch Service`);
     }
-    this.switchService = this.accessory.getService(this.platform.Service.Switch);
     accessory.removeService(this.switchService!);
   }
 
@@ -382,7 +567,7 @@ export class Bot {
         this.OnCached = this.On;
         this.accessory.context.On = this.OnCached;
       } else {
-        if (this.deviceStatus.body.power === 'on') {
+        /*if (this.deviceStatus.body.power === 'on') {
           this.On = true;
           this.OnCached = this.On;
           this.accessory.context.On = this.OnCached;
@@ -390,6 +575,11 @@ export class Bot {
           this.On = false;
           this.OnCached = this.On;
           this.accessory.context.On = this.OnCached;
+        }*/
+        this.OnCached = this.On;
+        this.accessory.context.On = this.OnCached;
+        if (this.On === undefined) {
+          this.On = false;
         }
       }
       this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
@@ -437,67 +627,62 @@ export class Bot {
     // Convert to BLE Address
     const switchbot = await this.connectBLE();
     // Start to monitor advertisement packets
-    if (switchbot !== false) {
-      switchbot.startScan({
-        model: 'H',
-        id: this.device.bleMac,
-      }).then(() => {
-        // Set an event hander
-        switchbot.onadvertisement = (ad: ad) => {
-          this.serviceData = ad.serviceData;
-          this.mode = ad.serviceData.mode;
-          this.state = ad.serviceData.state;
-          this.battery = ad.serviceData.battery;
-          this.debugLog(`Bot: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-          this.debugLog(`Bot: ${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(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
-          } else {
-            this.connected = false;
-            this.debugLog(`Bot: ${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();
+    if (switchbot === false) {
+      this.errorLog(`Bot: ${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: ad) => {
+        this.serviceData = ad.serviceData;
+        this.mode = ad.serviceData.mode;
+        this.state = ad.serviceData.state;
+        this.battery = ad.serviceData.battery;
+        this.debugLog(`Bot: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+        this.debugLog(`Bot: ${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(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
         } else {
-          await this.BLEconnection(switchbot);
-        }
-      }).catch(async (e: any) => {
-        this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-        if (this.deviceLogging === 'debug') {
-          this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-            + ` Error Message: ${JSON.stringify(e.message)}`);
-        }
-        if (this.platform.debugMode) {
-          this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-            + ` Error: ${JSON.stringify(e)}`);
+          this.connected = false;
+          this.debugLog(`Bot: ${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(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
         if (this.platform.config.credentials?.openToken) {
           this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
           await this.openAPIRefreshStatus();
         }
-        this.apiError(e);
-      });
-    } else {
-      await this.BLEconnection(switchbot);
-    }
-  }
-
-  public async BLEconnection(switchbot: any) {
-    this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
-    if (this.platform.config.credentials?.openToken) {
-      this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-      await this.openAPIRefreshStatus();
-    }
+      }
+    }).catch(async (e: any) => {
+      this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
+      if (this.deviceLogging === 'debug') {
+        this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+          + ` Error Message: ${JSON.stringify(e.message)}`);
+      }
+      if (this.platform.debugMode) {
+        this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+          + ` Error: ${JSON.stringify(e)}`);
+      }
+      if (this.platform.config.credentials?.openToken) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+        await this.openAPIRefreshStatus();
+      }
+      this.apiError(e);
+    });
   }
 
   private async openAPIRefreshStatus() {
@@ -545,54 +730,30 @@ export class Bot {
   }
 
   private async BLEpushChanges() {
+    this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
     if (this.On !== this.OnCached) {
       this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
       const switchbot = await this.connectBLE();
-      if (switchbot !== false) {
-        if (this.botMode === 'press') {
-          this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
-          switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac })
-            .then((device_list: { press: (arg0: { id: string | undefined; }) => any; }[]) => {
-              this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
-              return device_list[0].press({ id: this.device.bleMac });
-            }).then(() => {
-              this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
-              this.On = false;
-              this.OnCached = this.On;
-              this.accessory.context.On = this.OnCached;
-              setTimeout(() => {
-                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);
-                }
-                this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
-              }, 500);
-            }).catch(async (e: any) => {
-              this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-              if (this.deviceLogging === 'debug') {
-                this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                  + ` Error Message: ${JSON.stringify(e.message)}`);
-              }
-              if (this.platform.debugMode) {
-                this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                  + ` Error: ${JSON.stringify(e)}`);
-              }
-              if (this.platform.config.credentials?.openToken) {
-                this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-                await this.openAPIpushChanges();
-              }
-              this.apiError(e);
-            });
-        } else if (this.botMode === 'switch') {
-          this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
-          switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list: any) => {
+      //if (switchbot !== false) {
+      if (this.botMode === 'press') {
+        this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+        switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac })
+          .then((device_list: { press: (arg0: { id: string | undefined; }) => any; }[]) => {
             this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
-            return this.turnOnOff(device_list);
+            return device_list[0].press({ id: this.device.bleMac });
           }).then(() => {
             this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+            this.On = false;
             this.OnCached = this.On;
             this.accessory.context.On = this.OnCached;
+            setTimeout(() => {
+              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);
+              }
+              this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
+            }, 500);
           }).catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
             if (this.deviceLogging === 'debug') {
@@ -609,16 +770,41 @@ export class Bot {
             }
             this.apiError(e);
           });
-        } else {
-          throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
-        }
+      } else if (this.botMode === 'switch') {
+        this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
+        switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list: any) => {
+          this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+          return this.turnOnOff(device_list);
+        }).then(() => {
+          this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+          this.OnCached = this.On;
+          this.accessory.context.On = this.OnCached;
+        }).catch(async (e: any) => {
+          this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+          if (this.deviceLogging === 'debug') {
+            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+              + ` Error Message: ${JSON.stringify(e.message)}`);
+          }
+          if (this.platform.debugMode) {
+            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+              + ` Error: ${JSON.stringify(e)}`);
+          }
+          if (this.platform.config.credentials?.openToken) {
+            this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+            await this.openAPIpushChanges();
+          }
+          this.apiError(e);
+        });
       } else {
-        this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-        if (this.platform.config.credentials?.openToken) {
-          this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-          await this.openAPIpushChanges();
-        }
+        throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
       }
+      /* } else {
+         this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+         if (this.platform.config.credentials?.openToken) {
+           this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+           await this.openAPIpushChanges();
+         }
+       }*/
     }
     this.OnCached = this.On;
     this.accessory.context.On = this.OnCached;
@@ -725,25 +911,108 @@ export class Bot {
         }
       }
       this.debugLog(`Bot: ${this.accessory.displayName} Door On: ${this.On}`);
+    } else if (this.device.bot?.deviceType === 'window') {
+      if (this.On === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+      } else {
+        if (this.On) {
+          this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
+          this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
+          this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState,
+            this.platform.Characteristic.PositionState.STOPPED);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+        } else {
+          this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
+          this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
+          this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState,
+            this.platform.Characteristic.PositionState.STOPPED);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+        }
+      }
+      this.debugLog(`Bot: ${this.accessory.displayName} Window On: ${this.On}`);
+    } else if (this.device.bot?.deviceType === 'windowcovering') {
+      if (this.On === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+      } else {
+        if (this.On) {
+          this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
+          this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
+          this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState,
+            this.platform.Characteristic.PositionState.STOPPED);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+        } else {
+          this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
+          this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
+          this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState,
+            this.platform.Characteristic.PositionState.STOPPED);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+        }
+      }
+      this.debugLog(`Bot: ${this.accessory.displayName} Window Covering On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'lock') {
       if (this.On === undefined) {
         this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
-          this.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState,
+          this.lockService?.updateCharacteristic(this.platform.Characteristic.LockTargetState,
             this.platform.Characteristic.LockTargetState.UNSECURED);
-          this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState,
+          this.lockService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState,
             this.platform.Characteristic.LockCurrentState.UNSECURED);
           this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic LockTargetState: UNSECURED, LockCurrentState: UNSECURED`);
         } else {
-          this.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState,
+          this.lockService?.updateCharacteristic(this.platform.Characteristic.LockTargetState,
             this.platform.Characteristic.LockTargetState.SECURED);
-          this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState,
+          this.lockService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState,
             this.platform.Characteristic.LockCurrentState.SECURED);
           this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic LockTargetState: SECURED, LockCurrentState: SECURED`);
         }
       }
       this.debugLog(`Bot: ${this.accessory.displayName} Lock On: ${this.On}`);
+    } else if (this.device.bot?.deviceType === 'faucet') {
+      if (this.On === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+      } else {
+        if (this.On) {
+          this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active,
+            this.platform.Characteristic.Active.ACTIVE);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+        } else {
+          this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active,
+            this.platform.Characteristic.Active.INACTIVE);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+        }
+      }
+      this.debugLog(`Bot: ${this.accessory.displayName} Faucet On: ${this.On}`);
+    } else if (this.device.bot?.deviceType === 'fan') {
+      if (this.On === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+      } else {
+        if (this.On) {
+          this.fanService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+        } else {
+          this.fanService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+        }
+      }
+      this.debugLog(`Bot: ${this.accessory.displayName} Fan On: ${this.On}`);
+    } else if (this.device.bot?.deviceType === 'stateful') {
+      if (this.On === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+      } else {
+        if (this.On) {
+          this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent,
+            this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+          this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, 1);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1`);
+        } else {
+          this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent,
+            this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+          this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, 0);
+          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0`);
+        }
+      }
+      this.debugLog(`Bot: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'switch') {
       if (this.On === undefined) {
         this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
@@ -784,9 +1053,24 @@ export class Bot {
       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 {
@@ -852,9 +1136,11 @@ export class Bot {
       } else {
         this.On = true;
       }
-    } else if (this.device.bot?.deviceType === 'door') {
+    } else if (this.device.bot?.deviceType === 'door'
+      || this.device.bot?.deviceType === 'window'
+      || this.device.bot?.deviceType === 'windowcovering') {
       this.debugLog(`Bot: ${this.accessory.displayName} TargetPosition: ${value}`);
-      if (value === 100) {
+      if (value === 0) {
         this.On = false;
       } else {
         this.On = true;
@@ -866,6 +1152,20 @@ export class Bot {
       } else {
         this.On = true;
       }
+    } else if (this.device.bot?.deviceType === 'faucet') {
+      this.debugLog(`Bot: ${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(`Bot: ${this.accessory.displayName} ProgrammableSwitchOutputState: ${value}`);
+      if (value === 0) {
+        this.On = false;
+      } else {
+        this.On = true;
+      }
     } else {
       this.debugLog(`Bot: ${this.accessory.displayName} On: ${value}`);
       this.On = value;