@switchbot/homebridge-switchbot 3.5.0-beta.26 → 3.5.0-beta.27

package/src/device/blindtilt.ts

@@ -60,34 +60,34 @@ export class BlindTilt extends deviceBase {
     this.blindTiltUpdateInProgress = false;
     this.setNewTarget = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize LightBulb property
     this.WindowCovering = {
-      Service: this.accessory.addService(this.hap.Service.WindowCovering),
-      PositionState: this.accessory.context.PositionState || this.hap.Characteristic.PositionState.STOPPED,
-      TargetPosition: this.accessory.context.TargetPosition || 100,
-      CurrentPosition: this.accessory.context.CurrentPosition || 100,
-      TargetHorizontalTiltAngle: this.accessory.context.TargetHorizontalTiltAngle || 0,
-      CurrentHorizontalTiltAngle: this.accessory.context.CurrentHorizontalTiltAngle || 0,
+      Service: accessory.getService(this.hap.Service.WindowCovering)!,
+      PositionState: accessory.context.PositionState || this.hap.Characteristic.PositionState.STOPPED,
+      TargetPosition: accessory.context.TargetPosition || 100,
+      CurrentPosition: accessory.context.CurrentPosition || 100,
+      TargetHorizontalTiltAngle: accessory.context.TargetHorizontalTiltAngle || 0,
+      CurrentHorizontalTiltAngle: accessory.context.CurrentHorizontalTiltAngle || 0,
     };
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
-      BatteryLevel: this.accessory.context.BatteryLevel || 100,
+      Service: accessory.getService(this.hap.Service.Battery)!,
+      BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
     // Initialize LightSensor property
     if (!this.device.blindTilt?.hide_lightsensor) {
       this.LightSensor = {
-        Service: this.accessory.addService(this.hap.Service.LightSensor),
-        CurrentAmbientLightLevel: this.accessory.context.CurrentAmbientLightLevel || 0,
+        Service: accessory.getService(this.hap.Service.LightSensor)!,
+        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel || 0.0001,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
     // you can create multiple services for each accessory
     (this.WindowCovering!.Service =
@@ -262,16 +262,18 @@ export class BlindTilt extends deviceBase {
       this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
     }
-    this.debugLog(
-      `${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},` +
-      ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`,
-    );
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},`
+    + ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
 
     if (!this.device.blindTilt?.hide_lightsensor) {
       const set_minLux = await this.minLux();
       const set_maxLux = await this.maxLux();
       const spaceBetweenLevels = 9;
 
+      if (this.LightSensor?.CurrentAmbientLightLevel === 0) {
+        this.LightSensor!.CurrentAmbientLightLevel = 0.0001;
+      }
+
       // Brightness
       switch (serviceData.lightLevel) {
         case 1:
@@ -347,7 +349,7 @@ export class BlindTilt extends deviceBase {
       String(deviceStatus.body.direction));
     this.debugLog(` device: ${deviceStatus.body.slidePosition} => HK: ${homekitPosition}`);
 
-    this.WindowCovering.CurrentPosition = homekitPosition;
+    this.WindowCovering!.CurrentPosition = homekitPosition;
     // CurrentPosition
     await this.setMinMax();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition}`);

package/src/device/bot.ts

@@ -98,12 +98,9 @@ export class Bot extends deviceBase {
     this.doBotUpdate = new Subject();
     this.botUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
@@ -112,7 +109,7 @@ export class Bot extends deviceBase {
     if (this.botDeviceType === 'switch') {
       // Initialize Switch property
       this.Switch = {
-        Service: this.accessory.addService(this.hap.Service.Switch),
+        Service: accessory.getService(this.hap.Service.Switch)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -136,7 +133,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'garagedoor') {
       // Initialize Switch property
       this.GarageDoor = {
-        Service: this.accessory.addService(this.hap.Service.GarageDoorOpener),
+        Service: accessory.getService(this.hap.Service.GarageDoorOpener)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -161,7 +158,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'door') {
       // Initialize Switch property
       this.Door = {
-        Service: this.accessory.addService(this.hap.Service.Door),
+        Service: accessory.getService(this.hap.Service.Door)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -194,7 +191,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'window') {
       // Initialize Switch property
       this.Window = {
-        Service: this.accessory.addService(this.hap.Service.Window),
+        Service: accessory.getService(this.hap.Service.Window)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -227,7 +224,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'windowcovering') {
       // Initialize Switch property
       this.WindowCovering = {
-        Service: this.accessory.addService(this.hap.Service.WindowCovering),
+        Service: accessory.getService(this.hap.Service.WindowCovering)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -260,7 +257,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'lock') {
       // Initialize Switch property
       this.Lock = {
-        Service: this.accessory.addService(this.hap.Service.LockMechanism),
+        Service: accessory.getService(this.hap.Service.LockMechanism)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -284,7 +281,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'faucet') {
       // Initialize Switch property
       this.Faucet = {
-        Service: this.accessory.addService(this.hap.Service.Faucet),
+        Service: accessory.getService(this.hap.Service.Faucet)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -308,7 +305,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'fan') {
       // Initialize Switch property
       this.Fan = {
-        Service: this.accessory.addService(this.hap.Service.Fanv2),
+        Service: accessory.getService(this.hap.Service.Fanv2)!,
         On: accessory.context.On || false,
       };
       this.removeLockService(accessory);
@@ -332,7 +329,7 @@ export class Bot extends deviceBase {
     } else if (this.botDeviceType === 'stateful') {
       // Initialize Switch property
       this.StatefulProgrammableSwitch = {
-        Service: this.accessory.addService(this.hap.Service.StatefulProgrammableSwitch),
+        Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -358,7 +355,7 @@ export class Bot extends deviceBase {
     } else {
       // Initialize Switch property
       this.Outlet = {
-        Service: this.accessory.addService(this.hap.Service.Outlet),
+        Service: accessory.getService(this.hap.Service.Outlet)!,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -381,6 +378,9 @@ export class Bot extends deviceBase {
       this.Outlet!.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // batteryService
     const batteryService = `${accessory.displayName} Battery`;
     (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)

package/src/device/ceilinglight.ts

@@ -48,12 +48,9 @@ export class CeilingLight extends deviceBase {
     this.doCeilingLightUpdate = new Subject();
     this.ceilingLightUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize LightBulb property
     this.LightBulb = {
-      Service: this.accessory.addService(this.hap.Service.Lightbulb),
+      Service: accessory.getService(this.hap.Service.Lightbulb)!,
       On: accessory.context.On || false,
       Hue: accessory.context.Hue || 0,
       Saturation: accessory.context.Saturation || 0,
@@ -61,6 +58,9 @@ export class CeilingLight extends deviceBase {
       ColorTemperature: accessory.context.ColorTemperature || 140,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     const LightBulbService = `${accessory.displayName} ${device.deviceType}`;
     (this.LightBulb!.Service = accessory.getService(this.hap.Service.Lightbulb)
       || accessory.addService(this.hap.Service.Lightbulb)), LightBulbService;

package/src/device/colorbulb.ts

@@ -49,12 +49,9 @@ export class ColorBulb extends deviceBase {
     this.doColorBulbUpdate = new Subject();
     this.colorBulbUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize LightBulb property
     this.LightBulb = {
-      Service: this.accessory.addService(this.hap.Service.Lightbulb),
+      Service: accessory.getService(this.hap.Service.Lightbulb)!,
       On: accessory.context.On || false,
       Hue: accessory.context.Hue || 0,
       Saturation: accessory.context.Saturation || 0,
@@ -62,6 +59,9 @@ export class ColorBulb extends deviceBase {
       ColorTemperature: accessory.context.ColorTemperature || 140,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
     const lightBulbService = `${accessory.displayName} ${device.deviceType}`;

package/src/device/contact.ts

@@ -51,19 +51,16 @@ export class Contact extends deviceBase {
     this.doContactUpdate = new Subject();
     this.contactUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Contact Sensor property
     this.ContactSensor = {
-      Service: this.accessory.addService(this.hap.Service.ContactSensor),
+      Service: accessory.getService(this.hap.Service.ContactSensor)!,
       ContactSensorState: this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
     };
 
     // Initialize Motion Sensor property
     if (!this.device.contact?.hide_motionsensor) {
       this.MotionSensor = {
-        Service: this.accessory.addService(this.hap.Service.MotionSensor),
+        Service: accessory.getService(this.hap.Service.MotionSensor)!,
         MotionDetected: false,
       };
     }
@@ -71,11 +68,14 @@ export class Contact extends deviceBase {
     // Initialize Light Sensor property
     if (!this.device.contact?.hide_lightsensor) {
       this.LightSensor = {
-        Service: this.accessory.addService(this.hap.Service.LightSensor),
+        Service: accessory.getService(this.hap.Service.LightSensor)!,
         CurrentAmbientLightLevel: 0,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the Contact service if it exists, otherwise create a new Contact service
     // you can create multiple services for each accessory
     const ContactSensorService = `${accessory.displayName} Contact Sensor`;

package/src/device/curtain.ts

@@ -53,32 +53,33 @@ export class Curtain extends deviceBase {
     this.curtainUpdateInProgress = false;
     this.setNewTarget = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
     // Initialize LightBulb property
     this.WindowCovering = {
-      Service: this.accessory.addService(this.hap.Service.WindowCovering),
-      PositionState: this.accessory.context.PositionState || this.hap.Characteristic.PositionState.STOPPED,
-      TargetPosition: this.accessory.context.TargetPosition || 100,
-      CurrentPosition: this.accessory.context.CurrentPosition || 100,
-      HoldPosition: this.accessory.context.HoldPosition || false,
+      Service: accessory.getService(this.hap.Service.WindowCovering)!,
+      PositionState: accessory.context.PositionState || this.hap.Characteristic.PositionState.STOPPED,
+      TargetPosition: accessory.context.TargetPosition || 100,
+      CurrentPosition: accessory.context.CurrentPosition || 100,
+      HoldPosition: accessory.context.HoldPosition || false,
     };
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
-      BatteryLevel: this.accessory.context.BatteryLevel || 100,
-      StatusLowBattery: this.accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+      Service: accessory.getService(this.hap.Service.Battery)!,
+      BatteryLevel: accessory.context.BatteryLevel || 100,
+      StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
     // Initialize LightSensor property
     if (!this.device.curtain?.hide_lightsensor) {
       this.LightSensor = {
-        Service: this.accessory.addService(this.hap.Service.LightSensor),
-        CurrentAmbientLightLevel: this.accessory.context.CurrentAmbientLightLevel || 0,
+        Service: accessory.getService(this.hap.Service.LightSensor)!,
+        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel || 0.0001,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
     // you can create multiple services for each accessory
     const WindowCoveringService = `${accessory.displayName} ${device.deviceType}`;
@@ -393,7 +394,7 @@ export class Curtain extends deviceBase {
   async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
     // CurrentPosition
-    this.WindowCovering.CurrentPosition = 100 - Number(deviceStatus.body.slidePosition);
+    this.WindowCovering!.CurrentPosition = 100 - Number(deviceStatus.body.slidePosition);
     await this.setMinMax();
     this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
     if (this.setNewTarget) {

package/src/device/hub.ts

@@ -38,13 +38,11 @@ export class Hub extends deviceBase {
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doHubUpdate = new Subject();
     this.hubUpdateInProgress = false;
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
 
     // Initialize Temperature Sensor property
     if (!device.hub?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: this.accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 0,
       };
     }
@@ -52,7 +50,7 @@ export class Hub extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.hub?.hide_humidity) {
       this.HumiditySensor = {
-        Service: this.accessory.addService(this.hap.Service.HumiditySensor),
+        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 0,
       };
     }
@@ -60,11 +58,14 @@ export class Hub extends deviceBase {
     // Initialize Light Sensor property
     if (!device.hub?.hide_lightsensor) {
       this.LightSensor = {
-        Service: this.accessory.addService(this.hap.Service.LightSensor),
-        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel || 0,
+        Service: accessory.getService(this.hap.Service.LightSensor)!,
+        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel || 0.0001,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Temperature Sensor Service
     if (device.hub?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);

package/src/device/humidifier.ts

@@ -42,12 +42,9 @@ export class Humidifier extends deviceBase {
     this.doHumidifierUpdate = new Subject();
     this.humidifierUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize the HumidifierDehumidifier Service
     this.HumidifierDehumidifier = {
-      Service: accessory.addService(this.hap.Service.HumidifierDehumidifier),
+      Service: accessory.getService(this.hap.Service.HumidifierDehumidifier)!,
       Active: accessory.context.Active || this.hap.Characteristic.Active.ACTIVE,
       WaterLevel: accessory.context.WaterLevel || 100,
       CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
@@ -61,11 +58,14 @@ export class Humidifier extends deviceBase {
     // Initialize the Temperature Sensor Service
     if (!device.humidifier?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the service if it exists, otherwise create a new service
     // you can create multiple services for each accessory
     const HumidifierDehumidifierService = `${accessory.displayName} Humidifier`;

package/src/device/iosensor.ts

@@ -45,13 +45,10 @@ export class IOSensor extends deviceBase {
     this.doIOSensorUpdate = new Subject();
     this.ioSensorUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Temperature Sensor property
     if (!device.iosensor?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: this.accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -59,18 +56,21 @@ export class IOSensor extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.iosensor?.hide_humidity) {
       this.HumiditySensor = {
-        Service: this.accessory.addService(this.hap.Service.HumiditySensor),
+        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Temperature Sensor Service
     if (device.iosensor?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);

package/src/device/lightstrip.ts

@@ -42,12 +42,9 @@ export class StripLight extends deviceBase {
     this.doStripLightUpdate = new Subject();
     this.stripLightUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize the LightBulb property
     this.LightBulb = {
-      Service: this.accessory.addService(this.hap.Service.Lightbulb),
+      Service: accessory.getService(this.hap.Service.Lightbulb)!,
       On: accessory.context.On || false,
       Hue: accessory.context.Hue || 0,
       Saturation: accessory.context.Saturation || 0,
@@ -55,6 +52,9 @@ export class StripLight extends deviceBase {
       ColorTemperature: accessory.context.ColorTemperature || 140,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
     const LightBulbService = `${accessory.displayName} ${device.deviceType}`;

package/src/device/lock.ts

@@ -44,19 +44,16 @@ export class Lock extends deviceBase {
     this.doLockUpdate = new Subject();
     this.lockUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize LockMechanism property
     this.LockMechanism = {
-      Service: accessory.addService(this.hap.Service.LockMechanism),
+      Service: accessory.getService(this.hap.Service.LockMechanism)!,
       LockTargetState: accessory.context.LockTargetState || this.hap.Characteristic.LockTargetState.SECURED,
       LockCurrentState: accessory.context.LockCurrentState || this.hap.Characteristic.LockCurrentState.SECURED,
     };
 
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
@@ -64,7 +61,7 @@ export class Lock extends deviceBase {
     // Initialize ContactSensor property
     if (!this.device.lock?.hide_contactsensor) {
       this.ContactSensor = {
-        Service: accessory.addService(this.hap.Service.ContactSensor),
+        Service: accessory.getService(this.hap.Service.ContactSensor)!,
         ContactSensorState: accessory.context.ContactSensorState || this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
       };
     }
@@ -72,11 +69,14 @@ export class Lock extends deviceBase {
     // Initialize Latch Button Service
     if (device.lock?.activate_latchbutton) {
       this.Switch = {
-        Service: accessory.addService(this.hap.Service.Switch),
+        Service: accessory.getService(this.hap.Service.Switch)!,
         On: accessory.context.On || false,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the LockMechanism service if it exists, otherwise create a new LockMechanism service
     // you can create multiple services for each accessory
     const LockMechanismService = `${accessory.displayName} ${device.deviceType}`;

package/src/device/meter.ts

@@ -40,13 +40,10 @@ export class Meter extends deviceBase {
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Temperature Sensor property
     if (!device.meter?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: this.accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -54,18 +51,21 @@ export class Meter extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.meter?.hide_humidity) {
       this.HumiditySensor = {
-        Service: this.accessory.addService(this.hap.Service.HumiditySensor),
+        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);

package/src/device/meterplus.ts

@@ -45,13 +45,10 @@ export class MeterPlus extends deviceBase {
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Temperature Sensor property
     if (!device.meter?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: this.accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -59,18 +56,21 @@ export class MeterPlus extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.meter?.hide_humidity) {
       this.HumiditySensor = {
-        Service: this.accessory.addService(this.hap.Service.HumiditySensor),
+        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);

package/src/device/motion.ts

@@ -46,15 +46,15 @@ export class Motion extends deviceBase {
     this.doMotionUpdate = new Subject();
     this.motionUbpdateInProgress = false;
 
+    // Initialize Motion Sensor property
+    this.MotionSensor = {
+      Service: accessory.getService(this.hap.Service.MotionSensor)!,
+      MotionDetected:accessory.context.MotionDetected || false,
+    };
+
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
 
-    if (this.MotionSensor.MotionDetected === undefined) {
-      this.MotionSensor.MotionDetected = false;
-    } else {
-      this.MotionSensor.MotionDetected = this.accessory.context.MotionDetected;
-    }
-
     // get the Battery service if it exists, otherwise create a new Motion service
     // you can create multiple services for each accessory
     const MotionSensorService = `${accessory.displayName} Motion Sensor`;

package/src/device/plug.ts

@@ -29,15 +29,15 @@ export class Plug extends deviceBase {
     this.doPlugUpdate = new Subject();
     this.plugUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Outlet property
     this.Outlet = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Outlet)!,
       On: accessory.context.On || false,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the Outlet service if it exists, otherwise create a new Outlet service
     // you can create multiple services for each accessory
     const OutletService = `${accessory.displayName} ${device.deviceType}`;