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

package/src/irdevice/light.ts

@@ -3,10 +3,12 @@
  * light.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -15,20 +17,22 @@ import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
  */
 export class Light extends irdeviceBase {
   // Services
-  private LightBulb!: {
+  private LightBulb?: {
     Service: Service;
     On: CharacteristicValue;
   };
 
-  ProgrammableSwitchServiceOn?: Service;
-  ProgrammableSwitchServiceOff?: Service;
+  private ProgrammableSwitchOn?: {
+    Service: Service;
+    ProgrammableSwitchEvent: CharacteristicValue;
+    ProgrammableSwitchOutputState: CharacteristicValue;
+  };
 
-  // Characteristic Values
-  On!: CharacteristicValue;
-  ProgrammableSwitchEventOn?: CharacteristicValue;
-  ProgrammableSwitchOutputStateOn?: CharacteristicValue;
-  ProgrammableSwitchEventOff?: CharacteristicValue;
-  ProgrammableSwitchOutputStateOff?: CharacteristicValue;
+  private ProgrammableSwitchOff?: {
+    Service: Service;
+    ProgrammableSwitchEvent: CharacteristicValue;
+    ProgrammableSwitchOutputState: CharacteristicValue;
+  };
 
   constructor(
     readonly platform: SwitchBotPlatform,
@@ -40,7 +44,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
@@ -57,47 +61,47 @@ export class Light extends irdeviceBase {
     } else {
 
       // create a new Stateful Programmable Switch On service
-      const ProgrammableSwitchServiceOn = `${accessory.displayName} ${device.remoteType} On`;
-      (this.ProgrammableSwitchServiceOn = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
-        || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), ProgrammableSwitchServiceOn;
+      const ProgrammableSwitchOn = `${accessory.displayName} ${device.remoteType} On`;
+      (this.ProgrammableSwitchOn!.Service = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+        || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), ProgrammableSwitchOn;
 
 
-      this.ProgrammableSwitchServiceOn.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} On`);
+      this.ProgrammableSwitchOn?.Service.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} On`);
 
-      this.ProgrammableSwitchServiceOn.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
+      this.ProgrammableSwitchOn?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
         validValueRanges: [0, 0],
         minValue: 0,
         maxValue: 0,
         validValues: [0],
       })
         .onGet(() => {
-          return this.ProgrammableSwitchEventOn!;
+          return this.ProgrammableSwitchOn!.ProgrammableSwitchEvent;
         });
 
-      this.ProgrammableSwitchServiceOn.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+      this.ProgrammableSwitchOn?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
         .onSet(this.ProgrammableSwitchOutputStateSetOn.bind(this));
 
 
 
       // create a new Stateful Programmable Switch Off service
-      const ProgrammableSwitchServiceOff = `${accessory.displayName} ${device.remoteType} Off`;
-      (this.ProgrammableSwitchServiceOff = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
-        || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), ProgrammableSwitchServiceOff;
+      const ProgrammableSwitchOff = `${accessory.displayName} ${device.remoteType} Off`;
+      (this.ProgrammableSwitchOff!.Service = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+        || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), ProgrammableSwitchOff;
 
 
-      this.ProgrammableSwitchServiceOff.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Off`);
+      this.ProgrammableSwitchOff?.Service.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Off`);
 
-      this.ProgrammableSwitchServiceOff.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
+      this.ProgrammableSwitchOff?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
         validValueRanges: [0, 0],
         minValue: 0,
         maxValue: 0,
         validValues: [0],
       })
         .onGet(() => {
-          return this.ProgrammableSwitchEventOff!;
+          return this.ProgrammableSwitchOff!.ProgrammableSwitchEvent;
         });
 
-      this.ProgrammableSwitchServiceOff.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+      this.ProgrammableSwitchOff?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
         .onSet(this.ProgrammableSwitchOutputStateSetOff.bind(this));
     }
 
@@ -106,11 +110,13 @@ export class Light extends irdeviceBase {
   async OnSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${value}`);
 
-    this.On = value;
-    if (this.On) {
-      await this.pushLightOnChanges();
+    this.LightBulb!.On = value;
+    if (this.LightBulb?.On) {
+      const On = true;
+      await this.pushLightOnChanges(On);
     } else {
-      await this.pushLightOffChanges();
+      const On = false;
+      await this.pushLightOffChanges(On);
     }
     /**
      * pushLightOnChanges and pushLightOffChanges above assume they are measuring the state of the accessory BEFORE
@@ -121,10 +127,10 @@ export class Light extends irdeviceBase {
   async ProgrammableSwitchOutputStateSetOn(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${value}`);
 
