@switchbot/homebridge-switchbot 3.5.0-beta.57 → 3.5.0-beta.59

package/src/homebridge-ui/public/index.html

@@ -1,8 +1,7 @@
 <p class="text-center">
   <img
     src="https://raw.githubusercontent.com/OpenWonderLabs/homebridge-switchbot/latest/branding/Homebridge_x_SwitchBot.svg"
-    alt="homebridge-switchbot logo"
-    style="width: 50%" />
+    alt="homebridge-switchbot logo" style="width: 50%" />
 </p>
 <div id="pageIntro" style="display: none">
   <p class="lead text-center">Thank you for installing <strong>homebridge-switchbot</strong></p>
@@ -10,10 +9,10 @@
   <ol>
     <li class="mb-3">
       Download the SwitchBot App from either the
-      <a href="https://apps.apple.com/us/app/switchbot/id1087374760" target="_blank" rel="noreferrer noopener">App Store</a> or the
-      <a href="https://play.google.com/store/apps/details?id=com.theswitchbot.switchbot&hl=en_US&gl=US" target="_blank" rel="noreferrer noopener"
-        >Play Store</a
-      >.
+      <a href="https://apps.apple.com/us/app/switchbot/id1087374760" target="_blank" rel="noreferrer noopener">App
+        Store</a> or the
+      <a href="https://play.google.com/store/apps/details?id=com.theswitchbot.switchbot&hl=en_US&gl=US" target="_blank"
+        rel="noreferrer noopener">Play Store</a>.
     </li>
     <li class="mb-3">Select <strong>Profile</strong>.</li>
     <li class="mb-3">Select <strong>Preferences</strong>.</li>
@@ -84,31 +83,38 @@
       <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki" target="_blank">Wiki Home</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Configuration" target="_blank">Configuration</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Configuration"
+        target="_blank">Configuration</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Beta-Version" target="_blank">Beta Version</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Beta-Version" target="_blank">Beta
+        Version</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Node-Version" target="_blank">Node Version</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Node-Version" target="_blank">Node
+        Version</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Uninstallation" target="_blank">Uninstallation</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Uninstallation"
+        target="_blank">Uninstallation</a>
     </li>
   </ul>
   <h5>Features</h5>
   <ul>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Supported-Devices" target="_blank">Supported Devices</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/wiki/Supported-Devices" target="_blank">Supported
+        Devices</a>
     </li>
   </ul>
   <h5>Help/About</h5>
   <ul>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/issues/new/choose" target="_blank">Support Request</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/issues/new/choose" target="_blank">Support
+        Request</a>
     </li>
     <li>
-      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/blob/latest/CHANGELOG.md" target="_blank">Changelog</a>
+      <a href="https://github.com/OpenWonderLabs/homebridge-switchbot/blob/latest/CHANGELOG.md"
+        target="_blank">Changelog</a>
     </li>
   </ul>
 </div>
@@ -237,4 +243,4 @@
       homebridge.hideSpinner();
     }
   })();
-</script>
+</script>

package/src/index.ts

@@ -2,9 +2,10 @@
  *
  * index.ts: @switchbot/homebridge-switchbot plugin registration.
  */
-import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
-import { API } from 'homebridge';
 import { SwitchBotPlatform } from './platform.js';
+import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
+
+import type { API } from 'homebridge';
 
 // Register our platform with homebridge.
 export default (api: API): void => {

package/src/irdevice/airconditioner.ts

@@ -3,10 +3,12 @@
  * airconditioners.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -607,7 +609,7 @@ export class AirConditioner extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.HeaterCooler.Active}`);
     } else {
       this.accessory.context.Active = this.HeaterCooler.Active;
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.Active, this.HeaterCooler.Active);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.Active, this.HeaterCooler.Active);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.HeaterCooler.Active}`);
     }
     // RotationSpeed
@@ -615,7 +617,7 @@ export class AirConditioner extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} RotationSpeed: ${this.HeaterCooler.RotationSpeed}`);
     } else {
       this.accessory.context.RotationSpeed = this.HeaterCooler.RotationSpeed;
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.RotationSpeed, this.HeaterCooler.RotationSpeed);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.RotationSpeed, this.HeaterCooler.RotationSpeed);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
         + ` RotationSpeed: ${this.HeaterCooler.RotationSpeed}`);
     }
@@ -624,7 +626,7 @@ export class AirConditioner extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} CurrentTemperature: ${this.HeaterCooler.CurrentTemperature}`);
     } else {
       this.accessory.context.CurrentTemperature = this.HeaterCooler.CurrentTemperature;
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.HeaterCooler.CurrentTemperature);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.HeaterCooler.CurrentTemperature);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
         + ` CurrentTemperature: ${this.HeaterCooler.CurrentTemperature}`);
     }
