@switchbot/homebridge-switchbot 2.0.0-beta.19 → 2.0.0-beta.20

package/dist/device/humidifier.js

@@ -20,19 +20,15 @@ class Humidifier {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        // Connection
+        this.BLE = (this.device.connectionType === 'BLE' || this.device.connectionType === 'Both');
+        this.OpenAPI = (this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'Both');
         // default placeholders
         this.logs(device);
-        this.openAPI();
         this.scan(device);
         this.refreshRate(device);
         this.config(device);
-        this.CurrentRelativeHumidity = 0;
-        this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
-        this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
-        this.Active = this.platform.Characteristic.Active.ACTIVE;
-        this.RelativeHumidityHumidifierThreshold = 0;
-        this.CurrentTemperature = 0;
-        this.WaterLevel = 0;
+        this.context();
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doHumidifierUpdate = new rxjs_1.Subject();
         this.humidifierUpdateInProgress = false;
@@ -70,8 +66,8 @@ class Humidifier {
             maxValue: 1,
             validValues: [0, 1],
         })
-            .onSet(this.handleTargetHumidifierDehumidifierStateSet.bind(this));
-        this.humidifierService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.handleActiveSet.bind(this));
+            .onSet(this.TargetHumidifierDehumidifierStateSet.bind(this));
+        this.humidifierService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
         this.humidifierService
             .getCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold)
             .setProps({
@@ -80,14 +76,14 @@ class Humidifier {
             maxValue: 100,
             minStep: this.minStep(),
         })
-            .onSet(this.handleRelativeHumidityHumidifierThresholdSet.bind(this));
+            .onSet(this.RelativeHumidityHumidifierThresholdSet.bind(this));
         // Temperature Sensor Service
-        if (device.humidifier?.hide_temperature || device.ble) {
+        if (device.humidifier?.hide_temperature || this.BLE) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
             this.temperatureservice = this.accessory.getService(this.platform.Service.TemperatureSensor);
             accessory.removeService(this.temperatureservice);
         }
-        else if (!this.temperatureservice && !device.ble) {
+        else if (!this.temperatureservice && !this.BLE) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
             (this.temperatureservice =
                 this.accessory.getService(this.platform.Service.TemperatureSensor) || this.accessory.addService(this.platform.Service.TemperatureSensor)),
@@ -127,12 +123,9 @@ class Humidifier {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(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.humidifierUpdateInProgress = false;
         });
@@ -141,15 +134,20 @@ class Humidifier {
      * Parse the device status from the SwitchBot api
      */
     async parseStatus() {
-        if (this.device.ble) {
+        if (this.BLE && !this.SwitchToOpenAPI) {
             await this.BLEparseStatus();
         }
-        else {
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
+            this.SwitchToOpenAPI = false;
             await this.openAPIparseStatus();
         }
+        else {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, parseStatus will not happen.`);
+        }
     }
     async BLEparseStatus() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // Current Relative Humidity
         this.CurrentRelativeHumidity = this.percentage;
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
@@ -163,79 +161,81 @@ class Humidifier {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
     }
     async openAPIparseStatus() {
-        if (this.platform.config.credentials?.token) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI parseStatus`);
-            // Current Relative Humidity
-            this.CurrentRelativeHumidity = this.humidity;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
-            // Current Temperature
-            if (!this.device.humidifier?.hide_temperature) {
-                this.CurrentTemperature = this.temperature;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
-            }
-            // Target Humidifier Dehumidifier State
-            switch (this.auto) {
-                case true:
-                    this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+        // Current Relative Humidity
+        this.CurrentRelativeHumidity = this.humidity;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+        // Current Temperature
+        if (!this.device.humidifier?.hide_temperature) {
+            this.CurrentTemperature = this.temperature;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
+        }
+        // Target Humidifier Dehumidifier State
+        switch (this.auto) {
+            case true:
+                this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER;
+                this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
+                this.RelativeHumidityHumidifierThreshold = this.CurrentRelativeHumidity;
+                break;
+            default:
+                this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+                if (this.nebulizationEfficiency > 100) {
+                    this.RelativeHumidityHumidifierThreshold = 100;
+                }
+                else {
+                    this.RelativeHumidityHumidifierThreshold = this.nebulizationEfficiency;
+                }
+                if (this.CurrentRelativeHumidity > this.RelativeHumidityHumidifierThreshold) {
+                    this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
+                }
+                else if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
+                    this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+                }
+                else {
                     this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
-                    this.RelativeHumidityHumidifierThreshold = this.CurrentRelativeHumidity;
-                    break;
-                default:
-                    this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
-                    if (this.nebulizationEfficiency > 100) {
-                        this.RelativeHumidityHumidifierThreshold = 100;
-                    }
-                    else {
-                        this.RelativeHumidityHumidifierThreshold = this.nebulizationEfficiency;
-                    }
-                    if (this.CurrentRelativeHumidity > this.RelativeHumidityHumidifierThreshold) {
-                        this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
-                    }
-                    else if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
-                        this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
-                    }
-                    else {
-                        this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
-                    }
-            }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                + ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
-            // Active
-            switch (this.power) {
-                case 'on':
-                    this.Active = this.platform.Characteristic.Active.ACTIVE;
-                    break;
-                default:
-                    this.Active = this.platform.Characteristic.Active.INACTIVE;
-            }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
-            // Water Level
-            if (this.lackWater) {
-                this.WaterLevel = 0;
-            }
-            else {
-                this.WaterLevel = 100;
-            }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
+                }
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
+        // Active
+        switch (this.power) {
+            case 'on':
+                this.Active = this.platform.Characteristic.Active.ACTIVE;
+                break;
+            default:
+                this.Active = this.platform.Characteristic.Active.INACTIVE;
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
+        // Water Level
+        if (this.lackWater) {
+            this.WaterLevel = 0;
         }
+        else {
+            this.WaterLevel = 100;
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
     }
     /**
      * Asks the SwitchBot API for the latest device information
      */
     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.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, refreshStatus will not happen.`);
+        }
     }
     async BLERefreshStatus() {
-        this.debugLog(`${this.device.deviceType}: ${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
@@ -292,123 +292,87 @@ class Humidifier {
                 }
             })
                 .catch(async (e) => {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    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.BLEconnection(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: 'e',
-                });
-                // 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();
-            })();
-        }
-    }
-    async BLEconnection(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.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-            await this.openAPIRefreshStatus();
-        }
-    }
     async openAPIRefreshStatus() {
-        if (this.platform.config.credentials?.token && this.OpenAPI) {
-            this.debugLog(`${this.device.deviceType}: ${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(`${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}`);
-                    });
-                    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.auto = this.deviceStatus.body.auto;
-                            this.power = this.deviceStatus.body.power;
-                            this.lackWater = this.deviceStatus.body.lackWater;
-                            this.humidity = this.deviceStatus.body.humidity;
-                            this.temperature = this.deviceStatus.body.temperature;
-                            this.nebulizationEfficiency = this.deviceStatus.body.nebulizationEfficiency;
-                            this.parseStatus();
-                            this.updateHomeKitCharacteristics();
-                        }
-                        catch (e) {
-                            this.errorLog(`${this.device.deviceType}: ${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} openAPIRefreshStatus 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(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                res.on('end', () => {
+                    try {
+                        this.deviceStatus = JSON.parse(rawData);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
+                        this.auto = this.deviceStatus.body.auto;
+                        this.power = this.deviceStatus.body.power;
+                        this.lackWater = this.deviceStatus.body.lackWater;
+                        this.humidity = this.deviceStatus.body.humidity;
+                        this.temperature = this.deviceStatus.body.temperature;
+                        this.nebulizationEfficiency = this.deviceStatus.body.nebulizationEfficiency;
+                        this.parseStatus();
+                        this.updateHomeKitCharacteristics();
+                    }
+                    catch (e) {
+                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                    }
                 });
-                req.end();
-            }
-            catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
-                        ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                this.apiError(e);
-            }
+            });
+            req.on('error', (e) => {
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+            });
+            req.end();
         }
