@switchbot/homebridge-switchbot 2.14.0 → 3.0.0-beta.0

package/dist/device/humidifier.js

@@ -1,57 +1,101 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Humidifier = void 0;
-const undici_1 = require("undici");
-const utils_1 = require("../utils");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const settings_1 = require("../settings");
+import { request } from 'undici';
+import { sleep } from '../utils';
+import { interval, Subject } from 'rxjs';
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
+import { Devices } from '../settings';
 /**
  * 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.
  */
-class Humidifier {
+export class Humidifier {
+    platform;
+    accessory;
+    device;
+    api;
+    log;
+    config;
+    hap;
+    // Services
+    humidifierService;
+    temperatureservice;
+    // Characteristic Values
+    Active;
+    WaterLevel;
+    FirmwareRevision;
+    CurrentTemperature;
+    CurrentRelativeHumidity;
+    TargetHumidifierDehumidifierState;
+    CurrentHumidifierDehumidifierState;
+    RelativeHumidityHumidifierThreshold;
+    // OpenAPI
+    OpenAPI_Active;
+    OpenAPI_WaterLevel;
+    OpenAPI_FirmwareRevision;
+    OpenAPI_CurrentTemperature;
+    OpenAPI_CurrentRelativeHumidity;
+    OpenAPI_CurrentHumidifierDehumidifierState;
+    OpenAPI_RelativeHumidityHumidifierThreshold;
+    // BLE Others
+    connected;
+    onState;
+    autoMode;
+    percentage;
+    // Config
+    set_minStep;
+    scanDuration;
+    deviceLogging;
+    deviceRefreshRate;
+    // Updates
+    humidifierUpdateInProgress;
+    doHumidifierUpdate;
+    // Connection
+    OpenAPI;
+    BLE;
     constructor(platform, accessory, device) {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        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.logs(device);
+        this.deviceLogs(device);
         this.scan(device);
         this.refreshRate(device);
         this.context();
-        this.config(device);
+        this.deviceConfig(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
-        this.doHumidifierUpdate = new rxjs_1.Subject();
+        this.doHumidifierUpdate = new Subject();
         this.humidifierUpdateInProgress = false;
         // Retrieve initial values and updateHomekit
         this.refreshStatus();
         // set accessory information
         accessory
-            .getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.platform.Characteristic.Model, 'W0801800')
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.platform.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+            .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.platform.Service.HumidifierDehumidifier)
-            || accessory.addService(this.platform.Service.HumidifierDehumidifier)), humidifierService;
-        this.humidifierService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-        if (!this.humidifierService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-            this.humidifierService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+        (this.humidifierService = accessory.getService(this.hap.Service.HumidifierDehumidifier)
+            || accessory.addService(this.hap.Service.HumidifierDehumidifier)), humidifierService;
+        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);
         }
         // 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.platform.Characteristic.CurrentHumidifierDehumidifierState, this.CurrentHumidifierDehumidifierState);
+        this.humidifierService.setCharacteristic(this.hap.Characteristic.CurrentHumidifierDehumidifierState, this.CurrentHumidifierDehumidifierState);
         this.humidifierService
