@switchbot/homebridge-switchbot 3.7.1-beta.12 → 3.7.1-beta.13

package/src/irdevice/vacuumcleaner.ts

@@ -2,12 +2,13 @@
  *
  * vacuumcleaner.ts: @switchbot/homebridge-switchbot.
  */
-import { irdeviceBase } from './irdevice.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 
-import type { SwitchBotPlatform } from '../platform.js';
-import type { irDevicesConfig } from '../settings.js';
-import type { irdevice } from '../types/irdevicelist.js';
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { SwitchBotPlatform } from '../platform.js'
+import type { irDevicesConfig } from '../settings.js'
+import type { irdevice } from '../types/irdevicelist.js'
+
+import { irdeviceBase } from './irdevice.js'
 
 /**
  * Platform Accessory
@@ -17,118 +18,111 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class VacuumCleaner extends irdeviceBase {
   // Services
   private Switch: {
-    Name: CharacteristicValue;
-    Service: Service;
-    On: CharacteristicValue;
-  };
+    Name: CharacteristicValue
+    Service: Service
+    On: CharacteristicValue
+  }
 
   constructor(
     readonly platform: SwitchBotPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {
-    super(platform, accessory, device);
+    super(platform, accessory, device)
     // Set category
-    accessory.category = this.hap.Categories.OTHER;
+    accessory.category = this.hap.Categories.OTHER
 
     // Initialize Switch Service
-    accessory.context.Switch = accessory.context.Switch ?? {};
+    accessory.context.Switch = accessory.context.Switch ?? {}
     this.Switch = {
       Name: accessory.displayName,
       Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
       On: accessory.context.On ?? false,
-    };
-    accessory.context.Switch = this.Switch as object;
+    }
+    accessory.context.Switch = this.Switch as object
 
-    this.Switch.Service
-      .setCharacteristic(this.hap.Characteristic.Name, this.Switch.Name)
-      .getCharacteristic(this.hap.Characteristic.On)
-      .onGet(() => {
-        return this.Switch.On;
-      })
-      .onSet(this.OnSet.bind(this));
+    this.Switch.Service.setCharacteristic(this.hap.Characteristic.Name, this.Switch.Name).getCharacteristic(this.hap.Characteristic.On).onGet(() => {
+      return this.Switch.On
+    }).onSet(this.OnSet.bind(this))
   }
 
   async OnSet(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`On: ${value}`);
+    await this.debugLog(`On: ${value}`)
 
     // Set the requested state
-    this.Switch.On = value;
+    this.Switch.On = value
     if (this.Switch.On) {
-      await this.pushOnChanges();
+      await this.pushOnChanges()
     } else {
-      await this.pushOffChanges();
+      await this.pushOffChanges()
     }
   }
 
   /**
    * Pushes the requested changes to the SwitchBot API
-   * deviceType	       CommandType     Command	      Parameter       Description
-   * Vacuum Cleaner    "command"       "turnOff"      "default"	      set to OFF state
-   * Vacuum Cleaner    "command"       "turnOn"       "default"	      set to ON state
+   * deviceType        CommandType     Command        Parameter       Description
+   * Vacuum Cleaner    "command"       "turnOff"      "default"       set to OFF state
+   * Vacuum Cleaner    "command"       "turnOn"       "default"       set to ON state
    */
   async pushOnChanges(): Promise<void> {
-    await this.debugLog('pushOnChanges'
-      + ` On: ${this.Switch.On}, disablePushOn: ${this.disablePushOn}`);
+    await this.debugLog(`pushOnChanges On: ${this.Switch.On}, disablePushOn: ${this.disablePushOn}`)
     if (this.Switch.On && !this.disablePushOn) {
-      const commandType: string = await this.commandType();
-      const command: string = await this.commandOn();
+      const commandType: string = await this.commandType()
+      const command: string = await this.commandOn()
       const bodyChange = JSON.stringify({
-        command: command,
+        command,
         parameter: 'default',
-        commandType: commandType,
-      });
-      await this.pushChanges(bodyChange);
+        commandType,
+      })
+      await this.pushChanges(bodyChange)
     }
   }
 
   async pushOffChanges(): Promise<void> {
-    await this.debugLog('pushOffChanges'
-      + ` On: ${this.Switch.On}, disablePushOff: ${this.disablePushOff}`);
+    await this.debugLog(`pushOffChanges On: ${this.Switch.On}, disablePushOff: ${this.disablePushOff}`)
     if (!this.Switch.On && !this.disablePushOff) {
-      const commandType: string = await this.commandType();
-      const command: string = await this.commandOff();
+      const commandType: string = await this.commandType()
+      const command: string = await this.commandOff()
       const bodyChange = JSON.stringify({
-        command: command,
+        command,
         parameter: 'default',
-        commandType: commandType,
-      });
-      await this.pushChanges(bodyChange);
+        commandType,
+      })
+      await this.pushChanges(bodyChange)
     }
   }
 
   async pushChanges(bodyChange: any): Promise<void> {
-    await this.debugLog('pushChanges');
+    await this.debugLog('pushChanges')
     if (this.device.connectionType === 'OpenAPI') {
-      await this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`);
+      await this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange);
-        const deviceStatus: any = await body.json();
-        await this.pushStatusCodes(statusCode, deviceStatus);
+        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body.json()
+        await this.pushStatusCodes(statusCode, deviceStatus)
         if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
-          await this.updateHomeKitCharacteristics();
+          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+          await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode);
-          await this.statusCode(deviceStatus.statusCode);
+          await this.statusCode(statusCode)
+          await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {
-        await this.apiError(e);
-        await this.pushChangeError(e);
+        await this.apiError(e)
+        await this.pushChangeError(e)
       }
     } else {
-      await this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`);
+      await this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
     }
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
-    await this.debugLog('updateHomeKitCharacteristics');
+    await this.debugLog('updateHomeKitCharacteristics')
     // On
