@switchbot/homebridge-switchbot 1.1.1-beta.7 → 1.2.1-beta.0

package/src/devices/bots.ts

@@ -31,6 +31,10 @@ export class Bot {
   state!: serviceData['state'];
   battery!: serviceData['battery'];
 
+  // Config
+  private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
+  private readonly debugDebug = this.platform.config.options?.debug === 'debug' || this.platform.debugMode;
+
   // Updates
   botUpdateInProgress!: boolean;
   doBotUpdate!: Subject<void>;
@@ -65,39 +69,36 @@ export class Bot {
 
     // get the LightBulb service if it exists, otherwise create a new LightBulb service
     // you can create multiple services for each accessory
-    switch (device.bot!.deviceType) {
-      case 'switch':
-        // If outletService still pressent, then remove first
-        if (this.outletService) {
-          this.platform.device(`Bot: ${this.accessory.displayName} Removing Leftover outletService first`);
-        }
-        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
-        accessory.removeService(this.outletService!);
+    if (device.bot?.deviceType === 'switch') {
+      // If outletService still pressent, then remove first
+      if (this.outletService) {
+        this.platform.device(`Bot: ${this.accessory.displayName} Removing Leftover outletService first`);
+      }
+      this.outletService = this.accessory.getService(this.platform.Service.Outlet);
+      accessory.removeService(this.outletService!);
 
-        // Add switchService
-        (this.switchService =
-          accessory.getService(this.platform.Service.Switch) ||
-          accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Switch`;
-        this.platform.log.info(`Bot: ${this.accessory.displayName} Displaying as Switch`);
+      // Add switchService
+      (this.switchService =
+        accessory.getService(this.platform.Service.Switch) ||
+        accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Switch`;
+      this.platform.log.info(`Bot: ${this.accessory.displayName} Displaying as Switch`);
 
-        this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-        break;
-      case 'outlet':
-      default:
-        // If switchService still pressent, then remove first
-        if (this.switchService) {
-          this.platform.device(`Bot: ${this.accessory.displayName} Removing Leftover switchService first`);
-        }
-        this.switchService = this.accessory.getService(this.platform.Service.Switch);
-        accessory.removeService(this.switchService!);
+      this.switchService?.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    } else {
+      // If switchService still pressent, then remove first
+      if (this.switchService) {
+        this.platform.device(`Bot: ${this.accessory.displayName} Removing Leftover switchService first`);
+      }
+      this.switchService = this.accessory.getService(this.platform.Service.Switch);
+      accessory.removeService(this.switchService!);
 
-        // Add outletService
-        (this.outletService =
-          accessory.getService(this.platform.Service.Outlet) ||
-          accessory.addService(this.platform.Service.Outlet)), `${accessory.displayName} Outlet`;
-        this.platform.log.info(`Bot: ${this.accessory.displayName} Displaying as Outlet`);
+      // Add outletService
+      (this.outletService =
+        accessory.getService(this.platform.Service.Outlet) ||
+        accessory.addService(this.platform.Service.Outlet)), `${accessory.displayName} Outlet`;
+      this.platform.log.info(`Bot: ${this.accessory.displayName} Displaying as Outlet`);
 
-        this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+      this.outletService?.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
     }
 
     if (device.ble) {
@@ -141,10 +142,15 @@ export class Bot {
         try {
           await this.pushChanges();
         } catch (e: any) {
-          this.platform.log.error(`Bot: ${this.accessory.displayName} failed to pushChanges,`
-            + ` Error Message: ${JSON.stringify(e.message)}`);
-          this.platform.debug(`Bot: ${this.accessory.displayName} Error: ${JSON.stringify(e)}`);
-          this.apiError(e);
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges`);
+          if (this.deviceDebug) {
+            this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges,`
+              + ` Error Message: ${JSON.stringify(e.message)}`);
+          }
+          if (this.debugDebug) {
+            this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges,`
+              + ` Error: ${JSON.stringify(e)}`);
+          }
         }
         this.botUpdateInProgress = false;
       });
@@ -239,7 +245,15 @@ export class Bot {
       this.parseStatus();
       this.updateHomeKitCharacteristics();
     }).catch(async (e: any) => {
-      this.platform.log.error(`Bot: ${this.accessory.displayName} BLE Connection failed refreshStatus, Error Message: ${JSON.stringify(e.message)}`);
+      this.platform.log.error(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
+      if (this.deviceDebug) {
+        this.platform.log.error(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+          + ` Error Message: ${JSON.stringify(e.message)}`);
+      }
+      if (this.debugDebug) {
+        this.platform.log.error(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+          + ` Error: ${JSON.stringify(e)}`);
+      }
       if (this.platform.config.credentials?.openToken) {
         this.platform.log.warn(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
@@ -264,8 +278,15 @@ export class Bot {
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
-        this.platform.log.error(`Bot: ${this.accessory.displayName} failed to refresh status, Error Message: ${JSON.stringify(e.message)}`);
-        this.platform.debug(`Bot: ${this.accessory.displayName} Error: ${JSON.stringify(e)}`);
+        this.platform.log.error(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
+        if (this.deviceDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+            + ` Error Message: ${JSON.stringify(e.message)}`);
+        }
+        if (this.debugDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+            + ` Error: ${JSON.stringify(e)}`);
+        }
         this.apiError(e);
       }
     }
@@ -298,7 +319,15 @@ export class Bot {
       }).then(() => {
         this.platform.device(`Bot: ${this.accessory.displayName} Done.`);
       }).catch(async (e: any) => {
-        this.platform.log.error(`Bot: ${this.accessory.displayName} BLE Connection failed pushChanges, Error Message: ${JSON.stringify(e.message)}`);
+        this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+        if (this.deviceDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+            + ` Error Message: ${JSON.stringify(e.message)}`);
+        }
+        if (this.debugDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+            + ` Error: ${JSON.stringify(e)}`);
+        }
         if (this.platform.config.credentials?.openToken) {
           this.platform.log.warn(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
           await this.openAPIpushChanges();
@@ -306,20 +335,28 @@ export class Bot {
       });
     } else if (this.device.bot?.mode === 'switch') {
       this.platform.device(`Bot: ${this.accessory.displayName} Press Mode: ${this.device.bot?.mode}`);
-      switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list) => {
+      switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list: any) => {
         this.platform.log.info(`Bot: ${this.accessory.displayName} On: ${this.SwitchOn}`);
         return this.turnOnOff(device_list);
       }).then(() => {
         this.platform.device(`Bot: ${this.accessory.displayName} Done.`);
       }).catch(async (e: any) => {
-        this.platform.log.error(`Bot: ${this.accessory.displayName} BLE Connection failed pushChanges, Error Message: ${JSON.stringify(e.message)}`);
+        this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+        if (this.deviceDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+            + ` Error Message: ${JSON.stringify(e.message)}`);
+        }
+        if (this.debugDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+            + ` Error: ${JSON.stringify(e)}`);
+        }
         if (this.platform.config.credentials?.openToken) {
           this.platform.log.warn(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
           await this.openAPIpushChanges();
         }
       });
     } else {
-      this.platform.log.error(`Bot: ${this.accessory.displayName} Mode Not Set.`);
+      this.platform.log.error(`Bot: ${this.accessory.displayName} Mode Not Set, mode: ${this.device.bot?.mode}`);
     }
   }
 
@@ -333,35 +370,47 @@ export class Bot {
 
   private async openAPIpushChanges() {
     if (this.platform.config.credentials?.openToken) {
-      this.platform.debug(`Bot: ${this.accessory.displayName} OpenAPI pushChanges`);
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-      } as payload;
-
-      if (this.device.bot?.mode === 'switch' && this.SwitchOn) {
-        payload.command = 'turnOn';
-        this.SwitchOn = true;
-        this.platform.debug(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.SwitchOn}`);
-      } else if (this.device.bot?.mode === 'switch' && !this.SwitchOn) {
-        payload.command = 'turnOff';
-        this.SwitchOn = false;
-        this.platform.debug(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.SwitchOn}`);
-      } else if (this.device.bot?.mode === 'press') {
-        payload.command = 'press';
-        this.platform.debug(`Bot: ${this.accessory.displayName} Press Mode`);
-        this.SwitchOn = false;
-      } else {
-        throw new Error(`Bot: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
-      }
+      try {
+        this.platform.debug(`Bot: ${this.accessory.displayName} OpenAPI pushChanges`);
+        const payload = {
+          commandType: 'command',
+          parameter: 'default',
+        } as payload;
+
+        if (this.device.bot?.mode === 'switch' && this.SwitchOn) {
+          payload.command = 'turnOn';
+          this.SwitchOn = true;
+          this.platform.debug(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.SwitchOn}`);
+        } else if (this.device.bot?.mode === 'switch' && !this.SwitchOn) {
+          payload.command = 'turnOff';
+          this.SwitchOn = false;
+          this.platform.debug(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.SwitchOn}`);
+        } else if (this.device.bot?.mode === 'press') {
+          payload.command = 'press';
+          this.platform.debug(`Bot: ${this.accessory.displayName} Press Mode`);
+          this.SwitchOn = false;
+        } else {
+          throw new Error(`Bot: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
+        }
 
-      this.platform.log.info(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
-        + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+        this.platform.log.info(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+          + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
 
-      // Make the API request
-      const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
-      this.platform.debug(`Bot ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
-      this.statusCode(push);
+        // Make the API request
+        const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+        this.platform.debug(`Bot ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
+        this.statusCode(push);
+      } catch (e: any) {
+        this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+        if (this.deviceDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+            + ` Error Message: ${JSON.stringify(e.message)}`);
+        }
+        if (this.debugDebug) {
+          this.platform.log.error(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+            + ` Error: ${JSON.stringify(e)}`);
+        }
+      }
     }
   }
 
@@ -425,8 +474,8 @@ export class Bot {
         this.platform.log.error(`Bot: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        // eslint-disable-next-line max-len
-        this.platform.log.error(`Bot: ${this.accessory.displayName} Device internal error due to device states not synchronized with server. Or command fomrat is invalid.`);
+        this.platform.log.error(`Bot: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
+          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Bot: ${this.accessory.displayName} Command successfully sent.`);

package/src/devices/colorbulb.ts

@@ -2,7 +2,7 @@ import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
 import { interval, Subject } from 'rxjs';
 import { debounceTime, skipWhile, tap } from 'rxjs/operators';
-import { DeviceURL, device, devicesConfig, switchbot, deviceStatusResponse, payload } from '../settings';
+import { DeviceURL, device, devicesConfig, switchbot, deviceStatusResponse, payload, hs2rgb, rgb2hs } from '../settings';
 import { AxiosResponse } from 'axios';
 
 /**
@@ -16,7 +16,9 @@ export class ColorBulb {
 
   // Characteristic Values
   On!: CharacteristicValue;
+  Hue!: CharacteristicValue;
   Brightness!: CharacteristicValue;
+  Saturation!: CharacteristicValue;
   ColorTemperature!: CharacteristicValue;
 
   // OpenAPI Others
@@ -27,6 +29,8 @@ export class ColorBulb {
 
   // Config
   set_minStep?: number;
+  private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
+  private readonly debugDebug = this.platform.config.options?.debug === 'debug' || this.platform.debugMode;
 
   // Updates
   colorBulbUpdateInProgress!: boolean;
@@ -93,15 +97,38 @@ export class ColorBulb {
     // handle ColorTemperature events using the ColorTemperature characteristic
     this.service.getCharacteristic(this.platform.Characteristic.ColorTemperature)
       .setProps({
-        minStep: this.minStep(),
+        minValue: 140,
+        maxValue: 500,
+        validValueRanges: [140, 500],
+      })
+      .onGet(() => {
+        return this.ColorTemperature;
+      })
+      .onSet(this.ColorTemperatureSet.bind(this));
+
+    // handle Hue events using the Hue characteristic
+    this.service.getCharacteristic(this.platform.Characteristic.Hue)
+      .setProps({
+        minValue: 0,
+        maxValue: 360,
+        validValueRanges: [0, 360],
+      })
+      .onGet(() => {
+        return this.Hue;
+      })
+      .onSet(this.HueSet.bind(this));
+
+    // handle Hue events using the Hue characteristic
+    this.service.getCharacteristic(this.platform.Characteristic.Saturation)
+      .setProps({
         minValue: 0,
         maxValue: 100,
         validValueRanges: [0, 100],
       })
       .onGet(() => {
-        return this.ColorTemperature;
+        return this.Saturation;
       })
-      .onSet(this.ColorTemperatureSet.bind(this));
+      .onSet(this.SaturationSet.bind(this));
 
     // Update Homekit
     this.updateHomeKitCharacteristics();
@@ -126,9 +153,15 @@ export class ColorBulb {
         try {
           await this.pushChanges();
         } catch (e: any) {
-          this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed to pushChanges,`
-            + ` Error Message: ${JSON.stringify(e.message)}`);
-          this.platform.debug(`Color Bulb: ${this.accessory.displayName} Error: ${JSON.stringify(e)}`);
+          this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed pushChanges`);
+          if (this.deviceDebug) {
+            this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed pushChanges,`
+              + ` Error Message: ${JSON.stringify(e.message)}`);
+          }
+          if (this.debugDebug) {
+            this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed pushChanges,`
+              + ` Error: ${JSON.stringify(e)}`);
+          }
           this.apiError(e);
         }
         this.colorBulbUpdateInProgress = false;
@@ -152,9 +185,40 @@ export class ColorBulb {
       default:
         this.On = false;
     }
-    this.platform.debug(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
-    this.deviceStatus.body.brightness = Number(this.Brightness);
-    this.deviceStatus.body.colorTemperature = Number(this.ColorTemperature);
+    this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+
+    // Brightness
+    this.Brightness = Number(this.deviceStatus.body.brightness);
+    this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+
+    // Color, Hue & Brightness
+    if (this.deviceStatus.body.color) {
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} color: ${JSON.stringify(this.deviceStatus.body.color)}`);
+      const [red, green, blue] = this.deviceStatus.body.color!.split(':');
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
+
+      const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
+
+      // Hue
+      this.Hue = hue;
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+
+      // Saturation
+      this.Saturation = saturation;
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+    }
+
+    // ColorTemperature
+    if (this.deviceStatus.body.colorTemperature) {
+      // Convert mired to kelvin to nearest 100 (Govee seems to need this)
+      const mired = Math.round(1000000 / this.deviceStatus.body.colorTemperature);
+
+      this.ColorTemperature = Number(mired);
+      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+    }
   }
 
   async refreshStatus() {
@@ -164,37 +228,123 @@ export class ColorBulb {
       this.parseStatus();
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
-      this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed to refresh status, Error Message ${JSON.stringify(e.message)}`);
-      this.platform.debug(`Color Bulb: ${this.accessory.displayName} Error: ${JSON.stringify(e)}`);
+      this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
+      if (this.deviceDebug) {
+        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+          + ` Error Message: ${JSON.stringify(e.message)}`);
+      }
+      if (this.debugDebug) {
+        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+          + ` Error: ${JSON.stringify(e)}`);
+      }
       this.apiError(e);
     }
   }
 
   /**
  * Pushes the requested changes to the SwitchBot API
- * deviceType	commandType	  Command	    command parameter	  Description
- * Color Bulb   -    "command"     "turnOff"   "default"	  =        set to OFF state
- * Color Bulb   -    "command"     "turnOn"    "default"	  =        set to ON state
+ * deviceType	      commandType	          Command	               command parameter	                     Description
+ * Color Bulb   -    "command"            "turnOff"                  "default"	              =        set to OFF state
+ * Color Bulb   -    "command"            "turnOn"                   "default"	              =        set to ON state
+ * Color Bulb   -    "command"            "toggle"                   "default"	              =        toggle state
+ * Color Bulb   -    "command"         "setBrightness"	             "{1-100}"	              =        set brightness
+ * Color Bulb   -    "command"           "setColor"	         "{0-255}:{0-255}:{0-255}"	      =        set RGB color value
+ * Color Bulb   -    "command"     "setColorTemperature"	         "{2700-6500}"	            =        set color temperature
  */
   async pushChanges() {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-    } as payload;
-
-    if (this.On) {
-      payload.command = 'turnOn';
-    } else {
-      payload.command = 'turnOff';
-    }
+    try {
+      // Push On Update
+      if (this.On) {
+        const payload = {
+          commandType: 'command',
+          parameter: 'default',
+        } as payload;
+
+        if (this.On) {
+          payload.command = 'turnOn';
+        } else {
+          payload.command = 'turnOff';
+        }
 
-    this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
-      + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+        this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+          + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+
+        // Make the API request
+        const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+        this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+        this.statusCode(push);
+      }
+
+      // Push Brightness Update
+      if (this.On) {
+        const payload = {
+          commandType: 'command',
+          command: 'setBrightness',
+          parameter: `{${this.Brightness}}`,
+        } as payload;
+
+        this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+          + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+
+        // Make the API request
+        const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+        this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+        this.statusCode(push);
+      }
+
+      // Push ColorTemperature Update
+      if (this.On) {
+        const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
+
+        const payload = {
+          commandType: 'command',
+          command: 'setColorTemperature',
+          parameter: `{${kelvin}}`,
+        } as payload;
+
+        this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+          + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+
+        // Make the API request
+        const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+        this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+        this.statusCode(push);
+      }
+
+      // Push Hue & Saturation Update
+      if (this.On) {
+        this.platform.log.warn(JSON.stringify(this.Hue));
+        this.platform.log.warn(JSON.stringify(this.Saturation));
+
+        const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
+        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
+
+        const payload = {
+          commandType: 'command',
+          command: 'setColor',
+          parameter: `{${red}}:{${green}}:{${blue}}`,
+        } as payload;
+
+        this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+          + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+
+        // Make the API request
+        const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+        this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+        this.statusCode(push);
+      }
 
-    // Make the API request
-    const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
-    this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
-    this.statusCode(push);
+    } catch (e: any) {
+      this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+      if (this.deviceDebug) {
+        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+          + ` Error Message: ${JSON.stringify(e.message)}`);
+      }
+      if (this.debugDebug) {
+        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+          + ` Error: ${JSON.stringify(e)}`);
+      }
+    }
   }
 
   updateHomeKitCharacteristics() {
@@ -216,11 +366,25 @@ export class ColorBulb {
       this.service.updateCharacteristic(this.platform.Characteristic.Brightness, this.ColorTemperature);
       this.platform.debug(`Color Bulb: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
     }
+    if (this.Hue === undefined) {
+      this.platform.debug(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+    } else {
+      this.service.updateCharacteristic(this.platform.Characteristic.Hue, this.Hue);
+      this.platform.debug(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
+    }
+    if (this.Saturation === undefined) {
+      this.platform.debug(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+    } else {
+      this.service.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
+      this.platform.debug(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
+    }
   }
 
   public apiError(e: any) {
     this.service.updateCharacteristic(this.platform.Characteristic.On, e);
+    this.service.updateCharacteristic(this.platform.Characteristic.Hue, e);
     this.service.updateCharacteristic(this.platform.Characteristic.Brightness, e);
+    this.service.updateCharacteristic(this.platform.Characteristic.Saturation, e);
     this.service.updateCharacteristic(this.platform.Characteristic.ColorTemperature, e);
   }
 
@@ -242,8 +406,8 @@ export class ColorBulb {
         this.platform.log.error(`Color Bulb: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        // eslint-disable-next-line max-len
-        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} Device internal error due to device states not synchronized with server. Or command fomrat is invalid.`);
+        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
+          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Color Bulb: ${this.accessory.displayName} Command successfully sent.`);
@@ -282,4 +446,25 @@ export class ColorBulb {
     this.ColorTemperature = value;
     this.doColorBulbUpdate.next();
   }
+
+  /**
+ * Handle requests to set the value of the "Hue" characteristic
+ */
+  HueSet(value: CharacteristicValue) {
+    this.platform.debug(`Color Bulb: ${this.accessory.displayName} Hue: ${value}`);
+
+    this.Hue = value;
+    this.doColorBulbUpdate.next();
+  }
+
+  /**
+ * Handle requests to set the value of the "Saturation" characteristic
+ */
+  SaturationSet(value: CharacteristicValue) {
+    this.platform.debug(`Color Bulb: ${this.accessory.displayName} Saturation: ${value}`);
+
+    this.Saturation = value;
+    this.doColorBulbUpdate.next();
+  }
 }
+