@switchbot/homebridge-switchbot 1.8.3-beta.0 → 1.9.0

package/dist/devices/bots.js

@@ -1,28 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bot = void 0;
-const rxjs = __importStar(require("rxjs"));
-const operators = __importStar(require("rxjs/operators"));
-const settings = __importStar(require("../settings"));
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const settings_1 = require("../settings");
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
@@ -38,6 +19,7 @@ class Bot {
         this.scan(device);
         this.refreshRate(device);
         this.PressOrSwitch(device);
+        this.allowPushChanges(device);
         this.config(device);
         if (this.On === undefined) {
             this.On = false;
@@ -56,19 +38,19 @@ class Bot {
         this.BatteryLevel = 100;
         this.StatusLowBattery = 0;
         // this is subject we use to track when we need to POST changes to the SwitchBot API
-        this.doBotUpdate = new rxjs.Subject();
+        this.doBotUpdate = new rxjs_1.Subject();
         this.botUpdateInProgress = false;
         // Retrieve initial values and updateHomekit
         this.refreshStatus();
         // set accessory information
         accessory
             .getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.Manufacturer, "SwitchBot")
-            .setCharacteristic(this.platform.Characteristic.Model, "SWITCHBOT-BOT-S1")
+            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
+            .setCharacteristic(this.platform.Characteristic.Model, 'SWITCHBOT-BOT-S1')
             .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId);
         // 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") {
+        if (device.bot?.deviceType === 'switch') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -81,15 +63,12 @@ class Bot {
             // Add switchService
             (this.switchService =
                 accessory.getService(this.platform.Service.Switch) ||
-                    accessory.addService(this.platform.Service.Switch)),
-                `${accessory.displayName} Switch`;
+                    accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Switch`;
             this.infoLog(`Bot: ${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.handleOnSet.bind(this));
         }
-        else if (device.bot?.deviceType === "garagedoor") {
+        else if (device.bot?.deviceType === 'garagedoor') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -102,16 +81,13 @@ class Bot {
             // Add switchService
             (this.garageDoorService =
                 accessory.getService(this.platform.Service.GarageDoorOpener) ||
-                    accessory.addService(this.platform.Service.GarageDoorOpener)),
-                `${accessory.displayName} Garage Door Opener`;
+                    accessory.addService(this.platform.Service.GarageDoorOpener)), `${accessory.displayName} Garage Door Opener`;
             this.infoLog(`Bot: ${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.handleOnSet.bind(this));
             this.garageDoorService.setCharacteristic(this.platform.Characteristic.ObstructionDetected, false);
         }
-        else if (device.bot?.deviceType === "door") {
+        else if (device.bot?.deviceType === 'door') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeOutletService(accessory);
@@ -124,22 +100,19 @@ class Bot {
             // Add switchService
             (this.doorService =
                 accessory.getService(this.platform.Service.Door) ||
-                    accessory.addService(this.platform.Service.Door)),
-                `${accessory.displayName} Door`;
+                    accessory.addService(this.platform.Service.Door)), `${accessory.displayName} Door`;
             this.infoLog(`Bot: ${accessory.displayName} Displaying as Door`);
             this.doorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            this.doorService
-                .getCharacteristic(this.platform.Characteristic.TargetPosition)
+            this.doorService.getCharacteristic(this.platform.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
-            })
-                .onSet(this.handleOnSet.bind(this));
+            }).onSet(this.handleOnSet.bind(this));
             this.doorService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
-        else if (device.bot?.deviceType === "window") {
+        else if (device.bot?.deviceType === 'window') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -152,22 +125,19 @@ class Bot {
             // Add switchService
             (this.windowService =
                 accessory.getService(this.platform.Service.Window) ||
-                    accessory.addService(this.platform.Service.Window)),
-                `${accessory.displayName} 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)
+            this.windowService.getCharacteristic(this.platform.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
-            })
-                .onSet(this.handleOnSet.bind(this));
+            }).onSet(this.handleOnSet.bind(this));
             this.windowService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
