@switchbot/homebridge-switchbot 3.5.0-beta.5 → 3.5.0-beta.50

package/src/device/humidifier.ts

@@ -1,119 +1,90 @@
 import { request } from 'undici';
-import { sleep } from '../utils.js';
+import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform.js';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue, API, Logging, HAP } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices, SwitchBotPlatformConfig } from '../settings.js';
+import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+import { convertUnits } from '../utils.js';
 
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export class Humidifier {
-  public readonly api: API;
-  public readonly log: Logging;
-  public readonly config!: SwitchBotPlatformConfig;
-  protected readonly hap: HAP;
+export class Humidifier extends deviceBase {
   // Services
-  humidifierService: Service;
-  temperatureservice?: Service;
-
-  // Characteristic Values
-  Active!: CharacteristicValue;
-  WaterLevel!: CharacteristicValue;
-  FirmwareRevision!: CharacteristicValue;
-  CurrentTemperature!: CharacteristicValue;
-  CurrentRelativeHumidity!: CharacteristicValue;
-  TargetHumidifierDehumidifierState!: CharacteristicValue;
-  CurrentHumidifierDehumidifierState!: CharacteristicValue;
-  RelativeHumidityHumidifierThreshold!: CharacteristicValue;
-
-  // OpenAPI
-  OpenAPI_Active: deviceStatus['power'];
-  OpenAPI_WaterLevel: deviceStatus['lackWater'];
-  OpenAPI_FirmwareRevision: deviceStatus['version'];
-  OpenAPI_CurrentTemperature: deviceStatus['temperature'];
-  OpenAPI_CurrentRelativeHumidity: deviceStatus['humidity'];
-  OpenAPI_CurrentHumidifierDehumidifierState: deviceStatus['auto'];
-  OpenAPI_RelativeHumidityHumidifierThreshold: deviceStatus['nebulizationEfficiency'];
-
-  // BLE Others
-  connected?: boolean;
-  onState!: serviceData['onState'];
-  autoMode!: serviceData['autoMode'];
-  percentage!: serviceData['percentage'];
-
-  // Config
-  set_minStep?: number;
-  scanDuration!: number;
-  deviceLogging!: string;
-  deviceRefreshRate!: number;
+  private HumidifierDehumidifier: {
+    Service: Service;
+    Active: CharacteristicValue;
+    WaterLevel: CharacteristicValue;
+    CurrentRelativeHumidity: CharacteristicValue;
+    TargetHumidifierDehumidifierState: CharacteristicValue;
+    CurrentHumidifierDehumidifierState: CharacteristicValue;
+    RelativeHumidityHumidifierThreshold: CharacteristicValue;
+  };
+
+  private TemperatureSensor?: {
+    Service: Service;
+    CurrentTemperature: CharacteristicValue;
+  };
 
   // Updates
   humidifierUpdateInProgress!: boolean;
   doHumidifierUpdate!: Subject<void>;
 
-  // Connection
-  private readonly OpenAPI: boolean;
-  private readonly BLE: boolean;
-
   constructor(
-    private readonly platform: SwitchBotPlatform,
-    private accessory: PlatformAccessory,
-    public device: device & devicesConfig,
+    readonly platform: SwitchBotPlatform,
+    accessory: PlatformAccessory,
+    device: device & devicesConfig,
   ) {
-    this.api = this.platform.api;
-    this.log = this.platform.log;
-    this.config = this.platform.config;
-    this.hap = this.api.hap;
-    // 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.deviceLogs(device);
-    this.scan(device);
-    this.refreshRate(device);
-    this.deviceContext();
-    this.deviceConfig(device);
-
+    super(platform, accessory, device);
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doHumidifierUpdate = new Subject();
     this.humidifierUpdateInProgress = false;
 
+    // Initialize the HumidifierDehumidifier Service
+    this.HumidifierDehumidifier = {
+      Service: accessory.getService(this.hap.Service.HumidifierDehumidifier)!,
+      Active: accessory.context.Active || this.hap.Characteristic.Active.ACTIVE,
+      WaterLevel: accessory.context.WaterLevel || 100,
+      CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
+      TargetHumidifierDehumidifierState: accessory.context.TargetHumidifierDehumidifierState
+        || this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER,
+      CurrentHumidifierDehumidifierState: accessory.context.CurrentHumidifierDehumidifierState
+        || this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE,
+      RelativeHumidityHumidifierThreshold: accessory.context.RelativeHumidityHumidifierThreshold || 50,
+    };
+
+    // Initialize the Temperature Sensor Service
+    if (!device.humidifier?.hide_temperature) {
+      this.TemperatureSensor = {
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
+        CurrentTemperature: accessory.context.CurrentTemperature || 30,
+      };
+    }
+
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
 
-    // set accessory information
-    accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.hap.Characteristic.Model, 'W0801800')
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
-
     // get the service if it exists, otherwise create a new service
     // you can create multiple services for each accessory
-    const humidifierService = `${accessory.displayName} Humidifier`;
-    (this.humidifierService = accessory.getService(this.hap.Service.HumidifierDehumidifier)
-      || accessory.addService(this.hap.Service.HumidifierDehumidifier)), humidifierService;
+    const HumidifierDehumidifierService = `${accessory.displayName} Humidifier`;
+    (this.HumidifierDehumidifier.Service = accessory.getService(this.hap.Service.HumidifierDehumidifier)
+      || accessory.addService(this.hap.Service.HumidifierDehumidifier)), HumidifierDehumidifierService;
 
-    this.humidifierService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-    if (!this.humidifierService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-      this.humidifierService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-    }
+    this.HumidifierDehumidifier.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
 
     // each service must implement at-minimum the "required characteristics" for the given service type
     // see https://developers.homebridge.io/#/service/HumidifierDehumidifier
 
     // create handlers for required characteristics
-    this.humidifierService.setCharacteristic(
+    this.HumidifierDehumidifier.Service.setCharacteristic(
       this.hap.Characteristic.CurrentHumidifierDehumidifierState,
-      this.CurrentHumidifierDehumidifierState,
+      this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState,
     );
 
-    this.humidifierService
+    this.HumidifierDehumidifier.Service
       .getCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState)
       .setProps({
         validValueRanges: [0, 1],
@@ -123,34 +94,31 @@ export class Humidifier {
       })
       .onSet(this.TargetHumidifierDehumidifierStateSet.bind(this));
 
-    this.humidifierService.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
+    this.HumidifierDehumidifier.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
 
-    this.humidifierService
+    this.HumidifierDehumidifier.Service
       .getCharacteristic(this.hap.Characteristic.RelativeHumidityHumidifierThreshold)
       .setProps({
         validValueRanges: [0, 100],
         minValue: 0,
         maxValue: 100,
-        minStep: this.minStep(),
+        minStep: this.minStep(device),
       })
       .onSet(this.RelativeHumidityHumidifierThresholdSet.bind(this));
 
     // Temperature Sensor Service
     if (device.humidifier?.hide_temperature || this.BLE) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-      this.temperatureservice = this.accessory.getService(this.hap.Service.TemperatureSensor);
-      accessory.removeService(this.temperatureservice!);
-    } else if (!this.temperatureservice && !this.BLE) {
+      this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
+      accessory.removeService(this.TemperatureSensor!.Service);
+    } else if (!this.TemperatureSensor?.Service && !this.BLE) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-      const temperatureservice = `${accessory.displayName} Temperature Sensor`;
-      (this.temperatureservice = this.accessory.getService(this.hap.Service.TemperatureSensor)
-        || this.accessory.addService(this.hap.Service.TemperatureSensor)), temperatureservice;
+      const TemperatureSensorService = `${accessory.displayName} Temperature Sensor`;
+      (this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor)
+        || this.accessory.addService(this.hap.Service.TemperatureSensor)), TemperatureSensorService;
 
-      this.temperatureservice.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
-      if (!this.temperatureservice.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-        this.temperatureservice.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
-      }
-      this.temperatureservice
+      this.TemperatureSensor!.Service.setCharacteristic(this.hap.Characteristic.Name, TemperatureSensorService);
+      this.TemperatureSensor!.Service
         .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
         .setProps({
           validValueRanges: [-273.15, 100],
@@ -159,7 +127,7 @@ export class Humidifier {
           minStep: 0.1,
         })
         .onGet(() => {
-          return this.CurrentTemperature;
+          return this.TemperatureSensor!.CurrentTemperature;
         });
     } else {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
@@ -176,22 +144,23 @@ export class Humidifier {
       });
 
     //regisiter webhook event handler
-    if (this.device.webhook) {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+    if (device.webhook) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
       this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
         try {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
-          if (context.scale === 'CELSIUS') {
-            const { temperature, humidity } = context;
-            const { CurrentTemperature, CurrentRelativeHumidity } = this;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
+          const { temperature, humidity } = context;
+          const { CurrentRelativeHumidity } = this.HumidifierDehumidifier;
+          const { CurrentTemperature } = this.TemperatureSensor || { CurrentTemperature: undefined };
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
               '(temperature, humidity) = ' +
-              `Webhook:(${temperature}, ${humidity}), ` +
+              `Webhook:(${convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo)}, ${humidity}), ` +
               `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
-            this.CurrentRelativeHumidity = humidity;
-            this.CurrentTemperature = temperature;
-            this.updateHomeKitCharacteristics();
+          this.HumidifierDehumidifier.CurrentRelativeHumidity = humidity;
+          if (!this.device.humidifier?.hide_temperature) {
+              this.TemperatureSensor!.CurrentTemperature = convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo);
           }
+          this.updateHomeKitCharacteristics();
         } catch (e: any) {
           this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
@@ -222,105 +191,94 @@ export class Humidifier {
       });
   }
 
-  /**
-   * Parse the device status from the SwitchBot api
-   */
-  async parseStatus(): Promise<void> {
-    if (!this.device.enableCloudService && this.OpenAPI) {
-      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
-    } else if (this.BLE) {
-      await this.BLEparseStatus();
-    } else if (this.OpenAPI && this.platform.config.credentials?.token) {
-      await this.openAPIparseStatus();
-    } else {
-      await this.offlineOff();
-      this.debugWarnLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`,
-      );
-    }
-  }
-
-  async BLEparseStatus(): Promise<void> {
+  async BLEparseStatus(serviceData: serviceData): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
+    // Target Humidifier Dehumidifier State
+    if (serviceData.autoMode) {
+      this.HumidifierDehumidifier.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+    }
     // Current Relative Humidity
-    this.CurrentRelativeHumidity = this.percentage!;
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+    this.HumidifierDehumidifier.CurrentRelativeHumidity = serviceData.percentage!;
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+      + ` CurrentRelativeHumidity: ${this.HumidifierDehumidifier.CurrentRelativeHumidity}`);
     // Active
-    if (this.onState) {
-      this.Active = this.hap.Characteristic.Active.ACTIVE;
+    if (serviceData.onState) {
+      this.HumidifierDehumidifier.Active = this.hap.Characteristic.Active.ACTIVE;
     } else {
-      this.Active = this.hap.Characteristic.Active.INACTIVE;
+      this.HumidifierDehumidifier.Active = this.hap.Characteristic.Active.INACTIVE;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.HumidifierDehumidifier.Active}`);
   }
 
-  async openAPIparseStatus(): Promise<void> {
+  async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
     // Current Relative Humidity
-    this.CurrentRelativeHumidity = this.OpenAPI_CurrentTemperature!;
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+    this.HumidifierDehumidifier.CurrentRelativeHumidity = deviceStatus.body.temperature!;
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+      + ` CurrentRelativeHumidity: ${this.HumidifierDehumidifier.CurrentRelativeHumidity}`);
     // Current Temperature
     if (!this.device.humidifier?.hide_temperature) {
-      this.CurrentTemperature = this.OpenAPI_CurrentTemperature!;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
+      this.TemperatureSensor!.CurrentTemperature = deviceStatus.body.temperature!;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
     }
     // Target Humidifier Dehumidifier State
-    switch (this.OpenAPI_CurrentHumidifierDehumidifierState) {
+    switch (deviceStatus.body.auto) {
       case true:
-        this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER;
-        this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
-        this.RelativeHumidityHumidifierThreshold = this.CurrentRelativeHumidity;
+        this.HumidifierDehumidifier.TargetHumidifierDehumidifierState =
+          this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER;
+        this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
+        this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold = this.HumidifierDehumidifier.CurrentRelativeHumidity;
         break;
       default:
-        this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
-        if (this.OpenAPI_RelativeHumidityHumidifierThreshold! > 100) {
-          this.RelativeHumidityHumidifierThreshold = 100;
+        this.HumidifierDehumidifier.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+        if (deviceStatus.body.nebulizationEfficiency! > 100) {
+          this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold = 100;
         } else {
-          this.RelativeHumidityHumidifierThreshold = this.OpenAPI_RelativeHumidityHumidifierThreshold!;
+          this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold = deviceStatus.body.nebulizationEfficiency!;
         }
-        if (this.CurrentRelativeHumidity > this.RelativeHumidityHumidifierThreshold) {
-          this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
-        } else if (this.Active === this.hap.Characteristic.Active.INACTIVE) {
-          this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+        if (this.HumidifierDehumidifier.CurrentRelativeHumidity > this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold) {
+          this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
+        } else if (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.INACTIVE) {
+          this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
         } else {
-          this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
+          this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState = this.hap.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}`,
-    );
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+      + ` TargetHumidifierDehumidifierState: ${this.HumidifierDehumidifier.TargetHumidifierDehumidifierState}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+      + ` RelativeHumidityHumidifierThreshold: ${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+      + ` CurrentHumidifierDehumidifierState: ${this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState}`);
     // Active
-    switch (this.OpenAPI_Active) {
+    switch (deviceStatus.body.power) {
       case 'on':
-        this.Active = this.hap.Characteristic.Active.ACTIVE;
+        this.HumidifierDehumidifier.Active = this.hap.Characteristic.Active.ACTIVE;
         break;
       default:
-        this.Active = this.hap.Characteristic.Active.INACTIVE;
+        this.HumidifierDehumidifier.Active = this.hap.Characteristic.Active.INACTIVE;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.HumidifierDehumidifier.Active}`);
     // Water Level
-    if (this.OpenAPI_WaterLevel) {
-      this.WaterLevel = 0;
+    if (deviceStatus.body.lackWater) {
+      this.HumidifierDehumidifier.WaterLevel = 0;
     } else {
-      this.WaterLevel = 100;
+      this.HumidifierDehumidifier.WaterLevel = 100;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.HumidifierDehumidifier.WaterLevel}`);
 
-    // FirmwareRevision
-    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
-    this.accessory.context.FirmwareRevision = this.FirmwareRevision;
+    // Firmware Version
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
+    if (deviceStatus.body.version) {
+      this.accessory.context.version = deviceStatus.body.version.toString();
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.version);
+    }
   }
 
