@switchbot/homebridge-switchbot 3.5.0-beta.28 → 3.5.0-beta.29

package/src/irdevice/fan.ts

@@ -13,7 +13,7 @@ import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export class Fan extends irdeviceBase {
+export class IRFan extends irdeviceBase {
   // Services
   private Fan: {
     Service: Service;
@@ -233,7 +233,8 @@ export class Fan extends irdeviceBase {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName} request to SwitchBot API, body: ${bodyChange} sent successfully`);
+          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+            + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
           this.updateHomeKitCharacteristics();
         } else {
           this.statusCode(statusCode);

package/src/irdevice/irdevice.ts

@@ -455,7 +455,7 @@ export abstract class irdeviceBase {
         break;
       default:
         this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Unknown statusCode: `
-        + `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+          + `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
     }
   }
 

package/src/irdevice/light.ts

@@ -225,7 +225,8 @@ export class Light extends irdeviceBase {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName} request to SwitchBot API, body: ${bodyChange} sent successfully`);
+          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+            + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
           this.accessory.context.On = this.On;
           this.updateHomeKitCharacteristics();
         } else {

package/src/irdevice/other.ts

@@ -440,7 +440,7 @@ export class Others extends irdeviceBase {
    */
   async pushOnChanges(On: boolean): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushOnChanges On: ${On},`
-      +` disablePushOn: ${this.disablePushOn}, customize: ${this.device.customize}, customOn: ${this.device.customOn}`);
+      + ` disablePushOn: ${this.disablePushOn}, customize: ${this.device.customize}, customOn: ${this.device.customOn}`);
     if (this.device.customize) {
       if (On === true && !this.disablePushOn) {
         const commandType: string = await this.commandType();
@@ -493,7 +493,8 @@ export class Others extends irdeviceBase {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName} request to SwitchBot API, body: ${bodyChange} sent successfully`);
+          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+            + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
           this.updateHomeKitCharacteristics();
         } else {
           this.statusCode(statusCode);
@@ -502,11 +503,11 @@ export class Others extends irdeviceBase {
       } catch (e: any) {
         this.apiError(e);
         this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType}`
-        + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
+          + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
       }
     } else {
       this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName}`
-      + ` Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`);
+        + ` Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`);
     }
   }
 
@@ -519,12 +520,12 @@ export class Others extends irdeviceBase {
           this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.OPEN);
           this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.OPEN);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetDoorState: Open, CurrentDoorState: Open (${this.GarageDoor!.On})`);
+            + ` TargetDoorState: Open, CurrentDoorState: Open (${this.GarageDoor!.On})`);
         } else {
           this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
           this.GarageDoor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetDoorState: Closed, CurrentDoorState: Closed (${this.GarageDoor!.On})`);
+            + ` TargetDoorState: Closed, CurrentDoorState: Closed (${this.GarageDoor!.On})`);
         }
       }
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Garage Door On: ${this.GarageDoor!.On}`);
@@ -537,13 +538,13 @@ export class Others extends irdeviceBase {
           this.Door!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
           this.Door!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetPosition: 100, CurrentPosition: 100 (${this.Door!.On})`);
+            + ` TargetPosition: 100, CurrentPosition: 100 (${this.Door!.On})`);
         } else {
           this.Door!.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
           this.Door!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
           this.Door!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetPosition: 0, CurrentPosition: 0 (${this.Door!.On})`);
+            + ` TargetPosition: 0, CurrentPosition: 0 (${this.Door!.On})`);
         }
       }
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Door On: ${this.Door!.On}`);
@@ -556,13 +557,13 @@ export class Others extends irdeviceBase {
           this.Window!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
           this.Window!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetPosition: 100, CurrentPosition: 100 (${this.Window!.On})`);
