@switchbot/homebridge-switchbot 2.5.3-beta.11 → 2.5.3-beta.13

package/src/device/curtain.ts

@@ -252,12 +252,12 @@ export class Curtain {
 
     if (this.setNewTarget && this.inMotion) {
       await this.setMinMax();
-      if (this.TargetPosition > this.CurrentPosition) {
+      if (Number(this.TargetPosition) > this.CurrentPosition) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
         this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
-      } else if (this.TargetPosition < this.CurrentPosition) {
+      } else if (Number(this.TargetPosition) < this.CurrentPosition) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
         this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
@@ -358,12 +358,12 @@ export class Curtain {
 
     if (this.setNewTarget && this.moving) {
       await this.setMinMax();
-      if (this.TargetPosition > this.CurrentPosition) {
+      if (Number(this.TargetPosition) > this.CurrentPosition) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
         this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
-      } else if (this.TargetPosition < this.CurrentPosition) {
+      } else if (Number(this.TargetPosition) < this.CurrentPosition) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
         this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
@@ -569,26 +569,27 @@ export class Curtain {
       }
       this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
       if (switchbot !== false) {
-        switchbot
-          .discover({ model: 'c', quick: true, id: this.device.bleMac })
-          .then(async (device_list: any) => {
-            this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
-            return await this.retry({
-              max: await this.maxRetry(),
-              fn: async () => {
+        await this.retry({
+          max: await this.maxRetry(),
+          fn: () => {
+            return switchbot
+              .discover({ model: 'c', quick: true, id: this.device.bleMac })
+              .then(async (device_list: any) => {
+                this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
                 return await device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
-              },
-            });
-          })
-          .then(() => {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-          })
-          .catch(async (e: any) => {
-            this.apiError(e);
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
-          + ` Connection, Error Message: ${superStringify(e.message)}`);
-            await this.BLEPushConnection();
-          });
+              })
+              .then(() => {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+              })
+              .catch(async (e: any) => {
+                this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+                  + ` Connection, Error Message: ${superStringify(e.message)}`);
+                await this.BLEPushConnection();
+                throw new Error('Connection error');
+              });
+          },
+        });
       } else {
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
         await this.BLEPushConnection();
@@ -637,7 +638,7 @@ export class Curtain {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
         this.debugLog(`Pushing ${this.TargetPosition}`);
         const adjustedTargetPosition = 100 - Number(this.TargetPosition);
-        if (this.TargetPosition > 50) {
+        if (Number(this.TargetPosition) > 50) {
           this.setPositionMode = this.device.curtain?.setOpenMode;
         } else {
           this.setPositionMode = this.device.curtain?.setCloseMode;
@@ -889,7 +890,7 @@ export class Curtain {
   }
 
   async SilentPerformance() {
-    if (this.TargetPosition > 50) {
+    if (Number(this.TargetPosition) > 50) {
       if (this.device.curtain?.setOpenMode === '1') {
         this.setPositionMode = 1;
         this.Mode = 'Silent Mode';
@@ -910,12 +911,12 @@ export class Curtain {
 
   async setMinMax(): Promise<void> {
     if (this.device.curtain?.set_min) {
-      if (this.CurrentPosition <= this.device.curtain?.set_min) {
+      if (Number(this.CurrentPosition) <= this.device.curtain?.set_min) {
         this.CurrentPosition = 0;
       }
     }
     if (this.device.curtain?.set_max) {
-      if (this.CurrentPosition >= this.device.curtain?.set_max) {
+      if (Number(this.CurrentPosition) >= this.device.curtain?.set_max) {
         this.CurrentPosition = 100;
       }
     }

package/src/device/meter.ts

@@ -438,7 +438,7 @@ export class Meter {
     if (this.device.mqttURL) {
       this.mqttPublish(`{${mqttmessage.join(',')}}`);
     }
-    if (this.CurrentRelativeHumidity > 0) {
+    if (Number(this.CurrentRelativeHumidity) > 0) {
       // reject unreliable data
       if (this.device.history) {
         this.historyService?.addEntry(entry);

package/src/device/meterplus.ts

@@ -356,6 +356,9 @@ export class MeterPlus {
           try {
             this.deviceStatus = JSON.parse(rawData);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${superStringify(this.deviceStatus)}`);
+            if (this.device.deviceType === 'WoIOSensor') {
+              this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${superStringify(this.deviceStatus)}`);
+            }
             this.Humidity = this.deviceStatus.body.humidity!;
             this.Temperature = this.deviceStatus.body.temperature!;
             this.parseStatus();
@@ -438,7 +441,7 @@ export class MeterPlus {
     if (this.device.mqttURL) {
       this.mqttPublish(`{${mqttmessage.join(',')}}`);
     }
-    if (this.CurrentRelativeHumidity > 0) {
+    if (Number(this.CurrentRelativeHumidity) > 0) {
       // reject unreliable data
       if (this.device.history) {
         this.historyService?.addEntry(entry);

package/src/irdevice/airpurifier.ts

@@ -188,7 +188,7 @@ export class AirPurifier {
       'commandType': 'command',
     });
     if (this.Active === 1) {
-      if ((this.CurrentTemperature || 24) < (this.LastTemperature || 30)) {
+      if ((Number(this.CurrentTemperature)|| 24) < (this.LastTemperature || 30)) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
       } else {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.HEATING;

package/src/platform.ts

@@ -423,6 +423,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.createMeter(device);
         break;
       case 'MeterPlus':
+      case 'WoIOSensor':
         this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createMeterPlus(device);
         break;