-        else {
-            if (this.deviceLogging.includes('debug')) {
-                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, device status will not be sent.`);
-            }
+        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)}`);
         }
     }
     /**
      * Pushes the requested changes to the SwitchBot API
      */
     async pushChanges() {
-        //if (this.device.ble) {
-        //  await this.BLEpushChanges();
-        //} else {
-        await this.openAPIpushChanges();
-        //}
+        /*if (this.BLE) {
+          await this.BLERefreshStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            await this.openAPIpushChanges();
+        }
+        else {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, pushChanges will not happen.`);
+        }
         (0, rxjs_1.interval)(5000)
             .pipe((0, operators_1.take)(1))
             .subscribe(async () => {
@@ -416,7 +380,7 @@ class Humidifier {
         });
     }
     async BLEpushChanges() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE pushChanges`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
         const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
         this.device.bleMac = this.device
@@ -424,40 +388,32 @@ class Humidifier {
             .join(':')
             .toLowerCase();
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        if (switchbot !== false) {
-            switchbot
-                .discover({ model: 'e', quick: true, id: this.device.bleMac })
-                .then((device_list) => {
-                this.infoLog(`${this.accessory.displayName} Target Position: ${this.Active}`);
-                return device_list[0].percentage(this.RelativeHumidityHumidifierThreshold);
-            })
-                .then(() => {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-            })
-                .catch(async (e) => {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    await this.openAPIpushChanges();
-                }
-                this.apiError(e);
-            });
-        }
-        else {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-            if (this.platform.config.credentials?.token) {
+        switchbot
+            .discover({
+            model: 'e',
+            quick: true,
+            id: this.device.bleMac,
+        })
+            .then((device_list) => {
+            this.infoLog(`${this.accessory.displayName} Target Position: ${this.Active}`);
+            return device_list[0].percentage(this.RelativeHumidityHumidifierThreshold);
+        })
+            .then(() => {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+        })
+            .catch(async (e) => {
+            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)}`);
+            if (this.platform.config.credentials?.token && this.device.connectionType !== 'Both') {
                 this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
                 await this.openAPIpushChanges();
             }
-        }
+        });
     }
     async openAPIpushChanges() {
-        if (this.platform.config.credentials?.token && this.OpenAPI) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI pushChanges`);
+        try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
             if (this.TargetHumidifierDehumidifierState === this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER &&
                 this.Active === this.platform.Characteristic.Active.ACTIVE) {
                 // Make Push On request to the API
@@ -491,7 +447,7 @@ class Humidifier {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges statusCode: ${res.statusCode}`);
                     res.on('data', d => {
                         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
@@ -512,8 +468,10 @@ class Humidifier {
                 await this.pushActiveChanges();
             }
         }
-        else {
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
+        catch (e) {
+            this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     /**
@@ -521,6 +479,7 @@ class Humidifier {
      */
     async pushAutoChanges() {
         try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushAutoChanges`);
             if (this.TargetHumidifierDehumidifierState === this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
                 this.Active === this.platform.Characteristic.Active.ACTIVE) {
                 // Make Push On request to the API
@@ -567,14 +526,15 @@ class Humidifier {
                 req.end();
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushAutoChanges: ${(0, super_stringify_1.default)(req)}`);
             }
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushAutoChanges.` +
+                    `TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}, Active: ${this.Active}`);
+            }
         }
         catch (e) {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` +
