@switchbot/homebridge-switchbot 3.5.0-beta.43 → 3.5.0-beta.45

package/src/device/device.ts

@@ -73,8 +73,8 @@ export abstract class deviceBase {
       .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.context.name)
       .setCharacteristic(this.hap.Characteristic.Model, accessory.context.model)
       .setCharacteristic(this.hap.Characteristic.SerialNumber, accessory.context.deviceId)
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, device.version || accessory.context.version)
-      .setCharacteristic(this.hap.Characteristic.HardwareRevision, device.version || accessory.context.version);
+      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, device.version?.toString() || accessory.context.version)
+      .setCharacteristic(this.hap.Characteristic.HardwareRevision, device.version?.toString() || accessory.context.version);
   }
 
   async getDeviceLogSettings(device: device & devicesConfig): Promise<void> {
@@ -553,15 +553,20 @@ export abstract class deviceBase {
       device.version = this.platform.version;
       accessory.context.version = this.platform.version;
     } else {
-      accessory.context.version = device.version;
+      accessory.context.version = device.version?.toString;
     }
+    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} Context: ${JSON.stringify(accessory.context)}`);
   }
 
   async statusCode(statusCode: number): Promise<void> {
-    switch (this.device.deviceType) {
-      case this.device.hubDeviceId:
-      case '000000000000':
-        statusCode = 161;
+    switch (statusCode) {
+      case 171:
+        switch (this.device.deviceId) {
+          case this.device.hubDeviceId:
+          case '000000000000':
+            statusCode = 161;
+            break;
+        }
         break;
     }
     switch (statusCode) {

package/src/device/fan.ts

@@ -206,7 +206,7 @@ export class Fan extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/hub.ts

@@ -219,7 +219,7 @@ export class Hub extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/humidifier.ts

@@ -5,6 +5,7 @@ import { SwitchBotPlatform } from '../platform.js';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+import { convertUnits } from '../utils.js';
 
 /**
  * Platform Accessory
@@ -148,20 +149,18 @@ export class Humidifier extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
         try {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
-          if (context.scale === 'CELSIUS') {
-            const { temperature, humidity } = context;
-            const { CurrentRelativeHumidity } = this.HumidifierDehumidifier;
-            const { CurrentTemperature } = this.TemperatureSensor || { CurrentTemperature: undefined };
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
+          const { temperature, humidity } = context;
+          const { CurrentRelativeHumidity } = this.HumidifierDehumidifier;
+          const { CurrentTemperature } = this.TemperatureSensor || { CurrentTemperature: undefined };
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
               '(temperature, humidity) = ' +
-              `Webhook:(${temperature}, ${humidity}), ` +
+              `Webhook:(${convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo)}, ${humidity}), ` +
               `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
-            this.HumidifierDehumidifier.CurrentRelativeHumidity = humidity;
-            if (!this.device.humidifier?.hide_temperature) {
-              this.TemperatureSensor!.CurrentTemperature = temperature;
-            }
-            this.updateHomeKitCharacteristics();
+          this.HumidifierDehumidifier.CurrentRelativeHumidity = humidity;
+          if (!this.device.humidifier?.hide_temperature) {
+              this.TemperatureSensor!.CurrentTemperature = convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo);
           }
+          this.updateHomeKitCharacteristics();
         } catch (e: any) {
           this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
@@ -271,7 +270,7 @@ export class Humidifier extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/iosensor.ts

@@ -230,7 +230,7 @@ export class IOSensor extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/lightstrip.ts

@@ -328,7 +328,7 @@ export class StripLight extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/lock.ts

@@ -258,7 +258,7 @@ export class Lock extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/meter.ts

@@ -226,7 +226,7 @@ export class Meter extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/meterplus.ts

@@ -227,7 +227,7 @@ export class MeterPlus extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/motion.ts

@@ -202,7 +202,7 @@ export class Motion extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/plug.ts

@@ -132,7 +132,7 @@ export class Plug extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/robotvacuumcleaner.ts

@@ -201,7 +201,7 @@ export class RobotVacuumCleaner extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)

package/src/device/waterdetector.ts

@@ -168,7 +168,7 @@ export class WaterDetector extends deviceBase {
     // Firmware Version
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = deviceStatus.body.version;
+      this.accessory.context.version = deviceStatus.body.version.toString();
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)