@switchbot/homebridge-switchbot 1.3.1-beta.9 → 1.4.1-beta.2

package/dist/devices/curtains.js

@@ -13,18 +13,18 @@ class Curtain {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
-        this.deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
-        this.debugDebug = this.platform.config.options?.debug === 'debug' || this.platform.debugMode;
-        // Curtain Config
-        this.platform.device(`Curtain: ${this.accessory.displayName} Config: (ble: ${device.ble}, disable_group: ${device.curtain?.disable_group},`
-            + ` hide_lightsensor: ${device.curtain?.hide_lightsensor}, set_minLux: ${device.curtain?.set_minLux}, set_maxLux: `
-            + `${device.curtain?.set_maxLux}, refreshRate: ${device.curtain?.refreshRate}, set_max: ${device.curtain?.set_max}, set_min: `
-            + `${device.curtain?.set_min}, set_minStep: ${device.curtain?.set_minStep})`);
         // default placeholders
+        this.refreshRate();
+        this.logs();
         this.setMinMax();
         this.CurrentPosition = 0;
         this.TargetPosition = 0;
         this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+        // Curtain Config
+        this.debugLog(`Curtain: ${this.accessory.displayName} Config: (ble: ${device.ble}, disable_group: ${device.curtain?.disable_group},`
+            + ` hide_lightsensor: ${device.curtain?.hide_lightsensor}, set_minLux: ${device.curtain?.set_minLux}, set_maxLux: `
+            + `${device.curtain?.set_maxLux}, refreshRate: ${device.curtain?.refreshRate}, set_max: ${device.curtain?.set_max}, set_min: `
+            + `${device.curtain?.set_min}, set_minStep: ${device.curtain?.set_minStep})`);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doCurtainUpdate = new rxjs_1.Subject();
         this.curtainUpdateInProgress = false;
@@ -72,36 +72,36 @@ class Curtain {
             .onSet(this.TargetPositionSet.bind(this));
         // Light Sensor Service
         if (device.curtain?.hide_lightsensor) {
-            this.platform.device(`Curtain: ${accessory.displayName} Removing Light Sensor Service`);
+            this.debugLog(`Curtain: ${accessory.displayName} Removing Light Sensor Service`);
             this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor);
             accessory.removeService(this.lightSensorService);
         }
         else if (!this.lightSensorService) {
-            this.platform.device(`Curtain: ${accessory.displayName} Add Light Sensor Service`);
+            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)), `${accessory.displayName} Light Sensor`;
             this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
         }
         else {
-            this.platform.device(`Curtain: ${accessory.displayName} Light Sensor Service Not Added`);
+            this.debugLog(`Curtain: ${accessory.displayName} Light Sensor Service Not Added`);
         }
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
-        (0, rxjs_1.interval)(this.platform.config.options.refreshRate * 1000)
+        (0, rxjs_1.interval)(this.deviceRefreshRate * 1000)
             .pipe((0, operators_1.skipWhile)(() => this.curtainUpdateInProgress))
             .subscribe(() => {
             this.refreshStatus();
         });
         // update slide progress
-        (0, rxjs_1.interval)(this.curtainRefreshRate() * 1000)
+        (0, rxjs_1.interval)(this.curtainRefreshRate * 1000)
             .pipe((0, operators_1.skipWhile)(() => this.curtainUpdateInProgress))
             .subscribe(() => {
             if (this.PositionState === this.platform.Characteristic.PositionState.STOPPED) {
                 return;
             }
-            this.platform.debug(`Curtain: ${accessory.displayName} Refresh Status When Moving, PositionState: ${this.PositionState}`);
+            this.debugLog(`Curtain: ${accessory.displayName} Refresh Status When Moving, PositionState: ${this.PositionState}`);
             this.refreshStatus();
         });
         // Watch for Curtain change events