-        else if (device.bot?.deviceType === "windowcovering") {
+        else if (device.bot?.deviceType === 'windowcovering') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -180,22 +150,19 @@ class Bot {
             // Add switchService
             (this.windowCoveringService =
                 accessory.getService(this.platform.Service.WindowCovering) ||
-                    accessory.addService(this.platform.Service.WindowCovering)),
-                `${accessory.displayName} Window Covering`;
+                    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)
+            this.windowCoveringService.getCharacteristic(this.platform.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
-            })
-                .onSet(this.handleOnSet.bind(this));
+            }).onSet(this.handleOnSet.bind(this));
             this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
-        else if (device.bot?.deviceType === "lock") {
+        else if (device.bot?.deviceType === 'lock') {
             this.removeFanService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
@@ -208,15 +175,12 @@ class Bot {
             // Add switchService
             (this.lockService =
                 accessory.getService(this.platform.Service.LockMechanism) ||
-                    accessory.addService(this.platform.Service.LockMechanism)),
-                `${accessory.displayName} Lock`;
+                    accessory.addService(this.platform.Service.LockMechanism)), `${accessory.displayName} Lock`;
             this.infoLog(`Bot: ${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.handleOnSet.bind(this));
         }
-        else if (device.bot?.deviceType === "faucet") {
+        else if (device.bot?.deviceType === 'faucet') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -229,15 +193,12 @@ class Bot {
             // Add switchService
             (this.faucetService =
                 accessory.getService(this.platform.Service.Faucet) ||
-                    accessory.addService(this.platform.Service.Faucet)),
-                `${accessory.displayName} 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));
+            this.faucetService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.handleOnSet.bind(this));
         }