-    this.ProgrammableSwitchOutputStateOn = value;
-    if (this.ProgrammableSwitchOutputStateOn === 1) {
-      this.On = true;
-      await this.pushLightOnChanges();
+    this.ProgrammableSwitchOn!.ProgrammableSwitchOutputState = value;
+    if (this.ProgrammableSwitchOn?.ProgrammableSwitchOutputState === 1) {
+      const On = true;
+      await this.pushLightOnChanges(On);
     }
     /**
      * pushLightOnChanges and pushLightOffChanges above assume they are measuring the state of the accessory BEFORE
@@ -135,10 +141,10 @@ export class Light extends irdeviceBase {
   async ProgrammableSwitchOutputStateSetOff(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${value}`);
 
-    this.ProgrammableSwitchOutputStateOff = value;
-    if (this.ProgrammableSwitchOutputStateOff === 1) {
-      this.On = false;
-      await this.pushLightOffChanges();
+    this.ProgrammableSwitchOff!.ProgrammableSwitchOutputState = value;
+    if (this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState === 1) {
+      const On = false;
+      await this.pushLightOffChanges(On);
     }
     /**
      * pushLightOnChanges and pushLightOffChanges above assume they are measuring the state of the accessory BEFORE
@@ -158,11 +164,9 @@ export class Light extends irdeviceBase {
    * Light -       "command"       "channelAdd"      "default"	        =        next channel
    * Light -       "command"       "channelSub"      "default"	        =        previous channel
    */
-  async pushLightOnChanges(): Promise<void> {
-    this.debugLog(
-      `${this.device.remoteType}: ${this.accessory.displayName} pushLightOnChanges On: ${this.On},` + ` disablePushOn: ${this.disablePushOn}`,
-    );
-    if (this.On && !this.disablePushOn) {
+  async pushLightOnChanges(On: boolean): Promise<void> {
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushLightOnChanges On: ${On}, disablePushOn: ${this.disablePushOn}`);
+    if (On === true && this.disablePushOn === false) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const bodyChange = JSON.stringify({
@@ -170,15 +174,13 @@ export class Light extends irdeviceBase {
         parameter: 'default',
         commandType: commandType,
       });
-      await this.pushChanges(bodyChange);
+      await this.pushChanges(bodyChange, On);
     }
   }
 
-  async pushLightOffChanges(): Promise<void> {
-    this.debugLog(
-      `${this.device.remoteType}: ${this.accessory.displayName} pushLightOffChanges On: ${this.On},` + ` disablePushOff: ${this.disablePushOff}`,
-    );
-    if (!this.On && !this.disablePushOff) {
+  async pushLightOffChanges(On: boolean): Promise<void> {
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushLightOffChanges On: ${On}, disablePushOff: ${this.disablePushOff}`);
+    if (On === false && this.disablePushOff === false) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const bodyChange = JSON.stringify({
@@ -186,29 +188,11 @@ export class Light extends irdeviceBase {
         parameter: 'default',
         commandType: commandType,
       });
-      await this.pushChanges(bodyChange);
+      await this.pushChanges(bodyChange, On);
     }
   }
 
-  /*async pushLightBrightnessUpChanges(): Promise<void> {
-    const bodyChange = JSON.stringify({
-      command: 'brightnessUp',
-      parameter: 'default',
-      commandType: 'command',
-    });
-    await this.pushChanges(bodyChange);
-  }
-
-  async pushLightBrightnessDownChanges(): Promise<void> {
-    const bodyChange = JSON.stringify({
-      command: 'brightnessDown',
-      parameter: 'default',
-      commandType: 'command',
-    });
-    await this.pushChanges(bodyChange);
-  }*/
-
-  async pushChanges(bodyChange: any): Promise<void> {
+  async pushChanges(bodyChange: any, On: boolean): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
@@ -227,7 +211,7 @@ export class Light extends irdeviceBase {
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
           this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
             + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
-          this.accessory.context.On = this.On;
+          this.accessory.context.On = On;
           this.updateHomeKitCharacteristics();
         } else {
           this.statusCode(statusCode);
@@ -235,63 +219,59 @@ export class Light extends irdeviceBase {
         }
       } catch (e: any) {
         this.apiError(e);
-        this.errorLog(
-          `${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType}` +
-          ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-        );
+        this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType}`
+        + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
       }
     } else {
-      this.warnLog(
-        `${this.device.remoteType}: ${this.accessory.displayName}` +
-        ` Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`,
-      );
+      this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} Connection Type: `
+      + `${this.device.connectionType}, commands will not be sent to OpenAPI`);
     }
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
-    if (this.device.irlight?.stateless) {
+    if (!this.device.irlight?.stateless) {
       // On
-      if (this.On === undefined) {
-        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+      if (this.LightBulb?.On === undefined) {
+        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.LightBulb?.On}`);
       } else {
-        this.accessory.context.On = this.On;
-        this.LightBulb.Service?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+        this.accessory.context.On = this.LightBulb.On;
+        this.LightBulb?.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
+        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.LightBulb.On}`);
       }
     } else {
       // On Stateful Programmable Switch
-      if (this.ProgrammableSwitchOutputStateOn === undefined) {
+      if (this.ProgrammableSwitchOn?.ProgrammableSwitchOutputState === undefined) {
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName}`
-          + ` ProgrammableSwitchOutputStateOn: ${this.ProgrammableSwitchOutputStateOn}`);
+          + ` ProgrammableSwitchOutputStateOn: ${this.ProgrammableSwitchOn?.ProgrammableSwitchOutputState}`);
       } else {
-        this.accessory.context.ProgrammableSwitchOutputStateOn = this.ProgrammableSwitchOutputStateOn;
-        this.ProgrammableSwitchServiceOn?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState,
-          this.ProgrammableSwitchOutputStateOn);
+        this.accessory.context.ProgrammableSwitchOutputStateOn = this.ProgrammableSwitchOn.ProgrammableSwitchOutputState;
+        this.ProgrammableSwitchOn?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState,
+          this.ProgrammableSwitchOn.ProgrammableSwitchOutputState);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` ProgrammableSwitchOutputStateOn: ${this.ProgrammableSwitchOutputStateOn}`);
+          + ` ProgrammableSwitchOutputStateOn: ${this.ProgrammableSwitchOn.ProgrammableSwitchOutputState}`);
       }
       // Off Stateful Programmable Switch
-      if (this.ProgrammableSwitchOutputStateOff === undefined) {
+      if (this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState === undefined) {
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName}`
-          + ` ProgrammableSwitchOutputStateOff: ${this.ProgrammableSwitchOutputStateOff}`);
+          + ` ProgrammableSwitchOutputStateOff: ${this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState}`);
       } else {
-        this.accessory.context.ProgrammableSwitchOutputStateOff = this.ProgrammableSwitchOutputStateOff;
-        this.ProgrammableSwitchServiceOff?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState,
-          this.ProgrammableSwitchOutputStateOff);
+        this.accessory.context.ProgrammableSwitchOutputStateOff = this.ProgrammableSwitchOff.ProgrammableSwitchOutputState;
+        this.ProgrammableSwitchOff.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState,
+          this.ProgrammableSwitchOff.ProgrammableSwitchOutputState);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` ProgrammableSwitchOutputStateOff: ${this.ProgrammableSwitchOutputStateOff}`);
+          + ` ProgrammableSwitchOutputStateOff: ${this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState}`);
       }
     }
   }
 
   async apiError(e: any): Promise<void> {
-    if (this.device.irlight?.stateless) {
-      this.LightBulb.Service?.updateCharacteristic(this.hap.Characteristic.On, e);
+    if (!this.device.irlight?.stateless) {
+      this.LightBulb?.Service.updateCharacteristic(this.hap.Characteristic.On, e);
     } else {
-      this.ProgrammableSwitchServiceOn?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
-      this.ProgrammableSwitchServiceOn?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
-      this.ProgrammableSwitchServiceOff?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
-      this.ProgrammableSwitchServiceOff?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
+      this.ProgrammableSwitchOn?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
+      this.ProgrammableSwitchOn?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
+      this.ProgrammableSwitchOff?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
+      this.ProgrammableSwitchOff?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
     }
   }
 }

