@switchbot/homebridge-switchbot 1.2.1 → 1.2.4

package/src/devices/humidifiers.ts

@@ -29,6 +29,7 @@ export class Humidifier {
   deviceStatus!: deviceStatusResponse;
 
   // BLE Others
+  connected?: boolean;
   serviceData!: serviceData;
   onState!: serviceData['onState'];
   autoMode!: serviceData['autoMode'];
@@ -315,14 +316,30 @@ export class Humidifier {
         this.platform.device(`Humidifier: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         this.platform.device(`Humidifier: ${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.platform.device(`Humidifier: ${this.accessory.displayName} connected: ${this.connected}`);
+        } else {
+          this.connected = false;
+          this.platform.device(`Humidifier: ${this.accessory.displayName} connected: ${this.connected}`);
+        }
       };
       // Wait 10 seconds
       return switchbot.wait(10000);
-    }).then(() => {
+    }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();
-      this.parseStatus();
-      this.updateHomeKitCharacteristics();
+      if (this.connected) {
+        this.parseStatus();
+        this.updateHomeKitCharacteristics();
+      } else {
+        this.platform.log.error(`Humidifier: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+        if (this.platform.config.credentials?.openToken) {
+          this.platform.log.warn(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
+          await this.openAPIRefreshStatus();
+        }
+      }
     }).catch(async (e: any) => {
       this.platform.log.error(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
       if (this.deviceDebug) {
@@ -578,7 +595,7 @@ export class Humidifier {
       if (this.CurrentTemperature === undefined) {
         this.platform.debug(`Humidifier: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
       } else {
-        this.temperatureservice!.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
+        this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
         this.platform.device(`Humidifier: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
       }
     }
@@ -594,7 +611,7 @@ export class Humidifier {
     this.service.updateCharacteristic(this.platform.Characteristic.Active, e);
     this.service.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, e);
     if (!this.device.humidifier?.hide_temperature && !this.device.ble) {
-      this.temperatureservice!.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
+      this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
     }
   }
 

package/src/devices/meters.ts

@@ -29,6 +29,7 @@ export class Meter {
   deviceStatus!: deviceStatusResponse;
 
   // BLE Others
+  connected?: boolean;
   switchbot!: switchbot;
   serviceData!: serviceData;
   battery!: serviceData['battery'];
@@ -191,19 +192,13 @@ export class Meter {
     // Current Temperature
     if (!this.device.meter?.hide_temperature) {
       if (this.device.meter?.unit === 1) {
-        this.CurrentTemperature = Number(this.temperature?.f);
+        this.CurrentTemperature = this.toFahrenheit(this.temperature!.c);
       } else if (this.device.meter?.unit === 0) {
-        this.CurrentTemperature = Number(this.temperature?.c);
+        this.CurrentTemperature = this.toCelsius(this.temperature!.c);
       } else {
-        if (this.fahrenheit) {
-          this.CurrentTemperature = Number(this.temperature?.f);
-        } else {
-          this.CurrentTemperature = Number(this.temperature?.c);
-        }
+        this.CurrentTemperature = Number(this.temperature?.c);
       }
-
-      this.CurrentTemperature = Number();
-      this.platform.debug(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c, fahrenheit: ${this.fahrenheit}`);
+      this.platform.debug(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
     }
   }
 
@@ -278,14 +273,30 @@ export class Meter {
         this.platform.device(`Meter: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName}, `
           + `temperature: ${JSON.stringify(ad.serviceData.temperature)}, fahrenheit: ${ad.serviceData.fahrenheit}, `
           + `humidity: ${ad.serviceData.humidity}, battery: ${ad.serviceData.battery}`);
+
+        if (this.serviceData) {
+          this.connected = true;
+          this.platform.device(`Meter: ${this.accessory.displayName} connected: ${this.connected}`);
+        } else {
+          this.connected = false;
+          this.platform.device(`Meter: ${this.accessory.displayName} connected: ${this.connected}`);
+        }
       };
       // Wait 10 seconds
       return switchbot.wait(10000);
-    }).then(() => {
+    }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();
-      this.parseStatus();
-      this.updateHomeKitCharacteristics();
+      if (this.connected) {
+        this.parseStatus();
+        this.updateHomeKitCharacteristics();
+      } else {
+        this.platform.log.error(`Meter: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+        if (this.platform.config.credentials?.openToken) {
+          this.platform.log.warn(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
+          await this.openAPIRefreshStatus();
+        }
+      }
     }).catch(async (e: any) => {
       this.platform.log.error(`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
       if (this.deviceDebug) {

package/src/devices/motion.ts

@@ -26,6 +26,7 @@ export class Motion {
   deviceStatus!: deviceStatusResponse;
 
   // BLE Others
+  connected?: boolean;
   switchbot!: switchbot;
   serviceData!: serviceData;
   battery!: serviceData['battery'];
@@ -185,14 +186,30 @@ export class Motion {
         this.platform.device(`Motion Sensor: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         this.platform.device(`Motion Sensor: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, lightLevel: `
           + `${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`);
+
+        if (this.serviceData) {
+          this.connected = true;
+          this.platform.device(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
+        } else {
+          this.connected = false;
+          this.platform.device(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
+        }
       };
       // Wait 10 seconds
       return switchbot.wait(10000);
-    }).then(() => {
+    }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();
-      this.parseStatus();
-      this.updateHomeKitCharacteristics();
+      if (this.connected) {
+        this.parseStatus();
+        this.updateHomeKitCharacteristics();
+      } else {
+        this.platform.log.error(`Motion Sensor: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+        if (this.platform.config.credentials?.openToken) {
+          this.platform.log.warn(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
+          await this.openAPIRefreshStatus();
+        }
+      }
     }).catch(async (e: any) => {
       this.platform.log.error(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
       if (this.deviceDebug) {

package/src/devices/plugs.ts

@@ -12,7 +12,6 @@ export class Plug {
 
   // Characteristic Values
   On!: CharacteristicValue;
-  OutletInUse!: CharacteristicValue;
 
   // OpenAPI Others
   deviceStatus!: deviceStatusResponse;
@@ -32,7 +31,6 @@ export class Plug {
   ) {
     // default placeholders
     this.On = false;
-    this.OutletInUse = true;
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doPlugUpdate = new Subject();
@@ -68,8 +66,6 @@ export class Plug {
     // create handlers for required characteristics
     this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
 
-    this.service.setCharacteristic(this.platform.Characteristic.OutletInUse, this.OutletInUse || true);
-
     // Update Homekit
     this.updateHomeKitCharacteristics();
 
@@ -173,17 +169,10 @@ export class Plug {
       this.service.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.platform.device(`Plug: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
-    if (this.OutletInUse === undefined) {
-      this.platform.debug(`Plug: ${this.accessory.displayName} OutletInUse: ${this.OutletInUse}`);
-    } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.OutletInUse, this.OutletInUse);
-      this.platform.device(`Plug: ${this.accessory.displayName} updateCharacteristic OutletInUse: ${this.OutletInUse}`);
-    }
   }
 
   public apiError(e: any) {
     this.service.updateCharacteristic(this.platform.Characteristic.On, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.OutletInUse, e);
   }
 
   private statusCode(push: AxiosResponse<{ statusCode: number; }>) {

package/src/irdevices/airconditioners.ts

@@ -168,39 +168,39 @@ export class AirConditioner {
     if (this.Active === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
     if (this.RotationSpeed === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} RotationSpeed: ${this.RotationSpeed}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.RotationSpeed, this.RotationSpeed);
+      this.service?.updateCharacteristic(this.platform.Characteristic.RotationSpeed, this.RotationSpeed);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName} updateCharacteristic RotationSpeed: ${this.RotationSpeed}`);
     }
     if (this.CurrentTemperature === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.CurrentTemperature);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.CurrentTemperature);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
     }
     if (this.TargetHeaterCoolerState === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.TargetHeaterCoolerState, this.TargetHeaterCoolerState);
+      this.service?.updateCharacteristic(this.platform.Characteristic.TargetHeaterCoolerState, this.TargetHeaterCoolerState);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName}`
         + ` updateCharacteristic TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}`);
     }
     if (this.CurrentHeaterCoolerState === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.CurrentHeaterCoolerState, this.CurrentHeaterCoolerState);
+      this.service?.updateCharacteristic(this.platform.Characteristic.CurrentHeaterCoolerState, this.CurrentHeaterCoolerState);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName}`
         + ` updateCharacteristic CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`);
     }
     if (this.HeatingThresholdTemperature === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} HeatingThresholdTemperature: ${this.HeatingThresholdTemperature}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.HeatingThresholdTemperature, this.HeatingThresholdTemperature);
+      this.service?.updateCharacteristic(this.platform.Characteristic.HeatingThresholdTemperature, this.HeatingThresholdTemperature);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName}`
         + ` updateCharacteristic HeatingThresholdTemperature: ${this.HeatingThresholdTemperature}`);
     }

package/src/irdevices/airpurifiers.ts

@@ -87,20 +87,20 @@ export class AirPurifier {
     if (this.Active === undefined) {
       this.platform.debug(`Air Purifier: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.platform.device(`Air Purifier: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
     if (this.CurrentAirPurifierState === undefined) {
       this.platform.debug(`Air Purifier: ${this.accessory.displayName} CurrentAirPurifierState: ${this.CurrentAirPurifierState}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.CurrentAirPurifierState, this.CurrentAirPurifierState);
+      this.service?.updateCharacteristic(this.platform.Characteristic.CurrentAirPurifierState, this.CurrentAirPurifierState);
       this.platform.device(`Air Purifier: ${this.accessory.displayName}`
         + ` updateCharacteristic CurrentAirPurifierState: ${this.CurrentAirPurifierState}`);
     }
     if (this.CurrentHeaterCoolerState === undefined) {
       this.platform.debug(`Air Purifier: ${this.accessory.displayName} CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.CurrentHeaterCoolerState, this.CurrentHeaterCoolerState);
+      this.service?.updateCharacteristic(this.platform.Characteristic.CurrentHeaterCoolerState, this.CurrentHeaterCoolerState);
       this.platform.device(`Air Purifier: ${this.accessory.displayName}`
         + ` updateCharacteristic CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`);
     }

package/src/irdevices/cameras.ts

@@ -63,7 +63,7 @@ export class Camera {
     if (this.On === undefined) {
       this.platform.debug(`Camera: ${this.accessory.displayName} On: ${this.On}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.On, this.On);
+      this.service?.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.platform.device(`Camera: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
   }

package/src/irdevices/fans.ts

@@ -126,19 +126,19 @@ export class Fan {
     if (this.Active === undefined) {
       this.platform.debug(`Fan: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.platform.device(`Fan: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
     if (this.SwingMode === undefined) {
       this.platform.debug(`Fan: ${this.accessory.displayName} SwingMode: ${this.SwingMode}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.SwingMode, this.SwingMode);
+      this.service?.updateCharacteristic(this.platform.Characteristic.SwingMode, this.SwingMode);
       this.platform.device(`Fan: ${this.accessory.displayName} updateCharacteristic SwingMode: ${this.SwingMode}`);
     }
     if (this.RotationSpeed === undefined) {
       this.platform.debug(`Fan: ${this.accessory.displayName} RotationSpeed: ${this.RotationSpeed}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.RotationSpeed, this.RotationSpeed);
+      this.service?.updateCharacteristic(this.platform.Characteristic.RotationSpeed, this.RotationSpeed);
       this.platform.device(`Fan: ${this.accessory.displayName} updateCharacteristic RotationSpeed: ${this.RotationSpeed}`);
     }
   }

package/src/irdevices/lights.ts

@@ -78,7 +78,7 @@ export class Light {
     if (this.On === undefined) {
       this.platform.debug(`Light: ${this.accessory.displayName} On: ${this.On}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.On, this.On);
+      this.service?.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.platform.device(`Light: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
   }

package/src/irdevices/others.ts

@@ -60,7 +60,7 @@ export class Others {
     if (this.Active === undefined) {
       this.platform.debug(`Other: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.platform.device(`Other: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
   }
@@ -175,6 +175,6 @@ export class Others {
   }
 
   public apiError(e: any) {
-    this.service!.updateCharacteristic(this.platform.Characteristic.Active, e);
+    this.service?.updateCharacteristic(this.platform.Characteristic.Active, e);
   }
 }

package/src/irdevices/tvs.ts

@@ -214,13 +214,13 @@ export class TV {
     if (this.Active === undefined) {
       this.platform.debug(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.platform.device(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
     if (this.ActiveIdentifier === undefined) {
       this.platform.debug(`${this.device.remoteType}: ${this.accessory.displayName} ActiveIdentifier: ${this.ActiveIdentifier}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.ActiveIdentifier, this.ActiveIdentifier);
+      this.service?.updateCharacteristic(this.platform.Characteristic.ActiveIdentifier, this.ActiveIdentifier);
       this.platform.device(`${this.device.remoteType}: ${this.accessory.displayName}`
         + ` updateCharacteristic ActiveIdentifier: ${this.ActiveIdentifier}`);
     }

package/src/irdevices/vacuumcleaners.ts

@@ -63,7 +63,7 @@ export class VacuumCleaner {
     if (this.On === undefined) {
       this.platform.debug(`Vacuum Cleaner: ${this.accessory.displayName} On: ${this.On}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.On, this.On);
+      this.service?.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.platform.device(`Vacuum Cleaner: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
   }

package/src/irdevices/waterheaters.ts

@@ -77,7 +77,7 @@ export class WaterHeater {
     if (this.Active === undefined) {
       this.platform.debug(`Water Heater: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service!.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.platform.device(`Water Heater: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
   }

package/src/platform.ts

@@ -192,6 +192,9 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           const devices = deviceLists.map((v: any) => v);
           for (const device of devices) {
             if (device.deviceType) {
+              if (device.configDeviceName) {
+                device.deviceName = device.configDeviceName;
+              }
               this.createDevice(device);
             }
           }
@@ -209,6 +212,9 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           this.debug(`SwitchBot Devices: ${JSON.stringify(devices)}`);
           for (const device of devices) {
             if (device.deviceType) {
+              if (device.configDeviceName) {
+                device.deviceName = device.configDeviceName;
+              }
               this.createDevice(device);
             }
           }