@switchbot/homebridge-switchbot 2.0.0-beta.3 → 2.0.0-beta.30

package/dist/device/curtain.js

@@ -8,6 +8,7 @@ const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
 const rxjs_1 = require("rxjs");
 const async_mqtt_1 = require("async-mqtt");
+const super_stringify_1 = __importDefault(require("super-stringify"));
 const operators_1 = require("rxjs/operators");
 const settings_1 = require("../settings");
 class Curtain {
@@ -17,15 +18,16 @@ class Curtain {
         this.device = device;
         //MQTT stuff
         this.mqttClient = null;
+        // Connection
+        this.BLE = (this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI');
+        this.OpenAPI = (this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI');
         // default placeholders
         this.logs(device);
         this.refreshRate(device);
         this.scan(device);
         this.config(device);
         this.setupMqtt(device);
-        this.CurrentPosition = 0;
-        this.TargetPosition = 0;
-        this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+        this.context();
         // 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;
@@ -76,34 +78,34 @@ class Curtain {
             .onSet(this.TargetPositionSet.bind(this));
         // Light Sensor Service
         if (device.curtain?.hide_lightsensor) {
-            this.debugLog(`Curtain: ${accessory.displayName} Removing Light Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
             this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor);
             accessory.removeService(this.lightSensorService);
         }
         else if (!this.lightSensorService) {
-            this.debugLog(`Curtain: ${accessory.displayName} Add Light Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${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.debugLog(`Curtain: ${accessory.displayName} Light Sensor Service Not Added`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Light Sensor Service Not Added`);
         }
         // Battery Service
-        if (!device.ble) {
-            this.debugLog(`Curtain: ${accessory.displayName} Removing Battery Service`);
+        if (!this.BLE) {
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Battery Service`);
             this.batteryService = this.accessory.getService(this.platform.Service.Battery);
             accessory.removeService(this.batteryService);
         }
-        else if (device.ble && !this.batteryService) {
-            this.debugLog(`Curtain: ${accessory.displayName} Add Battery Service`);
+        else if (this.BLE && !this.batteryService) {
+            this.debugLog(`${this.device.deviceType}: ${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.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
         }
         else {
-            this.debugLog(`Curtain: ${accessory.displayName} Battery Service Not Added`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);
         }
         // Update Homekit
         this.updateHomeKitCharacteristics();
@@ -120,7 +122,7 @@ class Curtain {
             if (this.PositionState === this.platform.Characteristic.PositionState.STOPPED) {
                 return;
             }
-            this.debugLog(`Curtain: ${accessory.displayName} Refresh Status When Moving, PositionState: ${this.PositionState}`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Refresh Status When Moving, PositionState: ${this.PositionState}`);
             await this.refreshStatus();
         });
         // Watch for Curtain change events
@@ -134,94 +136,65 @@ class Curtain {
                 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)}`);
-                }
                 this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
+                    + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
             }
             this.curtainUpdateInProgress = false;
         });
     }
-    /*
-     * Publish MQTT message for topics of
-     * 'homebridge-switchbot/curtain/xx:xx:xx:xx:xx:xx'
-     */
-    mqttPublish(topic, message) {
-        const mac = this.device.deviceId
-            ?.toLowerCase()
-            .match(/[\s\S]{1,2}/g)
-            ?.join(':');
-        const options = this.device.mqttPubOptions || {};
-        this.mqttClient?.publish(`homebridge-switchbot/curtain/${mac}/${topic}`, `${message}`, options);
-        this.debugLog(`Meter: ${this.accessory.displayName} MQTT message: ${topic}/${message} options:${JSON.stringify(options)}`);
-    }
-    /*
-     * Setup MQTT hadler if URL is specifed.
-     */
-    async setupMqtt(device) {
-        if (device.mqttURL) {
-            try {
-                this.mqttClient = await (0, async_mqtt_1.connectAsync)(device.mqttURL, device.mqttOptions || {});
-                this.debugLog(`Meter: ${this.accessory.displayName} MQTT connection has been established successfully.`);
-                this.mqttClient.on('error', (e) => {
-                    this.errorLog(`Meter: ${this.accessory.displayName} Failed to publish MQTT messages. ${e}`);
-                });
-            }
-            catch (e) {
-                this.mqttClient = null;
-                this.errorLog(`Meter: ${this.accessory.displayName} Failed to establish MQTT connection. ${e}`);
-            }
-        }
-    }
     /**
      * Parse the device status from the SwitchBot api
      */
     async parseStatus() {
-        if (this.SwitchToOpenAPI || !this.device.ble) {
+        if (this.BLE) {
+            await this.BLEparseStatus();
+        }
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIparseStatus();
         }
         else {
-            await this.BLEparseStatus();
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, parseStatus will not happen.`);
         }
     }
     async BLEparseStatus() {
-        this.debugLog(`Curtain: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // CurrentPosition
         this.CurrentPosition = 100 - Number(this.position);
         await this.setMinMax();
-        this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
         if (this.setNewTarget) {
-            this.infoLog(`Curtain: ${this.accessory.displayName} Checking Status ...`);
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
         }
         if (this.setNewTarget) {
             await this.setMinMax();
             if (this.TargetPosition > this.CurrentPosition) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
                 this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`Curtain: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
             }
             else if (this.TargetPosition < this.CurrentPosition) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
                 this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`Curtain: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
             }
             else {
-                this.debugLog(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
                 this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`Curtain: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
             }
         }
         else {
-            this.debugLog(`Curtain: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
             this.TargetPosition = this.CurrentPosition;
             this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-            this.debugLog(`Curtain: ${this.accessory.displayName} Stopped`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
         }
-        this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},` +
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},` +
             ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
         if (!this.device.curtain?.hide_lightsensor) {
             this.set_minLux = this.minLux();
@@ -231,47 +204,48 @@ class Curtain {
             switch (this.lightLevel) {
                 case 1:
                     this.CurrentAmbientLightLevel = this.set_minLux;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 2:
                     this.CurrentAmbientLightLevel = (this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
+                    this.debugLog(`${this.device.deviceType}: ${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.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 4:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 5:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 6:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 7:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 8:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 9:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8;
-                    this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
                     break;
                 case 10:
                 default:
                     this.CurrentAmbientLightLevel = this.set_maxLux;
                     this.debugLog();
             }
-            this.debugLog(`Curtain: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
+                + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
         // Battery
         this.BatteryLevel = Number(this.battery);
@@ -281,86 +255,85 @@ class Curtain {
         else {
             this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-        this.debugLog(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
+            + ` StatusLowBattery: ${this.StatusLowBattery}`);
     }
     async openAPIparseStatus() {
-        if (this.device.ble) {
-            this.SwitchToOpenAPI = false;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+        // CurrentPosition
+        this.CurrentPosition = 100 - Number(this.slidePosition);
+        await this.setMinMax();
+        this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+        if (this.setNewTarget) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
         }
-        if (this.platform.config.credentials?.token) {
-            this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI parseStatus`);
-            // CurrentPosition
-            this.CurrentPosition = 100 - Number(this.slidePosition);
+        if (this.setNewTarget && this.moving) {
             await this.setMinMax();
-            this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
-            if (this.setNewTarget) {
-                this.infoLog(`Curtain: ${this.accessory.displayName} Checking Status ...`);
-            }
-            if (this.setNewTarget && this.moving) {
-                await 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.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                    this.debugLog(`Curtain: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
-                }
-                else if (this.TargetPosition < this.CurrentPosition) {
-                    this.debugLog(`Curtain: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
-                    this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
-                    this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                    this.debugLog(`Curtain: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
-                }
-                else {
-                    this.debugLog(`Curtain: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
-                    this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-                    this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                    this.debugLog(`Curtain: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
-                }
+            if (this.TargetPosition > this.CurrentPosition) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
+                this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
+                this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
+            }
+            else if (this.TargetPosition < this.CurrentPosition) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
+                this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
+                this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
             }
             else {
-                this.debugLog(`Curtain: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
-                this.TargetPosition = this.CurrentPosition;
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
                 this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-                this.debugLog(`Curtain: ${this.accessory.displayName} Stopped`);
-            }
-            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();
-                this.set_maxLux = this.maxLux();
-                // Brightness
-                switch (this.brightness) {
-                    case 'dim':
-                        this.CurrentAmbientLightLevel = this.set_minLux;
-                        break;
-                    case 'bright':
-                    default:
-                        this.CurrentAmbientLightLevel = this.set_maxLux;
-                }
-                this.debugLog(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
+            }
+        }
+        else {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
+            this.TargetPosition = this.CurrentPosition;
+            this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},` +
+            ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
+        if (!this.device.curtain?.hide_lightsensor) {
+            this.set_minLux = this.minLux();
+            this.set_maxLux = this.maxLux();
+            // Brightness
+            switch (this.brightness) {
+                case 'dim':
+                    this.CurrentAmbientLightLevel = this.set_minLux;
+                    break;
+                case 'bright':
+                default:
+                    this.CurrentAmbientLightLevel = this.set_maxLux;
             }
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
     }
     async refreshStatus() {
-        if (this.device.ble) {
+        if (this.BLE) {
             await this.BLERefreshStatus();
         }
-        else {
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIRefreshStatus();
         }
+        else {
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, refreshStatus will not happen.`);
+        }
     }
     async BLERefreshStatus() {
-        this.debugLog(`Curtain: ${this.accessory.displayName} BLE refreshStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
         const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
         this.device.bleMac = this.device
             .deviceId.match(/.{1,2}/g)
             .join(':')
             .toLowerCase();
-        this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         this.getCustomBLEAddress(switchbot);
         // Start to monitor advertisement packets
-        this.errorLog(`Color Bulb: ${this.accessory.displayName} switchbot: ${JSON.stringify(switchbot)}`);
         if (switchbot !== false) {
             switchbot
                 .startScan({
@@ -371,27 +344,23 @@ class Curtain {
                 // Set an event hander
                 switchbot.onadvertisement = (ad) => {
                     this.address = ad.address;
-                    if (this.deviceLogging.includes('debug')) {
-                        this.infoLog(this.address);
-                        this.infoLog(this.device.bleMac);
-                        this.infoLog(`Curtain: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-                        this.infoLog(`Curtain: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
-                    }
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
+                        + ` BLE Address Found: ${this.address}`);
                     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}, ` +
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(ad.serviceData)}`);
+                    this.debugLog(`${this.device.deviceType}: ${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}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                     else {
                         this.connected = false;
-                        this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                 };
                 // Wait 2 seconds
@@ -401,162 +370,107 @@ class Curtain {
                 // Stop to monitor
                 switchbot.stopScan();
                 if (this.connected) {
-                    this.parseStatus();
+                    this.BLEparseStatus();
                     this.updateHomeKitCharacteristics();
                 }
                 else {
-                    this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                    if (this.platform.config.credentials?.token) {
-                        this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-                        this.SwitchToOpenAPI = true;
-                        await this.openAPIRefreshStatus();
-                    }
+                    await this.BLERefreshConnection(switchbot);
                 }
             })
                 .catch(async (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?.token) {
-                    this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    this.SwitchToOpenAPI = true;
-                    await this.openAPIRefreshStatus();
-                }
                 this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}`
+                    + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                await this.BLERefreshConnection(switchbot);
             });
         }
         else {
-            await this.BLEconnection(switchbot);
-        }
-    }
-    async getCustomBLEAddress(switchbot) {
-        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: 'c',
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`Curtain: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await switchbot.wait(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
-        }
-    }
-    async BLEconnection(switchbot) {
-        this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
-        if (this.platform.config.credentials?.token) {
-            this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-            this.SwitchToOpenAPI = true;
-            await this.openAPIRefreshStatus();
+            await this.BLERefreshConnection(switchbot);
         }
     }
     async openAPIRefreshStatus() {
-        if (this.platform.config.credentials?.token) {
-            this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI refreshStatus`);
-            try {
-                const t = Date.now();
-                const nonce = 'requestID';
-                const data = this.platform.config.credentials?.token + t + nonce;
-                const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
-                const sign = signTerm.toString('base64');
-                this.debugLog(`Curtain: ${this.accessory.displayName} sign: ${sign}`);
-                const options = {
-                    hostname: settings_1.HostDomain,
-                    port: 443,
-                    path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
-                    method: 'GET',
-                    headers: {
-                        Authorization: this.platform.config.credentials?.token,
-                        sign: sign,
-                        nonce: nonce,
-                        t: t,
-                        'Content-Type': 'application/json',
-                    },
-                };
-                const req = https_1.default.request(options, (res) => {
-                    this.debugLog(`Curtain: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-                    let rawData = '';
-                    res.on('data', (d) => {
-                        rawData += d;
-                        this.debugLog(`Curtain: ${this.accessory.displayName} d: ${d}`);
-                    });
-                    res.on('end', () => {
-                        try {
-                            this.deviceStatus = JSON.parse(rawData);
-                            this.debugLog(`Curtain: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
-                            this.slidePosition = this.deviceStatus.body.slidePosition;
-                            this.moving = this.deviceStatus.body.moving;
-                            this.brightness = this.deviceStatus.body.brightness;
-                            this.parseStatus();
-                            this.updateHomeKitCharacteristics();
-                        }
-                        catch (e) {
-                            this.errorLog(`Curtain: ${this.accessory.displayName} error message: ${e.message}`);
-                        }
-                    });
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
+        try {
+            const t = Date.now();
+            const nonce = 'requestID';
+            const data = this.platform.config.credentials?.token + t + nonce;
+            const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+            const sign = signTerm.toString('base64');
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+            const options = {
+                hostname: settings_1.HostDomain,
+                port: 443,
+                path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
+                method: 'GET',
+                headers: {
+                    Authorization: this.platform.config.credentials?.token,
+                    sign: sign,
+                    nonce: nonce,
+                    t: t,
+                    'Content-Type': 'application/json',
+                },
+            };
+            const req = https_1.default.request(options, (res) => {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                let rawData = '';
+                res.on('data', (d) => {
+                    rawData += d;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                 });
-                req.on('error', (e) => {
-                    this.errorLog(`Curtain: ${this.accessory.displayName} error message: ${e.message}`);
+                res.on('end', () => {
+                    try {
+                        this.deviceStatus = JSON.parse(rawData);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
+                        this.slidePosition = this.deviceStatus.body.slidePosition;
+                        this.moving = this.deviceStatus.body.moving;
+                        this.brightness = this.deviceStatus.body.brightness;
+                        this.openAPIparseStatus();
+                        this.updateHomeKitCharacteristics();
+                    }
+                    catch (e) {
+                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                    }
                 });
-                req.end();
-            }
-            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)}`);
-                }
-                this.apiError(e);
-            }
+            });
+            req.on('error', (e) => {
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+            });
+            req.end();
+        }
+        catch (e) {
+            this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     async pushChanges() {
-        if (this.device.ble) {
-            await this.BLEpushChanges();
+        if (this.BLE) {
+            await this.BLERefreshStatus();
         }
-        else {
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIpushChanges();
         }
+        else {
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, pushChanges will not happen.`);
+        }
         (0, rxjs_1.interval)(this.updateRate * 1000)
-            .pipe((0, operators_1.take)(2))
+            .pipe((0, operators_1.take)(1))
             .subscribe(async () => {
             await this.refreshStatus();
         });
     }
     async BLEpushChanges() {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
         if (this.TargetPosition !== this.CurrentPosition) {
-            this.debugLog(`Curtain: ${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(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-            if (this.TargetPosition > 50) {
-                if (this.device.curtain?.setOpenMode === '1') {
-                    this.setPositionMode = 1;
-                    this.Mode = 'Silent Mode';
-                }
-                else {
-                    this.setPositionMode = 0;
-                    this.Mode = 'Performance Mode';
-                }
-            }
-            else {
-                if (this.device.curtain?.setCloseMode === '1') {
-                    this.setPositionMode = 1;
-                    this.Mode = 'Silent Mode';
-                }
-                else {
-                    this.setPositionMode = 0;
-                    this.Mode = 'Performance Mode';
-                }
-            }
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+            this.SilentPerformance();
             const adjustedMode = this.setPositionMode || null;
             if (adjustedMode === null) {
                 this.Mode = 'Default Mode';
@@ -570,248 +484,290 @@ class Curtain {
                     return device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
                 })
                     .then(() => {
-                    this.debugLog(`Curtain: ${this.accessory.displayName} Done.`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
                 })
                     .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.platform.config.credentials?.token) {
-                        this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-                        await this.openAPIpushChanges();
-                    }
                     this.apiError(e);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+                        + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                    await this.BLEPushConnection();
                 });
             }
             else {
-                this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    await this.openAPIpushChanges();
-                }
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+                await this.BLEPushConnection();
             }
         }
         else {
-            this.debugLog(`Curtain: ${this.accessory.displayName} No BLE Changes, CurrentPosition & TargetPosition Are the Same.` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges, CurrentPosition & TargetPosition Are the Same.` +
                 `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
         }
     }
     async openAPIpushChanges() {
-        if (this.platform.config.credentials?.token) {
-            try {
-                this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI pushChanges`);
-                if (this.TargetPosition !== this.CurrentPosition) {
-                    // Make Push On request to the API
-                    const t = Date.now();
-                    const nonce = 'requestID';
-                    const data = this.platform.config.credentials?.token + t + nonce;
-                    const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret)
-                        .update(Buffer.from(data, 'utf-8'))
-                        .digest();
-                    const sign = signTerm.toString('base64');
-                    this.debugLog(`Curtain: ${this.accessory.displayName} sign: ${sign}`);
-                    this.debugLog(`Pushing ${this.TargetPosition}`);
-                    const adjustedTargetPosition = 100 - Number(this.TargetPosition);
-                    if (this.TargetPosition > 50) {
-                        this.setPositionMode = this.device.curtain?.setOpenMode;
-                    }
-                    else {
-                        this.setPositionMode = this.device.curtain?.setCloseMode;
-                    }
-                    if (this.setPositionMode === '1') {
-                        this.Mode = 'Silent Mode';
-                    }
-                    else if (this.setPositionMode === '0') {
-                        this.Mode = 'Performance Mode';
-                    }
-                    else {
-                        this.Mode = 'Default Mode';
-                    }
-                    this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
-                    const adjustedMode = this.setPositionMode || 'ff';
-                    const body = JSON.stringify({
-                        'command': 'setPosition',
-                        'parameter': `0,${adjustedMode},${adjustedTargetPosition}`,
-                        'commandType': 'command',
-                    });
-                    this.infoLog(`Curtain: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
-                    const options = {
-                        hostname: settings_1.HostDomain,
-                        port: 443,
-                        path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
-                        method: 'POST',
-                        headers: {
-                            'Authorization': this.platform.config.credentials?.token,
-                            'sign': sign,
-                            'nonce': nonce,
-                            't': t,
-                            'Content-Type': 'application/json',
-                            'Content-Length': body.length,
-                        },
-                    };
-                    const req = https_1.default.request(options, res => {
-                        this.debugLog(`Curtain: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-                        this.statusCode({ res });
-                        res.on('data', d => {
-                            this.debugLog(`Curtain: ${this.accessory.displayName} d: ${d}`);
-                        });
-                    });
-                    req.on('error', (e) => {
-                        this.errorLog(`Curtain: ${this.accessory.displayName} error message: ${e.message}`);
-                    });
-                    req.write(body);
-                    req.end();
-                    this.debugLog(`Curtain: ${this.accessory.displayName} openAPIpushChanges: ${JSON.stringify(req)}`);
+        try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI pushChanges`);
+            if (this.TargetPosition !== this.CurrentPosition) {
+                // Make Push On request to the API
+                const t = Date.now();
+                const nonce = 'requestID';
+                const data = this.platform.config.credentials?.token + t + nonce;
+                const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret)
+                    .update(Buffer.from(data, 'utf-8'))
+                    .digest();
+                const sign = signTerm.toString('base64');
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`Pushing ${this.TargetPosition}`);
+                const adjustedTargetPosition = 100 - Number(this.TargetPosition);
+                if (this.TargetPosition > 50) {
+                    this.setPositionMode = this.device.curtain?.setOpenMode;
                 }
                 else {
-                    this.debugLog(`Curtain: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.` +
-                        `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
+                    this.setPositionMode = this.device.curtain?.setCloseMode;
                 }
-            }
-            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.setPositionMode === '1') {
+                    this.Mode = 'Silent Mode';
                 }
-                this.apiError(e);
+                else if (this.setPositionMode === '0') {
+                    this.Mode = 'Performance Mode';
+                }
+                else {
+                    this.Mode = 'Default Mode';
+                }
+                this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
+                const adjustedMode = this.setPositionMode || 'ff';
+                const body = (0, super_stringify_1.default)({
+                    'command': 'setPosition',
+                    'parameter': `0,${adjustedMode},${adjustedTargetPosition}`,
+                    'commandType': 'command',
+                });
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                const options = {
+                    hostname: settings_1.HostDomain,
+                    port: 443,
+                    path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
+                    method: 'POST',
+                    headers: {
+                        'Authorization': this.platform.config.credentials?.token,
+                        'sign': sign,
+                        'nonce': nonce,
+                        't': t,
+                        'Content-Type': 'application/json',
+                        'Content-Length': body.length,
+                    },
+                };
+                const req = https_1.default.request(options, res => {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges statusCode: ${res.statusCode}`);
+                    this.statusCode({ res });
+                    res.on('data', d => {
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
+                    });
+                });
+                req.on('error', (e) => {
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                });
+                req.write(body);
+                req.end();
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
             }
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.`
+                    + ` CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
+            }
+        }
+        catch (e) {
+            this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+        }
+    }
+    /**
+     * Handle requests to set the value of the "Target Position" characteristic
+     */
+    async TargetPositionSet(value) {
+        if (this.TargetPosition === this.accessory.context.TargetPosition) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetPosition: ${value}`);
+        }
+        else {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+        }
+        this.TargetPosition = value;
+        this.mqttPublish('TargetPosition', this.TargetPosition);
+        await this.setMinMax();
+        if (value > this.CurrentPosition) {
+            this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
+            this.setNewTarget = true;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+        }
+        else if (value < this.CurrentPosition) {
+            this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
+            this.setNewTarget = true;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+        }
+        else {
+            this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+            this.setNewTarget = false;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+        }
+        this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
+        this.windowCoveringService.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.
+         */
+        clearTimeout(this.setNewTargetTimer);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateRate: ${this.updateRate}`);
+        if (this.setNewTarget) {
+            this.setNewTargetTimer = setTimeout(() => {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} setNewTarget ${this.setNewTarget} timeout`);
+                this.setNewTarget = false;
+            }, this.updateRate * 1000);
         }
+        this.doCurtainUpdate.next();
     }
     async updateHomeKitCharacteristics() {
         await this.setMinMax();
         if (this.CurrentPosition === undefined || Number.isNaN(this.CurrentPosition)) {
-            this.debugLog(`Curtain: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
         }
         else {
+            this.accessory.context.CurrentPosition = this.CurrentPosition;
             this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.CurrentPosition, Number(this.CurrentPosition));
-            this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic CurrentPosition: ${this.CurrentPosition}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentPosition: ${this.CurrentPosition}`);
             this.mqttPublish('CurrentPosition', this.CurrentPosition);
         }
         if (this.PositionState === undefined) {
-            this.debugLog(`Curtain: ${this.accessory.displayName} PositionState: ${this.PositionState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} PositionState: ${this.PositionState}`);
         }
         else {
+            this.accessory.context.PositionState = this.PositionState;
             this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.PositionState, Number(this.PositionState));
-            this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
             this.mqttPublish('PositionState', this.PositionState);
         }
         if (this.TargetPosition === undefined || Number.isNaN(this.TargetPosition)) {
-            this.debugLog(`Curtain: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
         }
         else {
+            this.accessory.context.TargetPosition = this.TargetPosition;
             this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, Number(this.TargetPosition));
-            this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
             this.mqttPublish('TargetPosition', this.TargetPosition);
         }
         if (!this.device.curtain?.hide_lightsensor) {
             if (this.CurrentAmbientLightLevel === undefined || Number.isNaN(this.CurrentAmbientLightLevel)) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
             else {
+                this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
                 this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
-                this.debugLog(`Curtain: ${this.accessory.displayName}` + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                    + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
                 this.mqttPublish('CurrentAmbientLightLevel', this.CurrentAmbientLightLevel);
             }
         }
-        if (this.device.ble) {
+        if (this.BLE) {
             if (this.BatteryLevel === undefined) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
             }
             else {
+                this.accessory.context.BatteryLevel = this.BatteryLevel;
                 this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-                this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
                 this.mqttPublish('BatteryLevel', this.BatteryLevel);
             }
             if (this.StatusLowBattery === undefined) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
             }
             else {
+                this.accessory.context.StatusLowBattery = this.StatusLowBattery;
                 this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-                this.debugLog(`Curtain: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
                 this.mqttPublish('StatusLowBattery', this.StatusLowBattery);
             }
         }
     }
-    async apiError(e) {
-        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.PositionState, e);
-        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-        if (!this.device.curtain?.hide_lightsensor) {
-            this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
+    /*
+     * Publish MQTT message for topics of
+     * 'homebridge-switchbot/curtain/xx:xx:xx:xx:xx:xx'
+     */
+    mqttPublish(topic, message) {
+        const mac = this.device.deviceId
+            ?.toLowerCase()
+            .match(/[\s\S]{1,2}/g)
+            ?.join(':');
+        const options = this.device.mqttPubOptions || {};
+        this.mqttClient?.publish(`homebridge-switchbot/curtain/${mac}/${topic}`, `${message}`, options);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT message: ${topic}/${message} options:${(0, super_stringify_1.default)(options)}`);
+    }
+    /*
+     * Setup MQTT hadler if URL is specifed.
+     */
+    async setupMqtt(device) {
+        if (device.mqttURL) {
+            try {
+                this.mqttClient = await (0, async_mqtt_1.connectAsync)(device.mqttURL, device.mqttOptions || {});
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT connection has been established successfully.`);
+                this.mqttClient.on('error', (e) => {
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to publish MQTT messages. ${e}`);
+                });
+            }
+            catch (e) {
+                this.mqttClient = null;
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to establish MQTT connection. ${e}`);
+            }
         }
-        if (this.device.ble) {
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
+    }
+    async getCustomBLEAddress(switchbot) {
+        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+            (async () => {
+                // Start to monitor advertisement packets
+                await switchbot.startScan({
+                    model: 'c',
+                });
+                // Set an event handler
+                switchbot.onadvertisement = (ad) => {
+                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${(0, super_stringify_1.default)(ad, null, '  ')}`);
+                };
+                await switchbot.wait(10000);
+                // Stop to monitor
+                switchbot.stopScan();
+            })();
         }
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
-    async statusCode({ res }) {
-        switch (res.statusCode) {
-            case 151:
-                this.errorLog(`Curtain: ${this.accessory.displayName} Command not supported by this device type.`);
-                break;
-            case 152:
-                this.errorLog(`Curtain: ${this.accessory.displayName} Device not found.`);
-                break;
-            case 160:
-                this.errorLog(`Curtain: ${this.accessory.displayName} Command is not supported.`);
-                break;
-            case 161:
-                this.errorLog(`Curtain: ${this.accessory.displayName} Device is offline.`);
-                break;
-            case 171:
-                this.errorLog(`Curtain: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
-                break;
-            case 190:
-                this.errorLog(`Curtain: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command: ${JSON.stringify(res)} format is invalid`);
-                break;
-            case 100:
-                this.debugLog(`Curtain: ${this.accessory.displayName} Command successfully sent.`);
-                break;
-            default:
-                this.debugLog(`Curtain: ${this.accessory.displayName} Unknown statusCode.`);
+    async BLEPushConnection() {
+        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
+            await this.openAPIpushChanges();
         }
     }
-    /**
-     * Handle requests to set the value of the "Target Position" characteristic
-     */
-    async TargetPositionSet(value) {
-        this.debugLog(`Curtain: ${this.accessory.displayName} TargetPosition: ${value}`);
-        this.TargetPosition = value;
-        this.mqttPublish('TargetPosition', this.TargetPosition);
-        await this.setMinMax();
-        if (value > this.CurrentPosition) {
-            this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
-            this.setNewTarget = true;
-            this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+    async BLERefreshConnection(switchbot) {
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Refresh Status`);
+            await this.openAPIRefreshStatus();
         }
-        else if (value < this.CurrentPosition) {
-            this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
-            this.setNewTarget = true;
-            this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+    }
+    async SilentPerformance() {
+        if (this.TargetPosition > 50) {
+            if (this.device.curtain?.setOpenMode === '1') {
+                this.setPositionMode = 1;
+                this.Mode = 'Silent Mode';
+            }
+            else {
+                this.setPositionMode = 0;
+                this.Mode = 'Performance Mode';
+            }
         }
         else {
-            this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-            this.setNewTarget = false;
-            this.debugLog(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
-        }
-        this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
-        this.windowCoveringService.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.
-         */
-        clearTimeout(this.setNewTargetTimer);
-        this.debugLog(`Curtain: ${this.accessory.displayName} updateRate: ${this.updateRate}`);
-        if (this.setNewTarget) {
-            this.setNewTargetTimer = setTimeout(() => {
-                this.debugLog(`Curtain: ${this.accessory.displayName} setNewTarget ${this.setNewTarget} timeout`);
-                this.setNewTarget = false;
-            }, this.updateRate * 1000);
+            if (this.device.curtain?.setCloseMode === '1') {
+                this.setPositionMode = 1;
+                this.Mode = 'Silent Mode';
+            }
+            else {
+                this.setPositionMode = 0;
+                this.Mode = 'Performance Mode';
+            }
         }
-        this.doCurtainUpdate.next();
     }
     async setMinMax() {
         if (this.device.curtain?.set_min) {
@@ -825,96 +781,117 @@ class Curtain {
             }
         }
     }
-    async config(device) {
-        let config = {};
-        if (device.curtain) {
-            config = device.curtain;
-        }
-        if (device.ble) {
-            config['ble'] = device.ble;
-        }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
-        }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
-        }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
+    minStep(device) {
+        if (device.curtain?.set_minStep) {
+            this.set_minStep = device.curtain?.set_minStep;
         }
-        if (Object.entries(config).length !== 0) {
-            this.infoLog(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+        else {
+            this.set_minStep = 1;
         }
+        return this.set_minStep;
     }
-    async refreshRate(device) {
-        // refreshRate
-        if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Curtain: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+    minLux() {
+        if (this.device.curtain?.set_minLux) {
+            this.set_minLux = this.device.curtain?.set_minLux;
         }
-        else if (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}`);
+        else {
+            this.set_minLux = 1;
         }
-        // updateRate
-        if (device?.curtain?.updateRate) {
-            this.updateRate = device?.curtain?.updateRate;
-            this.debugLog(`Curtain: ${this.accessory.displayName} Using Device Config Curtain refreshRate: ${this.deviceRefreshRate}`);
+        return this.set_minLux;
+    }
+    maxLux() {
+        if (this.device.curtain?.set_maxLux) {
+            this.set_maxLux = this.device.curtain?.set_maxLux;
         }
         else {
-            this.updateRate = 7;
-            this.debugLog(`Curtain: ${this.accessory.displayName} Using Default Curtain Refresh Rate.`);
+            this.set_maxLux = 6001;
         }
+        return this.set_maxLux;
     }
     async scan(device) {
         if (device.scanDuration) {
             if (this.updateRate > device.scanDuration) {
                 this.scanDuration = this.updateRate;
-                this.warnLog(`Curtain: ${this.accessory.displayName} scanDuration is less then updateRate, overriding scanDuration with updateRate`);
+                this.warnLog(`${this.device.deviceType}: `
+                    + `${this.accessory.displayName} scanDuration is less then updateRate, overriding scanDuration with updateRate`);
             }
             else {
                 this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
             }
-            if (device.ble) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
             }
         }
         else {
             if (this.updateRate > 1) {
                 this.scanDuration = this.updateRate;
-                this.warnLog(`Curtain: ${this.accessory.displayName} scanDuration is less then updateRate, overriding scanDuration with updateRate`);
+                this.warnLog(`${this.device.deviceType}: `
+                    + `${this.accessory.displayName} scanDuration is less then updateRate, overriding scanDuration with updateRate`);
             }
             else {
                 this.scanDuration = this.accessory.context.scanDuration = 1;
             }
-            if (this.device.ble) {
-                this.debugLog(`Curtain: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
             }
         }
     }
-    async logs(device) {
-        if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`Curtain: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+    async statusCode({ res }) {
+        switch (res.statusCode) {
+            case 151:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
+                break;
+            case 152:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
+                break;
+            case 160:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
+                break;
+            case 161:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
+                this.offlineOff();
+                break;
+            case 171:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+                this.offlineOff();
+                break;
+            case 190:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
+                    ` Or command: ${(0, super_stringify_1.default)(res)} format is invalid`);
+                break;
+            case 100:
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
+                break;
+            default:
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
         }
-        else if (device.logging) {
-            this.deviceLogging = this.accessory.context.logging = device.logging;
-            this.debugLog(`Curtain: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+    }
+    async offlineOff() {
+        if (this.device.offline) {
+            this.CurrentPosition = 100;
+            this.windowCoveringService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.CurrentPosition);
+            await this.updateHomeKitCharacteristics();
         }
-        else if (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}`);
+    }
+    async apiError(e) {
+        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
+        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
+        if (!this.device.curtain?.hide_lightsensor) {
+            this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
         }
-        else {
-            this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`Curtain: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+        if (this.BLE) {
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
         }
+        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
     FirmwareRevision(accessory, device) {
         let FirmwareRevision;
-        this.debugLog(`Curtain: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`Curtain: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`Curtain: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
         if (accessory.context.FirmwareRevision) {
             FirmwareRevision = accessory.context.FirmwareRevision;
         }
@@ -926,32 +903,84 @@ class Curtain {
         }
         return FirmwareRevision;
     }
-    minStep(device) {
-        if (device.curtain?.set_minStep) {
-            this.set_minStep = device.curtain?.set_minStep;
+    async context() {
+        if (this.CurrentPosition === undefined) {
+            this.CurrentPosition = 0;
         }
         else {
-            this.set_minStep = 1;
+            this.CurrentPosition = this.accessory.context.CurrentPosition;
+        }
+        if (this.TargetPosition === undefined) {
+            this.TargetPosition = 0;
+        }
+        else {
+            this.TargetPosition = this.accessory.context.TargetPosition;
+        }
+        if (this.PositionState === undefined) {
+            this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+        }
+        else {
+            this.PositionState = this.accessory.context.PositionState;
         }
-        return this.set_minStep;
     }
-    minLux() {
-        if (this.device.curtain?.set_minLux) {
-            this.set_minLux = this.device.curtain?.set_minLux;
+    async refreshRate(device) {
+        // refreshRate
+        if (device.refreshRate) {
+            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
+            this.debugLog(`${this.device.deviceType}: ${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.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+        }
+        // updateRate
+        if (device?.curtain?.updateRate) {
+            this.updateRate = device?.curtain?.updateRate;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Curtain refreshRate: ${this.deviceRefreshRate}`);
         }
         else {
-            this.set_minLux = 1;
+            this.updateRate = 7;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default Curtain Refresh Rate.`);
         }
-        return this.set_minLux;
     }
-    maxLux() {
-        if (this.device.curtain?.set_maxLux) {
-            this.set_maxLux = this.device.curtain?.set_maxLux;
+    async config(device) {
+        let config = {};
+        if (device.curtain) {
+            config = device.curtain;
+        }
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
+        }
+        if (device.logging !== undefined) {
+            config['logging'] = device.logging;
+        }
+        if (device.refreshRate !== undefined) {
+            config['refreshRate'] = device.refreshRate;
+        }
+        if (device.scanDuration !== undefined) {
+            config['scanDuration'] = device.scanDuration;
+        }
+        if (Object.entries(config).length !== 0) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
+        }
+    }
+    async logs(device) {
+        if (this.platform.debugMode) {
+            this.deviceLogging = this.accessory.context.logging = 'debugMode';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+        }
+        else if (device.logging) {
+            this.deviceLogging = this.accessory.context.logging = device.logging;
+            this.debugLog(`${this.device.deviceType}: ${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.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
         }
         else {
-            this.set_maxLux = 6001;
+            this.deviceLogging = this.accessory.context.logging = 'standard';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
-        return this.set_maxLux;
     }
     /**
      * Logging for Device
@@ -966,11 +995,25 @@ class Curtain {
             this.platform.log.warn(String(...log));
         }
     }
+    debugWarnLog(...log) {
+        if (this.enablingDeviceLogging()) {
+            if (this.deviceLogging?.includes('debug')) {
+                this.platform.log.warn('[DEBUG]', String(...log));
+            }
+        }
+    }
     errorLog(...log) {
         if (this.enablingDeviceLogging()) {
             this.platform.log.error(String(...log));
         }
     }
+    debugErrorLog(...log) {
+        if (this.enablingDeviceLogging()) {
+            if (this.deviceLogging?.includes('debug')) {
+                this.platform.log.error('[DEBUG]', String(...log));
+            }
+        }
+    }
     debugLog(...log) {
         if (this.enablingDeviceLogging()) {
             if (this.deviceLogging === 'debug') {