@switchbot/homebridge-switchbot 1.11.2 → 1.12.2-beta.1

package/src/device/bot.ts

@@ -355,7 +355,7 @@ export class Bot {
             });
         } catch (e: any) {
           this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
           if (this.platform.debugMode) {
@@ -506,7 +506,7 @@ export class Bot {
       })
       .catch(async (e: any) => {
         this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
@@ -534,7 +534,7 @@ export class Bot {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
@@ -604,7 +604,7 @@ export class Bot {
           })
           .catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging === 'debug') {
+            if (this.deviceLogging.includes('debug')) {
               this.errorLog(
                 `Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
               );
@@ -633,7 +633,7 @@ export class Bot {
           })
           .catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging === 'debug') {
+            if (this.deviceLogging.includes('debug')) {
               this.errorLog(
                 `Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
               );
@@ -650,24 +650,22 @@ export class Bot {
       } else {
         throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
       }
-      /* } else {
-         this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-         if (this.platform.config.credentials?.openToken) {
-           this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-           await this.openAPIpushChanges();
-         }
-       }*/
     }
     this.OnCached = this.On;
     this.accessory.context.On = this.OnCached;
   }
 
   async turnOnOff(device_list: any): Promise<any> {
-    if (this.On) {
-      return device_list[0].turnOn({ id: this.device.bleMac });
-    } else {
-      return device_list[0].turnOff({ id: this.device.bleMac });
-    }
+    return await this.retry({
+      max: await this.maxRetry(),
+      fn: () => {
+        if (this.On) {
+          return device_list[0].turnOn({ id: this.device.bleMac });
+        } else {
+          return device_list[0].turnOff({ id: this.device.bleMac });
+        }
+      },
+    });
   }
 
   async openAPIpushChanges(): Promise<void> {
@@ -710,7 +708,7 @@ export class Bot {
         }
       } catch (e: any) {
         this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
@@ -1046,6 +1044,28 @@ export class Bot {
     this.doBotUpdate.next();
   }
 
+  async retry({ max, fn }: { max: number; fn: { (): any; (): Promise<any> } }): Promise<null> {
+    return fn().catch(async (err: any) => {
+      if (max === 0) {
+        throw err;
+      }
+      this.infoLog(err);
+      this.infoLog('Retrying');
+      await this.switchbot.wait(1000);
+      return this.retry({ max: max - 1, fn });
+    });
+  }
+
+  async maxRetry(): Promise<number> {
+    let maxRetry: number;
+    if (this.device.bot?.maxRetry) {
+      maxRetry = this.device.bot?.maxRetry;
+    } else {
+      maxRetry = 5;
+    }
+    return maxRetry;
+  }
+
   async config(device: device & devicesConfig): Promise<void> {
     let config = {};
     if (device.bot) {
@@ -1067,7 +1087,7 @@ export class Bot {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -1258,6 +1278,6 @@ export class Bot {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/colorbulb.ts

@@ -205,12 +205,9 @@ export class ColorBulb {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.colorBulbUpdateInProgress = false;
@@ -281,17 +278,12 @@ export class ColorBulb {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -355,17 +347,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -404,17 +391,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -449,17 +431,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -491,17 +468,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -700,7 +672,7 @@ export class ColorBulb {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -781,6 +753,6 @@ export class ColorBulb {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/contact.ts

@@ -314,15 +314,12 @@ export class Contact {
         })
         .catch(async (e: any) => {
           this.errorLog(`Contact Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Contact Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
                 ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Contact Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
             this.SwitchToOpenAPI = true;
@@ -357,17 +354,12 @@ export class Contact {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Contact Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Contact Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
               ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(
-            `Contact Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-          );
-        }
         this.apiError(e);
       }
     }
@@ -450,7 +442,7 @@ export class Contact {
       config['scanDuration'] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Contact Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Contact Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -544,6 +536,6 @@ export class Contact {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/curtain.ts

@@ -118,7 +118,7 @@ export class Curtain {
       })
       .onSet(this.TargetPositionSet.bind(this));
 
-    // Light Sensor Service
+    /* Light Sensor Service
     if (device.curtain?.hide_lightsensor) {
       this.debugLog(`Curtain: ${accessory.displayName} Removing Light Sensor Service`);
       this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor);
@@ -132,7 +132,7 @@ export class Curtain {
       this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
     } else {
       this.debugLog(`Curtain: ${accessory.displayName} Light Sensor Service Not Added`);
-    }
+    }*/
 
     // Battery Service
     if (!device.ble) {
@@ -184,12 +184,9 @@ export class Curtain {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.curtainUpdateInProgress = false;
@@ -425,14 +422,11 @@ export class Curtain {
         })
         .catch(async (e: any) => {
           this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
             this.SwitchToOpenAPI = true;
@@ -467,14 +461,11 @@ export class Curtain {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-        }
         this.apiError(e);
       }
     }
@@ -516,14 +507,11 @@ export class Curtain {
           })
           .catch(async (e: any) => {
             this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging === 'debug') {
+            if (this.deviceLogging.includes('debug')) {
               this.errorLog(
                 `Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
               );
             }
-            if (this.platform.debugMode) {
-              this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-            }
             if (this.platform.config.credentials?.openToken) {
               this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
               await this.openAPIpushChanges();
@@ -575,14 +563,11 @@ export class Curtain {
         }
       } catch (e: any) {
         this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-        }
         this.apiError(e);
       }
     }
@@ -747,7 +732,7 @@ export class Curtain {
       config['scanDuration'] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -869,6 +854,6 @@ export class Curtain {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/humidifier.ts

@@ -176,12 +176,9 @@ export class Humidifier {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.humidifierUpdateInProgress = false;
@@ -333,14 +330,11 @@ export class Humidifier {
         })
         .catch(async (e: any) => {
           this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
             await this.openAPIRefreshStatus();
@@ -380,15 +374,12 @@ export class Humidifier {
         }
       } catch (e: any) {
         this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
               ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-        }
         this.apiError(e);
       }
     }
@@ -432,14 +423,11 @@ export class Humidifier {
         })
         .catch(async (e: any) => {
           this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
             await this.openAPIpushChanges();
@@ -481,15 +469,12 @@ export class Humidifier {
           this.statusCode(push);
         } catch (e: any) {
           this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
                 ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
       } else if (
@@ -531,15 +516,12 @@ export class Humidifier {
       }
     } catch (e: any) {
       this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -569,15 +551,12 @@ export class Humidifier {
       }
     } catch (e: any) {
       this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -763,7 +742,7 @@ export class Humidifier {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Humidifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Humidifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -848,6 +827,6 @@ export class Humidifier {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/lock.ts

@@ -98,12 +98,9 @@ export class Lock {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.lockUpdateInProgress = false;
@@ -133,14 +130,11 @@ export class Lock {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -264,7 +258,7 @@ export class Lock {
       config['scanDuration'] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Lock: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Lock: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -340,6 +334,6 @@ export class Lock {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/meter.ts

@@ -283,14 +283,11 @@ export class Meter {
         })
         .catch(async (e: any) => {
           this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
             this.SwitchToOpenAPI = true;
@@ -324,14 +321,11 @@ export class Meter {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-        }
         this.apiError(e);
       }
     }
@@ -417,7 +411,7 @@ export class Meter {
       config['scanDuration'] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Meter: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Meter: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -493,6 +487,6 @@ export class Meter {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }