@switchbot/homebridge-switchbot 2.9.0-beta.0 → 2.9.0-beta.10

package/src/device/curtain.ts

@@ -471,7 +471,7 @@ export class Curtain {
     + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   async refreshStatus(): Promise<void> {
@@ -1118,7 +1118,7 @@ export class Curtain {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/hub.ts

@@ -278,7 +278,7 @@ export class Hub {
     }
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   async refreshStatus(): Promise<void> {
@@ -483,7 +483,7 @@ export class Hub {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/humidifier.ts

@@ -283,7 +283,7 @@ export class Humidifier {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.WaterLevel}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -893,7 +893,7 @@ export class Humidifier {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/iosensor.ts

@@ -254,7 +254,7 @@ export class IOSensor {
     + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -629,7 +629,7 @@ export class IOSensor {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/lightstrip.ts

@@ -278,7 +278,7 @@ export class StripLight {
     }
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -1034,7 +1034,7 @@ export class StripLight {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/lock.ts

@@ -240,7 +240,7 @@ export class Lock {
     + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -669,7 +669,7 @@ export class Lock {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/meter.ts

@@ -255,7 +255,7 @@ export class Meter {
     + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -637,7 +637,7 @@ export class Meter {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/meterplus.ts

@@ -255,7 +255,7 @@ export class MeterPlus {
     + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -648,7 +648,7 @@ export class MeterPlus {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/motion.ts

@@ -229,7 +229,7 @@ export class Motion {
     + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -571,7 +571,7 @@ export class Motion {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/plug.ts

@@ -156,7 +156,7 @@ export class Plug {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -597,7 +597,7 @@ export class Plug {
     if (device.firmware) {
       this.FirmwareRevision = device.firmware;
     } else if (device.version) {
-      this.FirmwareRevision = JSON.stringify(device.version);
+      this.FirmwareRevision = device.version;
     } else if (accessory.context.FirmwareRevision) {
       this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {

package/src/device/robotvacuumcleaner.ts

@@ -202,7 +202,7 @@ export class RobotVacuumCleaner {
     this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = JSON.stringify(this.OpenAPI_FirmwareRevision);
+    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
   }
 
   /**
@@ -757,10 +757,12 @@ export class RobotVacuumCleaner {
     );
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (device.version) {
+      this.FirmwareRevision = device.version;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
       this.FirmwareRevision = this.platform.version;
     }

package/src/irdevice/airconditioner.ts

@@ -637,15 +637,15 @@ export class AirConditioner {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context(): Promise<void> {

package/src/irdevice/airpurifier.ts

@@ -384,15 +384,15 @@ export class AirPurifier {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   private context() {

package/src/irdevice/camera.ts

@@ -265,15 +265,15 @@ export class Camera {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context() {

package/src/irdevice/fan.ts

@@ -397,15 +397,15 @@ export class Fan {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context() {

package/src/irdevice/light.ts

@@ -290,15 +290,15 @@ export class Light {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context() {

package/src/irdevice/other.ts

@@ -349,6 +349,13 @@ export class Others {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set On: ${value}`);
       this.On = value;
     }
+
+    //pushChanges
+    if (this.On) {
+      await this.pushOnChanges();
+    } else {
+      await this.pushOffChanges();
+    }
   }
 
   /**
@@ -659,7 +666,9 @@ export class Others {
 
   async commandType(): Promise<string> {
     let commandType: string;
-    if (this.device.customize) {
+    if (this.device.commandType && this.device.customize) {
+      commandType = this.device.commandType;
+    } else if (this.device.customize) {
       commandType = 'customize';
     } else {
       commandType = 'command';
@@ -852,13 +861,17 @@ export class Others {
   }
 
   async deviceType(device: irdevice & irDevicesConfig): Promise<void> {
-    if (device.other?.deviceType) {
-      this.otherDeviceType = this.accessory.context.deviceType = device.other.deviceType;
-      if (this.deviceLogging.includes('debug') || this.deviceLogging === 'standard') {
-        this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}`);
-      }
+    if (!device.other?.deviceType && this.accessory.context.deviceType) {
+      this.otherDeviceType = this.accessory.context.deviceType;
+      this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}, from Accesory Cache.`);
+    } else if (device.other?.deviceType) {
+      this.accessory.context.deviceType = device.other.deviceType;
+      this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Accesory Cache: ${this.accessory.context.deviceType}`);
+      this.otherDeviceType = this.accessory.context.deviceType;
+      this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}`);
     } else {
-      this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} No Device Type Set, deviceType: ${this.device.other?.deviceType}`);
+      this.otherDeviceType = 'outlet';
+      this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} no deviceType set, using default deviceType: ${this.otherDeviceType}`);
     }
   }
 
@@ -868,15 +881,15 @@ export class Others {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context() {

package/src/irdevice/tv.ts

@@ -531,15 +531,15 @@ export class TV {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context() {

package/src/irdevice/vacuumcleaner.ts

@@ -261,15 +261,15 @@ export class VacuumCleaner {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context() {

package/src/irdevice/waterheater.ts

@@ -270,15 +270,15 @@ export class WaterHeater {
     );
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      this.FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       this.FirmwareRevision = device.firmware;
+    } else if (accessory.context.FirmwareRevision) {
+      this.FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
-      this.FirmwareRevision = this.platform.version!;
+      this.FirmwareRevision = this.platform.version;
     }
     this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} setFirmwareRevision: ${this.FirmwareRevision}`);
-    return JSON.stringify(this.FirmwareRevision);
+    return String(this.FirmwareRevision);
   }
 
   async context(): Promise<void> {

package/src/settings.ts

@@ -165,6 +165,7 @@ export interface irDevicesConfig extends irdevice {
   customOn?: string;
   customOff?: string;
   customize?: boolean;
+  commandType?: string;
   disablePushOn?: boolean;
   disablePushOff?: boolean;
   disablePushDetail?: boolean;