-                    ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushAutoChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     /**
@@ -582,6 +542,7 @@ class Humidifier {
      */
     async pushActiveChanges() {
         try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushActiveChanges`);
             if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
                 // Make Push On request to the API
                 const t = Date.now();
@@ -614,7 +575,7 @@ class Humidifier {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushActiveChanges statusCode: ${res.statusCode}`);
                     this.statusCode({ res });
                     res.on('data', d => {
                         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
@@ -629,13 +590,38 @@ class Humidifier {
             }
         }
         catch (e) {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` +
-                    ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushActiveChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+        }
+    }
+    /**
+     * Handle requests to set the "Target Humidifier Dehumidifier State" characteristic
+     */
+    async TargetHumidifierDehumidifierStateSet(value) {
+        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHumidifierDehumidifierState: ${value}`);
+        this.TargetHumidifierDehumidifierState = value;
+        this.doHumidifierUpdate.next();
+    }
+    /**
+     * Handle requests to set the "Active" characteristic
+     */
+    async ActiveSet(value) {
+        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Active: ${value}`);
+        this.Active = value;
+        this.doHumidifierUpdate.next();
+    }
+    /**
+     * Handle requests to set the "Relative Humidity Humidifier Threshold" characteristic
+     */
+    async RelativeHumidityHumidifierThresholdSet(value) {
+        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set RelativeHumidityHumidifierThreshold: ${value}`);
+        this.RelativeHumidityHumidifierThreshold = value;
+        if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
+            this.Active = this.platform.Characteristic.Active.ACTIVE;
+            this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
         }