@@ -635,7 +637,7 @@ export class AirConditioner extends irdeviceBase {
           + ` CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
       } else {
         this.accessory.context.CurrentRelativeHumidity = this.HumiditySensor!.CurrentRelativeHumidity;
-        this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity,
+        this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity,
           this.HumiditySensor!.CurrentRelativeHumidity);
         this.debugLog(
           `${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
@@ -648,7 +650,7 @@ export class AirConditioner extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} TargetHeaterCoolerState: ${this.HeaterCooler.TargetHeaterCoolerState}`);
     } else {
       this.accessory.context.TargetHeaterCoolerState = this.HeaterCooler.TargetHeaterCoolerState;
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.TargetHeaterCoolerState, this.HeaterCooler.TargetHeaterCoolerState);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.TargetHeaterCoolerState, this.HeaterCooler.TargetHeaterCoolerState);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
         + ` TargetHeaterCoolerState: ${this.HeaterCooler.TargetHeaterCoolerState}`);
     }
@@ -658,7 +660,7 @@ export class AirConditioner extends irdeviceBase {
         + ` CurrentHeaterCoolerState: ${this.HeaterCooler.CurrentHeaterCoolerState}`);
     } else {
       this.accessory.context.CurrentHeaterCoolerState = this.HeaterCooler.CurrentHeaterCoolerState;
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, this.HeaterCooler.CurrentHeaterCoolerState);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, this.HeaterCooler.CurrentHeaterCoolerState);
       this.debugLog(
         `${this.device.remoteType}: ${this.accessory.displayName}` +
         ` updateCharacteristic CurrentHeaterCoolerState: ${this.HeaterCooler.CurrentHeaterCoolerState}`,
@@ -669,8 +671,8 @@ export class AirConditioner extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} ThresholdTemperature: ${this.HeaterCooler.ThresholdTemperature}`);
     } else {
       this.accessory.context.ThresholdTemperature = this.HeaterCooler.ThresholdTemperature;
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.HeatingThresholdTemperature, this.HeaterCooler.ThresholdTemperature);
-      this.HeaterCooler.Service?.updateCharacteristic(this.hap.Characteristic.CoolingThresholdTemperature, this.HeaterCooler.ThresholdTemperature);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.HeatingThresholdTemperature, this.HeaterCooler.ThresholdTemperature);
+      this.HeaterCooler.Service.updateCharacteristic(this.hap.Characteristic.CoolingThresholdTemperature, this.HeaterCooler.ThresholdTemperature);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
         + ` ThresholdTemperature: ${this.HeaterCooler.ThresholdTemperature}`);
     }

package/src/irdevice/airpurifier.ts

@@ -3,10 +3,12 @@
  * airpurifier.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory

package/src/irdevice/camera.ts

@@ -3,10 +3,12 @@
  * camera.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -142,7 +144,7 @@ export class Camera extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Switch.On}`);
     } else {
       this.accessory.context.On = this.Switch.On;
-      this.Switch.Service?.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
+      this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Switch.On}`);
     }
   }

package/src/irdevice/fan.ts

@@ -3,10 +3,12 @@
  * fan.ts: @switchbot/homebridge-switchbot.
  */
 import { request } from 'undici';
+import { Devices } from '../settings.js';
 import { irdeviceBase } from './irdevice.js';
-import { SwitchBotPlatform } from '../platform.js';
-import { Devices, irDevicesConfig, irdevice } from '../settings.js';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { irDevicesConfig, irdevice } from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
  * Platform Accessory
@@ -23,11 +25,6 @@ export class IRFan extends irdeviceBase {
     RotationDirection: CharacteristicValue;
   };
 
