@switchbot/homebridge-switchbot 1.10.2-beta.7 → 1.11.2

package/src/irdevice/camera.ts

@@ -10,7 +10,7 @@ import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
  */
 export class Camera {
   // Services
-  service!: Service;
+  switchService!: Service;
 
   // Characteristic Values
   On!: CharacteristicValue;
@@ -38,7 +38,7 @@ export class Camera {
 
     // get the Television service if it exists, otherwise create a new Television service
     // you can create multiple services for each accessory
-    (this.service = accessory.getService(this.platform.Service.Switch) || accessory.addService(this.platform.Service.Switch)),
+    (this.switchService = accessory.getService(this.platform.Service.Switch) || accessory.addService(this.platform.Service.Switch)),
     `${accessory.displayName} Camera`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
@@ -47,13 +47,13 @@ export class Camera {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 
     // handle on / off events using the On characteristic
-    this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+    this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
   }
 
-  private OnSet(value: CharacteristicValue) {
+  async OnSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`Camera: ${this.accessory.displayName} On: ${value}`);
     this.On = value;
     if (this.On) {
@@ -63,11 +63,11 @@ export class Camera {
     }
   }
 
-  private updateHomeKitCharacteristics() {
+  async updateHomeKitCharacteristics(): Promise<void> {
     if (this.On === undefined) {
       this.debugLog(`Camera: ${this.accessory.displayName} On: ${this.On}`);
     } else {
-      this.service?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+      this.switchService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.debugLog(`Camera: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
   }
@@ -82,7 +82,7 @@ export class Camera {
    * Light:        "command"       "channelAdd"      "default"	        =        next channel
    * Light:        "command"       "channelSub"      "default"	        =        previous channel
    */
-  async pushOnChanges() {
+  async pushOnChanges(): Promise<void> {
     if (this.On) {
       const payload = {
         commandType: 'command',
@@ -93,7 +93,7 @@ export class Camera {
     }
   }
 
-  async pushOffChanges() {
+  async pushOffChanges(): Promise<void> {
     if (!this.On) {
       const payload = {
         commandType: 'command',
@@ -104,7 +104,7 @@ export class Camera {
     }
   }
 
-  public async pushChanges(payload: payload) {
+  async pushChanges(payload: payload): Promise<void> {
     try {
       this.infoLog(
         `Camera: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -132,7 +132,7 @@ export class Camera {
     }
   }
 
-  private statusCode(push: AxiosResponse<{ statusCode: number }>) {
+  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void> {
     switch (push.data.statusCode) {
       case 151:
         this.errorLog(`Camera: ${this.accessory.displayName} Command not supported by this device type.`);
@@ -163,12 +163,12 @@ export class Camera {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.On, e);
+  async apiError(e: any): Promise<void> {
+    this.switchService.updateCharacteristic(this.platform.Characteristic.On, e);
     //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
-  config(device: irdevice & irDevicesConfig) {
+  async config(device: irdevice & irDevicesConfig): Promise<void> {
     let config = {};
     if (device.ircam) {
       config = device.ircam;
@@ -181,7 +181,7 @@ export class Camera {
     }
   }
 
-  logs(device: irdevice & irDevicesConfig) {
+  async logs(device: irdevice & irDevicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode';
       this.debugLog(`Camera: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
@@ -200,25 +200,25 @@ export class Camera {
   /**
    * Logging for Device
    */
-  infoLog(...log: any[]) {
+  infoLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.info(String(...log));
     }
   }
 
-  warnLog(...log: any[]) {
+  warnLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.warn(String(...log));
     }
   }
 
-  errorLog(...log: any[]) {
+  errorLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.error(String(...log));
     }
   }
 
-  debugLog(...log: any[]) {
+  debugLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging === 'debug') {
         this.platform.log.info('[DEBUG]', String(...log));

package/src/irdevice/fan.ts

@@ -10,7 +10,7 @@ import { DeviceURL, irdevice, deviceStatusResponse, irDevicesConfig, payload } f
  */
 export class Fan {
   // Services
-  service!: Service;
+  fanService!: Service;
 
   // Characteristic Values
   Active!: CharacteristicValue;
@@ -48,7 +48,7 @@ export class Fan {
 
     // get the Television service if it exists, otherwise create a new Television service
     // you can create multiple services for each accessory
-    (this.service = accessory.getService(this.platform.Service.Fanv2) || accessory.addService(this.platform.Service.Fanv2)),
+    (this.fanService = accessory.getService(this.platform.Service.Fanv2) || accessory.addService(this.platform.Service.Fanv2)),
     `${accessory.displayName} Fan`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
@@ -57,10 +57,10 @@ export class Fan {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    this.fanService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 
     // handle on / off events using the Active characteristic
-    this.service.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
+    this.fanService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
 
     if (device.irfan?.rotation_speed) {
       if (device.irfan?.set_minStep) {
@@ -79,7 +79,7 @@ export class Fan {
         this.maxValue = 100;
       }
       // handle Roation Speed events using the RotationSpeed characteristic
-      this.service
+      this.fanService
         .getCharacteristic(this.platform.Characteristic.RotationSpeed)
         .setProps({
           minStep: this.minStep,
@@ -87,9 +87,9 @@ export class Fan {
           maxValue: this.maxValue,
         })
         .onSet(this.RotationSpeedSet.bind(this));
-    } else if (this.service.testCharacteristic(this.platform.Characteristic.RotationSpeed) && !device.irfan?.swing_mode) {
-      const characteristic = this.service.getCharacteristic(this.platform.Characteristic.RotationSpeed);
-      this.service.removeCharacteristic(characteristic);
+    } else if (this.fanService.testCharacteristic(this.platform.Characteristic.RotationSpeed) && !device.irfan?.swing_mode) {
+      const characteristic = this.fanService.getCharacteristic(this.platform.Characteristic.RotationSpeed);
+      this.fanService.removeCharacteristic(characteristic);
       this.debugLog(`Fan: ${this.accessory.displayName} Rotation Speed Characteristic was removed.`);
     } else {
       // eslint-disable-next-line max-len
@@ -101,10 +101,10 @@ export class Fan {
 
     if (device.irfan?.swing_mode) {
       // handle Osolcation events using the SwingMode characteristic
-      this.service.getCharacteristic(this.platform.Characteristic.SwingMode).onSet(this.SwingModeSet.bind(this));
-    } else if (this.service.testCharacteristic(this.platform.Characteristic.SwingMode) && !device.irfan?.swing_mode) {
-      const characteristic = this.service.getCharacteristic(this.platform.Characteristic.SwingMode);
-      this.service.removeCharacteristic(characteristic);
+      this.fanService.getCharacteristic(this.platform.Characteristic.SwingMode).onSet(this.SwingModeSet.bind(this));
+    } else if (this.fanService.testCharacteristic(this.platform.Characteristic.SwingMode) && !device.irfan?.swing_mode) {
+      const characteristic = this.fanService.getCharacteristic(this.platform.Characteristic.SwingMode);
+      this.fanService.removeCharacteristic(characteristic);
       this.debugLog(`Fan: ${this.accessory.displayName} Swing Mode Characteristic was removed.`);
     } else {
       // eslint-disable-next-line max-len
@@ -115,42 +115,42 @@ export class Fan {
     }
   }
 
-  private SwingModeSet(value: CharacteristicValue) {
+  async SwingModeSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`Fan: ${this.accessory.displayName} SwingMode: ${value}`);
     if (value > this.SwingMode) {
       this.SwingMode = 1;
-      this.pushFanOnChanges();
-      this.pushFanSwingChanges();
+      await this.pushFanOnChanges();
+      await this.pushFanSwingChanges();
     } else {
       this.SwingMode = 0;
-      this.pushFanOnChanges();
-      this.pushFanSwingChanges();
+      await this.pushFanOnChanges();
+      await this.pushFanSwingChanges();
     }
     this.SwingMode = value;
   }
 
-  private updateHomeKitCharacteristics() {
+  async updateHomeKitCharacteristics(): Promise<void> {
     if (this.Active === undefined) {
       this.debugLog(`Fan: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
-      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
+      this.fanService?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.debugLog(`Fan: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }
     if (this.SwingMode === undefined) {
       this.debugLog(`Fan: ${this.accessory.displayName} SwingMode: ${this.SwingMode}`);
     } else {
-      this.service?.updateCharacteristic(this.platform.Characteristic.SwingMode, this.SwingMode);
+      this.fanService?.updateCharacteristic(this.platform.Characteristic.SwingMode, this.SwingMode);
       this.debugLog(`Fan: ${this.accessory.displayName} updateCharacteristic SwingMode: ${this.SwingMode}`);
     }
     if (this.RotationSpeed === undefined) {
       this.debugLog(`Fan: ${this.accessory.displayName} RotationSpeed: ${this.RotationSpeed}`);
     } else {
-      this.service?.updateCharacteristic(this.platform.Characteristic.RotationSpeed, this.RotationSpeed);
+      this.fanService?.updateCharacteristic(this.platform.Characteristic.RotationSpeed, this.RotationSpeed);
       this.debugLog(`Fan: ${this.accessory.displayName} updateCharacteristic RotationSpeed: ${this.RotationSpeed}`);
     }
   }
 
-  private RotationSpeedSet(value: CharacteristicValue) {
+  async RotationSpeedSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`Fan: ${this.accessory.displayName} RotationSpeed: ${value}`);
     if (value > this.RotationSpeed) {
       this.RotationSpeed = 1;
@@ -163,7 +163,7 @@ export class Fan {
     this.RotationSpeed = value;
   }
 
-  private ActiveSet(value: CharacteristicValue) {
+  async ActiveSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`Fan: ${this.accessory.displayName} Active: ${value}`);
     if (value === this.platform.Characteristic.Active.INACTIVE) {
       this.pushFanOffChanges();
@@ -184,7 +184,7 @@ export class Fan {
    * Fan:        "command"       "middleSpeed"    "default"	        =        fan speed to medium
    * Fan:        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
-  async pushFanOnChanges() {
+  async pushFanOnChanges(): Promise<void> {
     if (this.Active !== 1) {
       const payload = {
         commandType: 'command',
@@ -195,7 +195,7 @@ export class Fan {
     }
   }
 
-  async pushFanOffChanges() {
+  async pushFanOffChanges(): Promise<void> {
     const payload = {
       commandType: 'command',
       parameter: 'default',
@@ -204,7 +204,7 @@ export class Fan {
     await this.pushTVChanges(payload);
   }
 
-  async pushFanSpeedUpChanges() {
+  async pushFanSpeedUpChanges(): Promise<void> {
     const payload = {
       commandType: 'command',
       parameter: 'default',
@@ -213,7 +213,7 @@ export class Fan {
     await this.pushTVChanges(payload);
   }
 
-  async pushFanSpeedDownChanges() {
+  async pushFanSpeedDownChanges(): Promise<void> {
     const payload = {
       commandType: 'command',
       parameter: 'default',
@@ -222,7 +222,7 @@ export class Fan {
     await this.pushTVChanges(payload);
   }
 
-  async pushFanSwingChanges() {
+  async pushFanSwingChanges(): Promise<void> {
     const payload = {
       commandType: 'command',
       parameter: 'default',
@@ -231,7 +231,7 @@ export class Fan {
     await this.pushTVChanges(payload);
   }
 
-  public async pushTVChanges(payload: payload) {
+  async pushTVChanges(payload: payload): Promise<void> {
     try {
       this.infoLog(
         `Fan: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -257,7 +257,7 @@ export class Fan {
     }
   }
 
-  private statusCode(push: AxiosResponse<{ statusCode: number }>) {
+  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void> {
     switch (push.data.statusCode) {
       case 151:
         this.errorLog(`Fan: ${this.accessory.displayName} Command not supported by this device type.`);
@@ -288,14 +288,14 @@ export class Fan {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.Active, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.RotationSpeed, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.SwingMode, e);
+  async apiError(e: any): Promise<void> {
+    this.fanService.updateCharacteristic(this.platform.Characteristic.Active, e);
+    this.fanService.updateCharacteristic(this.platform.Characteristic.RotationSpeed, e);
+    this.fanService.updateCharacteristic(this.platform.Characteristic.SwingMode, e);
     //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
-  config(device: irdevice & irDevicesConfig) {
+  async config(device: irdevice & irDevicesConfig): Promise<void> {
     let config = {};
     if (device.irfan) {
       config = device.irfan;
@@ -308,7 +308,7 @@ export class Fan {
     }
   }
 
-  logs(device: irdevice & irDevicesConfig) {
+  async logs(device: irdevice & irDevicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode';
       this.debugLog(`Fan: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
@@ -327,25 +327,25 @@ export class Fan {
   /**
    * Logging for Device
    */
-  infoLog(...log: any[]) {
+  infoLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.info(String(...log));
     }
   }
 
-  warnLog(...log: any[]) {
+  warnLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.warn(String(...log));
     }
   }
 
-  errorLog(...log: any[]) {
+  errorLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.error(String(...log));
     }
   }
 
-  debugLog(...log: any[]) {
+  debugLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging === 'debug') {
         this.platform.log.info('[DEBUG]', String(...log));

package/src/irdevice/light.ts

@@ -10,7 +10,7 @@ import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
  */
 export class Light {
   // Services
-  service!: Service;
+  lightBulbService!: Service;
 
   // Characteristic Values
   On!: CharacteristicValue;
@@ -38,7 +38,7 @@ export class Light {
 
     // get the Television service if it exists, otherwise create a new Television service
     // you can create multiple services for each accessory
-    (this.service = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
+    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
     `${accessory.displayName} Light Bulb`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
@@ -47,10 +47,10 @@ export class Light {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    this.lightBulbService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 
     // handle on / off events using the On characteristic
-    this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+    this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
 
     // handle Brightness events using the Brightness characteristic
     /* this.service
@@ -68,21 +68,21 @@ export class Light {
       });*/
   }
 
-  private OnSet(value: CharacteristicValue) {
+  async OnSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`Light: ${this.accessory.displayName} On: ${value}`);
     this.On = value;
     if (this.On) {
-      this.pushLightOnChanges();
+      await this.pushLightOnChanges();
     } else {
-      this.pushLightOffChanges();
+      await this.pushLightOffChanges();
     }
   }
 
-  private updateHomeKitCharacteristics() {
+  async updateHomeKitCharacteristics(): Promise<void> {
     if (this.On === undefined) {
       this.debugLog(`Light: ${this.accessory.displayName} On: ${this.On}`);
     } else {
-      this.service?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+      this.lightBulbService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.debugLog(`Light: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
   }
@@ -97,7 +97,7 @@ export class Light {
    * Light:        "command"       "channelAdd"      "default"	        =        next channel
    * Light:        "command"       "channelSub"      "default"	        =        previous channel
    */
-  async pushLightOnChanges() {
+  async pushLightOnChanges(): Promise<void> {
     if (this.On) {
       const payload = {
         commandType: 'command',
@@ -108,7 +108,7 @@ export class Light {
     }
   }
 
-  async pushLightOffChanges() {
+  async pushLightOffChanges(): Promise<void> {
     if (!this.On) {
       const payload = {
         commandType: 'command',
@@ -119,7 +119,7 @@ export class Light {
     }
   }
 
-  async pushLightBrightnessUpChanges() {
+  async pushLightBrightnessUpChanges(): Promise<void> {
     const payload = {
       commandType: 'command',
       parameter: 'default',
@@ -128,7 +128,7 @@ export class Light {
     await this.pushChanges(payload);
   }
 
-  async pushLightBrightnessDownChanges() {
+  async pushLightBrightnessDownChanges(): Promise<void> {
     const payload = {
       commandType: 'command',
       parameter: 'default',
@@ -137,7 +137,7 @@ export class Light {
     await this.pushChanges(payload);
   }
 
-  public async pushChanges(payload: payload) {
+  async pushChanges(payload: payload): Promise<void> {
     try {
       this.infoLog(
         `Light: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -165,7 +165,7 @@ export class Light {
     }
   }
 
-  private statusCode(push: AxiosResponse<{ statusCode: number }>) {
+  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void>{
     switch (push.data.statusCode) {
       case 151:
         this.errorLog(`Light: ${this.accessory.displayName} Command not supported by this device type.`);
@@ -196,12 +196,12 @@ export class Light {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.On, e);
+  async apiError(e: any): Promise<void> {
+    this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, e);
     //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
-  config(device: irdevice & irDevicesConfig) {
+  async config(device: irdevice & irDevicesConfig): Promise<void> {
     let config = {};
     if (device.irlight) {
       config = device.irlight;
@@ -214,7 +214,7 @@ export class Light {
     }
   }
 
-  logs(device: irdevice & irDevicesConfig) {
+  async logs(device: irdevice & irDevicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode';
       this.debugLog(`Light: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
@@ -233,25 +233,25 @@ export class Light {
   /**
    * Logging for Device
    */
-  infoLog(...log: any[]) {
+  infoLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.info(String(...log));
     }
   }
 
-  warnLog(...log: any[]) {
+  warnLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.warn(String(...log));
     }
   }
 
-  errorLog(...log: any[]) {
+  errorLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.error(String(...log));
     }
   }
 
-  debugLog(...log: any[]) {
+  debugLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging === 'debug') {
         this.platform.log.info('[DEBUG]', String(...log));