@switchbot/homebridge-switchbot 3.5.0-beta.55 → 3.5.0-beta.57

package/src/device/meter.ts

@@ -44,7 +44,7 @@ export class Meter extends deviceBase {
     // Initialize Temperature Sensor property
     if (!device.meter?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
+        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -52,14 +52,14 @@ export class Meter extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.meter?.hide_humidity) {
       this.HumiditySensor = {
-        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
+        Service: accessory.getService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery)!,
+      Service: accessory.getService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };

package/src/device/meterplus.ts

@@ -48,7 +48,7 @@ export class MeterPlus extends deviceBase {
     // Initialize Temperature Sensor property
     if (!device.meter?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
+        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -56,14 +56,14 @@ export class MeterPlus extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.meter?.hide_humidity) {
       this.HumiditySensor = {
-        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
+        Service: accessory.getService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery)!,
+      Service: accessory.getService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };

package/src/device/motion.ts

@@ -48,18 +48,33 @@ export class Motion extends deviceBase {
 
     // Initialize Motion Sensor property
     this.MotionSensor = {
-      Service: accessory.getService(this.hap.Service.MotionSensor)!,
+      Service: accessory.getService(this.hap.Service.MotionSensor) as Service,
       MotionDetected: accessory.context.MotionDetected || false,
     };
 
+    // Initialize Battery property
+    this.Battery = {
+      Service: accessory.getService(this.hap.Service.Battery) as Service,
+      BatteryLevel: accessory.context.BatteryLevel || 100,
+      StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+    };
+
+    // Initialize Motion Sensor property
+    if (!device.motion?.hide_lightsensor) {
+      this.LightSensor = {
+        Service: accessory.getService(this.hap.Service.LightSensor) as Service,
+        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel || 0,
+      };
+    };
+
+
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
 
     // 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`;
     (this.MotionSensor.Service = accessory.getService(this.hap.Service.MotionSensor)
-      || accessory.addService(this.hap.Service.MotionSensor)), MotionSensorService;
+        || accessory.addService(this.hap.Service.MotionSensor)), `${accessory.displayName} Motion Sensor`;
 
     this.MotionSensor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
     // each service must implement at-minimum the "required characteristics" for the given service type

package/src/device/plug.ts

@@ -31,7 +31,7 @@ export class Plug extends deviceBase {
 
     // Initialize Outlet property
     this.Outlet = {
-      Service: accessory.getService(this.hap.Service.Outlet)!,
+      Service: accessory.getService(this.hap.Service.Outlet) as Service,
       On: accessory.context.On || false,
     };
 

package/src/device/robotvacuumcleaner.ts

@@ -40,14 +40,14 @@ export class RobotVacuumCleaner extends deviceBase {
 
     // Initialize Lightbulb property
     this.LightBulb = {
-      Service: accessory.getService(this.hap.Service.Lightbulb)!,
+      Service: accessory.getService(this.hap.Service.Lightbulb) as Service,
       On: accessory.context.On || false,
       Brightness: accessory.context.Brightness || 0,
     };
 
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery)!,
+      Service: accessory.getService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };

package/src/device/waterdetector.ts

@@ -48,7 +48,7 @@ export class WaterDetector extends deviceBase {
 
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery)!,
+      Service: accessory.getService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
       ChargingState: accessory.context.ChargingState || this.hap.Characteristic.ChargingState.NOT_CHARGEABLE,
@@ -57,7 +57,7 @@ export class WaterDetector extends deviceBase {
     // Initialize Leak Sensor property
     if (!this.device.waterdetector?.hide_leak) {
       this.LeakSensor = {
-        Service: accessory.getService(this.hap.Service.LeakSensor)!,
+        Service: accessory.getService(this.hap.Service.LeakSensor) as Service,
         StatusActive: accessory.context.StatusActive || false,
         LeakDetected: accessory.context.LeakDetected || this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
       };

package/src/irdevice/airconditioner.ts

@@ -58,7 +58,7 @@ export class AirConditioner extends irdeviceBase {
 
     // Initialize HeaterCooler property
     this.HeaterCooler = {
-      Service: accessory.getService(this.hap.Service.Switch)!,
+      Service: accessory.getService(this.hap.Service.Switch) as Service,
       Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
       CurrentHeaterCoolerState: accessory.context.CurrentHeaterCoolerState || this.hap.Characteristic.CurrentHeaterCoolerState.IDLE,
       TargetHeaterCoolerState: accessory.context.TargetHeaterCoolerState || this.hap.Characteristic.TargetHeaterCoolerState.AUTO,
@@ -72,7 +72,7 @@ export class AirConditioner extends irdeviceBase {
       const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
       this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
       this.HumiditySensor = {
-        Service: this.meter!.getService(this.hap.Service.HumiditySensor)!,
+        Service: this.meter!.getService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: this.meter!.context.CurrentRelativeHumidity || 0,
       };
     }

package/src/irdevice/airpurifier.ts

@@ -54,7 +54,7 @@ export class AirPurifier extends irdeviceBase {
 
     // Initialize AirPurifier property
     this.AirPurifier = {
-      Service: accessory.getService(this.hap.Service.Switch)!,
+      Service: accessory.getService(this.hap.Service.Switch) as Service,
       Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
       RotationSpeed: accessory.context.RotationSpeed || 0,
       CurrentAirPurifierState: accessory.context.CurrentAirPurifierState || this.hap.Characteristic.CurrentAirPurifierState.INACTIVE,
@@ -63,7 +63,7 @@ export class AirPurifier extends irdeviceBase {
 
     // Initialize TemperatureSensor property
     this.TemperatureSensor = {
-      Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
+      Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
       CurrentTemperature: accessory.context.CurrentTemperature || 24,
     };
 

package/src/irdevice/camera.ts

@@ -29,7 +29,7 @@ export class Camera extends irdeviceBase {
 
     // Initialize Switch property
     this.Switch = {
-      Service: accessory.getService(this.hap.Service.Switch)!,
+      Service: accessory.getService(this.hap.Service.Switch) as Service,
       On: accessory.context.On || false,
     };
 

package/src/irdevice/fan.ts

@@ -37,7 +37,7 @@ export class IRFan extends irdeviceBase {
 
     // Initialize Switch property
     this.Fan = {
-      Service: accessory.getService(this.hap.Service.Lightbulb)!,
+      Service: accessory.getService(this.hap.Service.Lightbulb) as Service,
       Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
       SwingMode: accessory.context.SwingMode || this.hap.Characteristic.SwingMode.SWING_DISABLED,
       RotationSpeed: accessory.context.RotationSpeed || 0,

package/src/irdevice/light.ts

@@ -40,7 +40,7 @@ export class Light extends irdeviceBase {
     if (!device.irlight?.stateless) {
       // Initialize LightBulb property
       this.LightBulb = {
-        Service: accessory.getService(this.hap.Service.Lightbulb)!,
+        Service: accessory.getService(this.hap.Service.Lightbulb) as Service,
         On: accessory.context.On || false,
       };
       // get the Light service if it exists, otherwise create a new Light service

package/src/irdevice/other.ts

@@ -82,7 +82,7 @@ export class Others extends irdeviceBase {
     if (this.otherDeviceType === 'switch') {
       // Initialize Switch property
       this.Switch = {
-        Service: accessory.getService(this.hap.Service.Switch)!,
+        Service: accessory.getService(this.hap.Service.Switch) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -106,7 +106,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'garagedoor') {
       // Initialize Garage Door property
       this.GarageDoor = {
-        Service: accessory.getService(this.hap.Service.GarageDoorOpener)!,
+        Service: accessory.getService(this.hap.Service.GarageDoorOpener) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -131,7 +131,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'door') {
       // Initialize Door property
       this.Door = {
-        Service: accessory.getService(this.hap.Service.Door)!,
+        Service: accessory.getService(this.hap.Service.Door) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -164,7 +164,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'window') {
       // Initialize Window property
       this.Window = {
-        Service: accessory.getService(this.hap.Service.Window)!,
+        Service: accessory.getService(this.hap.Service.Window) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -197,7 +197,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'windowcovering') {
       // Initialize WindowCovering property
       this.WindowCovering = {
-        Service: accessory.getService(this.hap.Service.WindowCovering)!,
+        Service: accessory.getService(this.hap.Service.WindowCovering) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -230,7 +230,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'lock') {
       // Initialize Lock property
       this.Lock = {
-        Service: accessory.getService(this.hap.Service.LockMechanism)!,
+        Service: accessory.getService(this.hap.Service.LockMechanism) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -254,7 +254,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'faucet') {
       // Initialize Faucet property
       this.Faucet = {
-        Service: accessory.getService(this.hap.Service.Faucet)!,
+        Service: accessory.getService(this.hap.Service.Faucet) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -278,7 +278,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'fan') {
       // Initialize Fan property
       this.Fan = {
-        Service: accessory.getService(this.hap.Service.Fanv2)!,
+        Service: accessory.getService(this.hap.Service.Fanv2) as Service,
         On: accessory.context.On || false,
       };
       this.removeLockService(accessory);
@@ -302,7 +302,7 @@ export class Others extends irdeviceBase {
     } else if (this.otherDeviceType === 'stateful') {
       // Initialize StatefulProgrammableSwitch property
       this.StatefulProgrammableSwitch = {
-        Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)!,
+        Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);
@@ -328,7 +328,7 @@ export class Others extends irdeviceBase {
     } else {
       // Initialize Outlet property
       this.Outlet = {
-        Service: accessory.getService(this.hap.Service.Outlet)!,
+        Service: accessory.getService(this.hap.Service.Outlet) as Service,
         On: accessory.context.On || false,
       };
       this.removeFanService(accessory);

package/src/irdevice/tv.ts

@@ -41,7 +41,7 @@ export class TV extends irdeviceBase {
 
     // Initialize Television property
     this.Television = {
-      Service: accessory.getService(this.hap.Service.Television)!,
+      Service: accessory.getService(this.hap.Service.Television) as Service,
       Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
       ActiveIdentifier: accessory.context.ActiveIdentifier || 1,
       SleepDiscoveryMode: accessory.context.SleepDiscoveryMode || this.hap.Characteristic.SleepDiscoveryMode.ALWAYS_DISCOVERABLE,
@@ -50,7 +50,7 @@ export class TV extends irdeviceBase {
 
     // Initialize TelevisionSpeaker property
     this.TelevisionSpeaker = {
-      Service: accessory.getService(this.hap.Service.TelevisionSpeaker)!,
+      Service: accessory.getService(this.hap.Service.TelevisionSpeaker) as Service,
       Active: accessory.context.Active || false,
       VolumeControlType: accessory.context.VolumeControlType || this.hap.Characteristic.VolumeControlType.ABSOLUTE,
       VolumeSelector: accessory.context.VolumeSelector || this.hap.Characteristic.VolumeSelector.INCREMENT,

package/src/irdevice/vacuumcleaner.ts

@@ -29,7 +29,7 @@ export class VacuumCleaner extends irdeviceBase {
 
     // Initialize Switch property
     this.Switch = {
-      Service: accessory.getService(this.hap.Service.Switch)!,
+      Service: accessory.getService(this.hap.Service.Switch) as Service,
       On: accessory.context.On || false,
     };
 

package/src/irdevice/waterheater.ts

@@ -29,7 +29,7 @@ export class WaterHeater extends irdeviceBase {
 
     // Initialize Valve property
     this.Valve = {
-      Service: accessory.getService(this.hap.Service.Valve)!,
+      Service: accessory.getService(this.hap.Service.Valve) as Service,
       Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
     };