@switchbot/homebridge-switchbot 0.2.0-alpha.2 → 1.0.1-beta.2

package/src/devices/plugs.ts

@@ -1,8 +1,8 @@
-import { Service, PlatformAccessory, CharacteristicValue, MacAddress } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
 import { interval, Subject } from 'rxjs';
 import { debounceTime, skipWhile, tap } from 'rxjs/operators';
-import { DeviceURL, device, devicesConfig } from '../settings';
+import { DeviceURL, device, devicesConfig, switchbot, deviceStatusResponse } from '../settings';
 
 export class Plug {
   // Services
@@ -12,26 +12,15 @@ export class Plug {
   On!: CharacteristicValue;
   OutletInUse!: CharacteristicValue;
 
-  // Others
-  deviceStatus!: any;
-  switchbot!: {
-    discover: (
-      arg0:
-        {
-          duration: any;
-          model: string;
-          quick: boolean;
-          id: MacAddress;
-        }
-    ) => Promise<any>;
-    wait: (
-      arg0: number
-    ) => any;
-  };
+  // OpenAPI Others
+  deviceStatus!: deviceStatusResponse;
+
+  // BLE Others
+  switchbot!: switchbot;
 
   // Updates
   plugUpdateInProgress!: boolean;
-  doPlugUpdate;
+  doPlugUpdate!: Subject<void>;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevices/airconditioners.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,31 +9,37 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class AirConditioner {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   Active!: CharacteristicValue;
+  ARActive!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
-  CurrentHeaterCoolerState!: CharacteristicValue;
-  CurrentTemperature!: CharacteristicValue;
   CurrentARTemp!: CharacteristicValue;
   CurrentARMode!: CharacteristicValue;
+  LastTemperature!: CharacteristicValue;
   CurrentARFanSpeed!: CharacteristicValue;
-  ARActive!: CharacteristicValue;
-  LastTemperature!: number;
-  CurrentMode!: number;
-  CurrentFanSpeed!: number;
+  CurrentTemperature!: CharacteristicValue;
+  CurrentHeaterCoolerState!: CharacteristicValue;
+
+  // Others
   Busy: any;
   Timeout: any = null;
+  CurrentMode!: number;
+  ValidValues: number[];
+  CurrentFanSpeed!: number;
   static MODE_AUTO: number;
   static MODE_COOL: number;
   static MODE_HEAT: number;
-  ValidValues: number[];
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
+    this.CurrentTemperature = 24;
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -66,7 +72,8 @@ export class AirConditioner {
         minStep: 0.01,
       })
       .onGet((value: CharacteristicValue) => {
-        return this.CurrentTemperatureGet(Number(value));
+        this.platform.device(`onGet: ${this.CurrentTemperature}`);
+        return this.CurrentTemperatureGet(value);
       });
 
     if (device.irair?.hide_automode) {
@@ -158,15 +165,17 @@ export class AirConditioner {
 
   private CurrentTemperatureGet(value: CharacteristicValue) {
     this.platform.debug('Trigger Get CurrentTemperture');
-
-    if (Number.isNaN(this.CurrentTemperature)) {
-      this.CurrentTemperature = 24;
+    if (this.CurrentTemperature) {
+      this.CurrentTemperature;
+      this.service
+        .getCharacteristic(this.platform.Characteristic.CurrentTemperature).updateValue(this.CurrentTemperature);
     } else {
+      this.CurrentTemperature = 24;
       this.service
-        .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
-        .updateValue(Number(this.CurrentTemperature) || 24);
+        .getCharacteristic(this.platform.Characteristic.CurrentTemperature).updateValue(this.CurrentTemperature);
     }
-    return (this.CurrentTemperature === Number(value));
+
+    return (this.CurrentTemperature = value);
   }
 
   private TargetHeaterCoolerStateSet(value: CharacteristicValue) {
@@ -196,18 +205,32 @@ export class AirConditioner {
     } else {
       this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.INACTIVE;
     }
+    this.platform.device(`CurrentHeaterCoolerStateGet: ${this.CurrentHeaterCoolerState}`);
     return this.CurrentHeaterCoolerState;
   }
 
   private HeatingThresholdTemperatureGet() {
-    this.CurrentTemperature = this.CurrentTemperature || 24;
+    if (this.CurrentTemperature) {
+      this.CurrentTemperature;
+    } else {
+      this.CurrentTemperature = 24;
+    }
+    this.platform.device(`HeatingThresholdTemperatureGet: ${this.CurrentTemperature}`);
     return this.CurrentTemperature;
   }
 
   private HeatingThresholdTemperatureSet(value: CharacteristicValue) {
+    this.platform.device(`Before HeatingThresholdTemperatureSet CurrentTemperature: ${this.CurrentTemperature},`
+      + ` HeatingThresholdTemperatureSet LastTemperature: ${this.LastTemperature}`);
     this.pushAirConditionerStatusChanges();
-    this.LastTemperature = Number(this.CurrentTemperature);
-    this.CurrentTemperature = Number(value);
+    this.LastTemperature = this.CurrentTemperature;
+    if (this.CurrentTemperature) {
+      this.CurrentTemperature = value;
+    } else {
+      this.CurrentTemperature = 24;
+    }
+    this.platform.device(`After HeatingThresholdTemperatureSet CurrentTemperature: ${this.CurrentTemperature},`
+      + ` HeatingThresholdTemperatureSet LastTemperature: ${this.LastTemperature}`);
   }
 
   /**
@@ -313,7 +336,7 @@ export class AirConditioner {
     }
   }
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/airpurifiers.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,29 +9,33 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class AirPurifier {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   Active!: CharacteristicValue;
-  RotationSpeed!: CharacteristicValue;
-  CurrentAirPurifierState!: CharacteristicValue;
-  CurrentTemperature!: CharacteristicValue;
+  APActive!: CharacteristicValue;
   CurrentAPTemp!: CharacteristicValue;
   CurrentAPMode!: CharacteristicValue;
+  RotationSpeed!: CharacteristicValue;
   CurrentAPFanSpeed!: CharacteristicValue;
-  APActive!: CharacteristicValue;
-  LastTemperature!: number;
-  CurrentMode!: number;
-  CurrentFanSpeed!: number;
+  CurrentTemperature!: CharacteristicValue;
+  CurrentAirPurifierState!: CharacteristicValue;
+
+  // Others
   Busy: any;
   Timeout: any = null;
-  static PURIFYING_AIR: number;
   static IDLE: number;
+  CurrentMode!: number;
   static INACTIVE: number;
+  LastTemperature!: number;
+  CurrentFanSpeed!: number;
+  static PURIFYING_AIR: number;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -206,7 +210,7 @@ export class AirPurifier {
     }
   }
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/cameras.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,14 +9,16 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class Camera {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   On!: CharacteristicValue;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -108,7 +110,7 @@ export class Camera {
     }
   }
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/fans.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { DeviceURL, irdevice, deviceStatusResponse, devicesConfig } from '../settings';
+import { DeviceURL, irdevice, deviceStatusResponse, irDevicesConfig } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,22 +9,28 @@ import { DeviceURL, irdevice, deviceStatusResponse, devicesConfig } from '../set
  * Each accessory may expose multiple services of different service types.
  */
 export class Fan {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   Active!: CharacteristicValue;
   ActiveIdentifier!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
   SwingMode!: CharacteristicValue;
   RotationDirection!: CharacteristicValue;
+
+  // Others
   deviceStatus!: deviceStatusResponse;
-  minStep: number | undefined;
-  minValue: number | undefined;
-  maxValue: number | undefined;
+
+  // Config
+  minStep?: number;
+  minValue?: number;
+  maxValue?: number;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -50,19 +56,19 @@ export class Fan {
     // handle on / off events using the Active characteristic
     this.service.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
 
-    if (device.fan?.rotation_speed) {
-      if (device.fan?.set_minStep) {
-        this.minStep = device.fan?.set_minStep;
+    if (device.irfan?.rotation_speed) {
+      if (device.irfan?.set_minStep) {
+        this.minStep = device.irfan?.set_minStep;
       } else {
         this.minStep = 1;
       }
-      if (device.fan?.set_min) {
-        this.minValue = device.fan?.set_min;
+      if (device.irfan?.set_min) {
+        this.minValue = device.irfan?.set_min;
       } else {
         this.minValue = 1;
       }
-      if (device.fan?.set_max) {
-        this.maxValue = device.fan?.set_max;
+      if (device.irfan?.set_max) {
+        this.maxValue = device.irfan?.set_max;
       } else {
         this.maxValue = 100;
       }
@@ -77,7 +83,7 @@ export class Fan {
         .onSet(this.RotationSpeedSet.bind(this));
     } else if (
       this.service.testCharacteristic(this.platform.Characteristic.RotationSpeed) &&
-      !device.fan?.swing_mode) {
+      !device.irfan?.swing_mode) {
       const characteristic = this.service.getCharacteristic(this.platform.Characteristic.RotationSpeed);
       this.service.removeCharacteristic(characteristic);
       this.platform.log.warn('Rotation Speed Characteristic was removed.');
@@ -87,10 +93,10 @@ export class Fan {
       );
     }
 
-    if (device.fan?.swing_mode) {
+    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.fan?.swing_mode) {
+    } 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.platform.log.warn('Swing Mode Characteristic was removed.');
@@ -226,7 +232,7 @@ export class Fan {
     }
   }
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/lights.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,14 +9,16 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class Light {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   On!: CharacteristicValue;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -143,7 +145,7 @@ export class Light {
   }
 
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/others.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,14 +9,16 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class Others {
+  // Services
   private service?: Service;
 
+  // Characteristic Values
   Active!: CharacteristicValue;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -129,7 +131,7 @@ export class Others {
     }
   }
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/tvs.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { DeviceURL, irdevice, deviceStatusResponse, devicesConfig } from '../settings';
+import { DeviceURL, irdevice, deviceStatusResponse, irDevicesConfig } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,17 +9,21 @@ import { DeviceURL, irdevice, deviceStatusResponse, devicesConfig } from '../set
  * Each accessory may expose multiple services of different service types.
  */
 export class TV {
+  // Services
   service!: Service;
   speakerService: Service;
 
+  // Characteristic Values
   Active!: CharacteristicValue;
   ActiveIdentifier!: CharacteristicValue;
+
+  // Others
   deviceStatus!: deviceStatusResponse;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -191,10 +195,12 @@ export class TV {
 
   private ActiveSet(value: CharacteristicValue) {
     this.platform.debug(`${this.accessory.displayName} Set Active: ${value}`);
-    if (value === this.platform.Characteristic.Active.INACTIVE) {
-      this.pushTvOffChanges();
-    } else {
-      this.pushTvOnChanges();
+    if (!this.device.irtv?.disable_power) {
+      if (value === this.platform.Characteristic.Active.INACTIVE) {
+        this.pushTvOffChanges();
+      } else {
+        this.pushTvOnChanges();
+      }
     }
     this.ActiveIdentifier = value;
     if (this.ActiveIdentifier !== undefined) {
@@ -337,7 +343,7 @@ export class TV {
   }
 
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/vacuumcleaners.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,14 +9,16 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class VacuumCleaner {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   On!: CharacteristicValue;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -109,7 +111,7 @@ export class VacuumCleaner {
   }
 
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');

package/src/irdevices/waterheaters.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { devicesConfig, DeviceURL, irdevice } from '../settings';
+import { irDevicesConfig, DeviceURL, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -9,14 +9,16 @@ import { devicesConfig, DeviceURL, irdevice } from '../settings';
  * Each accessory may expose multiple services of different service types.
  */
 export class WaterHeater {
+  // Services
   service!: Service;
 
+  // Characteristic Values
   Active!: CharacteristicValue;
 
   constructor(
     private readonly platform: SwitchBotPlatform,
     private accessory: PlatformAccessory,
-    public device: irdevice & devicesConfig,
+    public device: irdevice & irDevicesConfig,
   ) {
     // set accessory information
     accessory
@@ -126,7 +128,7 @@ export class WaterHeater {
   }
 
 
-  private statusCode(push: AxiosResponse<any>) {
+  private statusCode(push: AxiosResponse<{ statusCode: number;}>) {
     switch (push.data.statusCode) {
       case 151:
         this.platform.log.error('Command not supported by this device type.');