@switchbot/homebridge-switchbot 3.5.0-beta.67 → 3.5.0-beta.69

package/src/device/contact.ts

@@ -103,9 +103,11 @@ export class Contact extends deviceBase {
 
     // Initialize Motion Sensor Service
     if (this.device.contact?.hide_motionsensor) {
-      this.debugLog(`${device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
-      this.MotionSensor!.Service = accessory.getService(this.hap.Service.MotionSensor) as Service;
-      accessory.removeService(this.MotionSensor!.Service);
+      if (this.MotionSensor) {
+        this.debugLog(`${device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
+        this.MotionSensor.Service = accessory.getService(this.hap.Service.MotionSensor) as Service;
+        accessory.removeService(this.MotionSensor.Service);
+      }
     } else {
       accessory.context.MotionSensor = accessory.context.MotionSensor ?? {};
       this.MotionSensor = {
@@ -127,9 +129,11 @@ export class Contact extends deviceBase {
 
     // Initialize Light Sensor Service
     if (device.contact?.hide_lightsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
-      this.LightSensor!.Service = accessory.getService(this.hap.Service.LightSensor) as Service;
-      accessory.removeService(this.LightSensor!.Service);
+      if (this.LightSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
+        this.LightSensor.Service = accessory.getService(this.hap.Service.LightSensor) as Service;
+        accessory.removeService(this.LightSensor.Service);
+      }
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {

package/src/device/curtain.ts

@@ -148,9 +148,12 @@ export class Curtain extends deviceBase {
 
     // Initialize LightSensor Service
     if (device.curtain?.hide_lightsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
-      this.LightSensor!.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
-      accessory.removeService(this.LightSensor!.Service);
+      if (this.LightSensor?.Service) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
+        this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
+        accessory.removeService(this.LightSensor.Service);
+        accessory.context.LightSensor = {};
+      }
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {

package/src/device/device.ts

@@ -567,8 +567,8 @@ export abstract class deviceBase {
     if (version?.includes('.') === false) {
       const replace = version?.replace(/^V|-.*$/g, '');
       const match = replace?.match(/.{1,1}/g);
-      const blindTiltVersion = match?.join('.') ?? '0.0.0';
-      deviceVersion = blindTiltVersion;
+      const validVersion = match?.join('.');
+      deviceVersion = validVersion ?? '0.0.0';
     } else {
       deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
     }
@@ -584,11 +584,18 @@ export abstract class deviceBase {
 
   async statusCode(statusCode: number): Promise<void> {
     if (statusCode === 171) {
-      if (this.device.deviceId === this.device.hubDeviceId) {
+      const previousStatusCode = statusCode;
+      if (this.device.hubDeviceId === this.device.deviceId) {
         statusCode = 161;
+        this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${previousStatusCode} is now statusCode: `
+        + `${statusCode}, because the hubDeviceId: ${this.device.hubDeviceId} is set to the same as the deviceId: `
+        + `${this.device.deviceId}, meaning the device is it's own hub.`);
       }
-      if (this.device.deviceId === '000000000000') {
+      if (this.device.hubDeviceId === '000000000000') {
         statusCode = 161;
+        this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${previousStatusCode} is now statusCode: `
+        + `${statusCode}, because the hubDeviceId: ${this.device.hubDeviceId} is set to the same as the deviceId: `
+        + `${this.device.deviceId}, meaning the device is it's own hub.`);
       }
     }
     switch (statusCode) {
@@ -656,7 +663,7 @@ export abstract class deviceBase {
         break;
       default:
         this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: `
-          + `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+          + `${statusCode}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`);
     }
   }
 

package/src/device/hub.ts

@@ -48,9 +48,11 @@ export class Hub extends deviceBase {
 
     // Initialize Temperature Sensor Service
     if (device.hub?.hide_temperature) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-      this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
-      accessory.removeService(this.TemperatureSensor!.Service);
+      if (this.TemperatureSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
+        this.TemperatureSensor.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
+        accessory.removeService(this.TemperatureSensor.Service);
+      }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
@@ -78,9 +80,11 @@ export class Hub extends deviceBase {
 
     // Initialize Humidity Sensor Service
     if (device.hub?.hide_humidity) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
-      this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
-      accessory.removeService(this.HumiditySensor!.Service);
+      if (this.HumiditySensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
+        this.HumiditySensor.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
+        accessory.removeService(this.HumiditySensor.Service);
+      }
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
@@ -104,9 +108,11 @@ export class Hub extends deviceBase {
 
     // Initialize Light Sensor Service
     if (device.hub?.hide_lightsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
-      this.LightSensor!.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
-      accessory.removeService(this.LightSensor!.Service);
+      if (this.LightSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
+        this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
+        accessory.removeService(this.LightSensor.Service);
+      }
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {

package/src/device/humidifier.ts

@@ -103,9 +103,11 @@ export class Humidifier extends deviceBase {
 
     // Initialize the Temperature Sensor Service
     if (device.humidifier?.hide_temperature) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-      this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
-      accessory.removeService(this.TemperatureSensor!.Service);
+      if (this.TemperatureSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
+        this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
+        accessory.removeService(this.TemperatureSensor!.Service);
+      }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {

package/src/device/iosensor.ts

@@ -80,9 +80,11 @@ export class IOSensor extends deviceBase {
 
     // InitializeTemperature Sensor Service
     if (device.iosensor?.hide_temperature) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-      this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
-      accessory.removeService(this.TemperatureSensor!.Service);
+      if (this.TemperatureSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
+        this.TemperatureSensor.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
+        accessory.removeService(this.TemperatureSensor.Service);
+      }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
@@ -110,9 +112,11 @@ export class IOSensor extends deviceBase {
 
     // Initialize Humidity Sensor Service
     if (device.iosensor?.hide_humidity) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
-      this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
-      accessory.removeService(this.HumiditySensor!.Service);
+      if (this.HumiditySensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
+        this.HumiditySensor.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
+        accessory.removeService(this.HumiditySensor.Service);
+      }
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {

package/src/device/lock.ts

@@ -96,9 +96,11 @@ export class Lock extends deviceBase {
 
     // Contact Sensor Service
     if (device.lock?.hide_contactsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Contact Sensor Service`);
-      this.ContactSensor!.Service = this.accessory.getService(this.hap.Service.ContactSensor) as Service;
-      accessory.removeService(this.ContactSensor!.Service);
+      if (this.ContactSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Contact Sensor Service`);
+        this.ContactSensor.Service = this.accessory.getService(this.hap.Service.ContactSensor) as Service;
+        accessory.removeService(this.ContactSensor.Service);
+      }
     } else {
       accessory.context.ContactSensor = accessory.context.ContactSensor ?? {};
       this.ContactSensor = {
@@ -119,10 +121,12 @@ export class Lock extends deviceBase {
     }
 
     // Initialize Latch Button Service
-    if (device.lock?.activate_latchbutton === false) { // remove the service when this variable is false
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Latch Button Service`);
-      this.Switch!.Service = accessory.getService(this.hap.Service.Switch) as Service;
-      accessory.removeService(this.Switch!.Service);
+    if (device.lock?.activate_latchbutton === false) {
+      if (this.Switch) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Latch Button Service`);
+        this.Switch.Service = accessory.getService(this.hap.Service.Switch) as Service;
+        accessory.removeService(this.Switch.Service);
+      }
     } else {
       accessory.context.Switch = accessory.context.Switch ?? {};
       this.Switch = {

package/src/device/meter.ts

@@ -74,9 +74,11 @@ export class Meter extends deviceBase {
 
     // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-      this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
-      accessory.removeService(this.TemperatureSensor!.Service);
+      if (this.TemperatureSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
+        this.TemperatureSensor.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
+        accessory.removeService(this.TemperatureSensor.Service);
+      }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
@@ -103,9 +105,11 @@ export class Meter extends deviceBase {
     }
     // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
-      this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
-      accessory.removeService(this.HumiditySensor!.Service);
+      if (this.HumiditySensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
+        this.HumiditySensor.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
+        accessory.removeService(this.HumiditySensor.Service);
+      }
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {

package/src/device/meterplus.ts

@@ -78,9 +78,11 @@ export class MeterPlus extends deviceBase {
 
     // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-      this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
-      accessory.removeService(this.TemperatureSensor!.Service);
+      if (this.TemperatureSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
+        this.TemperatureSensor.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
+        accessory.removeService(this.TemperatureSensor.Service);
+      }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
@@ -107,9 +109,11 @@ export class MeterPlus extends deviceBase {
     }
     // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
-      this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
-      accessory.removeService(this.HumiditySensor!.Service);
+      if (this.HumiditySensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
+        this.HumiditySensor.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
+        accessory.removeService(this.HumiditySensor.Service);
+      }
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {

package/src/device/motion.ts

@@ -98,9 +98,11 @@ export class Motion extends deviceBase {
 
     // Initialize Light Sensor Service
     if (device.motion?.hide_lightsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
-      this.LightSensor!.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
-      accessory.removeService(this.LightSensor!.Service);
+      if (this.LightSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
+        this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
+        accessory.removeService(this.LightSensor.Service);
+      }
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {

package/src/device/waterdetector.ts

@@ -78,9 +78,11 @@ export class WaterDetector extends deviceBase {
 
     // Initialize Leak Sensor Service
     if (device.waterdetector?.hide_leak) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leak Sensor Service`);
-      this.LeakSensor!.Service = this.accessory.getService(this.hap.Service.LeakSensor) as Service;
-      accessory.removeService(this.LeakSensor!.Service);
+      if (this.LeakSensor) {
+        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leak Sensor Service`);
+        this.LeakSensor.Service = this.accessory.getService(this.hap.Service.LeakSensor) as Service;
+        accessory.removeService(this.LeakSensor.Service);
+      }
     } else {
       accessory.context.LeakSensor = accessory.context.LeakSensor ?? {};
       this.LeakSensor = {

package/src/irdevice/other.ts

@@ -725,125 +725,145 @@ export class Others extends irdeviceBase {
 
   async apiError(e: any): Promise<void> {
     if (this.otherDeviceType === 'garagedoor') {
-      this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
-      this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
-      this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
+      if (this.GarageDoor) {
+        this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
+        this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
+        this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
+      }
     } else if (this.otherDeviceType === 'door') {
-      this.Door!.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-      this.Door!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-      this.Door!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+      if (this.Door) {
+        this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+        this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+        this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+      }
     } else if (this.otherDeviceType === 'window') {
-      this.Window!.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-      this.Window!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-      this.Window!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+      if (this.Window) {
+        this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+        this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+        this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+      }
     } else if (this.otherDeviceType === 'windowcovering') {
-      this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-      this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-      this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+      if (this.WindowCovering) {
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+      }
     } else if (this.otherDeviceType === 'lock') {
-      this.Door!.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
-      this.Door!.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
+      if (this.LockMechanism) {
+        this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
+        this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
+      }
     } else if (this.otherDeviceType === 'faucet') {
-      this.Faucet!.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
+      if (this.Faucet) {
+        this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
+      }
     } else if (this.otherDeviceType === 'fan') {
-      this.Fan!.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+      if (this.Fan) {
+        this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+      }
     } else if (this.otherDeviceType === 'stateful') {
-      this.StatefulProgrammableSwitch!.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
-      this.StatefulProgrammableSwitch!.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
+      if (this.StatefulProgrammableSwitch) {
+        this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
+        this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
+      }
     } else if (this.otherDeviceType === 'switch') {
-      this.Switch!.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+      if (this.Switch) {
+        this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+      }
     } else {
-      this.Outlet!.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+      if (this.Outlet) {
+        this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+      }
     }
   }
 
   async removeOutletService(accessory: PlatformAccessory): Promise<void> {
     // If Outlet.Service still present, then remove first
     if (this.Outlet?.Service) {
-      this.Outlet!.Service = this.accessory.getService(this.hap.Service.Outlet) as Service;
+      this.Outlet.Service = this.accessory.getService(this.hap.Service.Outlet) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Outlet Service`);
-      accessory.removeService(this.Outlet!.Service);
+      accessory.removeService(this.Outlet.Service);
     }
   }
 
   async removeGarageDoorService(accessory: PlatformAccessory): Promise<void> {
     // If GarageDoor.Service still present, then remove first
     if (this.GarageDoor?.Service) {
-      this.GarageDoor!.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener) as Service;
+      this.GarageDoor.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
-      accessory.removeService(this.GarageDoor!.Service);
+      accessory.removeService(this.GarageDoor.Service);
     }
   }
 
   async removeDoorService(accessory: PlatformAccessory): Promise<void> {
     // If Door.Service still present, then remove first
     if (this.Door?.Service) {
-      this.Door!.Service = this.accessory.getService(this.hap.Service.Door) as Service;
+      this.Door.Service = this.accessory.getService(this.hap.Service.Door) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Door Service`);
-      accessory.removeService(this.Door!.Service);
+      accessory.removeService(this.Door.Service);
     }
   }
 
   async removeLockService(accessory: PlatformAccessory): Promise<void> {
     // If Lock.Service still present, then remove first
     if (this.LockMechanism?.Service) {
-      this.LockMechanism!.Service = this.accessory.getService(this.hap.Service.LockMechanism) as Service;
+      this.LockMechanism.Service = this.accessory.getService(this.hap.Service.LockMechanism) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
-      accessory.removeService(this.LockMechanism!.Service);
+      accessory.removeService(this.LockMechanism.Service);
     }
   }
 
   async removeFaucetService(accessory: PlatformAccessory): Promise<void> {
     // If Faucet.Service still present, then remove first
     if (this.Faucet?.Service) {
-      this.Faucet!.Service = this.accessory.getService(this.hap.Service.Faucet) as Service;
+      this.Faucet.Service = this.accessory.getService(this.hap.Service.Faucet) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Faucet Service`);
-      accessory.removeService(this.Faucet!.Service);
+      accessory.removeService(this.Faucet.Service);
     }
   }
 
   async removeFanService(accessory: PlatformAccessory): Promise<void> {
     // If Fan Service still present, then remove first
     if (this.Fan?.Service) {
-      this.Fan!.Service = this.accessory.getService(this.hap.Service.Fan) as Service;
+      this.Fan.Service = this.accessory.getService(this.hap.Service.Fan) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Fan Service`);
-      accessory.removeService(this.Fan!.Service);
+      accessory.removeService(this.Fan.Service);
     }
   }
 
   async removeWindowService(accessory: PlatformAccessory): Promise<void> {
     // If Window.Service still present, then remove first
     if (this.Window?.Service) {
-      this.Window!.Service = this.accessory.getService(this.hap.Service.Window) as Service;
+      this.Window.Service = this.accessory.getService(this.hap.Service.Window) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Service`);
-      accessory.removeService(this.Window!.Service);
+      accessory.removeService(this.Window.Service);
     }
   }
 
   async removeWindowCoveringService(accessory: PlatformAccessory): Promise<void> {
     // If WindowCovering.Service still present, then remove first
     if (this.WindowCovering?.Service) {
-      this.WindowCovering!.Service = this.accessory.getService(this.hap.Service.WindowCovering) as Service;
+      this.WindowCovering.Service = this.accessory.getService(this.hap.Service.WindowCovering) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
-      accessory.removeService(this.WindowCovering!.Service);
+      accessory.removeService(this.WindowCovering.Service);
     }
   }
 
   async removeStatefulProgrammableSwitchService(accessory: PlatformAccessory): Promise<void> {
     // If StatefulProgrammableSwitch.Service still present, then remove first
     if (this.StatefulProgrammableSwitch?.Service) {
-      this.StatefulProgrammableSwitch!.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch) as Service;
+      this.StatefulProgrammableSwitch.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
-      accessory.removeService(this.StatefulProgrammableSwitch!.Service);
+      accessory.removeService(this.StatefulProgrammableSwitch.Service);
     }
   }
 
   async removeSwitchService(accessory: PlatformAccessory): Promise<void> {
     // If Switch.Service still present, then remove first
     if (this.Switch?.Service) {
-      this.Switch!.Service = this.accessory.getService(this.hap.Service.Switch) as Service;
+      this.Switch.Service = this.accessory.getService(this.hap.Service.Switch) as Service;
       this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Switch Service`);
-      accessory.removeService(this.Switch!.Service);
+      accessory.removeService(this.Switch.Service);
     }
   }