@switchbot/homebridge-switchbot 3.5.0-beta.56 → 3.5.0-beta.58

package/src/device/fan.ts

@@ -4,10 +4,12 @@
  */
 import { request } from 'undici';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
+import { Devices } from '../settings.js';
 import { Subject, debounceTime, interval, skipWhile, take, tap } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 export class Fan extends deviceBase {
   // Services
@@ -41,7 +43,7 @@ export class Fan extends deviceBase {
 
     // Initialize Fan property
     this.Fan = {
-      Service: accessory.getService(this.hap.Service.Fanv2)!,
+      Service: accessory.getService(this.hap.Service.Fanv2) 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,
@@ -49,7 +51,7 @@ export class Fan 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_CHARGING,

package/src/device/hub.ts

@@ -2,12 +2,15 @@
  *
  * hub.ts: @switchbot/homebridge-switchbot.
  */
-import { Subject, interval, skipWhile } from 'rxjs';
+import { Units } from 'homebridge';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, device, deviceStatus, devicesConfig } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service, Units } from 'homebridge';
+import { Devices } from '../settings.js';
 import { convertUnits } from '../utils.js';
+import { Subject, interval, skipWhile } from 'rxjs';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { device, deviceStatus, devicesConfig } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
 
 export class Hub extends deviceBase {
   // Services
@@ -43,7 +46,7 @@ export class Hub extends deviceBase {
     // Initialize Temperature Sensor property
     if (!device.hub?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
+        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature || 0,
       };
     }
@@ -51,7 +54,7 @@ export class Hub extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.hub?.hide_humidity) {
       this.HumiditySensor = {
-        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
+        Service: accessory.getService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 0,
       };
     }
@@ -59,7 +62,7 @@ export class Hub extends deviceBase {
     // Initialize Light Sensor property
     if (!device.hub?.hide_lightsensor) {
       this.LightSensor = {
-        Service: accessory.getService(this.hap.Service.LightSensor)!,
+        Service: accessory.getService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel || 0.0001,
       };
     }

package/src/device/humidifier.ts

@@ -1,11 +1,13 @@
 import { request } from 'undici';
 import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
-import { SwitchBotPlatform } from '../platform.js';
-import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+import { Devices } from '../settings.js';
 import { convertUnits } from '../utils.js';
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 /**
  * Platform Accessory
@@ -45,7 +47,7 @@ export class Humidifier extends deviceBase {
 
     // Initialize the HumidifierDehumidifier Service
     this.HumidifierDehumidifier = {
-      Service: accessory.getService(this.hap.Service.HumidifierDehumidifier)!,
+      Service: accessory.getService(this.hap.Service.HumidifierDehumidifier) as Service,
       Active: accessory.context.Active || this.hap.Characteristic.Active.ACTIVE,
       WaterLevel: accessory.context.WaterLevel || 100,
       CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
@@ -59,7 +61,7 @@ export class Humidifier extends deviceBase {
     // Initialize the Temperature Sensor Service
     if (!device.humidifier?.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,
       };
     }
@@ -158,7 +160,7 @@ export class Humidifier extends deviceBase {
               `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
           this.HumidifierDehumidifier.CurrentRelativeHumidity = humidity;
           if (!this.device.humidifier?.hide_temperature) {
-              this.TemperatureSensor!.CurrentTemperature = convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo);
+            this.TemperatureSensor!.CurrentTemperature = convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo);
           }
           this.updateHomeKitCharacteristics();
         } catch (e: any) {

package/src/device/iosensor.ts

@@ -2,12 +2,15 @@
  *
  * iosensor.ts: @switchbot/homebridge-switchbot.
  */
+import { Units } from 'homebridge';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Subject, interval, skipWhile } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service, Units } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+import { Devices } from '../settings.js';
 import { convertUnits } from '../utils.js';