@@ -115,37 +115,55 @@ class Curtain {
                 await this.pushChanges();
             }
             catch (e) {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges,`
+                this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,`
                         + ` Error Message: ${JSON.stringify(e.message)}`);
                 }
-                if (this.debugDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges,`
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,`
                         + ` Error: ${JSON.stringify(e)}`);
                 }
-                this.apiError(e);
+                this.apiError();
             }
             this.curtainUpdateInProgress = false;
         });
     }
-    connectBLE() {
-        const switchbot = new node_switchbot_1.default();
-        this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
-        this.platform.device(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        return switchbot;
-    }
-    curtainRefreshRate() {
+    refreshRate() {
+        // refreshRate
+        if (this.device.refreshRate) {
+            this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
+        }
+        else if (this.platform.config.options.refreshRate) {
+            this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
+        }
+        // curtainRefreshRate
         if (this.device?.curtain?.refreshRate) {
-            this.refreshRate = this.device?.curtain?.refreshRate;
+            this.curtainRefreshRate = this.device?.curtain?.refreshRate;
         }
         else {
-            this.refreshRate = 5;
-            if (this.platform.config.options?.debug === 'device') {
-                this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using Default Curtain Refresh Rate.`);
+            this.curtainRefreshRate = 5;
+            if (this.deviceLogging === 'debug') {
+                this.warnLog(`Curtain: ${this.accessory.displayName} Using Default Curtain Refresh Rate.`);
             }
         }
-        return this.refreshRate;
+    }
+    logs() {
+        if (this.device.logging) {
+            this.deviceLogging = this.accessory.context.logging = this.device.logging;
+        }
+        else if (this.platform.config.options?.logging) {
+            this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
+        }
+        else {
+            this.deviceLogging = this.accessory.context.logging = 'standard';
+        }
+    }
+    connectBLE() {
+        const switchbot = new node_switchbot_1.default();
+        this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
+        this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+        return switchbot;
     }
     minStep() {
         if (this.device.curtain?.set_minStep) {
@@ -183,37 +201,37 @@ class Curtain {
         }
     }
     async BLEparseStatus() {
-        this.platform.debug(`Curtain: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`Curtain: ${this.accessory.displayName} BLE parseStatus`);
         this.setMinMax();
         this.CurrentPosition = 100 - Number(this.position);
-        this.platform.debug(`Curtain: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
+        this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
         if (this.setNewTarget) {
-            this.platform.log.info(`Curtain: ${this.accessory.displayName} Checking Status ...`);
+            this.infoLog(`Curtain: ${this.accessory.displayName} Checking Status ...`);
         }
         if (this.setNewTarget) {
             this.setMinMax();
             if (this.TargetPosition > this.CurrentPosition) {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
             }
             else if (this.TargetPosition < this.CurrentPosition) {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
             }
             else {
-                this.platform.debug(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
             }
         }
         else {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
             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.platform.debug(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},`
+        this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},`
             + ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
         if (!this.device.curtain?.hide_lightsensor) {
             this.set_minLux = this.minLux();
@@ -223,47 +241,47 @@ class Curtain {
             switch (this.lightLevel) {
                 case 1:
                     this.CurrentAmbientLightLevel = this.set_minLux;
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 2:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
+                    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.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 4:
                     this.CurrentAmbientLightLevel = (((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 5:
                     this.CurrentAmbientLightLevel = (((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 6:
                     this.CurrentAmbientLightLevel = (((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 7:
                     this.CurrentAmbientLightLevel = (((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 8:
                     this.CurrentAmbientLightLevel = (((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 9:
                     this.CurrentAmbientLightLevel = (((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8);
-                    this.platform.device(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 10:
                 default:
                     this.CurrentAmbientLightLevel = this.set_maxLux;
-                    this.platform.device();
+                    this.debugLog();
             }
-            this.platform.debug(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
+            this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
                 + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
         // Battery
@@ -274,42 +292,42 @@ class Curtain {
         else {
             this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-        this.platform.debug(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
     }
     async openAPIparseStatus() {
         if (this.platform.config.credentials?.openToken) {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} OpenAPI parseStatus`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI parseStatus`);
             // CurrentPosition
             this.setMinMax();
             this.CurrentPosition = 100 - this.deviceStatus.body.slidePosition;
-            this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
             if (this.setNewTarget) {
-                this.platform.log.info(`Checking ${this.accessory.displayName} Status ...`);
+                this.infoLog(`Checking ${this.accessory.displayName} Status ...`);
             }
             if (this.deviceStatus.body.moving) {
                 this.setMinMax();
                 if (this.TargetPosition > this.CurrentPosition) {
-                    this.platform.debug(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
                     this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
                 }
                 else if (this.TargetPosition < this.CurrentPosition) {
-                    this.platform.debug(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
                     this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
                 }
                 else {
-                    this.platform.debug(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
+                    this.debugLog(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
                     this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
                 }
             }
             else {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
                 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.platform.debug(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},`
+            this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},`
                 + ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
             if (!this.device.curtain?.hide_lightsensor) {
                 this.set_minLux = this.minLux();
@@ -323,7 +341,7 @@ class Curtain {
                     default:
                         this.CurrentAmbientLightLevel = this.set_maxLux;
                 }
-                this.platform.debug(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
         }
     }
@@ -336,7 +354,7 @@ class Curtain {
         }
     }
     async BLERefreshStatus() {
-        this.platform.debug(`Curtain: ${this.accessory.displayName} BLE refreshStatus`);
+        this.debugLog(`Curtain: ${this.accessory.displayName} BLE refreshStatus`);
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const switchbot = this.connectBLE();
         // Start to monitor advertisement packets
@@ -351,16 +369,16 @@ class Curtain {
                 this.battery = ad.serviceData.battery;
                 this.position = ad.serviceData.position;
                 this.lightLevel = ad.serviceData.lightLevel;
-                this.platform.device(`Curtain: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                this.platform.device(`Curtain: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, `
+                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.platform.device(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
                 }
                 else {
                     this.connected = false;
-                    this.platform.device(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
                 }
             };
             // Wait 10 seconds
@@ -373,49 +391,49 @@ class Curtain {
                 this.updateHomeKitCharacteristics();
             }
             else {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+                this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
                 if (this.platform.config.credentials?.openToken) {
-                    this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+                    this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
                     await this.openAPIRefreshStatus();
                 }
             }
         }).catch(async (e) => {
-            this.platform.log.error(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-            if (this.deviceDebug) {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+            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.debugDebug) {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+            if (this.platform.debugMode) {
+                this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
                     + ` Error: ${JSON.stringify(e)}`);
             }
             if (this.platform.config.credentials?.openToken) {
-                this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+                this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
                 await this.openAPIRefreshStatus();
             }
-            this.apiError(e);
+            this.apiError();
         });
     }
     async openAPIRefreshStatus() {
         if (this.platform.config.credentials?.openToken) {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} OpenAPI refreshStatus`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI refreshStatus`);
             try {
                 this.deviceStatus = (await this.platform.axios.get(`${settings_1.DeviceURL}/${this.device.deviceId}/status`)).data;
-                this.platform.debug(`Curtain: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
                 this.parseStatus();
                 this.updateHomeKitCharacteristics();
             }
             catch (e) {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+                this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
                         + ` Error Message: ${JSON.stringify(e.message)}`);
                 }
-                if (this.debugDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
                         + ` Error: ${JSON.stringify(e)}`);
                 }
-                this.apiError(e);
+                this.apiError();
             }
         }
     }
@@ -435,183 +453,174 @@ class Curtain {
     }
     async BLEpushChanges() {
         if (this.TargetPosition !== this.CurrentPosition) {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} BLE pushChanges`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} BLE pushChanges`);
             const switchbot = this.connectBLE();
             switchbot.discover({ model: 'c', quick: true, id: this.device.bleMac }).then((device_list) => {
-                this.platform.log.info(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
+                this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
                 return device_list[0].runToPos(100 - Number(this.TargetPosition));
             }).then(() => {
-                this.platform.device(`Curtain: ${this.accessory.displayName} Done.`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} Done.`);
             }).catch(async (e) => {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                if (this.deviceDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
                         + ` Error Message: ${JSON.stringify(e.message)}`);
                 }
-                if (this.debugDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                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.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+                    this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
                     await this.OpenAPIpushChanges();
                 }
-                this.apiError(e);
+                this.apiError();
             });
         }
         else {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} No BLE Changes, CurrentPosition & TargetPosition Are the Same.`
+            this.debugLog(`Curtain: ${this.accessory.displayName} No BLE Changes, CurrentPosition & TargetPosition Are the Same.`
                 + `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
         }
     }
     async OpenAPIpushChanges() {
         if (this.platform.config.credentials?.openToken) {
             try {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} OpenAPI pushChanges`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI pushChanges`);
                 if (this.TargetPosition !== this.CurrentPosition) {
-                    this.platform.debug(`Pushing ${this.TargetPosition}`);
+                    this.debugLog(`Pushing ${this.TargetPosition}`);
                     const adjustedTargetPosition = 100 - Number(this.TargetPosition);
                     const payload = {
                         commandType: 'command',
                         command: 'setPosition',
                         parameter: `0,ff,${adjustedTargetPosition}`,
                     };
-                    this.platform.log.info(`Curtain: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+                    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_1.DeviceURL}/${this.device.deviceId}/commands`, payload));
-                    this.platform.debug(`Curtain: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
+                    this.debugLog(`Curtain: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
                     this.statusCode(push);
                 }
                 else {
-                    this.platform.debug(`Curtain: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.`
+                    this.debugLog(`Curtain: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.`
                         + `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
                 }
             }
             catch (e) {
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-                if (this.deviceDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+                this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+                if (this.deviceLogging === 'debug') {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
                         + ` Error Message: ${JSON.stringify(e.message)}`);
                 }
-                if (this.debugDebug) {
-                    this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+                if (this.platform.debugMode) {
+                    this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
                         + ` Error: ${JSON.stringify(e)}`);
                 }
-                this.apiError(e);
+                this.apiError();
             }
         }
     }
     updateHomeKitCharacteristics() {
         this.setMinMax();
         if (this.CurrentPosition === undefined || Number.isNaN(this.CurrentPosition)) {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
         }
         else {
             this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, Number(this.CurrentPosition));
-            this.platform.device(`Curtain: ${this.accessory.displayName} updateCharacteristic CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic CurrentPosition: ${this.CurrentPosition}`);
         }
         if (this.PositionState === undefined) {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} PositionState: ${this.PositionState}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} PositionState: ${this.PositionState}`);
         }
         else {
-            this.platform.device(`Curtain: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
         }
         if (this.TargetPosition === undefined || Number.isNaN(this.TargetPosition)) {
-            this.platform.debug(`Curtain: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
         }
         else {
             this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, Number(this.TargetPosition));
-            this.platform.device(`Curtain: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
         }
         if (!this.device.curtain?.hide_lightsensor) {
             if (this.CurrentAmbientLightLevel === undefined || Number.isNaN(this.CurrentAmbientLightLevel)) {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
             else {
                 this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
-                this.platform.device(`Curtain: ${this.accessory.displayName}`
+                this.debugLog(`Curtain: ${this.accessory.displayName}`
                     + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
         }
         if (this.device.ble) {
             if (this.BatteryLevel === undefined) {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
             }
             else {
                 this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-                this.platform.device(`Curtain: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
             }
             if (this.StatusLowBattery === undefined) {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
             }
             else {
                 this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-                this.platform.device(`Curtain: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
             }
         }
     }
-    apiError(e) {
-        this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-        this.service.updateCharacteristic(this.platform.Characteristic.PositionState, e);
-        this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-        if (!this.device.curtain?.hide_lightsensor) {
-            this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
-        }
-        if (this.device.ble) {
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-        }
+    apiError() {
+        throw new this.platform.api.hap.HapStatusError(-70402 /* SERVICE_COMMUNICATION_FAILURE */);
     }
     statusCode(push) {
         switch (push.data.statusCode) {
             case 151:
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} Command not supported by this device type.`);
+                this.errorLog(`Curtain: ${this.accessory.displayName} Command not supported by this device type.`);
                 break;
             case 152:
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} Device not found.`);
+                this.errorLog(`Curtain: ${this.accessory.displayName} Device not found.`);
                 break;
             case 160:
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} Command is not supported.`);
+                this.errorLog(`Curtain: ${this.accessory.displayName} Command is not supported.`);
                 break;
             case 161:
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} Device is offline.`);
+                this.errorLog(`Curtain: ${this.accessory.displayName} Device is offline.`);
                 break;
             case 171:
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+                this.errorLog(`Curtain: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
                 break;
             case 190:
-                this.platform.log.error(`Curtain: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
+                this.errorLog(`Curtain: ${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.platform.debug(`Curtain: ${this.accessory.displayName} Command successfully sent.`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} Command successfully sent.`);
                 break;
             default:
-                this.platform.debug(`Curtain: ${this.accessory.displayName} Unknown statusCode.`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} Unknown statusCode.`);
         }
     }
     /**
      * Handle requests to set the value of the "Target Position" characteristic
      */
     TargetPositionSet(value) {
-        this.platform.debug(`Curtain: ${this.accessory.displayName} TargetPosition: ${value}`);
+        this.debugLog(`Curtain: ${this.accessory.displayName} TargetPosition: ${value}`);
         this.TargetPosition = value;
         this.setMinMax();
         if (value > this.CurrentPosition) {
             this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
             this.setNewTarget = true;
-            this.platform.debug(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
         }
         else if (value < this.CurrentPosition) {
             this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
             this.setNewTarget = true;
-            this.platform.debug(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
         }
         else {
             this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
             this.setNewTarget = false;
-            this.platform.debug(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+            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);
@@ -622,7 +631,7 @@ class Curtain {
         clearTimeout(this.setNewTargetTimer);
         if (this.setNewTarget) {
             this.setNewTargetTimer = setTimeout(() => {
-                this.platform.debug(`Curtain: ${this.accessory.displayName} setNewTarget ${this.setNewTarget} timeout`);
+                this.debugLog(`Curtain: ${this.accessory.displayName} setNewTarget ${this.setNewTarget} timeout`);
                 this.setNewTarget = false;
             }, 10000);
         }
@@ -640,6 +649,37 @@ class Curtain {
             }
         }
     }
+    /**
+   * Logging for Device
+   */
+    infoLog(...log) {
+        if (this.enablingDeviceLogging()) {
+            this.platform.log.info(String(...log));
+        }
+    }
+    warnLog(...log) {
+        if (this.enablingDeviceLogging()) {
+            this.platform.log.warn(String(...log));
+        }
+    }
+    errorLog(...log) {
+        if (this.enablingDeviceLogging()) {
+            this.platform.log.error(String(...log));
+        }
+    }
+    debugLog(...log) {
+        if (this.enablingDeviceLogging()) {
+            if (this.deviceLogging === 'debug') {
+                this.platform.log.info('[DEBUG]', String(...log));
+            }
+            else {
+                this.platform.log.debug(String(...log));
+            }
+        }
+    }
+    enablingDeviceLogging() {
+        return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    }
 }
 exports.Curtain = Curtain;
 //# sourceMappingURL=curtains.js.map