@switchbot/homebridge-switchbot 2.3.0-beta.3 → 2.3.0-beta.4

package/src/device/meterplus.ts

@@ -104,7 +104,9 @@ export class MeterPlus {
       `${accessory.displayName} Temperature Sensor`;
 
       this.temperatureservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
-      this.temperatureservice.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
+      if (!this.temperatureservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+        this.temperatureservice.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
+      }
       this.temperatureservice
         .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
         .setProps({
@@ -133,7 +135,9 @@ export class MeterPlus {
       `${accessory.displayName} Humidity Sensor`;
 
       this.humidityservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
-      this.humidityservice.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Humidity Sensor`);
+      if (!this.humidityservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+        this.humidityservice.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Humidity Sensor`);
+      }
       this.humidityservice
         .getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity)
         .setProps({
@@ -157,7 +161,9 @@ export class MeterPlus {
       `${accessory.displayName} Battery`;
 
       this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
-      this.batteryService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
+      if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+        this.batteryService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
+      }
       this.batteryService.setCharacteristic(this.platform.Characteristic.ChargingState, this.platform.Characteristic.ChargingState.NOT_CHARGEABLE);
     } else {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);

package/src/device/motion.ts

@@ -98,8 +98,9 @@ export class Motion {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.motionSensorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.motionSensorService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
-
+    if (!this.motionSensorService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.motionSensorService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
     // each service must implement at-minimum the "required characteristics" for the given service type
     // see https://developers.homebridge.io/#/service/MotionSensor
 

package/src/device/plug.ts

@@ -83,8 +83,9 @@ export class Plug {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.outletService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
-
+    if (!this.outletService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.outletService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
     // each service must implement at-minimum the "required characteristics" for the given service type
     // see https://developers.homebridge.io/#/service/Outlet
 

package/src/device/robotvacuumcleaner.ts

@@ -81,8 +81,9 @@ export class RobotVacuumCleaner {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.robotVacuumCleanerService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.robotVacuumCleanerService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
-
+    if (!this.robotVacuumCleanerService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.robotVacuumCleanerService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
     // each service must implement at-minimum the "required characteristics" for the given service type
     // see https://developers.homebridge.io/#/service/Lightbulb
 

package/src/device/striplight.ts

@@ -108,8 +108,9 @@ export class StripLight {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.lightBulbService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.lightBulbService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
-
+    if (!this.lightBulbService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.lightBulbService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
     // handle on / off events using the On characteristic
     this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
 

package/src/irdevice/airconditioner.ts

@@ -76,7 +76,9 @@ export class AirConditioner {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.coolerService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.coolerService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    if (!this.coolerService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.coolerService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
 
     // handle on / off events using the Active characteristic
     this.coolerService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));

package/src/irdevice/airpurifier.ts

@@ -71,8 +71,9 @@ export class AirPurifier {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.airPurifierService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.airPurifierService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
-
+    if (!this.airPurifierService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.airPurifierService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
     // handle on / off events using the Active characteristic
     this.airPurifierService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
 

package/src/irdevice/camera.ts

@@ -53,7 +53,9 @@ export class Camera {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.switchService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    if (!this.switchService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.switchService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
 
     // handle on / off events using the On characteristic
     this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));

package/src/irdevice/fan.ts

@@ -63,7 +63,9 @@ export class Fan {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.fanService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.fanService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    if (!this.fanService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.fanService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
 
     // handle on / off events using the Active characteristic
     this.fanService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));

package/src/irdevice/light.ts

@@ -41,7 +41,7 @@ export class Light {
       .getCharacteristic(this.platform.Characteristic.FirmwareRevision)
       .updateValue(this.FirmwareRevision(accessory, device));
 
-    // get the Television service if it exists, otherwise create a new Television service
+    // get the Light service if it exists, otherwise create a new Light service
     // you can create multiple services for each accessory
     (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
     `${accessory.displayName} ${device.remoteType}`;
@@ -53,7 +53,9 @@ export class Light {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.lightBulbService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.lightBulbService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    if (!this.lightBulbService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.lightBulbService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
 
     // handle on / off events using the On characteristic
     this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));

package/src/irdevice/other.ts

@@ -59,7 +59,9 @@ export class Others {
       `${accessory.displayName} Fan`;
 
       this.fanService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Fan`);
-      this.fanService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Fan`);
+      if (!this.fanService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+        this.fanService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Fan`);
+      }
       this.fanService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
     } else {
       this.debugLog(`${this.device.remoteType}: ${accessory.displayName} Fanv2 Service Not Added, deviceType: ${device.other?.deviceType}`);

package/src/irdevice/tv.ts

@@ -41,8 +41,6 @@ export class TV {
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
-      .setCharacteristic(this.platform.Characteristic.Name, `${device.deviceName} ${device.remoteType}`)
-      .setCharacteristic(this.platform.Characteristic.ConfiguredName, `${device.deviceName} ${device.remoteType}`)
       .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
       .setCharacteristic(this.platform.Characteristic.Model, device.remoteType)
       .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId!)
@@ -50,6 +48,13 @@ export class TV {
       .getCharacteristic(this.platform.Characteristic.FirmwareRevision)
       .updateValue(this.FirmwareRevision(accessory, device));
 
+    // get the Television service if it exists, otherwise create a new Television service
+    // you can create multiple services for each accessory
+    this.tvService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    if (!this.tvService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.tvService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
+
     // set the accessory category
     switch (device.remoteType) {
       case 'Speaker':
@@ -115,7 +120,9 @@ export class TV {
     `${accessory.displayName} Speaker`;
 
     this.speakerService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Speaker`);
-    this.speakerService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Speaker`);
+    if (!this.speakerService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.speakerService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Speaker`);
+    }
     this.speakerService
       .setCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.ACTIVE)
       .setCharacteristic(this.platform.Characteristic.VolumeControlType, this.platform.Characteristic.VolumeControlType.ABSOLUTE);

package/src/irdevice/vacuumcleaner.ts

@@ -53,7 +53,9 @@ export class VacuumCleaner {
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-    this.switchService.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    if (!this.switchService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.switchService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
 
     // handle on / off events using the On characteristic
     this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));

package/src/irdevice/waterheater.ts

@@ -52,8 +52,10 @@ export class WaterHeater {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.valveService.setCharacteristic(this.platform.Characteristic.Name, `${device.deviceName} ${device.remoteType}`);
-    this.valveService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${device.deviceName} ${device.remoteType}`);
+    this.valveService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    if (!this.valveService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.valveService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+    }
 
     // set sleep discovery characteristic
     this.valveService.setCharacteristic(this.platform.Characteristic.ValveType, this.platform.Characteristic.ValveType.GENERIC_VALVE);