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

package/src/device/motion.ts

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

package/src/device/plug.ts

@@ -95,12 +95,9 @@ export class Plug {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.plugUpdateInProgress = false;
@@ -127,14 +124,11 @@ export class Plug {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -278,7 +272,7 @@ export class Plug {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Plug: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Plug: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -354,6 +348,6 @@ export class Plug {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/airconditioner.ts

@@ -269,12 +269,9 @@ export class AirConditioner {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -590,7 +587,7 @@ export class AirConditioner {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Air Conditioner: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Air Conditioner: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -651,6 +648,6 @@ export class AirConditioner {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/airpurifier.ts

@@ -228,14 +228,11 @@ export class AirPurifier {
       this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
     } catch (e: any) {
       this.errorLog(`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -288,7 +285,7 @@ export class AirPurifier {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Air Purifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Air Purifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -340,6 +337,6 @@ export class AirPurifier {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/camera.ts

@@ -120,14 +120,11 @@ export class Camera {
       this.accessory.context.On = this.OnCached;
     } catch (e: any) {
       this.errorLog(`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -177,7 +174,7 @@ export class Camera {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Camera: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Camera: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -229,6 +226,6 @@ export class Camera {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/fan.ts

@@ -245,14 +245,11 @@ export class Fan {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -304,7 +301,7 @@ export class Fan {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Fan: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Fan: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -356,6 +353,6 @@ export class Fan {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/light.ts

@@ -153,14 +153,11 @@ export class Light {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -210,7 +207,7 @@ export class Light {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Light: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Light: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -262,6 +259,6 @@ export class Light {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/other.ts

@@ -152,14 +152,11 @@ export class Others {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -203,7 +200,7 @@ export class Others {
   async deviceType(device: irdevice & irDevicesConfig): Promise<void> {
     if (device.other?.deviceType) {
       this.otherDeviceType = this.accessory.context.deviceType = device.other.deviceType;
-      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
+      if (this.deviceLogging.includes('debug') || this.deviceLogging === 'standard') {
         this.warnLog(`Other: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}`);
       }
     } else {
@@ -220,7 +217,7 @@ export class Others {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Other: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Other: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -272,6 +269,6 @@ export class Others {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/tv.ts

@@ -348,17 +348,12 @@ export class TV {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -410,7 +405,7 @@ export class TV {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -462,6 +457,6 @@ export class TV {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/vacuumcleaner.ts

@@ -120,15 +120,12 @@ export class VacuumCleaner {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Vacuum Cleaner: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Vacuum Cleaner: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Vacuum Cleaner: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -178,7 +175,7 @@ export class VacuumCleaner {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Vacuum Cleaner: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Vacuum Cleaner: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -230,6 +227,6 @@ export class VacuumCleaner {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/irdevice/waterheater.ts

@@ -125,14 +125,11 @@ export class WaterHeater {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Water Heater: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Water Heater: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(`Water Heater: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-      }
       this.apiError(e);
     }
   }
@@ -182,7 +179,7 @@ export class WaterHeater {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Water Heater: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Water Heater: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -234,6 +231,6 @@ export class WaterHeater {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/platform.ts

@@ -61,7 +61,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.debugLog('Config OK');
     } catch (e: any) {
       this.errorLog(JSON.stringify(e.message));
-      if (this.platformLogging === 'debugMode') {
+      if (this.platformLogging?.includes('debug')) {
         this.errorLog(JSON.stringify(e));
       }
       return;
@@ -85,7 +85,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.discoverDevices();
       } catch (e: any) {
         this.errorLog('Failed to Discover Devices.', JSON.stringify(e.message));
-        if (this.platformLogging === 'debugMode') {
+        if (this.platformLogging?.includes('debug')) {
           this.errorLog(JSON.stringify(e));
         }
       }
@@ -117,7 +117,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
    * It should be used to setup event handlers for characteristics and update respective values.
    */
   configureAccessory(accessory: PlatformAccessory) {
-    this.infoLog(`Loading accessory from cache: ${accessory.displayName}`);
+    this.debugLog(`Loading accessory from cache: ${accessory.displayName}`);
 
     // add the restored accessory to the accessories cache so we can track if it has already been registered
     this.accessories.push(accessory);
@@ -140,7 +140,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       platformConfig['pushRate'] = this.config.options.pushRate;
     }
     if (Object.entries(platformConfig).length !== 0) {
-      this.warnLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
+      this.infoLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
     }
 
     if (this.config.options) {
@@ -1546,13 +1546,13 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   public deviceListInfo(devices: deviceResponses) {
-    if (this.platformLogging === 'debug') {
+    if (this.platformLogging?.includes('debug')) {
       this.warnLog(`deviceListInfoStatus: ${JSON.stringify(devices)}`);
     }
   }
 
   public async deviceInfo(device: (irdevice & devicesConfig) | (device & devicesConfig)) {
-    if (this.platformLogging === 'debug') {
+    if (this.platformLogging?.includes('debug')) {
       this.warnLog(JSON.stringify(device));
       this.deviceStatus = (await this.axios.get(`${DeviceURL}/${device.deviceId}/status`)).data;
       if (this.deviceStatus.message === 'success') {

package/src/settings.ts

@@ -68,6 +68,7 @@ export type bot = {
   deviceType?: string;
   doublePress?: number;
   allowPush?: boolean;
+  maxRetry?: number;
 };
 
 export type humidifier = {