+        this.doHumidifierUpdate.next();
     }
     /**
      * Updates the status for each of the HomeKit Characteristics
@@ -645,15 +631,17 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         }
         else {
+            this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidity;
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
                 + ` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         }
-        if (!this.device.ble) {
+        if (this.OpenAPI) {
             if (this.WaterLevel === undefined) {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
             }
             else {
+                this.accessory.context.WaterLevel = this.WaterLevel;
                 this.humidifierService.updateCharacteristic(this.platform.Characteristic.WaterLevel, this.WaterLevel);
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic WaterLevel: ${this.WaterLevel}`);
             }
@@ -663,6 +651,7 @@ class Humidifier {
                 + ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
         }
         else {
+            this.accessory.context.CurrentHumidifierDehumidifierState = this.CurrentHumidifierDehumidifierState;
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, this.CurrentHumidifierDehumidifierState);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
                 ` updateCharacteristic CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
@@ -672,6 +661,7 @@ class Humidifier {
                 + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
         }
         else {
+            this.accessory.context.TargetHumidifierDehumidifierState = this.TargetHumidifierDehumidifierState;
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, this.TargetHumidifierDehumidifierState);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
                 ` updateCharacteristic TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
@@ -680,6 +670,7 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
         }
         else {
+            this.accessory.context.Active = this.Active;
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
         }
@@ -688,33 +679,69 @@ class Humidifier {
                 + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
         }
         else {
+            this.accessory.context.RelativeHumidityHumidifierThreshold = this.RelativeHumidityHumidifierThreshold;
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, this.RelativeHumidityHumidifierThreshold);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
                 ` updateCharacteristic RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
         }
-        if (!this.device.humidifier?.hide_temperature && !this.device.ble) {
+        if (!this.device.humidifier?.hide_temperature && !this.BLE) {
             if (this.CurrentTemperature === undefined) {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
             }
             else {
+                this.accessory.context.CurrentTemperature = this.CurrentTemperature;
                 this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
             }
         }
     }
-    async apiError(e) {
-        this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, e);
-        if (!this.device.ble) {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.WaterLevel, e);
+    async getCustomBLEAddress(switchbot) {
+        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+            (async () => {
+                // Start to monitor advertisement packets
+                await switchbot.startScan({
+                    model: 'e',
+                });
+                // 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();
+            })();
         }
-        this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, e);
-        this.humidifierService.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, e);
-        this.humidifierService.updateCharacteristic(this.platform.Characteristic.Active, e);
-        this.humidifierService.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, e);
-        if (!this.device.humidifier?.hide_temperature && !this.device.ble) {
-            this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
+    }
+    async BLEconnection(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 !== 'Both') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
+            this.SwitchToOpenAPI = true;
+            await this.openAPIRefreshStatus();
+        }
+    }
+    minStep() {
+        if (this.device.humidifier?.set_minStep) {
+            this.set_minStep = this.device.humidifier?.set_minStep;
+        }
+        else {
+            this.set_minStep = 1;
+        }
+        return this.set_minStep;
+    }
+    async scan(device) {
+        if (device.scanDuration) {
+            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+            }
+        }
+        else {
+            this.scanDuration = this.accessory.context.scanDuration = 1;
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+            }
         }
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
     async statusCode({ res }) {
         switch (res.statusCode) {
@@ -750,61 +777,81 @@ class Humidifier {
         if (this.device.offline) {
             this.Active = this.platform.Characteristic.Active.INACTIVE;
             this.humidifierService.getCharacteristic(this.platform.Characteristic.Active).updateValue(this.Active);
+            await this.updateHomeKitCharacteristics();
         }
     }
-    /**
-     * Handle requests to set the "Target Humidifier Dehumidifier State" characteristic
-     */
-    async handleTargetHumidifierDehumidifierStateSet(value) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetHumidifierDehumidifierState: ${value}`);
-        this.TargetHumidifierDehumidifierState = value;
-        this.doHumidifierUpdate.next();
+    async apiError(e) {
+        this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, e);
+        if (!this.BLE) {
+            this.humidifierService.updateCharacteristic(this.platform.Characteristic.WaterLevel, e);
+        }
+        this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, e);
+        this.humidifierService.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, e);
+        this.humidifierService.updateCharacteristic(this.platform.Characteristic.Active, e);
+        this.humidifierService.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, e);
+        if (!this.device.humidifier?.hide_temperature && !this.BLE) {
+            this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
+        }
     }
-    /**
-     * Handle requests to set the "Active" characteristic
-     */
-    async handleActiveSet(value) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${value}`);
-        this.Active = value;
-        this.doHumidifierUpdate.next();
+    FirmwareRevision(accessory, device) {
+        let FirmwareRevision;
+        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;
+        }
+        else if (device.firmware) {
+            FirmwareRevision = device.firmware;
+        }
+        else {
+            FirmwareRevision = this.platform.version;
+        }
+        return FirmwareRevision;
     }
