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

package/dist/device/humidifier.js

@@ -83,12 +83,12 @@ class Humidifier {
             .onSet(this.handleRelativeHumidityHumidifierThresholdSet.bind(this));
         // Temperature Sensor Service
         if (device.humidifier?.hide_temperature || device.ble) {
-            this.debugLog(`Humidifier: ${accessory.displayName} Removing Temperature Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
             this.temperatureservice = this.accessory.getService(this.platform.Service.TemperatureSensor);
             accessory.removeService(this.temperatureservice);
         }
         else if (!this.temperatureservice && !device.ble) {
-            this.debugLog(`Humidifier: ${accessory.displayName} Add Temperature Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
             (this.temperatureservice =
                 this.accessory.getService(this.platform.Service.TemperatureSensor) || this.accessory.addService(this.platform.Service.TemperatureSensor)),
                 `${accessory.displayName} Temperature Sensor`;
@@ -106,7 +106,7 @@ class Humidifier {
             });
         }
         else {
-            this.debugLog(`Humidifier: ${accessory.displayName} Temperature Sensor Service Not Added`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
         }
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
@@ -127,9 +127,10 @@ class Humidifier {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
                 if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,`
+                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
                 }
                 this.apiError(e);
             }
@@ -148,10 +149,10 @@ class Humidifier {
         }
     }
     async BLEparseStatus() {
-        this.debugLog(`Humidifier: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE parseStatus`);
         // Current Relative Humidity
         this.CurrentRelativeHumidity = this.percentage;
-        this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         // Active
         if (this.onState) {
             this.Active = this.platform.Characteristic.Active.ACTIVE;
@@ -159,18 +160,18 @@ class Humidifier {
         else {
             this.Active = this.platform.Characteristic.Active.INACTIVE;
         }
-        this.debugLog(`Humidifier: ${this.accessory.displayName} Active: ${this.Active}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
     }
     async openAPIparseStatus() {
         if (this.platform.config.credentials?.token) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} OpenAPI parseStatus`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI parseStatus`);
             // Current Relative Humidity
             this.CurrentRelativeHumidity = this.humidity;
-            this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
             // Current Temperature
             if (!this.device.humidifier?.hide_temperature) {
                 this.CurrentTemperature = this.temperature;
-                this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
             }
             // Target Humidifier Dehumidifier State
             switch (this.auto) {
@@ -197,9 +198,12 @@ class Humidifier {
                         this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.HUMIDIFYING;
                     }
             }
-            this.debugLog(`Humidifier: ${this.accessory.displayName} TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
-            this.debugLog(`Humidifier: ${this.accessory.displayName}` + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
-            this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
             // Active
             switch (this.power) {
                 case 'on':
@@ -208,7 +212,7 @@ class Humidifier {
                 default:
                     this.Active = this.platform.Characteristic.Active.INACTIVE;
             }
-            this.debugLog(`Humidifier: ${this.accessory.displayName} Active: ${this.Active}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
             // Water Level
             if (this.lackWater) {
                 this.WaterLevel = 0;
@@ -216,7 +220,7 @@ class Humidifier {
             else {
                 this.WaterLevel = 100;
             }
-            this.debugLog(`Humidifier: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
         }
     }
     /**
@@ -231,14 +235,14 @@ class Humidifier {
         }
     }
     async BLERefreshStatus() {
-        this.debugLog(`Humidifier: ${this.accessory.displayName} BLE refreshStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE refreshStatus`);
         const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
         this.device.bleMac = this.device
             .deviceId.match(/.{1,2}/g)
             .join(':')
             .toLowerCase();
-        this.debugLog(`Humidifier: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         this.getCustomBLEAddress(switchbot);
         // Start to monitor advertisement packets
         if (switchbot !== false) {
@@ -254,23 +258,23 @@ class Humidifier {
                     if (this.deviceLogging.includes('debug')) {
                         this.infoLog(this.address);
                         this.infoLog(this.device.bleMac);
-                        this.infoLog(`Humidifier: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-                        this.infoLog(`Humidifier: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
+                        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
+                        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
                     }
                     this.serviceData = ad.serviceData;
                     this.autoMode = ad.serviceData.autoMode;
                     this.onState = ad.serviceData.onState;
                     this.percentage = ad.serviceData.percentage;
-                    this.debugLog(`Humidifier: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(ad.serviceData)}`);
-                    this.debugLog(`Humidifier: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName},` +
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(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 (this.serviceData) {
                         this.connected = true;
-                        this.debugLog(`Humidifier: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                     else {
                         this.connected = false;
-                        this.debugLog(`Humidifier: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                 };
                 // Wait 2 seconds
@@ -288,12 +292,13 @@ class Humidifier {
                 }
             })
                 .catch(async (e) => {
-                this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
                 if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
                 }
                 if (this.platform.config.credentials?.token) {
-                    this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
+                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
                     await this.openAPIRefreshStatus();
                 }
                 this.apiError(e);
@@ -312,7 +317,7 @@ class Humidifier {
                 });
                 // Set an event handler
                 switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`Humidifier: ${this.accessory.displayName} ad: ${(0, super_stringify_1.default)(ad, null, '  ')}`);
+                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${(0, super_stringify_1.default)(ad, null, '  ')}`);
                 };
                 await switchbot.wait(10000);
                 // Stop to monitor
@@ -321,22 +326,22 @@ class Humidifier {
         }
     }
     async BLEconnection(switchbot) {
-        this.errorLog(`Humidifier: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
         if (this.platform.config.credentials?.token) {
-            this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
             await this.openAPIRefreshStatus();
         }
     }
     async openAPIRefreshStatus() {
-        if (this.platform.config.credentials?.token && this.device.openAPI) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} OpenAPI refreshStatus`);
+        if (this.platform.config.credentials?.token && this.OpenAPI) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI refreshStatus`);
             try {
                 const t = Date.now();
                 const nonce = 'requestID';
                 const data = this.platform.config.credentials?.token + t + nonce;
                 const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Humidifier: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -351,16 +356,16 @@ class Humidifier {
                     },
                 };
                 const req = https_1.default.request(options, (res) => {
-                    this.debugLog(`Humidifier: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
                     let rawData = '';
                     res.on('data', (d) => {
                         rawData += d;
-                        this.debugLog(`Humidifier: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                     res.on('end', () => {
                         try {
                             this.deviceStatus = JSON.parse(rawData);
-                            this.debugLog(`Humidifier: ${this.accessory.displayName} refreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
+                            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
                             this.auto = this.deviceStatus.body.auto;
                             this.power = this.deviceStatus.body.power;
                             this.lackWater = this.deviceStatus.body.lackWater;
@@ -371,19 +376,19 @@ class Humidifier {
                             this.updateHomeKitCharacteristics();
                         }
                         catch (e) {
-                            this.errorLog(`Humidifier: ${this.accessory.displayName} error message: ${e.message}`);
+                            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                         }
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.end();
             }
             catch (e) {
-                this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
                 if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
                         ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
                 }
                 this.apiError(e);
@@ -391,7 +396,7 @@ class Humidifier {
         }
         else {
             if (this.deviceLogging.includes('debug')) {
-                this.warnLog(`Humidifier: ${this.accessory.displayName} OpenAPI is disabled, device status will not be sent.`);
+                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, device status will not be sent.`);
             }
         }
     }
@@ -411,14 +416,14 @@ class Humidifier {
         });
     }
     async BLEpushChanges() {
-        this.debugLog(`Humidifier: ${this.accessory.displayName} BLE pushChanges`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE pushChanges`);
         const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
         this.device.bleMac = this.device
             .deviceId.match(/.{1,2}/g)
             .join(':')
             .toLowerCase();
-        this.debugLog(`Humidifier: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         if (switchbot !== false) {
             switchbot
                 .discover({ model: 'e', quick: true, id: this.device.bleMac })
@@ -427,31 +432,32 @@ class Humidifier {
                 return device_list[0].percentage(this.RelativeHumidityHumidifierThreshold);
             })
                 .then(() => {
-                this.debugLog(`Humidifier: ${this.accessory.displayName} Done.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
             })
                 .catch(async (e) => {
-                this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
                 if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
                 }
                 if (this.platform.config.credentials?.token) {
-                    this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
+                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
                     await this.openAPIpushChanges();
                 }
                 this.apiError(e);
             });
         }
         else {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
             if (this.platform.config.credentials?.token) {
-                this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
+                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
                 await this.openAPIpushChanges();
             }
         }
     }
     async openAPIpushChanges() {
-        if (this.platform.config.credentials?.token && this.device.openAPI) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} OpenAPI pushChanges`);
+        if (this.platform.config.credentials?.token && this.OpenAPI) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI pushChanges`);
             if (this.TargetHumidifierDehumidifierState === this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER &&
                 this.Active === this.platform.Characteristic.Active.ACTIVE) {
                 // Make Push On request to the API
@@ -462,14 +468,14 @@ class Humidifier {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Humidifier: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
                 this.debugLog(`Pushing Manual: ${this.RelativeHumidityHumidifierThreshold}!`);
                 const body = (0, super_stringify_1.default)({
                     'command': 'setMode',
                     'parameter': `${this.RelativeHumidityHumidifierThreshold}`,
                     'commandType': 'command',
                 });
-                this.infoLog(`Humidifier: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -485,18 +491,18 @@ class Humidifier {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Humidifier: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
                     res.on('data', d => {
-                        this.debugLog(`Humidifier: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                     this.apiError(e);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Humidifier: ${this.accessory.displayName} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
             }
             else if (this.TargetHumidifierDehumidifierState === this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER &&
                 this.Active === this.platform.Characteristic.Active.ACTIVE) {
@@ -507,7 +513,7 @@ class Humidifier {
             }
         }
         else {
-            this.warnLog(`Humidifier: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
         }
     }
     /**
@@ -525,14 +531,14 @@ class Humidifier {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Humidifier: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
                 this.debugLog('Pushing Auto!');
                 const body = (0, super_stringify_1.default)({
                     'command': 'setMode',
                     'parameter': 'auto',
                     'commandType': 'command',
                 });
-                this.infoLog(`Humidifier: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -548,24 +554,24 @@ class Humidifier {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Humidifier: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
                     this.statusCode({ res });
                     res.on('data', d => {
-                        this.debugLog(`Humidifier: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Humidifier: ${this.accessory.displayName} pushAutoChanges: ${(0, super_stringify_1.default)(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushAutoChanges: ${(0, super_stringify_1.default)(req)}`);
             }
         }
         catch (e) {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection`);
             if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` +
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` +
                     ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
             }
             this.apiError(e);
@@ -585,14 +591,14 @@ class Humidifier {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Humidifier: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
                 this.debugLog('Pushing Off!');
                 const body = (0, super_stringify_1.default)({
                     'command': 'turnOff',
                     'parameter': 'default',
                     'commandType': 'command',
                 });
-                this.infoLog(`Humidifier: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -608,24 +614,24 @@ class Humidifier {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Humidifier: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
                     this.statusCode({ res });
                     res.on('data', d => {
-                        this.debugLog(`Humidifier: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Humidifier: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Humidifier: ${this.accessory.displayName} pushActiveChanges: ${(0, super_stringify_1.default)(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushActiveChanges: ${(0, super_stringify_1.default)(req)}`);
             }
         }
         catch (e) {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection`);
             if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` +
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` +
                     ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
             }
             this.apiError(e);
@@ -636,59 +642,63 @@ class Humidifier {
      */
     async updateHomeKitCharacteristics() {
         if (this.CurrentRelativeHumidity === undefined) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         }
         else {
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
-            this.debugLog(`Humidifier: ${this.accessory.displayName}` + ` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
         }
         if (!this.device.ble) {
             if (this.WaterLevel === undefined) {
-                this.debugLog(`Humidifier: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
             }
             else {
                 this.humidifierService.updateCharacteristic(this.platform.Characteristic.WaterLevel, this.WaterLevel);
-                this.debugLog(`Humidifier: ${this.accessory.displayName} updateCharacteristic WaterLevel: ${this.WaterLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic WaterLevel: ${this.WaterLevel}`);
             }
         }
         if (this.CurrentHumidifierDehumidifierState === undefined) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
         }
         else {
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, this.CurrentHumidifierDehumidifierState);
-            this.debugLog(`Humidifier: ${this.accessory.displayName}` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
                 ` updateCharacteristic CurrentHumidifierDehumidifierState: ${this.CurrentHumidifierDehumidifierState}`);
         }
         if (this.TargetHumidifierDehumidifierState === undefined) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
         }
         else {
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, this.TargetHumidifierDehumidifierState);
-            this.debugLog(`Humidifier: ${this.accessory.displayName}` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
                 ` updateCharacteristic TargetHumidifierDehumidifierState: ${this.TargetHumidifierDehumidifierState}`);
         }
         if (this.Active === undefined) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName} Active: ${this.Active}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${this.Active}`);
         }
         else {
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
-            this.debugLog(`Humidifier: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
         }
         if (this.RelativeHumidityHumidifierThreshold === undefined) {
-            this.debugLog(`Humidifier: ${this.accessory.displayName}` + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
         }
         else {
             this.humidifierService.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, this.RelativeHumidityHumidifierThreshold);
-            this.debugLog(`Humidifier: ${this.accessory.displayName}` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
                 ` updateCharacteristic RelativeHumidityHumidifierThreshold: ${this.RelativeHumidityHumidifierThreshold}`);
         }
         if (!this.device.humidifier?.hide_temperature && !this.device.ble) {
             if (this.CurrentTemperature === undefined) {
-                this.debugLog(`Humidifier: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
             }
             else {
                 this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
-                this.debugLog(`Humidifier: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
             }
         }
     }
@@ -709,31 +719,31 @@ class Humidifier {
     async statusCode({ res }) {
         switch (res.statusCode) {
             case 151:
-                this.errorLog(`Humidifier: ${this.accessory.displayName} Command not supported by this device type.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
                 break;
             case 152:
-                this.errorLog(`Humidifier: ${this.accessory.displayName} Device not found.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
                 break;
             case 160:
-                this.errorLog(`Humidifier: ${this.accessory.displayName} Command is not supported.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
                 break;
             case 161:
-                this.errorLog(`Humidifier: ${this.accessory.displayName} Device is offline.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
                 this.offlineOff();
                 break;
             case 171:
-                this.errorLog(`Humidifier: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
                 this.offlineOff();
                 break;
             case 190:
-                this.errorLog(`Humidifier: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
                     ` Or command: ${(0, super_stringify_1.default)(res)} format is invalid`);
                 break;
             case 100:
-                this.debugLog(`Humidifier: ${this.accessory.displayName} Command successfully sent.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
                 break;
             default:
-                this.debugLog(`Humidifier: ${this.accessory.displayName} Unknown statusCode.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
         }
     }
     async offlineOff() {
@@ -746,7 +756,7 @@ class Humidifier {
      * Handle requests to set the "Target Humidifier Dehumidifier State" characteristic
      */
     async handleTargetHumidifierDehumidifierStateSet(value) {
-        this.debugLog(`Humidifier: ${this.accessory.displayName} TargetHumidifierDehumidifierState: ${value}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetHumidifierDehumidifierState: ${value}`);
         this.TargetHumidifierDehumidifierState = value;
         this.doHumidifierUpdate.next();
     }
@@ -754,7 +764,7 @@ class Humidifier {
      * Handle requests to set the "Active" characteristic
      */
     async handleActiveSet(value) {
-        this.debugLog(`Humidifier: ${this.accessory.displayName} Active: ${value}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${value}`);
         this.Active = value;
         this.doHumidifierUpdate.next();
     }
@@ -762,7 +772,7 @@ class Humidifier {
      * Handle requests to set the "Relative Humidity Humidifier Threshold" characteristic
      */
     async handleRelativeHumidityHumidifierThresholdSet(value) {
-        this.debugLog(`Humidifier: ${this.accessory.displayName} RelativeHumidityHumidifierThreshold: ${value}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} RelativeHumidityHumidifierThreshold: ${value}`);
         this.RelativeHumidityHumidifierThreshold = value;
         if (this.Active === this.platform.Characteristic.Active.INACTIVE) {
             this.Active = this.platform.Characteristic.Active.ACTIVE;
@@ -778,6 +788,9 @@ class Humidifier {
         if (device.ble !== undefined) {
             config['ble'] = device.ble;
         }
+        if (device.openAPI !== undefined) {
+            config['openAPI'] = device.openAPI;
+        }
         if (device.logging !== undefined) {
             config['logging'] = device.logging;
         }
@@ -790,21 +803,18 @@ class Humidifier {
         if (device.offline !== undefined) {
             config['offline'] = device.offline;
         }
-        if (device.openAPI !== undefined) {
-            config['openAPI'] = device.openAPI;
-        }
         if (Object.entries(config).length !== 0) {
-            this.infoLog(`Humidifier: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
         }
     }
     async refreshRate(device) {
         if (device.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Humidifier: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+            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(`Humidifier: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
     async openAPI() {
@@ -814,45 +824,46 @@ class Humidifier {
         else {
             this.OpenAPI = this.device.openAPI;
         }
-        this.debugLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
     }
     async scan(device) {
         if (device.scanDuration) {
             this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
             if (device.ble) {
-                this.debugLog(`Humidifier: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
             }
         }
         else {
             this.scanDuration = this.accessory.context.scanDuration = 1;
             if (this.device.ble) {
-                this.debugLog(`Humidifier: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
             }
         }
     }
     async logs(device) {
         if (this.platform.debugMode) {
             this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`Humidifier: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+            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(`Humidifier: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+            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(`Humidifier: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
         }
         else {
             this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`Humidifier: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
     FirmwareRevision(accessory, device) {
         let FirmwareRevision;
-        this.debugLog(`Humidifier: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`Humidifier: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`Humidifier: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
         if (accessory.context.FirmwareRevision) {
             FirmwareRevision = accessory.context.FirmwareRevision;
         }