+            + ` TargetPosition: 100, CurrentPosition: 100 (${this.Window!.On})`);
         } else {
           this.Window!.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
           this.Window!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
           this.Window!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetPosition: 0, CurrentPosition: 0 (${this.Window!.On})`);
+            + ` TargetPosition: 0, CurrentPosition: 0 (${this.Window!.On})`);
         }
       }
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window On: ${this.Window!.On}`);
@@ -575,13 +576,13 @@ export class Others extends irdeviceBase {
           this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
           this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetPosition: 100, CurrentPosition: 100 (${this.WindowCovering!.On})`);
+            + ` TargetPosition: 100, CurrentPosition: 100 (${this.WindowCovering!.On})`);
         } else {
           this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
           this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
           this.WindowCovering!.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` TargetPosition: 0, CurrentPosition: 0 (${this.WindowCovering!.On})`);
+            + ` TargetPosition: 0, CurrentPosition: 0 (${this.WindowCovering!.On})`);
         }
       }
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window Covering On: ${this.WindowCovering!.On}`);
@@ -593,7 +594,7 @@ export class Others extends irdeviceBase {
           this.Lock!.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
           this.Lock!.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURE (${this.Lock!.On})`);
+            + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURE (${this.Lock!.On})`);
         } else {
           this.Lock!.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
           this.Lock!.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
@@ -637,13 +638,13 @@ export class Others extends irdeviceBase {
             this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
           this.StatefulProgrammableSwitch!.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 1);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1 (${this.StatefulProgrammableSwitch!.On})`);
+            + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1 (${this.StatefulProgrammableSwitch!.On})`);
         } else {
           this.StatefulProgrammableSwitch!.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent,
             this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
           this.StatefulProgrammableSwitch!.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-          + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0 (${this.StatefulProgrammableSwitch!.On})`);
+            + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0 (${this.StatefulProgrammableSwitch!.On})`);
         }
       }
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.StatefulProgrammableSwitch!.On}`);
@@ -701,90 +702,90 @@ export class Others extends irdeviceBase {
   async removeOutletService(accessory: PlatformAccessory): Promise<void> {
     // If Outlet.Service still present, then remove first
     if (this.Outlet?.Service) {
-    this.Outlet!.Service = this.accessory.getService(this.hap.Service.Outlet) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Outlet Service`);
-    accessory.removeService(this.Outlet!.Service);
+      this.Outlet!.Service = this.accessory.getService(this.hap.Service.Outlet) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Outlet Service`);
+      accessory.removeService(this.Outlet!.Service);
     }
   }
 
   async removeGarageDoorService(accessory: PlatformAccessory): Promise<void> {
     // If GarageDoor.Service still present, then remove first
     if (this.GarageDoor?.Service) {
-    this.GarageDoor!.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
-    accessory.removeService(this.GarageDoor!.Service);
+      this.GarageDoor!.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
+      accessory.removeService(this.GarageDoor!.Service);
     }
   }
 
   async removeDoorService(accessory: PlatformAccessory): Promise<void> {
     // If Door.Service still present, then remove first
     if (this.Door?.Service) {
-    this.Door!.Service = this.accessory.getService(this.hap.Service.Door) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Door Service`);
-    accessory.removeService(this.Door!.Service);
+      this.Door!.Service = this.accessory.getService(this.hap.Service.Door) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Door Service`);
+      accessory.removeService(this.Door!.Service);
     }
   }
 
   async removeLockService(accessory: PlatformAccessory): Promise<void> {
     // If Lock.Service still present, then remove first
     if (this.Lock?.Service) {
-    this.Lock!.Service = this.accessory.getService(this.hap.Service.LockMechanism) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
-    accessory.removeService(this.Lock!.Service);
+      this.Lock!.Service = this.accessory.getService(this.hap.Service.LockMechanism) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
+      accessory.removeService(this.Lock!.Service);
     }
   }
 
   async removeFaucetService(accessory: PlatformAccessory): Promise<void> {
     // If Faucet.Service still present, then remove first
     if (this.Faucet?.Service) {
-    this.Faucet!.Service = this.accessory.getService(this.hap.Service.Faucet) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Faucet Service`);
-    accessory.removeService(this.Faucet!.Service);
+      this.Faucet!.Service = this.accessory.getService(this.hap.Service.Faucet) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Faucet Service`);
+      accessory.removeService(this.Faucet!.Service);
     }
   }
 
   async removeFanService(accessory: PlatformAccessory): Promise<void> {
     // If Fan Service still present, then remove first
     if (this.Fan?.Service) {
-    this.Fan!.Service = this.accessory.getService(this.hap.Service.Fan) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Fan Service`);
-    accessory.removeService(this.Fan!.Service);
+      this.Fan!.Service = this.accessory.getService(this.hap.Service.Fan) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Fan Service`);
+      accessory.removeService(this.Fan!.Service);
     }
   }
 
   async removeWindowService(accessory: PlatformAccessory): Promise<void> {
     // If Window.Service still present, then remove first
     if (this.Window?.Service) {
-    this.Window!.Service = this.accessory.getService(this.hap.Service.Window) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Service`);
-    accessory.removeService(this.Window!.Service);
+      this.Window!.Service = this.accessory.getService(this.hap.Service.Window) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Service`);
+      accessory.removeService(this.Window!.Service);
     }
   }
 
   async removeWindowCoveringService(accessory: PlatformAccessory): Promise<void> {
     // If WindowCovering.Service still present, then remove first
     if (this.WindowCovering?.Service) {
-    this.WindowCovering!.Service = this.accessory.getService(this.hap.Service.WindowCovering) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
-    accessory.removeService(this.WindowCovering!.Service);
+      this.WindowCovering!.Service = this.accessory.getService(this.hap.Service.WindowCovering) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
+      accessory.removeService(this.WindowCovering!.Service);
     }
   }
 
   async removeStatefulProgrammableSwitchService(accessory: PlatformAccessory): Promise<void> {
     // If StatefulProgrammableSwitch.Service still present, then remove first
     if (this.StatefulProgrammableSwitch?.Service) {
-    this.StatefulProgrammableSwitch!.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
-    accessory.removeService(this.StatefulProgrammableSwitch!.Service);
+      this.StatefulProgrammableSwitch!.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
+      accessory.removeService(this.StatefulProgrammableSwitch!.Service);
     }
   }
 
   async removeSwitchService(accessory: PlatformAccessory): Promise<void> {
     // If Switch.Service still present, then remove first
     if (this.Switch?.Service) {
-    this.Switch!.Service = this.accessory.getService(this.hap.Service.Switch) as Service;
-    this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Switch Service`);
-    accessory.removeService(this.Switch!.Service);
+      this.Switch!.Service = this.accessory.getService(this.hap.Service.Switch) as Service;
+      this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Switch Service`);
+      accessory.removeService(this.Switch!.Service);
     }
   }
 

package/src/irdevice/tv.ts

@@ -390,7 +390,8 @@ export class TV extends irdeviceBase {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName} request to SwitchBot API, body: ${bodyChange} sent successfully`);
+          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+            + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
           this.updateHomeKitCharacteristics();
         } else {
           this.statusCode(statusCode);

package/src/irdevice/vacuumcleaner.ts

@@ -109,7 +109,8 @@ export class VacuumCleaner extends irdeviceBase {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName} request to SwitchBot API, body: ${bodyChange} sent successfully`);
+          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+            + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
           this.updateHomeKitCharacteristics();
         } else {
           this.statusCode(statusCode);

package/src/irdevice/waterheater.ts

@@ -114,7 +114,8 @@ export class WaterHeater extends irdeviceBase {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName} request to SwitchBot API, body: ${bodyChange} sent successfully`);
+          this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+            + ` request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
           this.updateHomeKitCharacteristics();
         } else {
           this.statusCode(statusCode);

package/src/platform.ts

@@ -20,8 +20,9 @@ import { CeilingLight } from './device/ceilinglight.js';
 import { StripLight } from './device/lightstrip.js';
 import { Humidifier } from './device/humidifier.js';
 import { RobotVacuumCleaner } from './device/robotvacuumcleaner.js';
+import { Fan } from './device/fan.js';
 import { TV } from './irdevice/tv.js';
-import { Fan } from './irdevice/fan.js';
+import { IRFan } from './irdevice/fan.js';
 import { Light } from './irdevice/light.js';
 import { Others } from './irdevice/other.js';
 import { Camera } from './irdevice/camera.js';
@@ -727,6 +728,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       case 'WoSweeperMini':
       case 'Robot Vacuum Cleaner S1':
       case 'Robot Vacuum Cleaner S1 Plus':
+      case 'Robot Vacuum Cleaner S10':
         this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createRobotVacuumCleaner(device);
         break;
@@ -747,6 +749,10 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       case 'remote with screen+':
         this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId} is Not Supported.`);
         break;