-        else if (device.bot?.deviceType === "fan") {
+        else if (device.bot?.deviceType === 'fan') {
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeFaucetService(accessory);
@@ -250,15 +211,12 @@ class Bot {
             // Add switchService
             (this.fanService =
                 accessory.getService(this.platform.Service.Fan) ||
-                    accessory.addService(this.platform.Service.Fan)),
-                `${accessory.displayName} 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));
+            this.fanService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
         }
-        else if (device.bot?.deviceType === "stateful") {
+        else if (device.bot?.deviceType === 'stateful') {
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -271,12 +229,10 @@ class Bot {
             // Add switchService
             (this.statefulProgrammableSwitchService =
                 accessory.getService(this.platform.Service.StatefulProgrammableSwitch) ||
-                    accessory.addService(this.platform.Service.StatefulProgrammableSwitch)),
-                `${accessory.displayName} Stateful Programmable Switch`;
+                    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)
+            this.statefulProgrammableSwitchService.getCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState)
                 .onSet(this.handleOnSet.bind(this));
         }
         else {
@@ -292,13 +248,10 @@ class Bot {
             // Add outletService
             (this.outletService =
                 accessory.getService(this.platform.Service.Outlet) ||
-                    accessory.addService(this.platform.Service.Outlet)),
-                `${accessory.displayName} Outlet`;
+                    accessory.addService(this.platform.Service.Outlet)), `${accessory.displayName} Outlet`;
             this.infoLog(`Bot: ${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.handleOnSet.bind(this));
         }
         // Battery Service
         if (!device.ble) {
@@ -310,8 +263,7 @@ class Bot {
             this.debugLog(`Bot: ${accessory.displayName} Add Battery Service`);
             (this.batteryService =
                 this.accessory.getService(this.platform.Service.Battery) ||
-                    this.accessory.addService(this.platform.Service.Battery)),
-                `${accessory.displayName} Battery`;
+                    this.accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
             this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
         }
         else {
@@ -320,32 +272,34 @@ class Bot {
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
-        rxjs
-            .interval(this.deviceRefreshRate * 1000)
-            .pipe(operators.skipWhile(() => this.botUpdateInProgress))
+        (0, rxjs_1.interval)(this.deviceRefreshRate * 1000)
+            .pipe((0, operators_1.skipWhile)(() => this.botUpdateInProgress))
             .subscribe(() => {
             this.refreshStatus();
         });
         // Watch for Bot change events
         // We put in a debounce of 100ms so we don't make duplicate calls
         this.doBotUpdate
-            .pipe(operators.tap(() => {
+            .pipe((0, operators_1.tap)(() => {
             this.botUpdateInProgress = true;
-        }), operators.debounceTime(100))
+        }), (0, operators_1.debounceTime)(100))
             .subscribe(async () => {
             try {
-                rxjs
-                    .interval(100)
-                    .pipe(operators.take(this.doublePress))
+                (0, rxjs_1.interval)(100)
+                    .pipe((0, operators_1.take)(this.doublePress))
                     .subscribe(async () => {
                     await this.pushChanges();
                 });
             }
             catch (e) {
                 this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes("debug")) {
-                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,`
+                        + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,`
+                        + ` Error: ${JSON.stringify(e)}`);
                 }
             }
             this.botUpdateInProgress = false;
@@ -381,12 +335,10 @@ class Bot {
         }
         this.BatteryLevel = Number(this.battery);
         if (this.BatteryLevel < 10) {
-            this.StatusLowBattery =
-                this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+            this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            this.StatusLowBattery =
-                this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
         if (Number.isNaN(this.BatteryLevel)) {
             this.BatteryLevel = 100;
@@ -399,7 +351,7 @@ class Bot {
         }
         if (this.platform.config.credentials?.openToken) {
             this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
-            if (this.botMode === "press") {
+            if (this.botMode === 'press') {
                 this.On = false;
                 this.OnCached = this.On;
                 this.accessory.context.On = this.OnCached;
@@ -438,21 +390,16 @@ class Bot {
         this.debugLog(`Bot: ${this.accessory.displayName} BLE refreshStatus`);
         const switchbot = await this.platform.connectBLE();
         // 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}`);
-        try {
-            await switchbot.discover({
-                model: "H",
-                quick: false,
-            });
-            // Start to monitor advertisement packets
-            await switchbot.startScan({
-                model: "H",
-                id: this.device.bleMac,
-            });
+        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}`);
+        }
+        switchbot.startScan({
+            model: 'H',
+            id: this.device.bleMac,
+        }).then(() => {
             // Set an event hander
             switchbot.onadvertisement = (ad) => {
                 this.serviceData = ad.serviceData;
@@ -460,8 +407,8 @@ class Bot {
                 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}`);
+                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}`);
@@ -472,7 +419,8 @@ class Bot {
                 }
             };
             // Wait 2 seconds
-            await switchbot.wait(this.scanDuration * 1000);
+            return switchbot.wait(this.scanDuration * 1000);
+        }).then(async () => {
             // Stop to monitor
             switchbot.stopScan();
             if (this.connected) {
@@ -487,12 +435,15 @@ class Bot {
                     await this.openAPIRefreshStatus();
                 }
             }
-        }
-        catch (e) {
+        }).catch(async (e) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-            if (this.deviceLogging.includes("debug")) {
-                this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
-                    ` Error Message: ${JSON.stringify(e.message)}`);
+            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`);
@@ -500,13 +451,13 @@ class Bot {
                 await this.openAPIRefreshStatus();
             }
             this.apiError(e);
-        }
+        });
     }
     async openAPIRefreshStatus() {
         if (this.platform.config.credentials?.openToken) {
             this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI refreshStatus`);
             try {
-                this.deviceStatus = (await this.platform.axios.get(`${settings.DeviceURL}/${this.device.deviceId}/status`)).data;
+                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();
@@ -514,9 +465,13 @@ class Bot {
             }
             catch (e) {
                 this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceLogging.includes("debug")) {
-                    this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+                        + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+                        + ` Error: ${JSON.stringify(e)}`);
                 }
                 this.apiError(e);
             }
@@ -536,58 +491,51 @@ class Bot {
         else {
             await this.openAPIpushChanges();
         }
-        rxjs
-            .interval(5000)
-            .pipe(operators.skipWhile(() => this.botUpdateInProgress))
-            .pipe(operators.take(1))
+        (0, rxjs_1.interval)(5000)
+            .pipe((0, operators_1.skipWhile)(() => this.botUpdateInProgress))
+            .pipe((0, operators_1.take)(1))
             .subscribe(() => {
             this.refreshStatus();
         });
     }
     async BLEpushChanges() {
         this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
-        if (this.On !== this.OnCached) {
+        if ((this.On !== this.OnCached) || this.allowPush) {
             this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
             const switchbot = await this.platform.connectBLE();
             // 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}`);
+            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") {
+            if (this.botMode === 'press') {
                 this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
-                switchbot
-                    .discover({ model: "H", quick: true, id: this.device.bleMac })
+                switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac })
                     .then((device_list) => {
                     this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
                     return device_list[0].press({ id: this.device.bleMac });
-                })
-                    .then(() => {
+                }).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);
+                        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.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
                         }
                         this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
                     }, 500);