-  /**
-   * Asks the SwitchBot API for the latest device information
-   */
   async refreshStatus(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
@@ -350,103 +308,43 @@ export class Humidifier {
     // Start to monitor advertisement packets
     (async () => {
       // Start to monitor advertisement packets
-      await switchbot.startScan({
-        model: 'e',
-        id: this.device.bleMac,
-      });
+      await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
       // Set an event handler
       switchbot.onadvertisement = (ad: any) => {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
-        if (this.device.bleMac === ad.address && ad.serviceData.model === 'e') {
+        if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-          this.autoMode = ad.serviceData.autoMode;
-          this.onState = ad.serviceData.onState;
-          this.percentage = ad.serviceData.percentage > 100 ? 100 : ad.serviceData.percentage;
         } else {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         }
       };
-      // Wait 1 seconds
+      // Wait 10 seconds
       await switchbot.wait(this.scanDuration * 1000);
       // Stop to monitor
       await switchbot.stopScan();
       // Update HomeKit
-      await this.BLEparseStatus();
+      await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
       await this.updateHomeKitCharacteristics();
     })();
-    /*if (switchbot !== false) {
-      switchbot
-        .startScan({
-          model: 'e',
-          id: this.device.bleMac,
-        })
-        .then(async () => {
-          // Set an event handler
-          switchbot.onadvertisement = async (ad: ad) => {
-            this.debugLog(
-              `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-              ` BLE Address Found: ${ad.address}`,
-            );
-            this.autoMode = ad.serviceData.autoMode;
-            this.onState = ad.serviceData.onState;
-            this.percentage = ad.serviceData.percentage;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-            this.debugLog(
-              `${this.device.deviceType}: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName},` +
-              `autoMode: ${ad.serviceData.autoMode}, onState: ${ad.serviceData.onState}, percentage: ${ad.serviceData.percentage}`,
-            );
-
-            if (ad.serviceData) {
-              this.connected = true;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning(switchbot);
-            } else {
-              this.connected = false;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-            }
-          };
-          // Wait
-          return await sleep(this.scanDuration * 1000);
-        })
-        .then(async () => {
-          // Stop to monitor
-          await this.stopScanning(switchbot);
-        })
-        .catch(async (e: any) => {
-          this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
-            ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
-          await this.BLERefreshConnection(switchbot);
-        });
-    } else {
+    if (switchbot === undefined) {
       await this.BLERefreshConnection(switchbot);
-    }*/
+    }
   }
 
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
-        headers: this.platform.generateHeaders(),
-      });
+      const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries,
+        `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-        this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
           + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-        this.OpenAPI_CurrentHumidifierDehumidifierState = deviceStatus.body.auto;
-        this.OpenAPI_Active = deviceStatus.body.power;
-        this.OpenAPI_WaterLevel = deviceStatus.body.lackWater;
-        this.OpenAPI_CurrentRelativeHumidity = deviceStatus.body.humidity;
-        this.OpenAPI_CurrentTemperature = deviceStatus.body.temperature;
-        this.OpenAPI_RelativeHumidityHumidifierThreshold = deviceStatus.body.nebulizationEfficiency;
-        this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-        this.openAPIparseStatus();
+        this.openAPIparseStatus(deviceStatus);
         this.updateHomeKitCharacteristics();
       } else {
         this.statusCode(statusCode);
@@ -500,11 +398,13 @@ export class Humidifier {
         id: this.device.bleMac,
       })
       .then(async (device_list: any) => {
-        this.infoLog(`${this.accessory.displayName} Target Position: ${this.Active}`);
-        return await device_list[0].percentage(this.RelativeHumidityHumidifierThreshold);
+        this.infoLog(`${this.accessory.displayName} Active: ${this.HumidifierDehumidifier.Active}`);
+        return await device_list[0].percentage(this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold);
       })
       .then(() => {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+        this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+          + `Active: ${this.HumidifierDehumidifier.Active} sent over BLE,  sent successfully`);
       })
       .catch(async (e: any) => {
         this.apiError(e);
@@ -519,13 +419,14 @@ export class Humidifier {
   async openAPIpushChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
     if (
-      this.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER &&
-      this.Active === this.hap.Characteristic.Active.ACTIVE
+      this.HumidifierDehumidifier.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER &&
+      this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE
     ) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing Manual: ${this.RelativeHumidityHumidifierThreshold}!`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` Pushing Manual: ${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}!`);
       const bodyChange = JSON.stringify({
         command: 'setMode',
-        parameter: `${this.RelativeHumidityHumidifierThreshold}`,
+        parameter: `${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}`,
         commandType: 'command',
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
@@ -543,6 +444,8 @@ export class Humidifier {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
@@ -555,8 +458,9 @@ export class Humidifier {
         );
       }
     } else if (
-      this.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
-      this.Active === this.hap.Characteristic.Active.ACTIVE
+      this.HumidifierDehumidifier.TargetHumidifierDehumidifierState ===
+      this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
+      this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE
     ) {
       await this.pushAutoChanges();
     } else {
@@ -570,8 +474,9 @@ export class Humidifier {
   async pushAutoChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushAutoChanges`);
     if (
-      this.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
-      this.Active === this.hap.Characteristic.Active.ACTIVE
+      this.HumidifierDehumidifier.TargetHumidifierDehumidifierState ===
+      this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
+      this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE
     ) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing Auto`);
       const bodyChange = JSON.stringify({
@@ -594,6 +499,8 @@ export class Humidifier {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
@@ -606,10 +513,8 @@ export class Humidifier {
         );
       }
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No pushAutoChanges.` +
-        `TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}, Active: ${this.Active}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushAutoChanges. TargetHumidifierDehumidifierState:`
+        + ` ${this.HumidifierDehumidifier.TargetHumidifierDehumidifierState}, Active: ${this.HumidifierDehumidifier.Active}`);
     }
   }
 
@@ -618,7 +523,7 @@ export class Humidifier {
    */
   async pushActiveChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushActiveChanges`);
-    if (this.Active === this.hap.Characteristic.Active.INACTIVE) {
+    if (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.INACTIVE) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing Off`);
       const bodyChange = JSON.stringify({
         command: 'turnOff',
@@ -640,6 +545,8 @@ export class Humidifier {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
@@ -652,7 +559,7 @@ export class Humidifier {
         );
       }
     } else {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushActiveChanges. Active: ${this.Active}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushActiveChanges. Active: ${this.HumidifierDehumidifier.Active}`);
     }
   }
 