+      case 'Battery Circulator Fan':
+        this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
+        this.createFan(device);
+        break;
       default:
         this.warnLog(`Device: ${device.deviceName} with Device Type: ${device.deviceType}, is currently not supported.`);
         // eslint-disable-next-line max-len
@@ -782,7 +788,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       case 'Fan':
       case 'DIY Fan':
         this.debugLog(`Discovered ${device.remoteType}: ${device.deviceId}`);
-        this.createFan(device);
+        this.createIRFan(device);
         break;
       case 'Air Conditioner':
       case 'DIY Air Conditioner':
@@ -1814,6 +1820,66 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
+  private async createFan(device: device & devicesConfig) {
+    const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.deviceType}`);
+
+    // see if an accessory with the same uuid has already been registered and restored from
+    // the cached devices we stored in the `configureAccessory` method above
+    const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
+
+    if (existingAccessory) {
+      // the accessory already exists
+      if (await this.registerDevice(device)) {
+        // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
+        existingAccessory.context.model = device.deviceType;
+        existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.configDeviceName || device.deviceName;
+        if (device.firmware) {
+          existingAccessory.context.FirmwareRevision = device.firmware;
+        }
+        existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+        this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+        existingAccessory.context.connectionType = await this.connectionType(device);
+        this.api.updatePlatformAccessories([existingAccessory]);
+        // create the accessory handler for the restored accessory
+        // this is imported from `platformAccessory.ts`
+        new Fan(this, existingAccessory, device);
+        this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${existingAccessory.UUID})`);
+      } else {
+        this.unregisterPlatformAccessories(existingAccessory);
+      }
+    } else if (await this.registerDevice(device)) {
+      // the accessory does not yet exist, so we need to create it
+      if (!device.external) {
+        this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+      }
+
+      // create a new accessory
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
+
+      // store a copy of the device object in the `accessory.context`
+      // the `context` property can be used to store any data about the accessory you may need
+      accessory.context.device = device;
+      accessory.context.model = device.deviceType;
+      accessory.context.deviceID = device.deviceId;
+      if (device.firmware) {
+        accessory.context.FirmwareRevision = device.firmware;
+      }
+      accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+      accessory.context.connectionType = await this.connectionType(device);
+      // create the accessory handler for the newly create accessory
+      // this is imported from `platformAccessory.ts`
+      new Fan(this, accessory, device);
+      this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
+
+      // publish device externally or link the accessory to your platform
+      this.externalOrPlatform(device, accessory);
+      this.accessories.push(accessory);
+    } else {
+      this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+    }
+  }
+
   private async createRobotVacuumCleaner(device: device & devicesConfig) {
     const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.deviceType}`);
 
@@ -1926,7 +1992,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
-  private async createFan(device: irdevice & devicesConfig) {
+  private async createIRFan(device: irdevice & devicesConfig) {
     const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.remoteType}`);
 
     // see if an accessory with the same uuid has already been registered and restored from