-            .getCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState)
+            .getCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState)
             .setProps({
             validValueRanges: [0, 1],
             minValue: 0,
@@ -59,9 +103,9 @@ class Humidifier {
             validValues: [0, 1],
         })
             .onSet(this.TargetHumidifierDehumidifierStateSet.bind(this));
-        this.humidifierService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
+        this.humidifierService.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
         this.humidifierService
-            .getCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold)
+            .getCharacteristic(this.hap.Characteristic.RelativeHumidityHumidifierThreshold)
             .setProps({
             validValueRanges: [0, 100],
             minValue: 0,
@@ -72,20 +116,20 @@ class Humidifier {
         // 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.platform.Service.TemperatureSensor);
+            this.temperatureservice = this.accessory.getService(this.hap.Service.TemperatureSensor);
             accessory.removeService(this.temperatureservice);
         }
         else if (!this.temperatureservice && !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.platform.Service.TemperatureSensor)
-                || this.accessory.addService(this.platform.Service.TemperatureSensor)), temperatureservice;
-            this.temperatureservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
-            if (!this.temperatureservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.temperatureservice.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
+            (this.temperatureservice = this.accessory.getService(this.hap.Service.TemperatureSensor)
+                || this.accessory.addService(this.hap.Service.TemperatureSensor)), temperatureservice;
+            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
-                .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
+                .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
                 .setProps({
                 validValueRanges: [-273.15, 100],
                 minValue: -273.15,
@@ -102,8 +146,8 @@ class Humidifier {
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
-        (0, rxjs_1.interval)(this.deviceRefreshRate * 1000)
-            .pipe((0, operators_1.skipWhile)(() => this.humidifierUpdateInProgress))
+        interval(this.deviceRefreshRate * 1000)
+            .pipe(skipWhile(() => this.humidifierUpdateInProgress))
             .subscribe(() => {
             this.refreshStatus();
         });
@@ -134,9 +178,9 @@ class Humidifier {
         // Watch for Humidifier change events
         // We put in a debounce of 100ms so we don't make duplicate calls
         this.doHumidifierUpdate
-            .pipe((0, operators_1.tap)(() => {
+            .pipe(tap(() => {
             this.humidifierUpdateInProgress = true;
-        }), (0, operators_1.debounceTime)(this.platform.config.options.pushRate * 1000))
+        }), debounceTime(this.platform.config.options.pushRate * 1000))
             .subscribe(async () => {
             try {
                 await this.pushChanges();
@@ -174,10 +218,10 @@ class Humidifier {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         // Active
         if (this.onState) {
-            this.Active = this.platform.Characteristic.Active.ACTIVE;
+            this.Active = this.hap.Characteristic.Active.ACTIVE;
         }
         else {
-            this.Active = this.platform.Characteristic.Active.INACTIVE;
+            this.Active = this.hap.Characteristic.Active.INACTIVE;
         }
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
     }
@@ -194,12 +238,12 @@ class Humidifier {
         // Target Humidifier Dehumidifier State
         switch (this.OpenAPI_CurrentHumidifierDehumidifierState) {
             case true:
-                this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER;
-                this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
+                this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER;
+                this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
                 this.RelativeHumidityHumidifierThreshold = this.CurrentRelativeHumidity;
                 break;
             default:
-                this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+                this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
                 if (this.OpenAPI_RelativeHumidityHumidifierThreshold > 100) {
                     this.RelativeHumidityHumidifierThreshold = 100;
                 }
@@ -207,13 +251,13 @@ class Humidifier {
                     this.RelativeHumidityHumidifierThreshold = this.OpenAPI_RelativeHumidityHumidifierThreshold;
                 }
                 if (this.CurrentRelativeHumidity > this.RelativeHumidityHumidifierThreshold) {
-                    this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
+                    this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
                 }
-                else if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
-                    this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+                else if (this.Active === this.hap.Characteristic.Active.INACTIVE) {
+                    this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
                 }
                 else {
-                    this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
+                    this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
                 }
         }
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
@@ -223,10 +267,10 @@ class Humidifier {
         // Active
         switch (this.OpenAPI_Active) {
             case 'on':
-                this.Active = this.platform.Characteristic.Active.ACTIVE;
+                this.Active = this.hap.Characteristic.Active.ACTIVE;
                 break;
             default:
-                this.Active = this.platform.Characteristic.Active.INACTIVE;
+                this.Active = this.hap.Characteristic.Active.INACTIVE;
         }
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
         // Water Level
@@ -299,7 +343,7 @@ class Humidifier {
                     }
                 };
                 // Wait
-                return await (0, utils_1.sleep)(this.scanDuration * 1000);
+                return await sleep(this.scanDuration * 1000);
             })
                 .then(async () => {
                 // Stop to monitor
@@ -319,7 +363,7 @@ class Humidifier {
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/status`, {
+            const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
                 headers: this.platform.generateHeaders(),
             });
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
@@ -369,8 +413,8 @@ class Humidifier {
             await this.offlineOff();
             this.debugWarnLog(`${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))
+        interval(5000)
+            .pipe(take(1))
             .subscribe(async () => {
             await this.refreshStatus();
         });
@@ -406,8 +450,8 @@ class Humidifier {
     }
     async openAPIpushChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
-        if (this.TargetHumidifierDehumidifierState === this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER &&
-            this.Active === this.platform.Characteristic.Active.ACTIVE) {
+        if (this.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER &&
+            this.Active === this.hap.Characteristic.Active.ACTIVE) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing Manual: ${this.RelativeHumidityHumidifierThreshold}!`);
             const bodyChange = JSON.stringify({
                 command: 'setMode',
@@ -416,7 +460,7 @@ class Humidifier {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -443,8 +487,8 @@ class Humidifier {
                     ` Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
-        else if (this.TargetHumidifierDehumidifierState === this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
-            this.Active === this.platform.Characteristic.Active.ACTIVE) {
+        else if (this.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
+            this.Active === this.hap.Characteristic.Active.ACTIVE) {
             await this.pushAutoChanges();
         }
         else {
@@ -456,8 +500,8 @@ class Humidifier {
      */
     async pushAutoChanges() {
         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) {
+        if (this.TargetHumidifierDehumidifierState === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
+            this.Active === this.hap.Characteristic.Active.ACTIVE) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing Auto`);
             const bodyChange = JSON.stringify({
                 command: 'setMode',
@@ -466,7 +510,7 @@ class Humidifier {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -503,7 +547,7 @@ class Humidifier {
      */
     async pushActiveChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushActiveChanges`);
-        if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
+        if (this.Active === this.hap.Characteristic.Active.INACTIVE) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing Off`);
             const bodyChange = JSON.stringify({
                 command: 'turnOff',
@@ -512,7 +556,7 @@ class Humidifier {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -560,7 +604,7 @@ class Humidifier {
      * Handle requests to set the "Target Humidifier Dehumidifier State" characteristic
      */
     async TargetHumidifierDehumidifierStateSet(value) {
-        if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
+        if (this.Active === this.hap.Characteristic.Active.ACTIVE) {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHumidifierDehumidifierState: ${value}`);
         }
         else {
@@ -573,16 +617,16 @@ class Humidifier {
      * Handle requests to set the "Relative Humidity Humidifier Threshold" characteristic
      */
     async RelativeHumidityHumidifierThresholdSet(value) {
-        if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
+        if (this.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.platform.Characteristic.Active.INACTIVE) {
-            this.Active = this.platform.Characteristic.Active.ACTIVE;
-            this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
+        if (this.Active === this.hap.Characteristic.Active.INACTIVE) {
+            this.Active = this.hap.Characteristic.Active.ACTIVE;
+            this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.IDLE;
         }
         this.doHumidifierUpdate.next();
     }
@@ -594,7 +638,7 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         }
         else {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
+            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;
         }
@@ -603,7 +647,7 @@ class Humidifier {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
             }
             else {
-                this.humidifierService.updateCharacteristic(this.platform.Characteristic.WaterLevel, this.WaterLevel);
+                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;
             }
@@ -613,7 +657,7 @@ class Humidifier {
                 ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
         }
         else {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, this.CurrentHumidifierDehumidifierState);
+            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;
@@ -622,7 +666,7 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
         }
         else {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, this.TargetHumidifierDehumidifierState);
+            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;
@@ -631,7 +675,7 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
         }
         else {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+            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;
         }
@@ -640,7 +684,7 @@ class Humidifier {
                 ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
         }
         else {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, this.RelativeHumidityHumidifierThreshold);
+            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;
@@ -650,7 +694,7 @@ class Humidifier {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
             }
             else {
-                this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
+                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;
             }
@@ -677,7 +721,7 @@ class Humidifier {
                 switchbot.onadvertisement = (ad) => {
                     this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
                 };
-                await (0, utils_1.sleep)(10000);
+                await sleep(10000);
                 // Stop to monitor
                 await switchbot.stopScan();
             })();
@@ -765,21 +809,21 @@ class Humidifier {
         }
     }
     async apiError(e) {
-        this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, e);
+        this.humidifierService.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
         if (!this.BLE) {
-            this.humidifierService.updateCharacteristic(this.platform.Characteristic.WaterLevel, e);
+            this.humidifierService.updateCharacteristic(this.hap.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);
+        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);
         if (!this.device.humidifier?.hide_temperature && !this.BLE) {
-            this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
+            this.temperatureservice?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
         }
     }
     async context() {
         if (this.Active === undefined) {
-            this.Active = this.platform.Characteristic.Active.ACTIVE;
+            this.Active = this.hap.Characteristic.Active.ACTIVE;
         }
         else {
             this.Active = this.accessory.context.Active;
@@ -797,19 +841,19 @@ class Humidifier {
             this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
         }
         if (this.TargetHumidifierDehumidifierState === undefined) {
-            this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+            this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
         }
         else if (this.accessory.context.TargetHumidifierDehumidifierState === undefined) {
-            this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+            this.TargetHumidifierDehumidifierState = this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
         }
         else {
             this.TargetHumidifierDehumidifierState = this.accessory.context.TargetHumidifierDehumidifierState;
         }
         if (this.CurrentHumidifierDehumidifierState === undefined) {
-            this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+            this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
         }
         else if (this.accessory.context.CurrentHumidifierDehumidifierState === undefined) {
-            this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+            this.CurrentHumidifierDehumidifierState = this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
         }
         else {
             this.CurrentHumidifierDehumidifierState = this.accessory.context.CurrentHumidifierDehumidifierState;
@@ -841,7 +885,7 @@ class Humidifier {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
-    async config(device) {
+    async deviceConfig(device) {
         let config = {};
         if (device.humidifier) {
             config = device.humidifier;
@@ -868,7 +912,7 @@ class Humidifier {
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
         }
     }
-    async logs(device) {
+    async deviceLogs(device) {
         if (this.platform.debugMode) {
             this.deviceLogging = this.accessory.context.logging = 'debugMode';
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
@@ -932,5 +976,4 @@ class Humidifier {
         return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
     }
 }
-exports.Humidifier = Humidifier;
 //# sourceMappingURL=humidifier.js.map