@switchbot/homebridge-switchbot 2.8.0-beta.9 → 2.8.0

package/src/irdevice/airconditioner.ts

@@ -87,20 +87,11 @@ export class AirConditioner {
 
     this.coolerService.getCharacteristic(this.platform.Characteristic.CurrentTemperature).onGet(this.CurrentTemperatureGet.bind(this));
 
-    if (this.hide_automode) {
-      this.TargetHeaterCoolerState = 1 || 2;
-      this.ValidValues = [1, 2];
-      this.debugLog(
-        `${this.device.remoteType}: ${this.accessory.displayName} ValidValues: ${JSON.stringify(this.ValidValues)},` +
-        ` hide_automode: ${this.hide_automode}, TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}`,
-      );
-    } else {
-      this.TargetHeaterCoolerState = 0 || 1 || 2;
-      this.ValidValues = [0, 1, 2];
-      this.debugLog(
-        `${this.device.remoteType}: ${this.accessory.displayName} ValidValues: ${JSON.stringify(this.ValidValues)},` +
-        ` hide_automode: ${this.hide_automode}, TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}`,
-      );
+    this.ValidValues = this.hide_automode ? [1, 2] : [0, 1, 2];
+
+    if (this.device.irair?.meterType && this.device.irair?.meterId) {
+      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
+      this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
     }
 
     if (this.meter) {
@@ -120,6 +111,8 @@ export class AirConditioner {
     this.coolerService
       .getCharacteristic(this.platform.Characteristic.HeatingThresholdTemperature)
       .setProps({
+        minValue: 0,
+        maxValue: 35,
         minStep: 0.5,
       })
       .onGet(this.ThresholdTemperatureGet.bind(this))
@@ -128,6 +121,8 @@ export class AirConditioner {
     this.coolerService
       .getCharacteristic(this.platform.Characteristic.CoolingThresholdTemperature)
       .setProps({
+        minValue: 0,
+        maxValue: 35,
         minStep: 0.5,
       })
       .onGet(this.ThresholdTemperatureGet.bind(this))
@@ -230,23 +225,31 @@ export class AirConditioner {
     }
     const parameter = `${this.ThresholdTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`;
 
+    await this.UpdateCurrentHeaterCoolerState();
+    const bodyChange = JSON.stringify({
+      command: 'setAll',
+      parameter: `${parameter}`,
+      commandType: 'command',
+    });
+
+    await this.pushChanges(bodyChange);
+  }
+
+  private async UpdateCurrentHeaterCoolerState() {
     if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
       await this.context();
-      if (this.ThresholdTemperature < this.accessory.context.CurrentTemperature) {
+      if (this.ThresholdTemperature < this.CurrentTemperature &&
+        this.TargetHeaterCoolerState !== this.platform.Characteristic.TargetHeaterCoolerState.HEAT) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
-      } else if (this.ThresholdTemperature > this.accessory.context.CurrentTemperature) {
+      } else if (this.ThresholdTemperature > this.CurrentTemperature &&
+        this.TargetHeaterCoolerState !== this.platform.Characteristic.TargetHeaterCoolerState.COOL) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.HEATING;
+      } else {
+        this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.IDLE;
       }
     } else {
       this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.INACTIVE;
     }
-    const bodyChange = JSON.stringify({
-      command: 'setAll',
-      parameter: `${parameter}`,
-      commandType: 'command',
-    });
-
-    await this.pushChanges(bodyChange);
   }
 
   async pushChanges(bodyChange: any): Promise<void> {
@@ -259,7 +262,7 @@ export class AirConditioner {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
@@ -285,39 +288,29 @@ export class AirConditioner {
   }
 
   async CurrentTemperatureGet(): Promise<CharacteristicValue> {
-    if (this.meter) {
-      this.CurrentTemperature =
-        this.meter.context?.CurrentTemperature ||
-        this.meter.getService(this.platform.Service.TemperatureSensor)?.getCharacteristic(this.platform.Characteristic.CurrentTemperature).value ||
-        24;
+    if (this.meter?.context?.CurrentTemperature) {
+      this.accessory.context.CurrentTemperature = this.meter.context.CurrentTemperature;
       this.debugLog(
         `${this.device.remoteType}: ${this.accessory.displayName} `
-        + `Using CurrentTemperature from ${this.meter.context?.deviceType} (${this.meter.context?.deviceID})`,
+        + `Using CurrentTemperature from ${this.meter.context.deviceType} (${this.meter.context.deviceID})`,
       );
-    } else if (this.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 24;
-    } else {
-      this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     }
+
+    this.CurrentTemperature = this.accessory.context.CurrentTemperature || 24;
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Get CurrentTemperature: ${this.CurrentTemperature}`);
     return this.CurrentTemperature;
   }
 
   async CurrentRelativeHumidityGet(): Promise<CharacteristicValue> {
-    if (this.meter) {
-      this.CurrentRelativeHumidity =
-        this.meter.context?.CurrentRelativeHumidity ||
-        this.meter.getService(this.platform.Service.HumiditySensor)?.getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity).value ||
-        0;
+    if (this.meter?.context?.CurrentRelativeHumidity) {
+      this.accessory.context.CurrentRelativeHumidity = this.meter.context.CurrentRelativeHumidity;
       this.debugLog(
         `${this.device.remoteType}: ${this.accessory.displayName} `
-        + `Using CurrentRelativeHumidity from ${this.meter.context?.deviceType} (${this.meter.context?.deviceID})`,
+        + `Using CurrentRelativeHumidity from ${this.meter.context.deviceType} (${this.meter.context.deviceID})`,
       );
-    } else if (this.CurrentRelativeHumidity === undefined) {
-      this.CurrentRelativeHumidity = 0;
-    } else {
-      this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
     }
+
+    this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity || 0;
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Get CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
     return this.CurrentRelativeHumidity as CharacteristicValue;
   }
@@ -338,7 +331,9 @@ export class AirConditioner {
     } else {
       this.CurrentFanSpeed = Number(value) + 1;
     }
-    this.RotationSpeed = this.CurrentFanSpeed;
+    this.RotationSpeed = value;
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName}` +
+      `Set RotationSpeed: ${this.RotationSpeed}, CurrentFanSpeed: ${this.CurrentFanSpeed}`);
     this.pushAirConditionerStatusChanges();
   }
 
@@ -360,25 +355,12 @@ export class AirConditioner {
   }
 
   async TargetHeaterCoolerStateGet(): Promise<CharacteristicValue> {
-    if (this.ValidValues === this.valid012) {
-      this.TargetHeaterCoolerState = this.platform.Characteristic.TargetHeaterCoolerState.AUTO;
-      this.debugLog(
-        `${this.device.remoteType}: ${this.accessory.displayName} Get (AUTO) TargetHeaterCoolerState: ${this.CurrentHeaterCoolerState},` +
-        ` ValidValues: ${this.ValidValues}`,
-      );
-    } else if (this.ValidValues === this.valid12) {
-      this.TargetHeaterCoolerState =
-        this.platform.Characteristic.TargetHeaterCoolerState.COOL || this.platform.Characteristic.TargetHeaterCoolerState.HEAT;
-      this.debugLog(
-        `${this.device.remoteType}: ${this.accessory.displayName} Get (COOL/HEAT) TargetHeaterCoolerState: ${this.CurrentHeaterCoolerState},` +
-        ` ValidValues: ${this.ValidValues}`,
-      );
-    } else {
-      this.debugLog(
-        `${this.device.remoteType}: ${this.accessory.displayName} Get TargetHeaterCoolerState: ${this.CurrentHeaterCoolerState},` +
-        ` ValidValues: ${this.ValidValues}`,
-      );
-    }
+    const targetState = this.TargetHeaterCoolerState || this.accessory.context.TargetHeaterCoolerState;
+    this.TargetHeaterCoolerState = this.ValidValues.includes(targetState) ? targetState : this.ValidValues[0];
+    this.debugLog(
+      `${this.device.remoteType}: ${this.accessory.displayName} Get (${this.getTargetHeaterCoolerStateName()})` +
+      ` TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}, ValidValues: ${this.ValidValues},  hide_automode: ${this.hide_automode}`,
+    );
     return this.TargetHeaterCoolerState;
   }
 
@@ -420,27 +402,29 @@ export class AirConditioner {
   }
 
   async CurrentHeaterCoolerStateGet(): Promise<CharacteristicValue> {
-    if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
-      if (this.ThresholdTemperature < this.accessory.context.CurrentTemperature) {
-        this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
-        this.debugLog(
-          `${this.device.remoteType}: ${this.accessory.displayName}` + ` Get (COOLING) CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`,
-        );
-      } else if (this.ThresholdTemperature > this.accessory.context.CurrentTemperature) {
-        this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.HEATING;
-        this.debugLog(
-          `${this.device.remoteType}: ${this.accessory.displayName}` + ` Get (HEATING) CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`,
-        );
-      }
-    } else {
-      this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.INACTIVE;
-      this.debugLog(
-        `${this.device.remoteType}: ${this.accessory.displayName}` + ` Get (INACTIVE) CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`,
-      );
-    }
+    await this.UpdateCurrentHeaterCoolerState();
+    this.debugLog(
+      `${this.device.remoteType}: ${this.accessory.displayName}` +
+      ` Get (${this.getTargetHeaterCoolerStateName()}) CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`,
+    );
+
     return this.CurrentHeaterCoolerState;
   }
 
+
+  private getTargetHeaterCoolerStateName(): string {
+    switch (this.TargetHeaterCoolerState) {
+      case this.platform.Characteristic.TargetHeaterCoolerState.AUTO:
+        return 'AUTO';
+      case this.platform.Characteristic.TargetHeaterCoolerState.HEAT:
+        return 'HEAT';
+      case this.platform.Characteristic.TargetHeaterCoolerState.COOL:
+        return 'COOL';
+      default:
+        return this.TargetHeaterCoolerState.toString();
+    }
+  }
+
   async ThresholdTemperatureGet(): Promise<CharacteristicValue> {
     await this.context();
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Get ThresholdTemperature: ${this.ThresholdTemperature}`);
@@ -650,18 +634,23 @@ export class AirConditioner {
     } else {
       this.Active = this.accessory.context.Active;
     }
-    if (this.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 24;
-    } else if (this.CurrentTemperature) {
-      this.CurrentTemperature;
-    } else if (this.accessory.context.CurrentTemperature === undefined) {
+
+    if (this.CurrentTemperature === undefined && this.accessory.context.CurrentTemperature === undefined) {
       this.CurrentTemperature = 24;
     } else {
-      this.CurrentTemperature = this.accessory.context.CurrentTemperature;
+      this.CurrentTemperature = this.CurrentTemperature || this.accessory.context.CurrentTemperature;
     }
 
-    if (this.ThresholdTemperature === undefined) {
+    if (this.ThresholdTemperature === undefined && this.accessory.context.ThresholdTemperature === undefined) {
       this.ThresholdTemperature = 24;
+    } else {
+      this.ThresholdTemperature = this.ThresholdTemperature || this.accessory.context.ThresholdTemperature;
+    }
+
+    if (this.RotationSpeed === undefined && this.accessory.context.RotationSpeed === undefined) {
+      this.RotationSpeed = 4;
+    } else {
+      this.RotationSpeed = this.RotationSpeed || this.accessory.context.RotationSpeed;
     }
 
     if (this.device.irair?.hide_automode) {
@@ -672,14 +661,11 @@ export class AirConditioner {
       this.accessory.context.hide_automode = this.hide_automode;
     }
 
-    if (this.device.irair?.meterUuid) {
-      this.meter = this.platform.accessories.find((accessory) => accessory.UUID === this.device.irair?.meterUuid);
-    }
     if (this.meter) {
-      if (this.CurrentRelativeHumidity === undefined) {
+      if (this.CurrentRelativeHumidity === undefined && this.accessory.context.CurrentRelativeHumidity === undefined) {
         this.CurrentRelativeHumidity = 0;
       } else {
-        this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
+        this.CurrentRelativeHumidity = this.CurrentRelativeHumidity || this.accessory.context.CurrentRelativeHumidity;
       }
     }
   }

package/src/irdevice/airpurifier.ts

@@ -218,7 +218,7 @@ export class AirPurifier {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/camera.ts

@@ -123,7 +123,7 @@ export class Camera {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/fan.ts

@@ -243,7 +243,7 @@ export class Fan {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/light.ts

@@ -147,7 +147,7 @@ export class Light {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/other.ts

@@ -142,7 +142,7 @@ export class Others {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/tv.ts

@@ -375,7 +375,7 @@ export class TV {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/vacuumcleaner.ts

@@ -119,7 +119,7 @@ export class VacuumCleaner {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/irdevice/waterheater.ts

@@ -128,7 +128,7 @@ export class WaterHeater {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);

package/src/platform.ts

@@ -300,18 +300,42 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         const { body, statusCode, headers } = await request(Devices, {
           headers: this.generateHeaders(),
         });
-        const devicesAPI = await body.json();
-        this.debugLog(`Devices: ${JSON.stringify(devicesAPI.body)}`);
-        this.statusCode(statusCode);
-        this.debugLog(`Headers: ${JSON.stringify(headers)}`);
-        // SwitchBot Devices
-        const deviceLists = devicesAPI.body.deviceList;
-        if (!this.config.options?.devices) {
-          this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
-          if (devicesAPI.body.length === 0) {
-            this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
-          } else {
-            const devices = deviceLists.map((v: any) => v);
+        if (statusCode === 200) {
+          const devicesAPI: any = await body.json();
+          this.debugLog(`Devices: ${JSON.stringify(devicesAPI.body)}`);
+          this.debugLog(`Headers: ${JSON.stringify(headers)}`);
+          // SwitchBot Devices
+          const deviceLists = devicesAPI.body.deviceList;
+          if (!this.config.options?.devices) {
+            this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+            if (deviceLists.length === 0) {
+              this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
+            } else {
+              const devices = deviceLists.map((v: any) => v);
+              for (const device of devices) {
+                if (device.deviceType) {
+                  if (device.configDeviceName) {
+                    device.deviceName = device.configDeviceName;
+                  }
+                  this.createDevice(device);
+                }
+              }
+            }
+          } else if (this.config.credentials?.token && this.config.options.devices) {
+            this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+            const deviceConfigs = this.config.options?.devices;
+
+            const mergeBydeviceId = (a1: { deviceId: string }[], a2: any[]) =>
+              a1.map((itm: { deviceId: string }) => ({
+                ...a2.find(
+                  (item: { deviceId: string }) =>
+                    item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
+                ),
+                ...itm,
+              }));
+
+            const devices = mergeBydeviceId(deviceLists, deviceConfigs);
+            this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
             for (const device of devices) {
               if (device.deviceType) {
                 if (device.configDeviceName) {
@@ -320,72 +344,51 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
                 this.createDevice(device);
               }
             }
+          } else {
+            this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
           }
-        } else if (this.config.credentials?.token && this.config.options.devices) {
-          this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
-          const deviceConfigs = this.config.options?.devices;
-
-          const mergeBydeviceId = (a1: { deviceId: string }[], a2: any[]) =>
-            a1.map((itm: { deviceId: string }) => ({
-              ...a2.find(
-                (item: { deviceId: string }) =>
-                  item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
-              ),
-              ...itm,
-            }));
-
-          const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-          this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
-          for (const device of devices) {
-            if (device.deviceType) {
-              if (device.configDeviceName) {
-                device.deviceName = device.configDeviceName;
-              }
-              this.createDevice(device);
-            }
+          if (devicesAPI.body.deviceList.length !== 0) {
+            this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
+          } else {
+            this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
           }
-        } else {
-          this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
-        }
-        if (devicesAPI.body.deviceList.length !== 0) {
-          this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-        } else {
-          this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-        }
 
-        // IR Devices
-        const irDeviceLists = devicesAPI.body.infraredRemoteList;
-        if (!this.config.options?.irdevices) {
-          this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
-          const devices = irDeviceLists.map((v: any) => v);
-          for (const device of devices) {
-            if (device.remoteType) {
+          // IR Devices
+          const irDeviceLists = devicesAPI.body.infraredRemoteList;
+          if (!this.config.options?.irdevices) {
+            this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+            const devices = irDeviceLists.map((v: any) => v);
+            for (const device of devices) {
+              if (device.remoteType) {
+                this.createIRDevice(device);
+              }
+            }
+          } else {
+            this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+            const irDeviceConfig = this.config.options?.irdevices;
+
+            const mergeIRBydeviceId = (a1: { deviceId: string }[], a2: any[]) =>
+              a1.map((itm: { deviceId: string }) => ({
+                ...a2.find(
+                  (item: { deviceId: string }) =>
+                    item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
+                ),
+                ...itm,
+              }));
+
+            const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
+            this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
+            for (const device of devices) {
               this.createIRDevice(device);
             }
           }
-        } else {
-          this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
-          const irDeviceConfig = this.config.options?.irdevices;
-
-          const mergeIRBydeviceId = (a1: { deviceId: string }[], a2: any[]) =>
-            a1.map((itm: { deviceId: string }) => ({
-              ...a2.find(
-                (item: { deviceId: string }) =>
-                  item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
-              ),
-              ...itm,
-            }));
-
-          const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
-          this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
-          for (const device of devices) {
-            this.createIRDevice(device);
+          if (devicesAPI.body.infraredRemoteList.length !== 0) {
+            this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+          } else {
+            this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
           }
-        }
-        if (devicesAPI.body.infraredRemoteList.length !== 0) {
-          this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
         } else {
-          this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+          this.statusCode(statusCode);
         }
       } catch (e: any) {
         this.debugErrorLog(
@@ -1665,9 +1668,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     // the cached devices we stored in the `configureAccessory` method above
     const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
 
-    if (device.irair?.meterType && device.irair?.meterId) {
-      device.irair.meterUuid = this.api.hap.uuid.generate(`${device.irair.meterId}-${device.irair.meterType}`);
-    }
     if (existingAccessory) {
       // the accessory already exists
       if (!device.hide_device && device.hubDeviceId) {

package/src/settings.ts

@@ -286,7 +286,7 @@ export type deviceStatus = {
   childLock?: boolean; //determines if a Humidifier's safety lock is on or not. (Used by the following deviceTypes: Humidifier)
   sound?: boolean; //determines if a Humidifier is muted or not. (Used by the following deviceTypes: Humidifier)
   lackWater?: boolean; //determines if the water tank is empty or not. (Used by the following deviceTypes: Humidifier)
-  version?: number; //the version of the device. (Used by the following deviceTypes: Blind Tilt)
+  version?: number; //the version of the device. (Used by the following deviceTypes: Blind Tilt, Meter, MeterPlus, IOSensor)
   direction?: string; //the opening direction of a Blind Tilt device. (Used by the following deviceTypes: Blind Tilt)
   runStatus?: string; //'static' when not moving. (Used by the following deviceTypes: Blind Tilt)
   mode?: number; //available for  devices. the fan mode. (Used by the following deviceTypes: Smart Fan)

package/.github/npm-version-script.js

@@ -1,81 +0,0 @@
-#!/bin/env node
-
-/**
- * This scripts queries the npm registry to pull out the latest version for a given tag.
- */
-
-const fs = require("fs");
-const semver = require("semver");
-const child_process = require("child_process");
-const assert = require("assert");
-
-const BRANCH_VERSION_PATTERN = /^([A-Za-z]*)-(\d+.\d+.\d+)$/
-
-// Load the contents of the package.json file
-const packageJSON = JSON.parse(fs.readFileSync("package.json", "utf8"));
-
-let refArgument = process.argv[2];
-let tagArgument = process.argv[3] || "latest";
-
-if (refArgument == null) {
-  console.error("ref argument is missing");
-  console.error("Usage: npm-version-script.js <ref> [tag]");
-  process.exit(1);
-}
-
-/**
- * Queries the NPM registry for the latest version for the provided tag.
- * @param tag The tag to query for.
- * @returns {string} Returns the version.
- */
-function getTagVersionFromNpm(tag) {
-  try {
-    return child_process.execSync(`npm info ${packageJSON.name} version --tag="${tag}"`).toString("utf8").trim();
-  } catch (e) {
-    throw e;
-  }
-}
-
-function desiredTargetVersion(ref) {
-  // ref is a GitHub action ref string
-  if (ref.startsWith("refs/pull/")) {
-    throw Error("The version script was executed inside a PR!");
-  }
-
-  assert(ref.startsWith("refs/heads/"))
-  let branchName = ref.slice("refs/heads/".length);
-
-  let results = branchName.match(BRANCH_VERSION_PATTERN);
-  if (results != null) {
-    if (results[1] !== tagArgument) {
-      console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`);
-    }
-
-    return results[2];
-  }
-
-  // legacy mode were we use the `betaVersion` property in the package.json
-  if (branchName === "beta" && packageJSON.betaVersion) {
-    return packageJSON.betaVersion
-  }
-
-  throw new Error("Malformed branch name for ref: " + ref + ". Can't derive the base version. Use a branch name like: beta-x.x.x!");
-}
-
-// derive the base version from the branch ref
-const baseVersion = desiredTargetVersion(refArgument);
-
-// query the npm registry for the latest version of the provided tag name
-const latestReleasedVersion = getTagVersionFromNpm(tagArgument); // e.g. 0.7.0-beta.12
-const latestReleaseBase = semver.inc(latestReleasedVersion, "patch"); // will produce 0.7.0 (removing the preid, needed for the equality check below)
-
-let publishTag;
-if (semver.eq(baseVersion, latestReleaseBase)) { // check if we are releasing another version for the latest beta
-  publishTag = latestReleasedVersion; // set the current latest beta to be incremented
-} else {
-  publishTag = baseVersion; // start of with a new beta version
-}
-
-// save the package.json
-packageJSON.version = publishTag;
-fs.writeFileSync("package.json", JSON.stringify(packageJSON, null, 2));