@@ -1949,7 +2015,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
-        new Fan(this, existingAccessory, device);
+        new IRFan(this, existingAccessory, device);
         this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${existingAccessory.UUID})`);
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
@@ -1975,7 +2041,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.connectionType = device.connectionType;
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
-      new Fan(this, accessory, device);
+      new IRFan(this, accessory, device);
       this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
 
       // publish device externally or link the accessory to your platform

package/src/settings.ts

@@ -48,6 +48,9 @@ export type options = {
 };
 
 export interface devicesConfig extends device {
+  bleMac?: string;
+  model?: string;
+  bleModel?: string;
   configDeviceType: string;
   configDeviceName?: string;
   deviceId: string;
@@ -89,11 +92,13 @@ export interface devicesConfig extends device {
 
 export type meter = {
   hide_temperature?: boolean;
+  convertUnitTo?: string;
   hide_humidity?: boolean;
 };
 
 export type iosensor = {
   hide_temperature?: boolean;
+  convertUnitTo?: string;
   hide_humidity?: boolean;
 };
 
@@ -174,6 +179,7 @@ export type lock = {
 
 export type hub = {
   hide_temperature?: boolean;
+  convertUnitTo?: string;
   hide_humidity?: boolean;
   hide_lightsensor?: boolean;
 };
@@ -271,14 +277,28 @@ export type device = {
   slidePosition?: string;
   //the version of the device
   version?: number;
-  //BLE Mac Address
-  bleMac?: string;
-  //Device Model
-  model?: string;
-  //Device BLE Model
-  bleModel?: string;
+  // Fan Mode:  direct mode: direct; natural mode: "natural"; sleep mode: "sleep"; ultra quiet mode: "baby"
+  mode: string;
+  //the current battery level
+  battery: number;
+  //ON/OFF state
+  power: string;
+  //set nightlight status. turn off: off; mode 1: 1; mode 2: 2
+  nightStatus: number;
+  //set horizontal oscillation. turn on: on; turn off: off
+  oscillation: string;
+  //set vertical oscillation. turn on: on; turn off: off
+  verticalOscillation: string;
+  //battery charge status. charging or uncharged
+  chargingStatus: string;
+  //fan speed. 1~100
+  fanSpeed: number;
 };
 
+// values defined but not displayed by API
+export interface deviceInfo extends device {
+}
+
 //a list of virtual infrared remote devices.
 export type infraredRemoteList = {
   device: Array<irdevice>;
@@ -300,7 +320,7 @@ export type deviceStatus = {
 
 export type deviceStatusBody = {
   //v1.1 of API
-  deviceId: string; //device ID. (Used by the following deviceTypes: Bot, Curtain, Meter, Meter Plus, Lock, Keypad, Keypad Touch, Motion Sensor, Contact Sensor, Ceiling Light, Ceiling Light Pro, Plug Mini (US), Plug Mini (JP), Strip Light, Color Bulb, Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus, Humidifier, Blind Tilt)
+  deviceId: string; //device ID. (Used by the following deviceTypes: Bot, Curtain, Meter, Meter Plus, Lock, Keypad, Keypad Touch, Motion Sensor, Contact Sensor, Ceiling Light, Ceiling Light Pro, Plug Mini (US), Plug Mini (JP), Strip Light, Color Bulb, Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus, Humidifier, Blind Tilt, Battery Circulator Fan)
   deviceType: string; //device type. (Used by the following deviceTypes: Bot, Curtain, Meter, Meter Plus, Lock, Keypad, Keypad Touch, Motion Sensor, Contact Sensor, Ceiling Light, Ceiling Light Pro, Plug Mini (US), Plug Mini (JP), Strip Light, Color Bulb, Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus, Humidifier, Blind Tilt)
   hubDeviceId: string; //device's parent Hub ID. 000000000000 when the device itself is a Hub or it is connected through Wi-Fi. (Used by the following deviceTypes: Bot, Curtain, Meter, Meter Plus, Lock, Keypad, Keypad Touch, Motion Sensor, Contact Sensor, Ceiling Light, Ceiling Light Pro, Plug Mini (JP), Strip Light, Color Bulb, Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus, Humidifier, Blind Tilt)
   power?: string; //ON/OFF state. (Used by the following deviceTypes: Bot, Ceiling Light, Ceiling Light Pro, PLug, Plug Mini (US), Plug Mini (JP), Strip Light, Color Bulb, Humidifier)
@@ -330,16 +350,21 @@ export type deviceStatusBody = {
   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, Meter, MeterPlus, IOSensor)
+  version?: number; //the version of the device.
   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)
+  mode?: number | string; //available for  devices. the fan mode. (Used by the following deviceTypes: Smart Fan, Battery Circulator Fan):(direct mode: direct; natural mode: "natural"; sleep mode: "sleep"; ultra quiet mode: "baby")
   speed?: number; //the fan speed. (Used by the following deviceTypes: Smart Fan)
   shaking?: boolean; //determines if the fan is swinging or not. (Used by the following deviceTypes: Smart Fan)
   shakeCenter?: string; //the fan's swing direction. (Used by the following deviceTypes: Smart Fan)
   shakeRange?: string; //the fan's swing range, 0~120°. (Used by the following deviceTypes: Smart Fan)
   status?: number //the leak status. 0 for no leak, 1 for leak. (Used by the following deviceTypes: Water Detector)
   lightLevel?: number; //the light level. (Used by the following deviceTypes: Hub)
+  nightStatus: number  //	set nightlight status. turn off: off; mode 1: 1; mode 2: 2
+  oscillation: string  //	set horizontal oscillation. turn on: on; turn off: off
+  verticalOscillation: string  //	set vertical oscillation. turn on: on; turn off: off
+  chargingStatus: string  //	battery charge status. charging or uncharged
+  fanSpeed: number  //	fan speed. 1~100
 };
 
 export type ad = {

package/src/utils.ts

@@ -19,8 +19,8 @@ export enum SwitchBotModel {
   ContactSensor = 'W1201500',
   ColorBulb = 'W1401400',
   StripLight = 'W1701100',
-  PlugMiniUS = 'W1901400',
-  PlugMiniJP = 'W2001400',
+  PlugMiniUS = 'W1901400/W1901401',
+  PlugMiniJP = 'W2001400/W2001401',
   Lock = 'W1601700',
   LockPro = 'W3500000',
   Keypad = 'W2500010',
@@ -30,16 +30,17 @@ export enum SwitchBotModel {
   WoSweeperMini = 'WoSweeperMini',
   RobotVacuumCleanerS1 = 'W3011000', // Currently only available in Japan.
   RobotVacuumCleanerS1Plus = 'W3011010', // Currently only available in Japan.
+  RobotVacuumCleanerS10 = 'W3211800',
   Remote = 'Remote',
   UniversalRemote = 'UniversalRemote',
-  CeilingLight = 'W2612230', // Currently only available in Japan.
-  CeilingLightPro = 'W2612210', // Currently only available in Japan.
+  CeilingLight = 'W2612230/W2612240', // Currently only available in Japan.
+  CeilingLightPro = 'W2612210/W2612220', // Currently only available in Japan.
   IndoorCam = 'W1301200',
   PanTiltCam = 'W1801200',
   PanTiltCam2K = 'W3101100',
   BlindTilt = 'W2701600',
   BatteryCirculatorFan = 'W3800510',
-  WaterDetector = 'WoWaterDetector',
+  WaterDetector = 'W4402000',
   Unknown = 'Unknown',
 }
 
@@ -77,11 +78,25 @@ export function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+/**
+ * Converts the value to celsius if the temperature units are in Fahrenheit
+**/
+export function convertUnits(value: number, unit: string, convert?: string): number {
+  if (unit === 'CELSIUS' && convert === 'CELSIUS') {
+    return Math.round((value * 9) / 5 + 32);
+  } else if (unit === 'FAHRENHEIT' && convert === 'FAHRENHEIT') {
+    // celsius should be to the nearest 0.5 degree
+    return Math.round((5 / 9) * (value - 32) * 2) / 2;
+  }
+  return value;
+}
+
+
 export function rgb2hs(r: any, g: any, b: any) {
-  /*
-    Credit:
-    https://github.com/WickyNilliams/pure-color
-  */
+/**
+ * Credit:
+ * https://github.com/WickyNilliams/pure-color
+**/
   r = parseInt(r);
   g = parseInt(g);
   b = parseInt(b);