-    /**
-     * Handle requests to set the "Relative Humidity Humidifier Threshold" characteristic
-     */
-    async handleRelativeHumidityHumidifierThresholdSet(value) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} RelativeHumidityHumidifierThreshold: ${value}`);
-        this.RelativeHumidityHumidifierThreshold = value;
-        if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
+    async context() {
+        if (this.Active === undefined) {
             this.Active = this.platform.Characteristic.Active.ACTIVE;
-            this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
         }
-        this.doHumidifierUpdate.next();
-    }
-    async config(device) {
-        let config = {};
-        if (device.humidifier) {
-            config = device.humidifier;
+        else {
+            this.Active = this.accessory.context.Active;
         }
-        if (device.ble !== undefined) {
-            config['ble'] = device.ble;
+        if (this.CurrentTemperature === undefined) {
+            this.CurrentTemperature = 0;
         }
-        if (device.openAPI !== undefined) {
-            config['openAPI'] = device.openAPI;
+        else {
+            this.CurrentTemperature = this.accessory.context.CurrentTemperature;
         }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
+        if (this.CurrentRelativeHumidity === undefined) {
+            this.CurrentRelativeHumidity = 0;
         }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
+        else {
+            this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
         }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
+        if (this.TargetHumidifierDehumidifierState === undefined) {
+            this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
         }
-        if (device.offline !== undefined) {
-            config['offline'] = device.offline;
+        else {
+            this.TargetHumidifierDehumidifierState = this.accessory.context.TargetHumidifierDehumidifierState;
         }
-        if (Object.entries(config).length !== 0) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
+        if (this.CurrentHumidifierDehumidifierState === undefined) {
+            this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+        }
+        else {
+            this.CurrentHumidifierDehumidifierState = this.accessory.context.CurrentHumidifierDehumidifierState;
+        }
+        if (this.RelativeHumidityHumidifierThreshold === undefined) {
+            this.RelativeHumidityHumidifierThreshold = 0;
+        }
+        else {
+            this.RelativeHumidityHumidifierThreshold = this.accessory.context.RelativeHumidityHumidifierThreshold;
+        }
+        if (this.WaterLevel === undefined) {
+            this.WaterLevel = 0;
+        }
+        else {
+            this.WaterLevel = this.accessory.context.WaterLevel;
         }
     }
     async refreshRate(device) {
@@ -817,27 +864,28 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
-    async openAPI() {
-        if (!this.device.openAPI) {
-            this.OpenAPI = true;
+    async config(device) {
+        let config = {};
+        if (device.humidifier) {
+            config = device.humidifier;
         }
-        else {
-            this.OpenAPI = this.device.openAPI;
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
-    }
-    async scan(device) {
-        if (device.scanDuration) {
-            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-            if (device.ble) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
+        if (device.logging !== undefined) {
+            config['logging'] = device.logging;
         }
-        else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.device.ble) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
+        if (device.refreshRate !== undefined) {
+            config['refreshRate'] = device.refreshRate;
+        }
+        if (device.scanDuration !== undefined) {
+            config['scanDuration'] = device.scanDuration;
+        }
+        if (device.offline !== undefined) {
+            config['offline'] = device.offline;
+        }
+        if (Object.entries(config).length !== 0) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
         }
     }
     async logs(device) {
@@ -858,32 +906,6 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
-    FirmwareRevision(accessory, device) {
-        let FirmwareRevision;
-        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;
-        }
-        else if (device.firmware) {
-            FirmwareRevision = device.firmware;
-        }
-        else {
-            FirmwareRevision = this.platform.version;
-        }
-        return FirmwareRevision;
-    }
-    minStep() {
-        if (this.device.humidifier?.set_minStep) {
-            this.set_minStep = this.device.humidifier?.set_minStep;
-        }
-        else {
-            this.set_minStep = 1;
-        }
-        return this.set_minStep;
-    }
     /**
      * Logging for Device
      */