@@ -660,13 +567,13 @@ export class Humidifier {
    * Handle requests to set the "Active" characteristic
    */
   async ActiveSet(value: CharacteristicValue): Promise<void> {
-    if (this.Active === this.accessory.context.Active) {
+    if (this.HumidifierDehumidifier.Active === this.accessory.context.Active) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Active: ${value}`);
     } else {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Active: ${value}`);
     }
 
-    this.Active = value;
+    this.HumidifierDehumidifier.Active = value;
     this.doHumidifierUpdate.next();
   }
 
@@ -674,13 +581,13 @@ export class Humidifier {
    * Handle requests to set the "Target Humidifier Dehumidifier State" characteristic
    */
   async TargetHumidifierDehumidifierStateSet(value: CharacteristicValue): Promise<void> {
-    if (this.Active === this.hap.Characteristic.Active.ACTIVE) {
+    if (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHumidifierDehumidifierState: ${value}`);
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHumidifierDehumidifierState: ${value}`);
     }
 
-    this.TargetHumidifierDehumidifierState = value;
+    this.HumidifierDehumidifier.TargetHumidifierDehumidifierState = value;
     this.doHumidifierUpdate.next();
   }
 
@@ -688,16 +595,16 @@ export class Humidifier {
    * Handle requests to set the "Relative Humidity Humidifier Threshold" characteristic
    */
   async RelativeHumidityHumidifierThresholdSet(value: CharacteristicValue): Promise<void> {
-    if (this.Active === this.hap.Characteristic.Active.ACTIVE) {
+    if (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set RelativeHumidityHumidifierThreshold: ${value}`);
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set RelativeHumidityHumidifierThreshold: ${value}`);
     }
 
-    this.RelativeHumidityHumidifierThreshold = value;
-    if (this.Active === this.hap.Characteristic.Active.INACTIVE) {
-      this.Active = this.hap.Characteristic.Active.ACTIVE;
-      this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
+    this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold = value;
+    if (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.INACTIVE) {
+      this.HumidifierDehumidifier.Active = this.hap.Characteristic.Active.ACTIVE;
+      this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
     }
     this.doHumidifierUpdate.next();
   }
@@ -706,117 +613,76 @@ export class Humidifier {
    * Updates the status for each of the HomeKit Characteristics
    */
   async updateHomeKitCharacteristics(): Promise<void> {
-    if (this.CurrentRelativeHumidity === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+    if (this.HumidifierDehumidifier.CurrentRelativeHumidity === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` CurrentRelativeHumidity: ${this.HumidifierDehumidifier.CurrentRelativeHumidity}`);
     } else {
-      this.humidifierService.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` + ` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`,
-      );
-      this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidity;
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity,
+        this.HumidifierDehumidifier.CurrentRelativeHumidity);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+        + ` CurrentRelativeHumidity: ${this.HumidifierDehumidifier.CurrentRelativeHumidity}`);
+      this.accessory.context.CurrentRelativeHumidity = this.HumidifierDehumidifier.CurrentRelativeHumidity;
     }
     if (this.OpenAPI) {
-      if (this.WaterLevel === undefined) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
+      if (this.HumidifierDehumidifier.WaterLevel === undefined) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.HumidifierDehumidifier.WaterLevel}`);
       } else {
-        this.humidifierService.updateCharacteristic(this.hap.Characteristic.WaterLevel, this.WaterLevel);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic WaterLevel: ${this.WaterLevel}`);
-        this.accessory.context.WaterLevel = this.WaterLevel;
+        this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.WaterLevel, this.HumidifierDehumidifier.WaterLevel);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+          + ` WaterLevel: ${this.HumidifierDehumidifier.WaterLevel}`);
+        this.accessory.context.WaterLevel = this.HumidifierDehumidifier.WaterLevel;
       }
     }
-    if (this.CurrentHumidifierDehumidifierState === undefined) {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` +
-        ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`,
-      );
+    if (this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
+        ` CurrentHumidifierDehumidifierState: ${this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState}`);
     } else {
-      this.humidifierService.updateCharacteristic(
-        this.hap.Characteristic.CurrentHumidifierDehumidifierState,
-        this.CurrentHumidifierDehumidifierState,
-      );
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` +
-        ` updateCharacteristic CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`,
-      );
-      this.accessory.context.CurrentHumidifierDehumidifierState = this.CurrentHumidifierDehumidifierState;
-    }
-    if (this.TargetHumidifierDehumidifierState === undefined) {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`,
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHumidifierDehumidifierState,
+        this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic` +
+        ` CurrentHumidifierDehumidifierState: ${this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState}`);
+      this.accessory.context.CurrentHumidifierDehumidifierState = this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState;
+    }
+    if (this.HumidifierDehumidifier.TargetHumidifierDehumidifierState === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` TargetHumidifierDehumidifierState: ${this.HumidifierDehumidifier.TargetHumidifierDehumidifierState}`,
       );
     } else {
-      this.humidifierService.updateCharacteristic(
-        this.hap.Characteristic.TargetHumidifierDehumidifierState,
-        this.TargetHumidifierDehumidifierState,
-      );
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` +
-        ` updateCharacteristic TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`,
-      );
-      this.accessory.context.TargetHumidifierDehumidifierState = this.TargetHumidifierDehumidifierState;
-    }
-    if (this.Active === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState,
+        this.HumidifierDehumidifier.TargetHumidifierDehumidifierState);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+        + ` TargetHumidifierDehumidifierState: ${this.HumidifierDehumidifier.TargetHumidifierDehumidifierState}`);
+      this.accessory.context.TargetHumidifierDehumidifierState = this.HumidifierDehumidifier.TargetHumidifierDehumidifierState;
+    }
+    if (this.HumidifierDehumidifier.Active === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.HumidifierDehumidifier.Active}`);
     } else {
-      this.humidifierService.updateCharacteristic(this.hap.Characteristic.Active, this.Active);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
-      this.accessory.context.Active = this.Active;
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.Active, this.HumidifierDehumidifier.Active);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.HumidifierDehumidifier.Active}`);
+      this.accessory.context.Active = this.HumidifierDehumidifier.Active;
     }
-    if (this.RelativeHumidityHumidifierThreshold === undefined) {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` +
-        ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`,
-      );
+    if (this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
+        ` RelativeHumidityHumidifierThreshold: ${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}`);
     } else {
-      this.humidifierService.updateCharacteristic(
-        this.hap.Characteristic.RelativeHumidityHumidifierThreshold,
-        this.RelativeHumidityHumidifierThreshold,
-      );
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` +
-        ` updateCharacteristic RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`,
-      );
-      this.accessory.context.RelativeHumidityHumidifierThreshold = this.RelativeHumidityHumidifierThreshold;
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.RelativeHumidityHumidifierThreshold,
+        this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic` +
+        ` RelativeHumidityHumidifierThreshold: ${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}`);
+      this.accessory.context.RelativeHumidityHumidifierThreshold = this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold;
     }
     if (!this.device.humidifier?.hide_temperature && !this.BLE) {
-      if (this.CurrentTemperature === undefined) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
+      if (this.TemperatureSensor!.CurrentTemperature === undefined) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
       } else {
-        this.temperatureservice?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.CurrentTemperature);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
-        this.accessory.context.CurrentTemperature = this.CurrentTemperature;
+        this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor!.CurrentTemperature);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+          + ` CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
+        this.accessory.context.CurrentTemperature = this.TemperatureSensor!.CurrentTemperature;
       }
     }
   }
 
