@switchbot/homebridge-switchbot 1.6.4-beta.5 → 1.7.1-beta.10

package/dist/devices/bots.js

@@ -19,6 +19,7 @@ class Bot {
         this.scan();
         this.refreshRate();
         this.PressOrSwitch();
+        this.config(device);
         if (this.On === undefined) {
             this.On = false;
             this.accessory.context.On = this.On;
@@ -35,9 +36,6 @@ class Bot {
         }
         this.BatteryLevel = 100;
         this.StatusLowBattery = 0;
-        // Bot Config
-        this.debugLog(`Bot: ${this.accessory.displayName} Config: (ble: ${device.ble}, offline: ${device.offline}, mode: ${device.bot?.mode},`
-            + ` deviceType: ${device.bot?.deviceType}, doublePress: ${this.doublePress})`);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doBotUpdate = new rxjs_1.Subject();
         this.botUpdateInProgress = false;
@@ -52,10 +50,15 @@ 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 =
                 accessory.getService(this.platform.Service.Switch) ||
@@ -65,10 +68,15 @@ class Bot {
             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 =
                 accessory.getService(this.platform.Service.GarageDoorOpener) ||
@@ -79,10 +87,15 @@ class Bot {
             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 =
                 accessory.getService(this.platform.Service.Door) ||
@@ -98,11 +111,66 @@ class Bot {
             }).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 =
                 accessory.getService(this.platform.Service.LockMechanism) ||
@@ -111,11 +179,71 @@ 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 =
                 accessory.getService(this.platform.Service.Outlet) ||
@@ -124,12 +252,22 @@ class Bot {
             this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
             this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
         }
-        if (device.ble) {
+        // Battery Service
+        if (!device.ble) {
+            this.debugLog(`Bot: ${accessory.displayName} Removing Battery Service`);
+            this.batteryService = this.accessory.getService(this.platform.Service.Battery);
+            accessory.removeService(this.batteryService);
+        }
+        else if (device.ble && !this.batteryService) {
+            this.debugLog(`Bot: ${accessory.displayName} Add Battery Service`);
             (this.batteryService =
-                accessory.getService(this.platform.Service.Battery) ||
-                    accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
+                this.accessory.getService(this.platform.Service.Battery) ||
+                    this.accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
             this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
         }
+        else {
+            this.debugLog(`Bot: ${accessory.displayName} Battery Service Not Added`);
+        }
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -166,6 +304,11 @@ class Bot {
             this.botUpdateInProgress = false;
         });
     }
+    config(device) {
+        if (device.bot !== undefined || device.ble !== undefined) {
+            this.warnLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(device.bot)}, BLE: ${device.ble}`);
+        }
+    }
     removeOutletService(accessory) {
         // If outletService still pressent, then remove first
         this.outletService = this.accessory.getService(this.platform.Service.Outlet);
@@ -198,6 +341,46 @@ class Bot {
         }
         accessory.removeService(this.lockService);
     }
+    removeFaucetService(accessory) {
+        // 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);
+    }
+    removeFanService(accessory) {
+        // 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);
+    }
+    removeWindowService(accessory) {
+        // 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);
+    }
+    removeWindowCoveringService(accessory) {
+        // 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);
+    }
+    removeStatefulProgrammableSwitchService(accessory) {
+        // 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);
+    }
     removeSwitchService(accessory) {
         // If switchService still pressent, then remove first
         this.switchService = this.accessory.getService(this.platform.Service.Switch);
@@ -209,13 +392,13 @@ class Bot {
     refreshRate() {
         if (this.device.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
                 this.warnLog(`Bot: ${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;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.deviceLogging === 'debug') {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
             }
         }
@@ -223,13 +406,13 @@ class Bot {
     scan() {
         if (this.device.scanDuration) {
             this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.device.ble && (this.deviceLogging === 'debug' || this.deviceLogging === 'standard')) {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
             }
         }
         else {
             this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.device.ble && this.deviceLogging === 'debug') {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
             }
         }
@@ -277,11 +460,11 @@ class Bot {
      * Parse the device status from the SwitchBot api
      */
     async parseStatus() {
-        if (this.device.ble) {
-            await this.BLEparseStatus();
+        if (this.SwitchToOpenAPI || !this.device.ble) {
+            await this.openAPIparseStatus();
         }
         else {
-            await this.openAPIparseStatus();
+            await this.BLEparseStatus();
         }
     }
     async BLEparseStatus() {
@@ -314,6 +497,9 @@ class Bot {
         this.debugLog(`Bot: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
     }
     async openAPIparseStatus() {
+        if (this.device.ble) {
+            this.SwitchToOpenAPI = false;
+        }
         if (this.platform.config.credentials?.openToken) {
             this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
             if (this.botMode === 'press') {
@@ -322,15 +508,19 @@ class Bot {
                 this.accessory.context.On = this.OnCached;
             }
             else {
-                if (this.deviceStatus.body.power === 'on') {
-                    this.On = true;
-                    this.OnCached = this.On;
-                    this.accessory.context.On = this.OnCached;
-                }
-                else {
+                /*if (this.power === 'on') {
+                  this.On = true;
+                  this.OnCached = this.On;
+                  this.accessory.context.On = this.OnCached;
+                } else {
+                  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.OnCached = this.On;
-                    this.accessory.context.On = this.OnCached;
                 }
             }
             this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
@@ -347,34 +537,12 @@ class Bot {
             await this.openAPIRefreshStatus();
         }
     }
-    async connectBLE() {
-        let switchbot;
-        try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const Switchbot = require('node-switchbot');
-            switchbot = new Switchbot();
-            // Convert to BLE Address
-            this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
-            this.debugLog(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        }
-        catch (e) {
-            switchbot = false;
-            this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot}`);
-            if (this.deviceLogging === 'debug') {
-                this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-                    + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
-            if (this.platform.debugMode) {
-                this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-                    + ` Error: ${JSON.stringify(e)}`);
-            }
-        }
-        return switchbot;
-    }
     async BLERefreshStatus() {
         this.debugLog(`Bot: ${this.accessory.displayName} BLE refreshStatus`);
+        const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
-        const switchbot = await this.connectBLE();
+        this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
+        this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         // Start to monitor advertisement packets
         if (switchbot === false) {
             this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
@@ -414,6 +582,7 @@ class Bot {
                 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`);
+                    this.SwitchToOpenAPI = true;
                     await this.openAPIRefreshStatus();
                 }
             }
@@ -429,6 +598,7 @@ class Bot {
             }
             if (this.platform.config.credentials?.openToken) {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                this.SwitchToOpenAPI = true;
                 await this.openAPIRefreshStatus();
             }
             this.apiError(e);
@@ -440,6 +610,7 @@ class Bot {
             try {
                 this.deviceStatus = (await this.platform.axios.get(`${settings_1.DeviceURL}/${this.device.deviceId}/status`)).data;
                 this.debugLog(`Bot: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+                this.power = this.deviceStatus.body.power;
                 this.parseStatus();
                 this.updateHomeKitCharacteristics();
             }
@@ -482,7 +653,10 @@ class Bot {
         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();
+            const switchbot = await this.platform.connectBLE();
+            // Convert to BLE Address
+            this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
+            this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
             //if (switchbot !== false) {
             if (this.botMode === 'press') {
                 this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
@@ -662,6 +836,46 @@ 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}`);
@@ -680,6 +894,56 @@ class Bot {
             }
             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}`);
@@ -726,10 +990,30 @@ class Bot {
             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);
         }
@@ -796,7 +1080,9 @@ class Bot {
                 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 === 0) {
                 this.On = false;
@@ -814,6 +1100,24 @@ class Bot {
                 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;