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

package/dist/devices/curtains.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.Curtain = 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");
 class Curtain {
     constructor(platform, accessory, device) {
         this.platform = platform;
@@ -38,7 +19,7 @@ class Curtain {
         this.TargetPosition = 0;
         this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
         // this is subject we use to track when we need to POST changes to the SwitchBot API
-        this.doCurtainUpdate = new rxjs.Subject();
+        this.doCurtainUpdate = new rxjs_1.Subject();
         this.curtainUpdateInProgress = false;
         this.setNewTarget = false;
         // Retrieve initial values and updateHomekit
@@ -46,14 +27,12 @@ class Curtain {
         // set accessory information
         accessory
             .getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.Manufacturer, "SwitchBot")
-            .setCharacteristic(this.platform.Characteristic.Model, "SWITCHBOT-CURTAIN-W0701600")
+            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
+            .setCharacteristic(this.platform.Characteristic.Model, 'SWITCHBOT-CURTAIN-W0701600')
             .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId);
         // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
         // you can create multiple services for each accessory
-        (this.service =
-            accessory.getService(this.platform.Service.WindowCovering) ||
-                accessory.addService(this.platform.Service.WindowCovering)),
+        (this.service = accessory.getService(this.platform.Service.WindowCovering) || accessory.addService(this.platform.Service.WindowCovering)),
             `${device.deviceName} ${device.deviceType}`;
         // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
         // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -92,8 +71,7 @@ class Curtain {
         else if (!this.lightSensorService) {
             this.debugLog(`Curtain: ${accessory.displayName} Add Light Sensor Service`);
             (this.lightSensorService =
-                this.accessory.getService(this.platform.Service.LightSensor) ||
-                    this.accessory.addService(this.platform.Service.LightSensor)),
+                this.accessory.getService(this.platform.Service.LightSensor) || this.accessory.addService(this.platform.Service.LightSensor)),
                 `${accessory.displayName} Light Sensor`;
             this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
         }
@@ -108,9 +86,7 @@ class Curtain {
         }
         else if (device.ble && !this.batteryService) {
             this.debugLog(`Curtain: ${accessory.displayName} Add Battery Service`);
-            (this.batteryService =
-                this.accessory.getService(this.platform.Service.Battery) ||
-                    this.accessory.addService(this.platform.Service.Battery)),
+            (this.batteryService = 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`);
         }
@@ -120,19 +96,16 @@ class Curtain {
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
-        rxjs
-            .interval(this.deviceRefreshRate * 1000)
-            .pipe(operators.skipWhile(() => this.curtainUpdateInProgress))
+        (0, rxjs_1.interval)(this.deviceRefreshRate * 1000)
+            .pipe((0, operators_1.skipWhile)(() => this.curtainUpdateInProgress))
             .subscribe(() => {
             this.refreshStatus();
         });
         // update slide progress
-        rxjs
-            .interval(this.updateRate * 1000)
-            .pipe(operators.skipWhile(() => this.curtainUpdateInProgress))
+        (0, rxjs_1.interval)(this.updateRate * 1000)
+            .pipe((0, operators_1.skipWhile)(() => this.curtainUpdateInProgress))
             .subscribe(() => {
-            if (this.PositionState ===
-                this.platform.Characteristic.PositionState.STOPPED) {
+            if (this.PositionState === this.platform.Characteristic.PositionState.STOPPED) {
                 return;
             }
             this.debugLog(`Curtain: ${accessory.displayName} Refresh Status When Moving, PositionState: ${this.PositionState}`);
@@ -141,18 +114,20 @@ class Curtain {
         // Watch for Curtain change events
         // We put in a debounce of 100ms so we don't make duplicate calls
         this.doCurtainUpdate
-            .pipe(operators.tap(() => {
+            .pipe((0, operators_1.tap)(() => {
             this.curtainUpdateInProgress = true;
-        }), operators.debounceTime(this.platform.config.options.pushRate * 1000))
+        }), (0, operators_1.debounceTime)(this.platform.config.options.pushRate * 1000))
             .subscribe(async () => {
             try {
                 await this.pushChanges();
             }
             catch (e) {
                 this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes("debug")) {
-                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
                 }
                 this.apiError(e);
             }
@@ -183,13 +158,11 @@ class Curtain {
             this.setMinMax();
             if (this.TargetPosition > this.CurrentPosition) {
                 this.debugLog(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
-                this.PositionState =
-                    this.platform.Characteristic.PositionState.INCREASING;
+                this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
             }
             else if (this.TargetPosition < this.CurrentPosition) {
                 this.debugLog(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
-                this.PositionState =
-                    this.platform.Characteristic.PositionState.DECREASING;
+                this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
             }
             else {
                 this.debugLog(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
@@ -218,44 +191,36 @@ class Curtain {
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 2:
-                    this.CurrentAmbientLightLevel =
-                        (this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels;
+                    this.CurrentAmbientLightLevel = (this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
                         ` Calculation: ${(this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels}`);
                     break;
                 case 3:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 2;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 2;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 4:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 5:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 6:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 7:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 8:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 9:
-                    this.CurrentAmbientLightLevel =
-                        ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8;
+                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8;
                     this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 10:
@@ -263,18 +228,15 @@ class Curtain {
                     this.CurrentAmbientLightLevel = this.set_maxLux;
                     this.debugLog();
             }
-            this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
-                ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
         // Battery
         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;
         }
         this.debugLog(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
     }
@@ -295,18 +257,15 @@ class Curtain {
                 this.setMinMax();
                 if (this.TargetPosition > this.CurrentPosition) {
                     this.debugLog(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
-                    this.PositionState =
-                        this.platform.Characteristic.PositionState.INCREASING;
+                    this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
                 }
                 else if (this.TargetPosition < this.CurrentPosition) {
                     this.debugLog(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
-                    this.PositionState =
-                        this.platform.Characteristic.PositionState.DECREASING;
+                    this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
                 }
                 else {
                     this.debugLog(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
-                    this.PositionState =
-                        this.platform.Characteristic.PositionState.STOPPED;
+                    this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
                 }
             }
             else {
@@ -314,8 +273,7 @@ class Curtain {
                 if (!this.setNewTarget) {
                     /*If Curtain calibration distance is short, there will be an error between the current percentage and the target percentage.*/
                     this.TargetPosition = this.CurrentPosition;
-                    this.PositionState =
-                        this.platform.Characteristic.PositionState.STOPPED;
+                    this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
                     this.debugLog(`Curtain: ${this.accessory.displayName} Stopped`);
                 }
             }
@@ -326,10 +284,10 @@ class Curtain {
                 this.set_maxLux = this.maxLux();
                 // Brightness
                 switch (this.brightness) {
-                    case "dim":
+                    case 'dim':
                         this.CurrentAmbientLightLevel = this.set_minLux;
                         break;
-                    case "bright":
+                    case 'bright':
                     default:
                         this.CurrentAmbientLightLevel = this.set_maxLux;
                 }
@@ -351,74 +309,88 @@ class Curtain {
         // Convert to BLE Address
         this.device.bleMac = this.device
             .deviceId.match(/.{1,2}/g)
-            .join(":")
+            .join(':')
             .toLowerCase();
         this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        try {
-            await switchbot.discover({
-                model: "c",
-                quick: false,
-            });
-            // Start to monitor advertisement packets
-            await switchbot.startScan({
-                model: "c",
+        // Start to monitor advertisement packets
+        if (switchbot !== false) {
+            switchbot
+                .startScan({
+                model: 'c',
                 id: this.device.bleMac,
-            });
-            // Set an event hander
-            switchbot.onadvertisement = (ad) => {
-                this.serviceData = ad.serviceData;
-                this.calibration = ad.serviceData.calibration;
-                this.battery = ad.serviceData.battery;
-                this.position = ad.serviceData.position;
-                this.lightLevel = ad.serviceData.lightLevel;
-                this.debugLog(`Curtain: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                this.debugLog(`Curtain: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, ` +
-                    `position: ${ad.serviceData.position}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`);
-                if (this.serviceData) {
-                    this.connected = true;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
+            })
+                .then(() => {
+                // Set an event hander
+                switchbot.onadvertisement = (ad) => {
+                    this.serviceData = ad.serviceData;
+                    this.calibration = ad.serviceData.calibration;
+                    this.battery = ad.serviceData.battery;
+                    this.position = ad.serviceData.position;
+                    this.lightLevel = ad.serviceData.lightLevel;
+                    this.debugLog(`Curtain: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, ` +
+                        `position: ${ad.serviceData.position}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`);
+                    if (this.serviceData) {
+                        this.connected = true;
+                        this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
+                    }
+                    else {
+                        this.connected = false;
+                        this.debugLog(`Curtain: ${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.connected = false;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
+                    this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+                    if (this.platform.config.credentials?.openToken) {
+                        this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+                        this.SwitchToOpenAPI = true;
+                        await this.openAPIRefreshStatus();
+                    }
+                }
+            })
+                .catch(async (e) => {
+                this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
                 }
-            };
-            // Wait 10 seconds
-            await switchbot.wait(this.scanDuration * 1000);
-            // Stop to monitor
-            switchbot.stopScan();
-            if (this.connected) {
-                this.parseStatus();
-                this.updateHomeKitCharacteristics();
-            }
-            else {
-                this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
                 if (this.platform.config.credentials?.openToken) {
                     this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
                     this.SwitchToOpenAPI = true;
                     await this.openAPIRefreshStatus();
                 }
-            }
+                this.apiError(e);
+            });
         }
-        catch (e) {
-            this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-            if (this.deviceLogging.includes("debug")) {
-                this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
-                    ` Error Message: ${JSON.stringify(e.message)}`);
-            }
-            if (this.platform.config.credentials?.openToken) {
-                this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-                this.SwitchToOpenAPI = true;
-                await this.openAPIRefreshStatus();
-            }
-            this.apiError(e);
+        else {
+            await this.BLEconnection(switchbot);
+        }
+    }
+    async BLEconnection(switchbot) {
+        this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+        if (this.platform.config.credentials?.openToken) {
+            this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+            this.SwitchToOpenAPI = true;
+            await this.openAPIRefreshStatus();
         }
     }
     async openAPIRefreshStatus() {
         if (this.platform.config.credentials?.openToken) {
             this.debugLog(`Curtain: ${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(`Curtain: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
                 this.slidePosition = this.deviceStatus.body.slidePosition;
                 this.moving = this.deviceStatus.body.moving;
@@ -428,9 +400,11 @@ class Curtain {
             }
             catch (e) {
                 this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceLogging.includes("debug")) {
-                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
                 }
                 this.apiError(e);
             }
@@ -443,10 +417,9 @@ class Curtain {
         else {
             await this.openAPIpushChanges();
         }
-        rxjs
-            .interval(5000)
-            .pipe(operators.skipWhile(() => this.curtainUpdateInProgress))
-            .pipe(operators.take(1))
+        (0, rxjs_1.interval)(5000)
+            .pipe((0, operators_1.skipWhile)(() => this.curtainUpdateInProgress))
+            .pipe((0, operators_1.take)(1))
             .subscribe(() => {
             this.refreshStatus();
         });
@@ -458,12 +431,12 @@ class Curtain {
             // Convert to BLE Address
             this.device.bleMac = this.device
                 .deviceId.match(/.{1,2}/g)
-                .join(":")
+                .join(':')
                 .toLowerCase();
             this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
             if (switchbot !== false) {
                 switchbot
-                    .discover({ model: "c", quick: true, id: this.device.bleMac })
+                    .discover({ model: 'c', quick: true, id: this.device.bleMac })
                     .then((device_list) => {
                     this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
                     return device_list[0].runToPos(100 - Number(this.TargetPosition));
@@ -473,9 +446,11 @@ class Curtain {
                 })
                     .catch(async (e) => {
                     this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                    if (this.deviceLogging.includes("debug")) {
-                        this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` +
-                            ` Error Message: ${JSON.stringify(e.message)}`);
+                    if (this.deviceLogging === 'debug') {
+                        this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                    }
+                    if (this.platform.debugMode) {
+                        this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
                     }
                     if (this.platform.config.credentials?.openToken) {
                         this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
@@ -505,14 +480,14 @@ class Curtain {
                     this.debugLog(`Pushing ${this.TargetPosition}`);
                     const adjustedTargetPosition = 100 - Number(this.TargetPosition);
                     const payload = {
-                        commandType: "command",
-                        command: "setPosition",
+                        commandType: 'command',
+                        command: 'setPosition',
                         parameter: `0,ff,${adjustedTargetPosition}`,
                     };
                     this.infoLog(`Curtain: ${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(`Curtain: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
                     this.statusCode(push);
                 }
@@ -523,9 +498,11 @@ class Curtain {
             }
             catch (e) {
                 this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-                if (this.deviceLogging.includes("debug")) {
-                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                }
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
                 }
                 this.apiError(e);
             }
@@ -533,8 +510,7 @@ class Curtain {
     }
     updateHomeKitCharacteristics() {
         this.setMinMax();
-        if (this.CurrentPosition === undefined ||
-            Number.isNaN(this.CurrentPosition)) {
+        if (this.CurrentPosition === undefined || Number.isNaN(this.CurrentPosition)) {
             this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
         }
         else {
@@ -547,8 +523,7 @@ class Curtain {
         else {
             this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
         }
-        if (this.TargetPosition === undefined ||
-            Number.isNaN(this.TargetPosition)) {
+        if (this.TargetPosition === undefined || Number.isNaN(this.TargetPosition)) {
             this.debugLog(`Curtain: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
         }
         else {
@@ -556,14 +531,12 @@ class Curtain {
             this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
         }
         if (!this.device.curtain?.hide_lightsensor) {
-            if (this.CurrentAmbientLightLevel === undefined ||
-                Number.isNaN(this.CurrentAmbientLightLevel)) {
+            if (this.CurrentAmbientLightLevel === undefined || Number.isNaN(this.CurrentAmbientLightLevel)) {
                 this.debugLog(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
             else {
                 this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
-                this.debugLog(`Curtain: ${this.accessory.displayName}` +
-                    ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName}` + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
         }
         if (this.device.ble) {
@@ -632,14 +605,12 @@ class Curtain {
         this.TargetPosition = value;
         this.setMinMax();
         if (value > this.CurrentPosition) {
-            this.PositionState =
-                this.platform.Characteristic.PositionState.INCREASING;
+            this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
             this.setNewTarget = true;
             this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
         }
         else if (value < this.CurrentPosition) {
-            this.PositionState =
-                this.platform.Characteristic.PositionState.DECREASING;
+            this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
             this.setNewTarget = true;
             this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
         }
@@ -649,9 +620,7 @@ class Curtain {
             this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
         }
         this.service.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
-        this.service
-            .getCharacteristic(this.platform.Characteristic.PositionState)
-            .updateValue(this.PositionState);
+        this.service.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         /**
          * If Curtain movement time is short, the moving flag from backend is always false.
          * The minimum time depends on the network control latency.
@@ -683,16 +652,16 @@ class Curtain {
             config = device.curtain;
         }
         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(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
@@ -701,13 +670,11 @@ class Curtain {
     refreshRate(device) {
         // refreshRate
         if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate =
-                device.refreshRate;
+            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
             this.debugLog(`Curtain: ${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(`Curtain: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
         // updateRate
@@ -722,8 +689,7 @@ class Curtain {
     }
     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(`Curtain: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
             }
@@ -737,7 +703,7 @@ class Curtain {
     }
     logs(device) {
         if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = "debugMode";
+            this.deviceLogging = this.accessory.context.logging = 'debugMode';
             this.debugLog(`Curtain: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
         }
         else if (device.logging) {
@@ -745,12 +711,11 @@ class Curtain {
             this.debugLog(`Curtain: ${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(`Curtain: ${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(`Curtain: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
@@ -801,8 +766,8 @@ class Curtain {
     }
     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));
@@ -810,7 +775,7 @@ class Curtain {
         }
     }
     enablingDeviceLogging() {
-        return (this.deviceLogging.includes("debug") || this.deviceLogging === "standard");
+        return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
     }
 }
 exports.Curtain = Curtain;