@switchbot/homebridge-switchbot 2.8.0 → 2.8.1-beta.1

package/src/device/robotvacuumcleaner.ts

@@ -6,31 +6,29 @@ import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, deviceStatus, ad, serviceData, switchbot, Devices } from '../settings';
+import { device, devicesConfig, deviceStatus, ad, serviceData, Devices } from '../settings';
 
 export class RobotVacuumCleaner {
   // Services
+  batteryService: Service;
   robotVacuumCleanerService: Service;
-  batteryService?: Service;
 
   // Characteristic Values
   On!: CharacteristicValue;
   Brightness!: CharacteristicValue;
-  BatteryLevel?: CharacteristicValue;
-  StatusLowBattery?: CharacteristicValue;
+  BatteryLevel!: CharacteristicValue;
+  StatusLowBattery!: CharacteristicValue;
 
-  // OpenAPI Others
-  Version: deviceStatus['version'];
-  Battery: deviceStatus['battery'];
-  power: deviceStatus['power'];
-  deviceStatus!: any; //deviceStatusResponse;
+  // OpenAPI Status
+  OpenAPI_On: deviceStatus['power'];
+  OpenAPI_BatteryLevel: deviceStatus['battery'];
+  OpenAPI_FirmwareRevision: deviceStatus['version'];
+
+  // BLE Status
+  BLE_On: serviceData['state'];
 
   // BLE Others
-  connected?: boolean;
-  switchbot!: switchbot;
-  address!: ad['address'];
-  serviceData!: serviceData;
-  state: serviceData['state'];
+  BLE_IsConnected?: boolean;
 
   // Config
   scanDuration!: number;
@@ -111,18 +109,12 @@ export class RobotVacuumCleaner {
       .onSet(this.BrightnessSet.bind(this));
 
     // Battery Service
-    if (!this.batteryService) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Battery Service`);
-      (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || this.accessory.addService(this.platform.Service.Battery)),
-      `${accessory.displayName} Battery`;
-
-      this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
-      if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-        this.batteryService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
-      }
-      this.batteryService.setCharacteristic(this.platform.Characteristic.ChargingState, this.platform.Characteristic.ChargingState.NOT_CHARGEABLE);
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
+    `${accessory.displayName} Battery`;
+
+    this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
+    if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.batteryService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
     }
 
     // Update Homekit
@@ -184,7 +176,7 @@ export class RobotVacuumCleaner {
   async BLEparseStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
     // State
-    switch (this.state) {
+    switch (this.BLE_On) {
       case 'on':
         this.On = true;
         break;
@@ -196,7 +188,7 @@ export class RobotVacuumCleaner {
 
   async openAPIparseStatus() {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
-    switch (this.power) {
+    switch (this.OpenAPI_On) {
       case 'on':
         this.On = true;
         break;
@@ -206,7 +198,7 @@ export class RobotVacuumCleaner {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
 
     // Battery
-    this.BatteryLevel = Number(this.Battery);
+    this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
     if (this.BatteryLevel < 15) {
       this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
@@ -253,14 +245,12 @@ export class RobotVacuumCleaner {
         })
         .then(async () => {
           // Set an event hander
-          switchbot.onadvertisement = async (ad: any) => {
-            this.address = ad.address;
+          switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-              ` BLE Address Found: ${this.address}`,
+              ` BLE Address Found: ${ad.address}`,
             );
-            this.serviceData = ad.serviceData;
-            this.state = ad.serviceData.state;
+            this.BLE_On = ad.serviceData.state;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
@@ -268,13 +258,13 @@ export class RobotVacuumCleaner {
               `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
             );
 
-            if (this.serviceData) {
-              this.connected = true;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+            if (ad.serviceData) {
+              this.BLE_IsConnected = true;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
               await this.stopScanning(switchbot);
             } else {
-              this.connected = false;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              this.BLE_IsConnected = false;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
             }
           };
           // Wait
@@ -308,9 +298,9 @@ export class RobotVacuumCleaner {
       this.statusCode(statusCode);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(deviceStatus)}`);
-      this.power = deviceStatus.body.power;
-      this.Battery = deviceStatus.body.battery;
-      this.Version = deviceStatus.body.version;
+      this.OpenAPI_On = deviceStatus.body.power;
+      this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
+      this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
       this.openAPIparseStatus();
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
@@ -568,11 +558,21 @@ export class RobotVacuumCleaner {
       this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
     }
+    // FirmwareRevision
+    if (this.OpenAPI_FirmwareRevision === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} FirmwareRevision: ${this.OpenAPI_FirmwareRevision}`);
+    } else {
+      this.accessory.context.OpenAPI_FirmwareRevision = this.OpenAPI_FirmwareRevision;
+      this.accessory.getService(this.platform.Service.AccessoryInformation)!
+        .updateCharacteristic(this.platform.Characteristic.FirmwareRevision, this.OpenAPI_FirmwareRevision);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        + `updateCharacteristic CurrentTemperature: ${this.OpenAPI_FirmwareRevision}`);
+    }
   }
 
   async stopScanning(switchbot: any) {
     await switchbot.stopScan();
-    if (this.connected) {
+    if (this.BLE_IsConnected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();
     } else {

package/src/irdevice/airconditioner.ts

@@ -16,10 +16,10 @@ export class AirConditioner {
   Active!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
   CurrentTemperature!: CharacteristicValue;
+  ThresholdTemperature!: CharacteristicValue;
   CurrentRelativeHumidity?: CharacteristicValue;
   TargetHeaterCoolerState!: CharacteristicValue;
   CurrentHeaterCoolerState!: CharacteristicValue;
-  ThresholdTemperature!: CharacteristicValue;
 
   // Others
   state!: string;
@@ -33,12 +33,12 @@ export class AirConditioner {
   static MODE_HEAT: number;
 
   // Config
-  disablePushOn?: boolean;
-  disablePushOff?: boolean;
-  disablePushDetail?: boolean;
   deviceLogging!: string;
   hide_automode?: boolean;
+  disablePushOn?: boolean;
+  disablePushOff?: boolean;
   meter?: PlatformAccessory;
+  disablePushDetail?: boolean;
 
   private readonly valid12 = [1, 2];
   private readonly valid012 = [0, 1, 2];

package/src/irdevice/camera.ts

@@ -16,9 +16,9 @@ export class Camera {
   On!: CharacteristicValue;
 
   // Config
+  deviceLogging!: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
-  deviceLogging!: string;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevice/fan.ts

@@ -14,21 +14,18 @@ export class Fan {
 
   // Characteristic Values
   Active!: CharacteristicValue;
-  ActiveIdentifier!: CharacteristicValue;
-  RotationSpeed!: CharacteristicValue;
   SwingMode!: CharacteristicValue;
+  RotationSpeed!: CharacteristicValue;
+  ActiveIdentifier!: CharacteristicValue;
   RotationDirection!: CharacteristicValue;
 
-  // Others
-  deviceStatus!: any;
-
   // Config
   minStep?: number;
   minValue?: number;
   maxValue?: number;
+  deviceLogging!: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
-  deviceLogging!: string;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevice/light.ts

@@ -16,9 +16,9 @@ export class Light {
   On!: CharacteristicValue;
 
   // Config
+  deviceLogging!: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
-  deviceLogging!: string;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevice/other.ts

@@ -16,10 +16,10 @@ export class Others {
   Active!: CharacteristicValue;
 
   // Config
-  disablePushOn?: boolean;
-  disablePushOff?: boolean;
   deviceLogging!: string;
+  disablePushOn?: boolean;
   otherDeviceType?: string;
+  disablePushOff?: boolean;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevice/tv.ts

@@ -17,14 +17,11 @@ export class TV {
   Active!: CharacteristicValue;
   ActiveIdentifier!: CharacteristicValue;
 
-  // Others
-  deviceStatus!: any;
-
   // Config
+  deviceLogging!: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
   disablePushDetail?: boolean;
-  deviceLogging!: string;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevice/vacuumcleaner.ts

@@ -16,9 +16,9 @@ export class VacuumCleaner {
   On!: CharacteristicValue;
 
   // Config
+  deviceLogging!: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
-  deviceLogging!: string;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/irdevice/waterheater.ts

@@ -16,9 +16,9 @@ export class WaterHeater {
   Active!: CharacteristicValue;
 
   // Config
+  deviceLogging!: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
-  deviceLogging!: string;
 
   constructor(
     private readonly platform: SwitchBotPlatform,

package/src/settings.ts

@@ -312,6 +312,10 @@ export type serviceData = {
   mode?: boolean;
   //Bot/ColorBulb State
   state?: string | boolean;
+  //Lock door open
+  door_open?: string;
+  //Lock Status
+  status?: string;
   //ColorBulb Power
   power?: boolean;
   //ColorBulb R
@@ -342,7 +346,7 @@ export type serviceData = {
   //Contact ((lightLevel == 0) ? 'dark' : 'bright')
   //Curtain (light sensor level (1-10))
   //Light Level
-  lightLevel?: number | string;
+  lightLevel?: number | string | boolean;
   //Contact DoorState
   doorState?: number | string;
   //Is Curtain Calibrated