-  async stopScanning(switchbot: any) {
-    switchbot.stopScan();
-    if (this.connected) {
-      await this.BLEparseStatus();
-      await this.updateHomeKitCharacteristics();
-    } else {
-      await this.BLERefreshConnection(switchbot);
-    }
-  }
-
-  async getCustomBLEAddress(switchbot: any) {
-    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: any) => {
-          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-        };
-        await sleep(10000);
-        // Stop to monitor
-        switchbot.stopScan();
-      })();
-    }
-  }
-
   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`);
@@ -833,283 +699,38 @@ export class Humidifier {
     }
   }
 
-  minStep(): number {
-    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: device & devicesConfig): Promise<void> {
-    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}`);
-      }
+  minStep(device: device & devicesConfig): number {
+    let set_minStep: number;
+    if (device.humidifier?.set_minStep) {
+      set_minStep = device.humidifier?.set_minStep;
     } else {
-      this.scanDuration = this.accessory.context.scanDuration = 1;
-      if (this.BLE) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-      }
-    }
-  }
-
-  async statusCode(statusCode: number): Promise<void> {
-    switch (statusCode) {
-      case 151:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
-        break;
-      case 152:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
-        break;
-      case 160:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
-        break;
-      case 161:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
-        this.offlineOff();
-        break;
-      case 171:
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
-          `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 format is invalid, statusCode: ${statusCode}`,
-        );
-        break;
-      case 100:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
-        break;
-      case 200:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
-        break;
-      case 400:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
-            + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
-        break;
-      case 401:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized,	Authorization for the API is required, `
-            + `but the request has not been authenticated, statusCode: ${statusCode}`);
-        break;
-      case 403:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden,	The request has been authenticated but does not `
-            + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
-        break;
-      case 404:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found,	Specifies the requested path does not exist, `
-        + `statusCode: ${statusCode}`);
-        break;
-      case 406:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable,	The client has requested a MIME type via `
-            + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
-        break;
-      case 415:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type,	The client has defined a contentType `
-            + `header that is not supported by the server, statusCode: ${statusCode}`);
-        break;
-      case 422:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity,	The client has made a valid request, `
-            + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
-        break;
-      case 429:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests,	The client has exceeded the number of `
-            + `requests allowed for a given time window, statusCode: ${statusCode}`);
-        break;
-      case 500:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error,	An unexpected error on the SmartThings `
-            + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
-        break;
-      default:
-        this.infoLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
-          `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`,
-        );
+      set_minStep = 1;
     }
