@switchbot/homebridge-switchbot 2.2.0-beta.1 → 2.2.0-beta.3

package/src/irdevice/airconditioner.ts

@@ -48,7 +48,7 @@ export class AirConditioner {
     // default placeholders
     this.logs({ device });
     this.config({ device });
-    this.context({ device });
+    this.context();
     this.allowPushOnChanges({ device });
     this.allowPushOffChanges({ device });
 
@@ -202,7 +202,7 @@ export class AirConditioner {
   }
 
   async pushAirConditionerDetailsChanges(): Promise<void> {
-    this.CurrentTemperatureUndefined();
+    await this.context();
     if (this.CurrentMode === undefined) {
       this.CurrentMode = 1;
     }
@@ -224,7 +224,7 @@ export class AirConditioner {
     const parameter = `${this.CurrentTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`;
 
     if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
-      this.CurrentTemperatureUndefined();
+      await this.context();
       if (this.CurrentTemperature < this.accessory.context.CurrentTemperature) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
       } else if (this.CurrentTemperature > this.accessory.context.CurrentTemperature) {
@@ -282,11 +282,11 @@ export class AirConditioner {
         req.write(body);
         req.end();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
-        this.accessory.context.CurrentTemperature = this.CurrentTemperature;
+        //this.accessory.context.CurrentTemperature = this.CurrentTemperature;
         this.HeatingThresholdTemperature = this.CurrentTemperature;
         this.CoolingThresholdTemperature = this.CurrentTemperature;
-        this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
-        this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
+        //this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
+        //this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.apiError({ e });
@@ -332,7 +332,6 @@ export class AirConditioner {
       this.CurrentFanSpeed = Number(value) + 1;
     }
     this.RotationSpeed = this.CurrentFanSpeed;
-    this.accessory.context.RotationSpeed = this.RotationSpeed;
     this.pushAirConditionerStatusChanges();
   }
 
@@ -354,7 +353,6 @@ export class AirConditioner {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   async TargetHeaterCoolerStateGet(): Promise<CharacteristicValue> {
@@ -407,7 +405,6 @@ export class AirConditioner {
         );
       }
     }
-    this.accessory.context.TargetHeaterCoolerState = this.TargetHeaterCoolerState;
     this.pushAirConditionerStatusChanges();
   }
 
@@ -434,7 +431,7 @@ export class AirConditioner {
 
   async CurrentHeaterCoolerStateGet(): Promise<CharacteristicValue> {
     if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
-      this.CurrentTemperatureUndefined();
+      await this.context();
       if (this.CurrentTemperature < this.accessory.context.CurrentTemperature) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName}`
@@ -454,7 +451,7 @@ export class AirConditioner {
   }
 
   async HeatingThresholdTemperatureGet(): Promise<CharacteristicValue> {
-    this.CurrentTemperatureUndefined;
+    await this.context();
     this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     this.HeatingThresholdTemperature = this.accessory.context.CurrentTemperature;
     this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
@@ -463,18 +460,14 @@ export class AirConditioner {
   }
 
   async HeatingThresholdTemperatureSet(value: CharacteristicValue): Promise<void> {
-    this.accessory.context.CurrentTemperature = this.CurrentTemperature;
     this.CurrentTemperature = value;
-    this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
-    this.debugLog(
-      `${this.device.remoteType}: ${this.accessory.displayName} Set HeatingThresholdTemperature: ${this.HeatingThresholdTemperature},` +
-        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`,
-    );
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Set HeatingThresholdTemperature: ${this.HeatingThresholdTemperature},` +
+        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`);
     this.pushAirConditionerStatusChanges();
   }
 
   async CoolingThresholdTemperatureGet(): Promise<CharacteristicValue> {
-    this.CurrentTemperatureUndefined;
+    await this.context();
     this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     this.CoolingThresholdTemperature = this.accessory.context.CurrentTemperature;
     this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
@@ -483,25 +476,12 @@ export class AirConditioner {
   }
 
   async CoolingThresholdTemperatureSet(value: CharacteristicValue): Promise<void> {
-    this.accessory.context.CurrentTemperature = this.CurrentTemperature;
     this.CurrentTemperature = value;
-    this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
-    this.debugLog(
-      `${this.device.remoteType}: ${this.accessory.displayName} Set CoolingThresholdTemperature: ${this.CoolingThresholdTemperature},` +
-        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`,
-    );
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Set CoolingThresholdTemperature: ${this.CoolingThresholdTemperature},` +
+        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`);
     this.pushAirConditionerStatusChanges();
   }
 
-  async CurrentTemperatureUndefined(): Promise<void> {
-    if (this.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 24;
-    }
-    if (this.accessory.context.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 30;
-    }
-  }
-
   async updateHomeKitCharacteristics(): Promise<void> {
     if (this.Active === undefined) {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Active}`);
@@ -668,7 +648,7 @@ export class AirConditioner {
     return FirmwareRevision;
   }
 
-  async context({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+  async context(): Promise<void> {
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -679,11 +659,14 @@ export class AirConditioner {
     } else {
       this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     }
-    if (device.irair?.hide_automode) {
-      this.hide_automode = device.irair?.hide_automode;
+    if (this.accessory.context.CurrentTemperature === undefined) {
+      this.CurrentTemperature = 30;
+    }
+    if (this.device.irair?.hide_automode) {
+      this.hide_automode = this.device.irair?.hide_automode;
       this.accessory.context.hide_automode = this.hide_automode;
     } else {
-      this.hide_automode = device.irair?.hide_automode;
+      this.hide_automode = this.device.irair?.hide_automode;
       this.accessory.context.hide_automode = this.hide_automode;
     }
   }

package/src/irdevice/airpurifier.ts

@@ -94,7 +94,6 @@ export class AirPurifier {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   async TargetAirPurifierStateSet(value: CharacteristicValue): Promise<void> {
@@ -134,7 +133,7 @@ export class AirPurifier {
    * AirPurifier:        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushAirPurifierOnChanges(): Promise<void> {
-    if (this.Active !== 1) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -147,9 +146,9 @@ export class AirPurifier {
   }
 
   async pushAirPurifierOffChanges(): Promise<void> {
-    const commandType: string = await this.commandType();
-    const command: string = await this.commandOff();
-    if (this.Active !== 0) {
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOn) {
+      const commandType: string = await this.commandType();
+      const command: string = await this.commandOff();
       const body = superStringify({
         'command': command,
         'parameter': 'default',

package/src/irdevice/camera.ts

@@ -70,7 +70,6 @@ export class Camera {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.On = value;
-    this.accessory.context.On = this.On;
   }
 
   /**
@@ -84,7 +83,7 @@ export class Camera {
    * Camera -        "command"       "channelSub"      "default"	        =        previous channel
    */
   async pushOnChanges(): Promise<void> {
-    if (this.On) {
+    if (this.On || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -99,7 +98,7 @@ export class Camera {
   async pushOffChanges(): Promise<void> {
     const commandType: string = await this.commandType();
     const command: string = await this.commandOff();
-    if (!this.On) {
+    if (!this.On || this.allowPushOff) {
       const body = superStringify({
         'command': command,
         'parameter': 'default',
@@ -109,7 +108,7 @@ export class Camera {
     }
   }
 
-  async pushChanges(body): Promise<void> {
+  async pushChanges(body: any): Promise<void> {
     if (this.device.connectionType === 'OpenAPI') {
       try {
       // Make Push On request to the API

package/src/irdevice/fan.ts

@@ -161,7 +161,6 @@ export class Fan {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   /**
@@ -174,7 +173,7 @@ export class Fan {
    * Fan -        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushFanOnChanges(): Promise<void> {
-    if (this.Active !== 1) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -187,14 +186,16 @@ export class Fan {
   }
 
   async pushFanOffChanges(): Promise<void> {
-    const commandType: string = await this.commandType();
-    const command: string = await this.commandOff();
-    const body = superStringify({
-      'command': command,
-      'parameter': 'default',
-      'commandType': commandType,
-    });
-    await this.pushTVChanges(body);
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOff) {
+      const commandType: string = await this.commandType();
+      const command: string = await this.commandOff();
+      const body = superStringify({
+        'command': command,
+        'parameter': 'default',
+        'commandType': commandType,
+      });
+      await this.pushTVChanges(body);
+    }
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {

package/src/irdevice/light.ts

@@ -70,7 +70,6 @@ export class Light {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.On = value;
-    this.accessory.context.On = this.On;
   }
 
   /**
@@ -84,7 +83,7 @@ export class Light {
    * Light -       "command"       "channelSub"      "default"	        =        previous channel
    */
   async pushLightOnChanges(): Promise<void> {
-    if (this.On) {
+    if (this.On || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -97,7 +96,7 @@ export class Light {
   }
 
   async pushLightOffChanges(): Promise<void> {
-    if (!this.On) {
+    if (!this.On || this.allowPushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const body = superStringify({

package/src/irdevice/other.ts

@@ -78,7 +78,6 @@ export class Others {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   /**
@@ -182,6 +181,7 @@ export class Others {
     if (this.Active === undefined) {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Active}`);
     } else {
+      this.accessory.context.Active = this.Active;
       this.fanService?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
     }

package/src/irdevice/tv.ts

@@ -202,8 +202,6 @@ export class TV {
 
   async ActiveSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${value}`);
-    this.Active = value;
-    this.accessory.context.Active = this.Active;
     if (!this.device.irtv?.disable_power) {
       if (value === this.platform.Characteristic.Active.INACTIVE) {
         await this.pushTvOffChanges();
@@ -215,7 +213,6 @@ export class TV {
        * they are updated, so we are only updating the accessory state after calling the above.
        */
       this.Active = value;
-      this.accessory.context.Active = this.Active;
     }
   }
 
@@ -230,7 +227,7 @@ export class TV {
    * TV           "command"       "channelSub"      "default"	        previous channel
    */
   async pushTvOnChanges(): Promise<void> {
-    if (this.Active !== 1) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -243,14 +240,16 @@ export class TV {
   }
 
   async pushTvOffChanges(): Promise<void> {
-    const commandType: string = await this.commandType();
-    const command: string = await this.commandOff();
-    const body = superStringify({
-      'command': command,
-      'parameter': 'default',
-      'commandType': commandType,
-    });
-    await this.pushTVChanges(body);
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOn) {
+      const commandType: string = await this.commandType();
+      const command: string = await this.commandOff();
+      const body = superStringify({
+        'command': command,
+        'parameter': 'default',
+        'commandType': commandType,
+      });
+      await this.pushTVChanges(body);
+    }
   }
 
   async pushOkChanges(): Promise<void> {

package/src/irdevice/vacuumcleaner.ts

@@ -70,7 +70,6 @@ export class VacuumCleaner {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.On = value;
-    this.accessory.context.On = this.On;
   }
 
   /**
@@ -80,7 +79,7 @@ export class VacuumCleaner {
    * Vacuum Cleaner    "command"       "turnOn"       "default"	      set to ON state
    */
   async pushOnChanges(): Promise<void> {
-    if (this.On) {
+    if (this.On || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -93,7 +92,7 @@ export class VacuumCleaner {
   }
 
   async pushOffChanges(): Promise<void> {
-    if (!this.On) {
+    if (!this.On || this.allowPushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const body = superStringify({

package/src/irdevice/waterheater.ts

@@ -76,7 +76,6 @@ export class WaterHeater {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   /**
@@ -86,7 +85,7 @@ export class WaterHeater {
    * WaterHeater     "command"       "turnOn"          "default"	       set to ON state
    */
   async pushWaterHeaterOnChanges(): Promise<void> {
-    if (this.Active !== 1) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -99,7 +98,7 @@ export class WaterHeater {
   }
 
   async pushWaterHeaterOffChanges(): Promise<void> {
-    if (this.Active !== 0) {
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const body = superStringify({

package/src/settings.ts

@@ -314,8 +314,18 @@ export type serviceData = {
   modelName: string;
   //Mode for Bot either Press or Switch
   mode?: boolean;
-  //Bot State
-  state?: string;
+  //Bot/ColorBulb State
+  state?: string | boolean;
+  //ColorBulb Power
+  power?: boolean;
+  //ColorBulb R
+  red?: number;
+  //ColorBulb G
+  green?: number;
+  //ColorBulb B
+  blue?: number;
+  //ColorBulb Color temperature
+  color_temperature?: number;
   //Battery percentage left on Bot, Meter, Motion, Contact, PlugMini, and Curtain
   battery?: number;
   //Humidifier's humidity level percentage
@@ -343,6 +353,8 @@ export type serviceData = {
   calibration?: boolean;
   //Current Curtain Positon %
   position?: number;
+  //Is Curtain Moving?
+  inMotion?: boolean;
   //PlugMini - Is there a delay?
   delay?: boolean;
   //PlugMini - Is there a Timer?