-                })
-                    .catch(async (e) => {
+                }).catch(async (e) => {
                     this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                    if (this.deviceLogging.includes("debug")) {
-                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` +
-                            ` Error Message: ${JSON.stringify(e.message)}`);
+                    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`);
@@ -596,24 +544,24 @@ class Bot {
                     this.apiError(e);
                 });
             }
-            else if (this.botMode === "switch") {
+            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) => {
+                switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list) => {
                     this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
                     return this.turnOnOff(device_list);
-                })
-                    .then(() => {
+                }).then(() => {
                     this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
                     this.OnCached = this.On;
                     this.accessory.context.On = this.OnCached;
-                })
-                    .catch(async (e) => {
+                }).catch(async (e) => {
                     this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                    if (this.deviceLogging.includes("debug")) {
-                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` +
-                            ` Error Message: ${JSON.stringify(e.message)}`);
+                    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`);
@@ -647,34 +595,34 @@ class Bot {
     async openAPIpushChanges() {
         if (this.platform.config.credentials?.openToken) {
             try {
-                if (this.On !== this.OnCached) {
+                if ((this.On !== this.OnCached) || this.allowPush) {
                     this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI pushChanges`);
                     const payload = {
-                        commandType: "command",
-                        parameter: "default",
+                        commandType: 'command',
+                        parameter: 'default',
                     };
-                    if (this.botMode === "switch" && this.On) {
-                        payload.command = "turnOn";
+                    if (this.botMode === 'switch' && this.On) {
+                        payload.command = 'turnOn';
                         this.On = true;
                         this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
                     }
-                    else if (this.botMode === "switch" && !this.On) {
-                        payload.command = "turnOff";
+                    else if (this.botMode === 'switch' && !this.On) {
+                        payload.command = 'turnOff';
                         this.On = false;
                         this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
                     }
-                    else if (this.botMode === "press") {
-                        payload.command = "press";
+                    else if (this.botMode === 'press') {
+                        payload.command = 'press';
                         this.debugLog(`Bot: ${this.accessory.displayName} Press Mode`);
                         this.On = false;
                     }
                     else {
                         throw new Error(`Bot: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
                     }
-                    this.infoLog(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-                        ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+                    this.infoLog(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+                        + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
                     // Make the API request
-                    const push = await this.platform.axios.post(`${settings.DeviceURL}/${this.device.deviceId}/commands`, payload);
+                    const push = (await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload));
                     this.debugLog(`Bot: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
                     this.statusCode(push);
                     this.OnCached = this.On;
@@ -683,9 +631,13 @@ class Bot {
             }
             catch (e) {
                 this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-                if (this.deviceLogging.includes("debug")) {
-                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+                        + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+                        + ` Error: ${JSON.stringify(e)}`);
                 }
                 this.apiError(e);
             }
@@ -695,7 +647,7 @@ class Bot {
      * Updates the status for each of the HomeKit Characteristics
      */
     updateHomeKitCharacteristics() {
-        if (this.device.bot?.deviceType === "garagedoor") {
+        if (this.device.bot?.deviceType === 'garagedoor') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -713,7 +665,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Garage Door On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "door") {
+        else if (this.device.bot?.deviceType === 'door') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -733,7 +685,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Door On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "window") {
+        else if (this.device.bot?.deviceType === 'window') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -753,7 +705,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Window On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "windowcovering") {
+        else if (this.device.bot?.deviceType === 'windowcovering') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -773,7 +725,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Window Covering On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "lock") {
+        else if (this.device.bot?.deviceType === 'lock') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -791,7 +743,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Lock On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "faucet") {
+        else if (this.device.bot?.deviceType === 'faucet') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -807,7 +759,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Faucet On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "fan") {
+        else if (this.device.bot?.deviceType === 'fan') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -823,7 +775,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} Fan On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "stateful") {
+        else if (this.device.bot?.deviceType === 'stateful') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -841,7 +793,7 @@ class Bot {
             }
             this.debugLog(`Bot: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.On}`);
         }
-        else if (this.device.bot?.deviceType === "switch") {
+        else if (this.device.bot?.deviceType === 'switch') {
             if (this.On === undefined) {
                 this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
@@ -877,41 +829,41 @@ class Bot {
         }
     }
     apiError(e) {
-        if (this.device.bot?.deviceType === "garagedoor") {
+        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") {
+        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") {
+        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") {
+        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") {
+        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") {
+        else if (this.device.bot?.deviceType === 'faucet') {
             this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, e);
         }
-        else if (this.device.bot?.deviceType === "fan") {
+        else if (this.device.bot?.deviceType === 'fan') {
             this.fanService?.updateCharacteristic(this.platform.Characteristic.On, e);
         }
-        else if (this.device.bot?.deviceType === "stateful") {
+        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") {
+        else if (this.device.bot?.deviceType === 'switch') {
             this.switchService?.updateCharacteristic(this.platform.Characteristic.On, e);
         }
         else {
@@ -943,8 +895,8 @@ class Bot {
                 this.offlineOff();
                 break;
             case 190:
-                this.errorLog(`Bot: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+                this.errorLog(`Bot: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
+                    + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
                 break;
             case 100:
                 this.debugLog(`Bot: ${this.accessory.displayName} Command successfully sent.`);
@@ -956,15 +908,11 @@ class Bot {
     offlineOff() {
         if (this.device.offline) {
             this.On = false;
-            if (this.device.bot?.deviceType === "switch") {
-                this.switchService
-                    ?.getCharacteristic(this.platform.Characteristic.On)
-                    .updateValue(this.On);
+            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.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
             }
         }
     }
@@ -972,7 +920,7 @@ class Bot {
      * Handle requests to set the "On" characteristic
      */
     handleOnSet(value) {
-        if (this.device.bot?.deviceType === "garagedoor") {
+        if (this.device.bot?.deviceType === 'garagedoor') {
             this.debugLog(`Bot: ${this.accessory.displayName} TargetDoorState: ${value}`);
             if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
                 this.On = false;
@@ -981,9 +929,9 @@ class Bot {
                 this.On = true;
             }
         }
-        else if (this.device.bot?.deviceType === "door" ||
-            this.device.bot?.deviceType === "window" ||
-            this.device.bot?.deviceType === "windowcovering") {
+        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;
@@ -992,7 +940,7 @@ class Bot {
                 this.On = true;
             }
         }
-        else if (this.device.bot?.deviceType === "lock") {
+        else if (this.device.bot?.deviceType === 'lock') {
             this.debugLog(`Bot: ${this.accessory.displayName} LockTargetState: ${value}`);
             if (value === this.platform.Characteristic.LockTargetState.SECURED) {
                 this.On = false;
@@ -1001,7 +949,7 @@ class Bot {
                 this.On = true;
             }
         }
-        else if (this.device.bot?.deviceType === "faucet") {
+        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;
@@ -1010,7 +958,7 @@ class Bot {
                 this.On = true;
             }
         }
-        else if (this.device.bot?.deviceType === "stateful") {
+        else if (this.device.bot?.deviceType === 'stateful') {
             this.debugLog(`Bot: ${this.accessory.displayName} ProgrammableSwitchOutputState: ${value}`);
             if (value === 0) {
                 this.On = false;
@@ -1031,16 +979,16 @@ class Bot {
             config = device.bot;
         }
         if (device.ble) {
-            config["ble"] = device.ble;
+            config['ble'] = device.ble;
         }
         if (device.logging !== undefined) {
-            config["logging"] = device.logging;
+            config['logging'] = device.logging;
         }
         if (device.refreshRate !== undefined) {
-            config["refreshRate"] = device.refreshRate;
+            config['refreshRate'] = device.refreshRate;
         }
         if (device.scanDuration !== undefined) {
-            config["scanDuration"] = device.scanDuration;
+            config['scanDuration'] = device.scanDuration;
         }
         if (Object.entries(config).length !== 0) {
             this.warnLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
@@ -1048,20 +996,17 @@ class Bot {
     }
     refreshRate(device) {
         if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate =
-                device.refreshRate;
+            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
             this.debugLog(`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;
+            this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
             this.debugLog(`Bot: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
     scan(device) {
         if (device.scanDuration) {
-            this.scanDuration = this.accessory.context.scanDuration =
-                device.scanDuration;
+            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
             if (device.ble) {
                 this.debugLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
             }
@@ -1075,7 +1020,7 @@ class Bot {
     }
     logs(device) {
         if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = "debugMode";
+            this.deviceLogging = this.accessory.context.logging = 'debugMode';
             this.debugLog(`Bot: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
         }
         else if (device.logging) {
@@ -1083,33 +1028,41 @@ class Bot {
             this.debugLog(`Bot: ${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.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
             this.debugLog(`Bot: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
         }
         else {
-            this.deviceLogging = this.accessory.context.logging = "standard";
+            this.deviceLogging = this.accessory.context.logging = 'standard';
             this.debugLog(`Bot: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
     PressOrSwitch(device) {
         if (!device.bot?.mode) {
-            this.botMode = "switch";
+            this.botMode = 'switch';
             this.warnLog(`Bot: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings,`);
             this.warnLog(`Bot: ${this.accessory.displayName} is defaulting to "${this.botMode}" mode, you may experience issues.`);
         }
-        else if (device.bot?.mode === "switch") {
-            this.botMode = "switch";
+        else if (device.bot?.mode === 'switch') {
+            this.botMode = 'switch';
             this.debugLog(`Bot: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
         }
-        else if (device.bot?.mode === "press") {
-            this.botMode = "press";
+        else if (device.bot?.mode === 'press') {
+            this.botMode = 'press';
             this.debugLog(`Bot: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
         }
         else {
             throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
         }
     }
+    allowPushChanges(device) {
+        if (device.bot?.allowPush) {
+            this.allowPush = true;
+        }
+        else {
+            this.allowPush = false;
+        }
+        this.debugLog(`Bot: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
+    }
     removeOutletService(accessory) {
         // If outletService still pressent, then remove first
         this.outletService = this.accessory.getService(this.platform.Service.Outlet);
@@ -1191,8 +1144,8 @@ class Bot {
         accessory.removeService(this.switchService);
     }
     /**
-     * Logging for Device
-     */
+   * Logging for Device
+   */
     infoLog(...log) {
         if (this.enablingDeviceLogging()) {
             this.platform.log.info(String(...log));
@@ -1210,8 +1163,8 @@ class Bot {
     }
     debugLog(...log) {
         if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging === "debug") {
-                this.platform.log.info("[DEBUG]", String(...log));
+            if (this.deviceLogging === 'debug') {
+                this.platform.log.info('[DEBUG]', String(...log));
             }
             else {
                 this.platform.log.debug(String(...log));
@@ -1219,7 +1172,7 @@ class Bot {
         }
     }
     enablingDeviceLogging() {
-        return (this.deviceLogging.includes("debug") || this.deviceLogging === "standard");
+        return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
     }
 }
 exports.Bot = Bot;