+    return set_minStep;
   }
 
   async offlineOff(): Promise<void> {
     this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} offline: ${this.device.offline}`);
     if (this.device.offline) {
-      await this.deviceContext();
-      if (this.CurrentTemperature === undefined) {
-        this.CurrentTemperature = 0;
-      }
-      await this.updateHomeKitCharacteristics();
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHumidifierDehumidifierState,
+        this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE);
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState,
+        this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER);
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
     }
   }
 
   async apiError(e: any): Promise<void> {
-    this.humidifierService.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
+    this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
     if (!this.BLE) {
-      this.humidifierService.updateCharacteristic(this.hap.Characteristic.WaterLevel, e);
+      this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.WaterLevel, e);
     }
-    this.humidifierService.updateCharacteristic(this.hap.Characteristic.CurrentHumidifierDehumidifierState, e);
-    this.humidifierService.updateCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState, e);
-    this.humidifierService.updateCharacteristic(this.hap.Characteristic.Active, e);
-    this.humidifierService.updateCharacteristic(this.hap.Characteristic.RelativeHumidityHumidifierThreshold, e);
+    this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHumidifierDehumidifierState, e);
+    this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState, e);
+    this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
+    this.HumidifierDehumidifier.Service.updateCharacteristic(this.hap.Characteristic.RelativeHumidityHumidifierThreshold, e);
     if (!this.device.humidifier?.hide_temperature && !this.BLE) {
-      this.temperatureservice?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
+      this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
     }
   }
-
-  async deviceContext() {
-    if (this.Active === undefined) {
-      this.Active = this.hap.Characteristic.Active.ACTIVE;
-    } else {
-      this.Active = this.accessory.context.Active;
-    }
-    if (this.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 30;
-    } else {
-      this.CurrentTemperature = this.accessory.context.CurrentTemperature;
-    }
-    if (this.CurrentRelativeHumidity === undefined) {
-      this.CurrentRelativeHumidity = 0;
-    } else {
-      this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
-    }
-    if (this.TargetHumidifierDehumidifierState === undefined) {
-      this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
-    } else if (this.accessory.context.TargetHumidifierDehumidifierState === undefined) {
-      this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
-    } else {
-      this.TargetHumidifierDehumidifierState = this.accessory.context.TargetHumidifierDehumidifierState;
-    }
-    if (this.CurrentHumidifierDehumidifierState === undefined) {
-      this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
-    } else if (this.accessory.context.CurrentHumidifierDehumidifierState === undefined) {
-      this.CurrentHumidifierDehumidifierState = this.hap.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;
-    }
-    if (this.FirmwareRevision === undefined) {
-      this.FirmwareRevision = this.platform.version;
-      this.accessory.context.FirmwareRevision = this.FirmwareRevision;
-    }
-  }
-
-  async refreshRate(device: device & devicesConfig): Promise<void> {
-    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}`);
-    }
-  }
-
-  async deviceConfig(device: device & devicesConfig): Promise<void> {
-    let config = {};
-    if (device.humidifier) {
-      config = device.humidifier;
-    }
-    if (device.connectionType !== undefined) {
-      config['connectionType'] = device.connectionType;
-    }
-    if (device.external !== undefined) {
-      config['external'] = device.external;
-    }
-    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 (device.offline !== undefined) {
-      config['offline'] = device.offline;
-    }
-    if (device.webhook !== undefined) {
-      config['webhook'] = device.webhook;
-    }
-    if (Object.entries(config).length !== 0) {
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-    }
-  }
-
-  async deviceLogs(device: device & devicesConfig): Promise<void> {
-    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.deviceLogging = this.accessory.context.logging = 'standard';
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-    }
-  }
-
-  /**
-   * Logging for Device
-   */
-  async infoLog(...log: any[]): Promise<void> {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.info(String(...log));
-    }
-  }
-
-  async warnLog(...log: any[]): Promise<void> {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.warn(String(...log));
-    }
-  }
-
-  async debugWarnLog(...log: any[]): Promise<void> {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.warn('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  async errorLog(...log: any[]): Promise<void> {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.error(String(...log));
-    }
-  }
-
-  async debugErrorLog(...log: any[]): Promise<void> {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.error('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  async debugLog(...log: any[]): Promise<void> {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging === 'debug') {
-        this.platform.log.info('[DEBUG]', String(...log));
-      } else {
-        this.platform.log.debug(String(...log));
-      }
-    }
-  }
-
-  enablingDeviceLogging(): boolean {
-    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
-  }
 }