package/src/irdevice/other.ts

@@ -3,10 +3,12 @@
  * other.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -82,7 +84,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 +108,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 +133,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 +166,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 +199,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 +232,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 +256,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 +280,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 +304,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 +330,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

@@ -3,10 +3,12 @@
  * tv.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -41,7 +43,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 +52,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,
@@ -418,7 +420,7 @@ export class TV extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Television.Active}`);
     } else {
       this.accessory.context.Active = this.Television.Active;
-      this.Television.Service?.updateCharacteristic(this.hap.Characteristic.Active, this.Television.Active);
+      this.Television.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Television.Active);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Television.Active}`);
     }
     // ActiveIdentifier
@@ -426,7 +428,7 @@ export class TV extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} ActiveIdentifier: ${this.Television.ActiveIdentifier}`);
     } else {
       this.accessory.context.ActiveIdentifier = this.Television.ActiveIdentifier;
-      this.Television.Service?.updateCharacteristic(this.hap.Characteristic.ActiveIdentifier, this.Television.ActiveIdentifier);
+      this.Television.Service.updateCharacteristic(this.hap.Characteristic.ActiveIdentifier, this.Television.ActiveIdentifier);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
         + ` ActiveIdentifier: ${this.Television.ActiveIdentifier}`);
     }

package/src/irdevice/vacuumcleaner.ts

@@ -3,10 +3,12 @@
  * vacuumcleaner.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -29,7 +31,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,
     };
 
@@ -133,7 +135,7 @@ export class VacuumCleaner extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Switch.On}`);
     } else {
       this.accessory.context.On = this.Switch.On;
-      this.Switch.Service?.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
+      this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Switch.On}`);
     }
   }

package/src/irdevice/waterheater.ts

@@ -3,10 +3,12 @@
  * waterheater.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -29,7 +31,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,
     };
 
@@ -138,7 +140,7 @@ export class WaterHeater extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Valve.Active}`);
     } else {
       this.accessory.context.Active = this.Valve.Active;
-      this.Valve.Service?.updateCharacteristic(this.hap.Characteristic.Active, this.Valve.Active);
+      this.Valve.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Valve.Active);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Valve.Active}`);
     }
   }