+import { Subject, interval, skipWhile } from 'rxjs';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 /**
  * Platform Accessory
@@ -16,7 +19,7 @@ import { convertUnits } from '../utils.js';
  */
 export class IOSensor extends deviceBase {
   // Services
-  private Battery!: {
+  private Battery: {
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
@@ -49,7 +52,7 @@ export class IOSensor extends deviceBase {
     // Initialize Temperature Sensor property
     if (!device.iosensor?.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,
       };
     }
@@ -57,14 +60,14 @@ export class IOSensor extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.iosensor?.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/lightstrip.ts

@@ -1,11 +1,13 @@
 import { request } from 'undici';
-import { interval, skipWhile, Subject } from 'rxjs';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
+import { Devices } from '../settings.js';
 import { hs2rgb, rgb2hs, m2hs } from '../utils.js';
+import { interval, skipWhile, Subject } from 'rxjs';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { device, devicesConfig, deviceStatus, serviceData, Devices } from '../settings.js';
-import { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { device, devicesConfig, deviceStatus, serviceData} from '../settings.js';
+import type { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -44,7 +46,7 @@ export class StripLight extends deviceBase {
 
     // Initialize the 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,
       Hue: accessory.context.Hue || 0,
       Saturation: accessory.context.Saturation || 0,

package/src/device/lock.ts

@@ -1,10 +1,12 @@
 import { request } from 'undici';
 import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
-import { SwitchBotPlatform } from '../platform.js';
+import { Devices } from '../settings.js';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, deviceStatus, Devices, serviceData } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import type { device, devicesConfig, deviceStatus, serviceData } from '../settings.js';
 
 export class Lock extends deviceBase {
   // Services
@@ -46,14 +48,14 @@ export class Lock extends deviceBase {
 
     // Initialize LockMechanism property
     this.LockMechanism = {
-      Service: accessory.getService(this.hap.Service.LockMechanism)!,
+      Service: accessory.getService(this.hap.Service.LockMechanism) as Service,
       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.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,
     };
@@ -61,7 +63,7 @@ export class Lock extends deviceBase {
     // Initialize ContactSensor property
     if (!this.device.lock?.hide_contactsensor) {
       this.ContactSensor = {
-        Service: accessory.getService(this.hap.Service.ContactSensor)!,
+        Service: accessory.getService(this.hap.Service.ContactSensor) as Service,
         ContactSensorState: accessory.context.ContactSensorState || this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
       };
     }
@@ -69,7 +71,7 @@ export class Lock extends deviceBase {
     // Initialize Latch Button Service
     if (device.lock?.activate_latchbutton) {
       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/device/meter.ts

@@ -2,16 +2,19 @@
  *
  * meter.ts: @switchbot/homebridge-switchbot.
  */
+import { Units } from 'homebridge';
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
 import { convertUnits } from '../utils.js';
 import { Subject, interval, skipWhile } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service, Units } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 export class Meter extends deviceBase {
   // Services
-  private Battery!: {
+  private Battery: {
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
@@ -44,7 +47,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 +55,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

@@ -2,11 +2,14 @@
  *
  * meterplus.ts: @switchbot/homebridge-switchbot.
  */
+import { Units } from 'homebridge';
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
 import { Subject, interval, skipWhile } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service, Units } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 /**
  * Platform Accessory
@@ -15,7 +18,7 @@ import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../se
  */
 export class MeterPlus extends deviceBase {
   // Services
-  private Battery!: {
+  private Battery: {
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
@@ -48,7 +51,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 +59,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

@@ -3,11 +3,13 @@
  *
  * motion.ts: @switchbot/homebridge-switchbot.
  */
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
 import { Subject, interval, skipWhile } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus } from '../settings.js';
 
 /**
  * Platform Accessory
@@ -16,13 +18,13 @@ import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../se
  */
 export class Motion extends deviceBase {
   // Services
-  private Battery!: {
+  private Battery: {
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
   };
 
-  private MotionSensor!: {
+  private MotionSensor: {
     Service: Service;
     MotionDetected: CharacteristicValue;
   };
@@ -48,20 +50,36 @@ 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) ?? accessory.addService(this.hap.Service.MotionSensor) as Service,
       MotionDetected: accessory.context.MotionDetected || false,
     };
 
+    // Initialize Battery property
+    this.Battery = {
+      Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(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;
+    /*(this.MotionSensor.Service = accessory.getService(this.hap.Service.MotionSensor)
+        || accessory.addService(this.hap.Service.MotionSensor)), `${accessory.displayName} Motion Sensor`;*/
+
+    if (this.MotionSensor.Service) {
+      this.MotionSensor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+    }
 
-    this.MotionSensor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
     // each service must implement at-minimum the "required characteristics" for the given service type
     // see https://developers.homebridge.io/#/service/MotionSensor
 
@@ -82,12 +100,14 @@ export class Motion extends deviceBase {
     }
 
     // Battery Service
-    const BatteryService = `${accessory.displayName} Battery`;
+    /*const BatteryService = `${accessory.displayName} Battery`;
     (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
-      || accessory.addService(this.hap.Service.Battery)), BatteryService;
+      || accessory.addService(this.hap.Service.Battery)), BatteryService;*/
 
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+    if (this.Battery.Service) {
+      this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
+      this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+    }
 
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();

package/src/device/plug.ts

@@ -3,11 +3,13 @@
  * plug.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
 import { Subject, debounceTime, interval, skipWhile, take, tap } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 export class Plug extends deviceBase {
   // Services
   private Outlet: {
@@ -31,7 +33,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

@@ -3,12 +3,14 @@
  * robotvacuumcleaner.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
-import { Subject, interval, skipWhile } from 'rxjs';
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
+import { Subject, interval, skipWhile } from 'rxjs';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, deviceStatus, serviceData, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import type { device, devicesConfig, deviceStatus, serviceData} from '../settings.js';
 
 export class RobotVacuumCleaner extends deviceBase {
   // Services
@@ -40,14 +42,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,
     };
@@ -594,7 +596,7 @@ export class RobotVacuumCleaner extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
     } else {
       this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
-      this.Battery.Service?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
+      this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
     }
     // StatusLowBattery

package/src/device/waterdetector.ts

@@ -4,10 +4,12 @@
  */
 import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
+import { Devices } from '../settings.js';
 import { skipWhile } from 'rxjs/operators';
-import { SwitchBotPlatform } from '../platform.js';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 /**
  * Platform Accessory
@@ -48,7 +50,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 +59,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/homebridge-ui/public/index.html

@@ -1,8 +1,7 @@
 <p class="text-center">
   <img
     src="https://raw.githubusercontent.com/OpenWonderLabs/homebridge-switchbot/latest/branding/Homebridge_x_SwitchBot.svg"
-    alt="homebridge-switchbot logo"
-    style="width: 50%" />
+    alt="homebridge-switchbot logo" style="width: 50%" />
 </p>
 <div id="pageIntro" style="display: none">
   <p class="lead text-center">Thank you for installing <strong>homebridge-switchbot</strong></p>
@@ -10,10 +9,10 @@
   <ol>
     <li class="mb-3">
       Download the SwitchBot App from either the
-      <a href="https://apps.apple.com/us/app/switchbot/id1087374760" target="_blank" rel="noreferrer noopener">App Store</a> or the
-      <a href="https://play.google.com/store/apps/details?id=com.theswitchbot.switchbot&hl=en_US&gl=US" target="_blank" rel="noreferrer noopener"
-        >Play Store</a
-      >.
+      <a href="https://apps.apple.com/us/app/switchbot/id1087374760" target="_blank" rel="noreferrer noopener">App
+        Store</a> or the
+      <a href="https://play.google.com/store/apps/details?id=com.theswitchbot.switchbot&hl=en_US&gl=US" target="_blank"
+        rel="noreferrer noopener">Play Store</a>.
     </li>
     <li class="mb-3">Select <strong>Profile</strong>.</li>
     <li class="mb-3">Select <strong>Preferences</strong>.</li>
@@ -84,31 +83,38 @@
       <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki" target="_blank">Wiki Home</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Configuration" target="_blank">Configuration</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Configuration"
+        target="_blank">Configuration</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Beta-Version" target="_blank">Beta Version</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Beta-Version" target="_blank">Beta
+        Version</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Node-Version" target="_blank">Node Version</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Node-Version" target="_blank">Node
+        Version</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Uninstallation" target="_blank">Uninstallation</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Uninstallation"
+        target="_blank">Uninstallation</a>
     </li>
   </ul>
   <h5>Features</h5>
   <ul>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Supported-Devices" target="_blank">Supported Devices</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Supported-Devices" target="_blank">Supported
+        Devices</a>
     </li>
   </ul>
   <h5>Help/About</h5>
   <ul>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/issues/new/choose" target="_blank">Support Request</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/issues/new/choose" target="_blank">Support
+        Request</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/blob/latest/CHANGELOG.md" target="_blank">Changelog</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/blob/latest/CHANGELOG.md"
+        target="_blank">Changelog</a>
     </li>
   </ul>
 </div>
@@ -237,4 +243,4 @@
       homebridge.hideSpinner();
     }
   })();
-</script>
+</script>