-  // Config
-  minStep?: number;
-  minValue?: number;
-  maxValue?: number;
-
   constructor(
     readonly platform: SwitchBotPlatform,
     accessory: PlatformAccessory,
@@ -55,29 +52,15 @@ export class IRFan extends irdeviceBase {
     // handle on / off events using the Active characteristic
     this.Fan.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
 
+
     if (device.irfan?.rotation_speed) {
-      if (device.irfan?.set_minStep) {
-        this.minStep = device.irfan?.set_minStep;
-      } else {
-        this.minStep = 1;
-      }
-      if (device.irfan?.set_min) {
-        this.minValue = device.irfan?.set_min;
-      } else {
-        this.minValue = 1;
-      }
-      if (device.irfan?.set_max) {
-        this.maxValue = device.irfan?.set_max;
-      } else {
-        this.maxValue = 100;
-      }
       // handle Rotation Speed events using the RotationSpeed characteristic
       this.Fan.Service
         .getCharacteristic(this.hap.Characteristic.RotationSpeed)
         .setProps({
-          minStep: this.minStep,
-          minValue: this.minValue,
-          maxValue: this.maxValue,
+          minStep: Number(this.minStep(device)),
+          minValue: Number(this.minValue(device)),
+          maxValue: Number(this.maxValue(device)),
         })
         .onSet(this.RotationSpeedSet.bind(this));
     } else if (this.Fan.Service.testCharacteristic(this.hap.Characteristic.RotationSpeed) && !device.irfan?.swing_mode) {
@@ -106,6 +89,36 @@ export class IRFan extends irdeviceBase {
     }
   }
 
+  async minStep(device: irdevice & irDevicesConfig): Promise<number> {
+    let minStep: number;
+    if (device.irfan?.set_minStep) {
+      minStep = device.irfan?.set_minStep;
+    } else {
+      minStep = 1;
+    }
+    return minStep;
+  }
+
+  async minValue(device: irdevice & irDevicesConfig): Promise<number> {
+    let minValue: number;
+    if (device.irfan?.set_min) {
+      minValue = device.irfan?.set_min;
+    } else {
+      minValue = 1;
+    }
+    return minValue;
+  }
+
+  async maxValue(device: irdevice & irDevicesConfig): Promise<number> {
+    let maxValue: number;
+    if (device.irfan?.set_max) {
+      maxValue = device.irfan?.set_max;
+    } else {
+      maxValue = 100;
+    }
+    return maxValue;
+  }
+
   async SwingModeSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} SwingMode: ${value}`);
     if (value > this.Fan.SwingMode) {
@@ -258,21 +271,21 @@ export class IRFan extends irdeviceBase {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Fan.Active}`);
     } else {
       this.accessory.context.Active = this.Fan.Active;
-      this.Fan.Service?.updateCharacteristic(this.hap.Characteristic.Active, this.Fan.Active);
+      this.Fan.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Fan.Active);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Fan.Active}`);
     }
     if (this.Fan.SwingMode === undefined) {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} SwingMode: ${this.Fan.SwingMode}`);
     } else {
       this.accessory.context.SwingMode = this.Fan.SwingMode;
-      this.Fan.Service?.updateCharacteristic(this.hap.Characteristic.SwingMode, this.Fan.SwingMode);
+      this.Fan.Service.updateCharacteristic(this.hap.Characteristic.SwingMode, this.Fan.SwingMode);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic SwingMode: ${this.Fan.SwingMode}`);
     }
     if (this.Fan.RotationSpeed === undefined) {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} RotationSpeed: ${this.Fan.RotationSpeed}`);
     } else {
       this.accessory.context.RotationSpeed = this.Fan.RotationSpeed;
-      this.Fan.Service?.updateCharacteristic(this.hap.Characteristic.RotationSpeed, this.Fan.RotationSpeed);
+      this.Fan.Service.updateCharacteristic(this.hap.Characteristic.RotationSpeed, this.Fan.RotationSpeed);
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic RotationSpeed: ${this.Fan.RotationSpeed}`);
     }
   }

package/src/irdevice/irdevice.ts

@@ -1,11 +1,10 @@
 /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
  *
- * device.ts: homebridge-august.
+ * device.ts: @switchbot/homebridge-switchbot.
  */
-import { API, HAP, Logging, PlatformAccessory } from 'homebridge';
-
-import { SwitchBotPlatform } from '../platform.js';
-import { SwitchBotPlatformConfig, irDevicesConfig, irdevice } from '../settings.js';
+import type { SwitchBotPlatform } from '../platform.js';
+import type { API, HAP, Logging, PlatformAccessory } from 'homebridge';
+import type { SwitchBotPlatformConfig, irDevicesConfig, irdevice } from '../settings.js';
 
 export abstract class irdeviceBase {
   public readonly api: API;