-    await this.updateCharacteristic(this.Switch.Service, this.hap.Characteristic.On,
-      this.Switch.On, 'On');
+    await this.updateCharacteristic(this.Switch.Service, this.hap.Characteristic.On, this.Switch.On, 'On')
   }
 
   async apiError(e: any): Promise<void> {
-    this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+    this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, e)
   }
 }

package/src/irdevice/waterheater.ts

@@ -2,12 +2,13 @@
  *
  * waterheater.ts: @switchbot/homebridge-switchbot.
  */
-import { irdeviceBase } from './irdevice.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
 
-import type { SwitchBotPlatform } from '../platform.js';
-import type { irDevicesConfig } from '../settings.js';
-import type { irdevice } from '../types/irdevicelist.js';
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { SwitchBotPlatform } from '../platform.js'
+import type { irDevicesConfig } from '../settings.js'
+import type { irdevice } from '../types/irdevicelist.js'
+
+import { irdeviceBase } from './irdevice.js'
 
 /**
  * Platform Accessory
@@ -17,120 +18,112 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class WaterHeater extends irdeviceBase {
   // Services
   private Valve: {
-    Name: CharacteristicValue;
-    Service: Service;
-    Active: CharacteristicValue;
-  };
+    Name: CharacteristicValue
+    Service: Service
+    Active: CharacteristicValue
+  }
 
   constructor(
     readonly platform: SwitchBotPlatform,
     accessory: PlatformAccessory,
     device: irdevice & irDevicesConfig,
   ) {
-    super(platform, accessory, device);
+    super(platform, accessory, device)
     // Set category
-    accessory.category = this.hap.Categories.FAUCET;
+    accessory.category = this.hap.Categories.FAUCET
 
     // Initialize Switch Service
-    accessory.context.Valve = accessory.context.Valve ?? {};
+    accessory.context.Valve = accessory.context.Valve ?? {}
     this.Valve = {
       Name: accessory.displayName,
       Service: accessory.getService(this.hap.Service.Valve) ?? accessory.addService(this.hap.Service.Valve) as Service,
       Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
-    };
-    accessory.context.Valve = this.Valve as object;
+    }
+    accessory.context.Valve = this.Valve as object
 
-    this.Valve.Service
-      .setCharacteristic(this.hap.Characteristic.Name, this.Valve.Name)
-      .setCharacteristic(this.hap.Characteristic.ValveType, this.hap.Characteristic.ValveType.GENERIC_VALVE)
-      .getCharacteristic(this.hap.Characteristic.Active)
-      .onGet(() => {
-        return this.Valve.Active;
-      })
-      .onSet(this.ActiveSet.bind(this));
+    this.Valve.Service.setCharacteristic(this.hap.Characteristic.Name, this.Valve.Name).setCharacteristic(this.hap.Characteristic.ValveType, this.hap.Characteristic.ValveType.GENERIC_VALVE).getCharacteristic(this.hap.Characteristic.Active).onGet(() => {
+      return this.Valve.Active
+    }).onSet(this.ActiveSet.bind(this))
   }
 
   async ActiveSet(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`Active: ${value}`);
+    await this.debugLog(`Active: ${value}`)
 
-    this.Valve.Active = value;
+    this.Valve.Active = value
     if (this.Valve.Active === this.hap.Characteristic.Active.ACTIVE) {
-      await this.pushWaterHeaterOnChanges();
-      this.Valve.Service.setCharacteristic(this.hap.Characteristic.InUse, this.hap.Characteristic.InUse.IN_USE);
+      await this.pushWaterHeaterOnChanges()
+      this.Valve.Service.setCharacteristic(this.hap.Characteristic.InUse, this.hap.Characteristic.InUse.IN_USE)
     } else {
-      await this.pushWaterHeaterOffChanges();
-      this.Valve.Service.setCharacteristic(this.hap.Characteristic.InUse, this.hap.Characteristic.InUse.NOT_IN_USE);
+      await this.pushWaterHeaterOffChanges()
+      this.Valve.Service.setCharacteristic(this.hap.Characteristic.InUse, this.hap.Characteristic.InUse.NOT_IN_USE)
     }
   }
 
   /**
    * Pushes the requested changes to the SwitchBot API
-   * deviceType	     Command Type    Command	         Parameter	       Description
-   * WaterHeater     "command"       "turnOff"         "default"	       set to OFF state
-   * WaterHeater     "command"       "turnOn"          "default"	       set to ON state
+   * deviceType      Command Type    Command           Parameter           Description
+   * WaterHeater     "command"       "turnOff"         "default"         set to OFF state
+   * WaterHeater     "command"       "turnOn"          "default"         set to ON state
    */
   async pushWaterHeaterOnChanges(): Promise<void> {
-    await this.debugLog(`pushWaterHeaterOnChanges Active: ${this.Valve.Active},`
-      + ` disablePushOn: ${this.disablePushOn}`);
+    await this.debugLog(`pushWaterHeaterOnChanges Active: ${this.Valve.Active}, disablePushOn: ${this.disablePushOn}`)
     if (this.Valve.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
-      const commandType: string = await this.commandType();
-      const command: string = await this.commandOn();
+      const commandType: string = await this.commandType()
+      const command: string = await this.commandOn()
       const bodyChange = JSON.stringify({
-        command: command,
+        command,
         parameter: 'default',
-        commandType: commandType,
-      });
-      await this.pushChanges(bodyChange);
+        commandType,
+      })
+      await this.pushChanges(bodyChange)
     }
   }
 
   async pushWaterHeaterOffChanges(): Promise<void> {
-    await this.debugLog(`pushWaterHeaterOffChanges Active: ${this.Valve.Active},`
-      + ` disablePushOff: ${this.disablePushOff}`);
+    await this.debugLog(`pushWaterHeaterOffChanges Active: ${this.Valve.Active}, disablePushOff: ${this.disablePushOff}`)
     if (this.Valve.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOff) {
-      const commandType: string = await this.commandType();
-      const command: string = await this.commandOff();
+      const commandType: string = await this.commandType()
+      const command: string = await this.commandOff()
       const bodyChange = JSON.stringify({
-        command: command,
+        command,
         parameter: 'default',
-        commandType: commandType,
-      });
-      await this.pushChanges(bodyChange);
+        commandType,
+      })
+      await this.pushChanges(bodyChange)
     }
   }
 
   async pushChanges(bodyChange: any): Promise<void> {
-    await this.debugLog('pushChanges');
+    await this.debugLog('pushChanges')
     if (this.device.connectionType === 'OpenAPI') {
-      this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`);
+      this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange);
-        const deviceStatus: any = await body.json();
-        await this.pushStatusCodes(statusCode, deviceStatus);
+        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body.json()
+        await this.pushStatusCodes(statusCode, deviceStatus)
         if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
-          await this.updateHomeKitCharacteristics();
+          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+          await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode);
-          await this.statusCode(deviceStatus.statusCode);
+          await this.statusCode(statusCode)
+          await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {
-        await this.apiError(e);
-        await this.pushChangeError(e);
+        await this.apiError(e)
+        await this.pushChangeError(e)
       }
     } else {
-      await this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`);
+      await this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
     }
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
-    await this.debugLog('updateHomeKitCharacteristics');
+    await this.debugLog('updateHomeKitCharacteristics')
     // Active
-    await this.updateCharacteristic(this.Valve.Service, this.hap.Characteristic.Active,
-      this.Valve.Active, 'Active');
+    await this.updateCharacteristic(this.Valve.Service, this.hap.Characteristic.Active, this.Valve.Active, 'Active')
   }
 
   async apiError({ e }: { e: any }): Promise<void> {
-    this.Valve.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
+    this.Valve.Service.updateCharacteristic(this.hap.Characteristic.Active, e)
   }
 }