@switchbot/homebridge-switchbot 3.5.0-beta.9 → 3.5.0

package/src/device/colorbulb.ts

@@ -1,152 +1,110 @@
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * blindtilt.ts: @switchbot/homebridge-switchbot.
+ */
 import { request } from 'undici';
-import { sleep } from '../utils.js';
+import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
-import { SwitchBotPlatform } from '../platform.js';
+import { Devices } from '../settings.js';
+import { hs2rgb, rgb2hs, m2hs } from '../utils.js';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { device, devicesConfig, deviceStatus, hs2rgb, rgb2hs, m2hs, serviceData, Devices, SwitchBotPlatformConfig } from '../settings.js';
-import {
-  Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap, API, Logging, HAP,
-} from 'homebridge';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { device, devicesConfig, deviceStatus, serviceData } from '../settings.js';
+import type { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
 
 /**
  * Platform Accessory
  * 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 ColorBulb {
-  public readonly api: API;
-  public readonly log: Logging;
-  public readonly config!: SwitchBotPlatformConfig;
-  protected readonly hap: HAP;
+export class ColorBulb extends deviceBase {
   // Services
-  lightBulbService!: Service;
-
-  // Characteristic Values
-  On!: CharacteristicValue;
-  Hue!: CharacteristicValue;
-  Saturation!: CharacteristicValue;
-  Brightness!: CharacteristicValue;
-  FirmwareRevision!: CharacteristicValue;
-  ColorTemperature?: CharacteristicValue;
-
-  // OpenAPI Status
-  OpenAPI_On: deviceStatus['power'];
-  OpenAPI_RGB: deviceStatus['color'];
-  OpenAPI_Brightness: deviceStatus['brightness'];
-  OpenAPI_FirmwareRevision: deviceStatus['version'];
-  OpenAPI_ColorTemperature?: deviceStatus['colorTemperature'];
-
-  // BLE Status
-  BLE_ColorTemperature: serviceData['color_temperature'];
-  BLE_Power: serviceData['power'];
-  BLE_Red: serviceData['red'];
-  BLE_Blue: serviceData['blue'];
-  BLE_Green: serviceData['green'];
-  BLE_On: serviceData['state'];
-  BLE_Delay: serviceData['delay'];
-  BLE_WifiRssi: serviceData['wifiRssi'];
-  BLE_Brightness: serviceData['brightness'];
-  BLE_Saturation;
-  BLE_Hue;
-
-  // BLE Others
-  BLE_IsConnected?: boolean;
-
-  // Config
-  set_minStep?: number;
-  scanDuration!: number;
-  deviceLogging!: string;
-  deviceRefreshRate!: number;
-  adaptiveLightingShift?: number;
+  private LightBulb: {
+    Name: CharacteristicValue;
+    Service: Service;
+    On: CharacteristicValue;
+    Hue: CharacteristicValue;
+    Saturation: CharacteristicValue;
+    Brightness: CharacteristicValue;
+    ColorTemperature?: CharacteristicValue;
+  };
 
   // Adaptive Lighting
   AdaptiveLightingController?: ControllerConstructor | Controller<ControllerServiceMap>;
-  minKelvin!: number;
-  maxKelvin!: number;
-
-  // Others
-  cacheKelvin!: number;
+  adaptiveLightingShift?: number;
 
   // Updates
   colorBulbUpdateInProgress!: boolean;
   doColorBulbUpdate!: Subject<void>;
 
-  // Connection
-  private readonly OpenAPI: boolean;
-  private readonly BLE: boolean;
-
   constructor(
-    private readonly platform: SwitchBotPlatform,
-    private accessory: PlatformAccessory,
-    public device: device & devicesConfig,
+    readonly platform: SwitchBotPlatform,
+    accessory: PlatformAccessory,
+    device: device & devicesConfig,
   ) {
-    this.api = this.platform.api;
-    this.log = this.platform.log;
-    this.config = this.platform.config;
-    this.hap = this.api.hap;
-    // Connection
-    this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
-    this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
+    super(platform, accessory, device);
     // default placeholders
-    this.deviceLogs(device);
-    this.scan(device);
-    this.refreshRate(device);
     this.adaptiveLighting(device);
-    this.deviceContext();
-    this.deviceConfig(device);
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doColorBulbUpdate = new Subject();
     this.colorBulbUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
-    // set accessory information
-    accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.hap.Characteristic.Model, 'W1401400')
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
-
-    // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
-    // you can create multiple services for each accessory
-    const lightBulbService = `${accessory.displayName} ${device.deviceType}`;
-    (this.lightBulbService = accessory.getService(this.hap.Service.Lightbulb)
-      || accessory.addService(this.hap.Service.Lightbulb)), lightBulbService;
-
-    if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
-      this.accessory.removeService(this.lightBulbService);
-      this.lightBulbService = this.accessory.addService(this.hap.Service.Lightbulb);
-      this.accessory.context.adaptiveLighting = false;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
+    // Initialize LightBulb property
+    accessory.context.LightBulb = accessory.context.LightBulb ?? {};
+    this.LightBulb = {
+      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
+      On: accessory.context.On ?? false,
+      Hue: accessory.context.Hue ?? 0,
+      Saturation: accessory.context.Saturation ?? 0,
+      Brightness: accessory.context.Brightness ?? 0,
+      ColorTemperature: accessory.context.ColorTemperature ?? 140,
+    };
+    accessory.context.LightBulb = this.LightBulb as object;
+
+    // Adaptive Lighting
+    if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {
+      accessory.removeService(this.LightBulb.Service);
+      this.LightBulb.Service = accessory.addService(this.hap.Service.Lightbulb);
+      accessory.context.adaptiveLighting = false;
+      this.debugLog(`${device.deviceType}: ${accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting}`);
     }
-
-    this.lightBulbService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-    if (!this.lightBulbService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-      this.lightBulbService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
+    if (this.adaptiveLightingShift !== -1) {
+      this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.LightBulb.Service, {
+        customTemperatureAdjustment: this.adaptiveLightingShift,
+      });
+      accessory.configureController(this.AdaptiveLightingController);
+      accessory.context.adaptiveLighting = true;
+      this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting},`
+        + ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
     }
+    this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
 
-    // handle on / off events using the On characteristic
-    this.lightBulbService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+    // Initialize LightBulb Characteristics
+    this.LightBulb.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.LightBulb.Name)
+      .getCharacteristic(this.hap.Characteristic.On)
+      .onGet(() => {
+        return this.LightBulb.On;
+      })
+      .onSet(this.OnSet.bind(this));
 
-    // handle Brightness events using the Brightness characteristic
-    this.lightBulbService
+    this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.Brightness)
       .setProps({
-        minStep: this.minStep(device),
+        minStep: device.colorbulb?.set_minStep ?? 1,
         minValue: 0,
         maxValue: 100,
         validValueRanges: [0, 100],
       })
       .onGet(() => {
-        return this.Brightness;
+        return this.LightBulb.Brightness;
       })
       .onSet(this.BrightnessSet.bind(this));
 
-    // handle ColorTemperature events using the ColorTemperature characteristic
-    this.lightBulbService
+    this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.ColorTemperature)
       .setProps({
         minValue: 140,
@@ -154,12 +112,11 @@ export class ColorBulb {
         validValueRanges: [140, 500],
       })
       .onGet(() => {
-        return this.ColorTemperature!;
+        return this.LightBulb.ColorTemperature!;
       })
       .onSet(this.ColorTemperatureSet.bind(this));
 
-    // handle Hue events using the Hue characteristic
-    this.lightBulbService
+    this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.Hue)
       .setProps({
         minValue: 0,
@@ -167,12 +124,11 @@ export class ColorBulb {
         validValueRanges: [0, 360],
       })
       .onGet(() => {
-        return this.Hue;
+        return this.LightBulb.Hue;
       })
       .onSet(this.HueSet.bind(this));
 
-    // handle Hue events using the Hue characteristic
-    this.lightBulbService
+    this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.Saturation)
       .setProps({
         minValue: 0,
@@ -180,22 +136,12 @@ export class ColorBulb {
         validValueRanges: [0, 100],
       })
       .onGet(() => {
-        return this.Saturation;
+        return this.LightBulb.Saturation;
       })
       .onSet(this.SaturationSet.bind(this));
 
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
-    if (this.adaptiveLightingShift !== -1) {
-      this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.lightBulbService, {
-        customTemperatureAdjustment: this.adaptiveLightingShift,
-      });
-      this.accessory.configureController(this.AdaptiveLightingController);
-      this.accessory.context.adaptiveLighting = true;
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
-        ` adaptiveLightingShift: ${this.adaptiveLightingShift}`,
-      );
-    }
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
 
     // Update Homekit
     this.updateHomeKitCharacteristics();
@@ -208,60 +154,7 @@ export class ColorBulb {
       });
 
     //regisiter webhook event handler
-    if (this.device.webhook) {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
-      this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
-        try {
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
-          const { powerState, brightness, color, colorTemperature } = context;
-          const { On, Brightness, Hue, Saturation, ColorTemperature } = this;
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
-            '(powerState, brightness, color, colorTemperature) = ' +
-            `Webhook:(${powerState}, ${brightness}, ${color}, ${colorTemperature}), ` +
-            `current:(${On}, ${Brightness}, ${Hue}, ${Saturation}, ${ColorTemperature})`);
-          this.On = powerState === 'ON' ? true : false;
-          this.Brightness = brightness;
-
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(color)}`);
-          const [red, green, blue] = color!.split(':');
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
-
-          const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
-          this.debugLog(
-            `${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`,
-          );
-
-          // Hue
-          this.Hue = hue;
-          if (this.accessory.context.Hue !== this.Hue) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
-          } else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
-          }
-
-          // Saturation
-          this.Saturation = saturation;
-          if (this.accessory.context.Saturation !== this.Saturation) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
-          } else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
-          }
-
-          this.ColorTemperature = colorTemperature;
-          if (this.accessory.context.ColorTemperature !== this.ColorTemperature) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
-          } else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
-          }
-          this.updateHomeKitCharacteristics();
-        } catch (e: any) {
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
-            + `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
-        }
-      };
-    }
+    this.registerWebhook(accessory, device);
 
     // Watch for Bulb change events
     // We put in a debounce of 100ms so we don't make duplicate calls
@@ -270,138 +163,130 @@ export class ColorBulb {
         tap(() => {
           this.colorBulbUpdateInProgress = true;
         }),
-        debounceTime(this.platform.config.options!.pushRate! * 1000),
+        debounceTime(this.devicePushRate * 1000),
       )
       .subscribe(async () => {
         try {
           await this.pushChanges();
         } catch (e: any) {
           this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,` +
-            ` Error Message: ${JSON.stringify(e.message)}`,
-          );
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
+            + ` Error Message: ${JSON.stringify(e.message)}`);
         }
         this.colorBulbUpdateInProgress = false;
       });
   }
 
   /**
-   * Parse the device status from the SwitchBot api
+   * Parse the device status from the SwitchBotBLE API
    */
-  async parseStatus(): Promise<void> {
-    if (!this.device.enableCloudService && this.OpenAPI) {
-      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
-    } else if (this.BLE) {
-      await this.BLEparseStatus();
-    } else if (this.OpenAPI && this.platform.config.credentials?.token) {
-      await this.openAPIparseStatus();
-    } else {
-      await this.offlineOff();
-      this.debugWarnLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`,
-      );
-    }
-  }
-
-  async BLEparseStatus(): Promise<void> {
+  async BLEparseStatus(serviceData: serviceData): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
     // State
-    switch (this.BLE_On) {
+    switch (serviceData.power) {
       case true:
-        this.On = true;
+        this.LightBulb.On = true;
         break;
       default:
-        this.On = false;
+        this.LightBulb.On = false;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
 
     // Brightness
-    this.Brightness = Number(this.BLE_Brightness);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+    this.LightBulb.Brightness = Number(serviceData.brightness);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
 
     // Color, Hue & Brightness
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${this.BLE_Red}`);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${this.BLE_Green}`);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${this.BLE_Blue}`);
-
-    const [hue, saturation] = rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue));
-    this.debugLog(
-      `${this.device.deviceType}: ${this.accessory.displayName}` +
-      ` hs: ${JSON.stringify(rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue)))}`,
-    );
-    this.BLE_Hue = hue;
-    this.BLE_Saturation = saturation;
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${serviceData.red}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${serviceData.green}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${serviceData.blue}`);
+
+    const [hue, saturation] = rgb2hs(Number(serviceData.red), Number(serviceData.green), Number(serviceData.blue));
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+      + ` hs: ${JSON.stringify(rgb2hs(Number(serviceData.red), Number(serviceData.green), Number(serviceData.blue)))}`);
 
     // Hue
-    this.Hue = this.BLE_Hue;
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
+    this.LightBulb.Hue = hue;
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
 
     // Saturation
-    this.Saturation = this.BLE_Saturation;
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+    this.LightBulb.Saturation = saturation;
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
 
     // ColorTemperature
-    if (this.BLE_ColorTemperature) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.BLE_ColorTemperature}`);
-      this.ColorTemperature = this.BLE_ColorTemperature!;
+    if (serviceData.color_temperature) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${serviceData.color_temperature}`);
+      this.LightBulb.ColorTemperature = serviceData.color_temperature!;
 
-      this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+      this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
     }
   }
 
-  async openAPIparseStatus() {
+  /**
+   * Parse the device status from the SwitchBot OpenAPI
+   */
+  async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
-    switch (this.OpenAPI_On) {
+    switch (deviceStatus.body.power) {
       case 'on':
-        this.On = true;
+        this.LightBulb.On = true;
         break;
       default:
-        this.On = false;
+        this.LightBulb.On = false;
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
 
     // Brightness
-    this.Brightness = Number(this.OpenAPI_Brightness);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+    this.LightBulb.Brightness = Number(deviceStatus.body.brightness);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
 
     // Color, Hue & Brightness
-    if (this.OpenAPI_RGB) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(this.OpenAPI_RGB)}`);
-      const [red, green, blue] = this.OpenAPI_RGB!.split(':');
+    if (deviceStatus.body.color) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(deviceStatus.body.color)}`);
+      const [red, green, blue] = deviceStatus.body.color!.split(':');
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
 
       const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
 
       // Hue
-      this.Hue = hue;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
+      this.LightBulb.Hue = hue;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
 
       // Saturation
-      this.Saturation = saturation;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+      this.LightBulb.Saturation = saturation;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
     }
 
     // ColorTemperature
-    if (!Number.isNaN(this.OpenAPI_ColorTemperature)) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.OpenAPI_ColorTemperature}`);
-      const mired = Math.round(1000000 / this.OpenAPI_ColorTemperature!);
+    if (!Number.isNaN(deviceStatus.body.colorTemperature)) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${deviceStatus.body.colorTemperature}`);
+      const mired = Math.round(1000000 / deviceStatus.body.colorTemperature!);
 
-      this.ColorTemperature = Number(mired);
+      this.LightBulb.ColorTemperature = Number(mired);
 
-      this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+      this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
     }
 
-    // FirmwareRevision
-    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
-    this.accessory.context.FirmwareRevision = this.FirmwareRevision;
+    // Firmware Version
+    const version = deviceStatus.body.version?.toString();
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+    if (deviceStatus.body.version) {
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
+    }
   }
 
   /**
@@ -416,10 +301,8 @@ export class ColorBulb {
       await this.openAPIRefreshStatus();
     } else {
       await this.offlineOff();
-      this.debugWarnLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` +
-        ` ${this.device.connectionType}, refreshStatus will not happen.`,
-      );
+      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+        + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
   }
 
@@ -436,113 +319,43 @@ export class ColorBulb {
     // Start to monitor advertisement packets
     (async () => {
       // Start to monitor advertisement packets
-      await switchbot.startScan({
-        model: 'u',
-        id: this.device.bleMac,
-      });
+      await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
       // Set an event handler
       switchbot.onadvertisement = (ad: any) => {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
-        if (this.device.bleMac === ad.address && ad.serviceData.model === 'u') {
+        if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-          this.BLE_ColorTemperature = ad.serviceData.color_temperature;
-          this.BLE_Power = ad.serviceData.power;
-          this.BLE_On = ad.serviceData.state;
-          this.BLE_Red = ad.serviceData.red;
-          this.BLE_Green = ad.serviceData.green;
-          this.BLE_Blue = ad.serviceData.blue;
-          this.BLE_Brightness = ad.serviceData.brightness;
-          this.BLE_Delay = ad.serviceData.delay;
         } else {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         }
       };
-      // Wait 1 seconds
+      // Wait 10 seconds
       await switchbot.wait(this.scanDuration * 1000);
       // Stop to monitor
       await switchbot.stopScan();
       // Update HomeKit
-      await this.BLEparseStatus();
+      await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
       await this.updateHomeKitCharacteristics();
     })();
-    /*if (switchbot !== false) {
-      switchbot
-        .startScan({
-          model: 'u',
-          id: this.device.bleMac,
-        })
-        .then(async () => {
-          // Set an event handler
-          switchbot.onadvertisement = async (ad: ad) => {
-            this.debugLog(
-              `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-              ` BLE Address Found: ${ad.address}`,
-            );
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-            this.BLE_Power = ad.serviceData.power;
-            this.BLE_On = ad.serviceData.state;
-            this.BLE_Red = ad.serviceData.red;
-            this.BLE_Green = ad.serviceData.green;
-            this.BLE_Blue = ad.serviceData.blue;
-            this.BLE_ColorTemperature = ad.serviceData.color_temperature;
-            this.BLE_Brightness = ad.serviceData.brightness;
-            this.BLE_Delay = ad.serviceData.delay;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-            this.debugLog(
-              `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
-                `delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
-                `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
-            );
-
-            if (ad.serviceData) {
-              this.BLE_IsConnected = true;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-              await this.stopScanning(switchbot);
-            } else {
-              this.BLE_IsConnected = false;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-            }
-          };
-          // Wait
-          return await sleep(this.scanDuration * 1000);
-        })
-        .then(async () => {
-          // Stop to monitor
-          await this.stopScanning(switchbot);
-        })
-        .catch(async (e: any) => {
-          this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
-            ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
-          await this.BLERefreshConnection(switchbot);
-        });
-    } else {
+    if (switchbot === undefined) {
       await this.BLERefreshConnection(switchbot);
-    }*/
+    }
   }
 
-  async openAPIRefreshStatus() {
+  async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
-        headers: this.platform.generateHeaders(),
-      });
+      const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries,
+        `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-        this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
           + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-        this.OpenAPI_On = deviceStatus.body.power;
-        this.OpenAPI_RGB = deviceStatus.body.color;
-        this.OpenAPI_Brightness = deviceStatus.body.brightness;
-        this.OpenAPI_ColorTemperature = deviceStatus.body.colorTemperature;
-        this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-        this.openAPIparseStatus();
+        this.openAPIparseStatus(deviceStatus);
         this.updateHomeKitCharacteristics();
       } else {
         this.statusCode(statusCode);
@@ -550,10 +363,81 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.apiError(e);
-      this.errorLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}` +
-        ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-      );
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
+        + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
+    }
+  }
+
+  async registerWebhook(accessory: PlatformAccessory, device: device & devicesConfig) {
+    if (device.webhook) {
+      this.debugLog(`${device.deviceType}: ${accessory.displayName} is listening webhook.`);
+      this.platform.webhookEventHandler[device.deviceId] = async (context) => {
+        try {
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
+          const { powerState, brightness, color, colorTemperature } = context;
+          const { On, Brightness, Hue, Saturation, ColorTemperature } = this.LightBulb;
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} ` +
+            '(powerState, brightness, color, colorTemperature) = ' +
+            `Webhook:(${powerState}, ${brightness}, ${color}, ${colorTemperature}), `
+            + `current:(${On}, ${Brightness}, ${Hue}, ${Saturation}, ${ColorTemperature})`);
+
+          // On
+          this.LightBulb.On = powerState === 'ON' ? true : false;
+          if (accessory.context.Brightness !== this.LightBulb.On) {
+            this.infoLog(`${device.deviceType}: ${accessory.displayName} On: ${this.LightBulb.On}`);
+          } else {
+            this.debugLog(`${device.deviceType}: ${accessory.displayName} On: ${this.LightBulb.On}`);
+          }
+
+          // Brightness
+          this.LightBulb.Brightness = brightness;
+          if (accessory.context.Brightness !== this.LightBulb.Brightness) {
+            this.infoLog(`${device.deviceType}: ${accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
+          } else {
+            this.debugLog(`${device.deviceType}: ${accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
+          }
+
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} color: ${JSON.stringify(color)}`);
+          const [red, green, blue] = color!.split(':');
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} red: ${JSON.stringify(red)}`);
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} green: ${JSON.stringify(green)}`);
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} blue: ${JSON.stringify(blue)}`);
+
+          const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
+          this.debugLog(
+            `${device.deviceType}: ${accessory.displayName}`
+            + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
+
+          // Hue
+          this.LightBulb.Hue = hue;
+          if (accessory.context.Hue !== this.LightBulb.Hue) {
+            this.infoLog(`${device.deviceType}: ${accessory.displayName} Hue: ${this.LightBulb.Hue}`);
+          } else {
+            this.debugLog(`${device.deviceType}: ${accessory.displayName} Hue: ${this.LightBulb.Hue}`);
+          }
+
+          // Saturation
+          this.LightBulb.Saturation = saturation;
+          if (accessory.context.Saturation !== this.LightBulb.Saturation) {
+            this.infoLog(`${device.deviceType}: ${accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
+          } else {
+            this.debugLog(`${device.deviceType}: ${accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
+          }
+
+          this.LightBulb.ColorTemperature = colorTemperature;
+          if (accessory.context.ColorTemperature !== this.LightBulb.ColorTemperature) {
+            this.infoLog(`${device.deviceType}: ${accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+          } else {
+            this.debugLog(`${device.deviceType}: ${accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+          }
+          this.updateHomeKitCharacteristics();
+        } catch (e: any) {
+          this.errorLog(`${device.deviceType}: ${accessory.displayName} `
+            + `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
+        }
+      };
+    } else {
+      this.debugWarnLog(`${device.deviceType}: ${accessory.displayName} is not listening webhook.`);
     }
   }
 
@@ -571,15 +455,14 @@ export class ColorBulb {
   async pushChanges(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
-      /*} else if (this.BLE) {
-        await this.BLEpushChanges();*/
+    } else if (this.BLE) {
+      await this.BLEpushChanges();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {
       await this.offlineOff();
-      this.debugWarnLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, pushChanges will not happen.`,
-      );
+      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+        + ` ${this.device.connectionType}, pushChanges will not happen.`);
     }
     // Refresh the status from the API
     interval(15000)
@@ -592,8 +475,9 @@ export class ColorBulb {
 
   async BLEpushChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
-    if (this.On !== this.accessory.context.On) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+    if (this.LightBulb.On !== this.accessory.context.On) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`
+        + ` On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
       const switchbot = await this.platform.connectBLE();
       // Convert to BLE Address
       this.device.bleMac = this.device
@@ -607,11 +491,11 @@ export class ColorBulb {
           id: this.device.bleMac,
         })
         .then(async (device_list: any) => {
-          this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
-          return await this.retry({
-            max: this.maxRetry(),
+          this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
+          return await this.retryBLE({
+            max: await this.maxRetryBLE(),
             fn: async () => {
-              if (this.On) {
+              if (this.LightBulb.On) {
                 return await device_list[0].turnOn({ id: this.device.bleMac });
               } else {
                 return await device_list[0].turnOff({ id: this.device.bleMac });
@@ -621,38 +505,37 @@ export class ColorBulb {
         })
         .then(() => {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-          this.On = false;
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `On: ${this.LightBulb.On} sent over BLE,  sent successfully`);
+          this.LightBulb.On = false;
         })
         .catch(async (e: any) => {
           this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}` +
-            ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+            + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
           await this.BLEPushConnection();
         });
       // Push Brightness Update
-      if (this.On) {
+      if (this.LightBulb.On) {
         await this.BLEpushBrightnessChanges();
       }
       // Push ColorTemperature Update
-      if (this.On) {
+      if (this.LightBulb.On) {
         await this.BLEpushColorTemperatureChanges();
       }
       // Push Hue & Saturation Update
-      if (this.On) {
+      if (this.LightBulb.On) {
         await this.BLEpushRGBChanges();
       }
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, ` + `OnCached: ${this.accessory.context.On}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges, On: ${this.LightBulb.On},`
+        + ` OnCached: ${this.accessory.context.On}`);
     }
   }
 
   async BLEpushBrightnessChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushBrightnessChanges`);
-    if (this.Brightness !== this.accessory.context.Brightness) {
+    if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
       const switchbot = await this.platform.connectBLE();
       // Convert to BLE Address
       this.device.bleMac = this.device
@@ -666,33 +549,28 @@ export class ColorBulb {
           id: this.device.bleMac,
         })
         .then(async (device_list: any) => {
-          this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.Brightness}`);
-          return await device_list[0].setBrightness(this.Brightness);
+          this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.LightBulb.Brightness}`);
+          return await device_list[0].setBrightness(this.LightBulb.Brightness);
         })
         .then(() => {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-          this.On = false;
+          this.LightBulb.On = false;
         })
         .catch(async (e: any) => {
           this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}` +
-            ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}`
+            + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
           await this.BLEPushConnection();
         });
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.` +
-        `Brightness: ${this.Brightness}, ` +
-        `BrightnessCached: ${this.accessory.context.Brightness}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.`
+        + `Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
     }
   }
 
   async BLEpushColorTemperatureChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushColorTemperatureChanges`);
-    if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
+    if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
       const switchbot = await this.platform.connectBLE();
       // Convert to BLE Address
       this.device.bleMac = this.device
@@ -706,36 +584,32 @@ export class ColorBulb {
           id: this.device.bleMac,
         })
         .then(async (device_list: any) => {
-          this.infoLog(`${this.accessory.displayName} Target ColorTemperature: ${this.ColorTemperature}`);
-          return await device_list[0].setColorTemperature(this.ColorTemperature);
+          this.infoLog(`${this.accessory.displayName} Target ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+          return await device_list[0].setColorTemperature(this.LightBulb.ColorTemperature);
         })
         .then(() => {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-          this.On = false;
+          this.LightBulb.On = false;
         })
         .catch(async (e: any) => {
           this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushColorTemperatureChanges with ` +
-            `${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushColorTemperatureChanges with `
+            + `${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
           await this.BLEPushConnection();
         });
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No BLEpushColorTemperatureChanges.` +
-        `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushColorTemperatureChanges.`
+        + `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
     }
   }
 
   async BLEpushRGBChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushRGBChanges`);
-    if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
+    if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
 
-      const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
+      const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
 
       const switchbot = await this.platform.connectBLE();
@@ -751,34 +625,30 @@ export class ColorBulb {
           id: this.device.bleMac,
         })
         .then(async (device_list: any) => {
-          this.infoLog(`${this.accessory.displayName} Target RGB: ${(this.Brightness, red, green, blue)}`);
-          return await device_list[0].setRGB(this.Brightness, red, green, blue);
+          this.infoLog(`${this.accessory.displayName} Target RGB: ${(this.LightBulb.Brightness, red, green, blue)}`);
+          return await device_list[0].setRGB(this.LightBulb.Brightness, red, green, blue);
         })
         .then(() => {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-          this.On = false;
+          this.LightBulb.On = false;
         })
         .catch(async (e: any) => {
           this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushRGBChanges with ${this.device.connectionType}` +
-            ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushRGBChanges with ${this.device.connectionType}`
+            + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
           await this.BLEPushConnection();
         });
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.Hue}, ` +
-        `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.LightBulb.Hue}, HueCached: `
+        + `${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
     }
   }
 
   async openAPIpushChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
-    if (this.On !== this.accessory.context.On) {
+    if (this.LightBulb.On !== this.accessory.context.On) {
       let command = '';
-      if (this.On) {
+      if (this.LightBulb.On) {
         command = 'turnOn';
       } else {
         command = 'turnOff';
@@ -803,44 +673,41 @@ export class ColorBulb {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
         }
       } catch (e: any) {
         this.apiError(e);
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}` +
-          ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-        );
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+          + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
       }
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` +
-        `On: ${this.On}, ` +
-        `OnCached: ${this.accessory.context.On}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges,`
+        + `On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
     }
     // Push Hue & Saturation Update
-    if (this.On) {
+    if (this.LightBulb.On) {
       await this.pushHueSaturationChanges();
     }
     // Push ColorTemperature Update
-    if (this.On) {
+    if (this.LightBulb.On) {
       await this.pushColorTemperatureChanges();
     }
     // Push Brightness Update
-    if (this.On) {
+    if (this.LightBulb.On) {
       await this.pushBrightnessChanges();
     }
   }
 
   async pushHueSaturationChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges`);
-    if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
-      const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
+    if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
+      const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
       const bodyChange = JSON.stringify({
         command: 'setColor',
@@ -862,30 +729,28 @@ export class ColorBulb {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
         }
       } catch (e: any) {
         this.apiError(e);
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}` +
-          ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-        );
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
+          + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
       }
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.Hue}, ` +
-        `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.LightBulb.Hue}, HueCached: `
+        + `${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
     }
   }
 
   async pushColorTemperatureChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushColorTemperatureChanges`);
-    if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
-      const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
-      this.cacheKelvin = kelvin;
+    if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
+      const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
+      this.accessory.context.kelvin = kelvin;
       const bodyChange = JSON.stringify({
         command: 'setColorTemperature',
         parameter: `${kelvin}`,
@@ -906,31 +771,29 @@ export class ColorBulb {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
         }
       } catch (e: any) {
         this.apiError(e);
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with ${this.device.connectionType}` +
-          ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-        );
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with ${this.device.connectionType}`
+          + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
       }
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.` +
-        `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.`
+        + `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
     }
   }
 
   async pushBrightnessChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges`);
-    if (this.Brightness !== this.accessory.context.Brightness) {
+    if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
       const bodyChange = JSON.stringify({
         command: 'setBrightness',
-        parameter: `${this.Brightness}`,
+        parameter: `${this.LightBulb.Brightness}`,
         commandType: 'command',
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
@@ -948,23 +811,20 @@ export class ColorBulb {
         if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
           this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+          this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+            + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
         }
       } catch (e: any) {
         this.apiError(e);
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}` +
-          ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-        );
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
+          + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
       }
     } else {
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.` +
-        `Brightness: ${this.Brightness}, ` +
-        `BrightnessCached: ${this.accessory.context.Brightness}`,
-      );
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.`
+        + `Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
     }
   }
 
@@ -972,13 +832,13 @@ export class ColorBulb {
    * Handle requests to set the value of the "On" characteristic
    */
   async OnSet(value: CharacteristicValue): Promise<void> {
-    if (this.On === this.accessory.context.On) {
+    if (this.LightBulb.On === this.accessory.context.On) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set On: ${value}`);
     } else {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
     }
 
-    this.On = value;
+    this.LightBulb.On = value;
     this.doColorBulbUpdate.next();
   }
 
@@ -986,15 +846,15 @@ export class ColorBulb {
    * Handle requests to set the value of the "Brightness" characteristic
    */
   async BrightnessSet(value: CharacteristicValue): Promise<void> {
-    if (this.Brightness === this.accessory.context.Brightness) {
+    if (this.LightBulb.Brightness === this.accessory.context.Brightness) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Brightness: ${value}`);
-    } else if (this.On) {
+    } else if (this.LightBulb.On) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
     }
 
-    this.Brightness = value;
+    this.LightBulb.Brightness = value;
     this.doColorBulbUpdate.next();
   }
 
@@ -1002,30 +862,32 @@ export class ColorBulb {
    * Handle requests to set the value of the "ColorTemperature" characteristic
    */
   async ColorTemperatureSet(value: CharacteristicValue): Promise<void> {
-    if (this.ColorTemperature === this.accessory.context.ColorTemperature) {
+    if (this.LightBulb.ColorTemperature === this.accessory.context.ColorTemperature) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set ColorTemperature: ${value}`);
-    } else if (this.On) {
+    } else if (this.LightBulb.On) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
     }
 
+    const minKelvin = 2000;
+    const maxKelvin = 9000;
     // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
     const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
 
     // Check and increase/decrease kelvin to range of device
-    const k = Math.min(Math.max(kelvin, this.minKelvin), this.maxKelvin);
+    const k = Math.min(Math.max(kelvin, minKelvin), maxKelvin);
 
-    if (!this.accessory.context.On || this.cacheKelvin === k) {
+    if (!this.accessory.context.On || this.accessory.context.kelvin === k) {
       return;
     }
 
     // Updating the hue/sat to the corresponding values mimics native adaptive lighting
     const hs = m2hs(value);
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
 
-    this.ColorTemperature = value;
+    this.LightBulb.ColorTemperature = value;
     this.doColorBulbUpdate.next();
   }
 
@@ -1033,17 +895,17 @@ export class ColorBulb {
    * Handle requests to set the value of the "Hue" characteristic
    */
   async HueSet(value: CharacteristicValue): Promise<void> {
-    if (this.Hue === this.accessory.context.Hue) {
+    if (this.LightBulb.Hue === this.accessory.context.Hue) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Hue: ${value}`);
-    } else if (this.On) {
+    } else if (this.LightBulb.On) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
     }
 
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
 
-    this.Hue = value;
+    this.LightBulb.Hue = value;
     this.doColorBulbUpdate.next();
   }
 
@@ -1051,60 +913,61 @@ export class ColorBulb {
    * Handle requests to set the value of the "Saturation" characteristic
    */
   async SaturationSet(value: CharacteristicValue): Promise<void> {
-    if (this.Saturation === this.accessory.context.Saturation) {
+    if (this.LightBulb.Saturation === this.accessory.context.Saturation) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Saturation: ${value}`);
-    } else if (this.On) {
+    } else if (this.LightBulb.On) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
     }
 
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
 
-    this.Saturation = value;
+    this.LightBulb.Saturation = value;
     this.doColorBulbUpdate.next();
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
     // On
-    if (this.On === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+    if (this.LightBulb.On === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
     } else {
-      this.accessory.context.On = this.On;
-      this.lightBulbService.updateCharacteristic(this.hap.Characteristic.On, this.On);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+      this.accessory.context.On = this.LightBulb.On;
+      this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.LightBulb.On}`);
     }
     // Brightness
-    if (this.Brightness === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+    if (this.LightBulb.Brightness === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
     } else {
-      this.accessory.context.Brightness = this.Brightness;
-      this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Brightness, this.Brightness);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
+      this.accessory.context.Brightness = this.LightBulb.Brightness;
+      this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, this.LightBulb.Brightness);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.LightBulb.Brightness}`);
     }
     // ColorTemperature
-    if (this.ColorTemperature === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+    if (this.LightBulb.ColorTemperature === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
     } else {
-      this.accessory.context.ColorTemperature = this.ColorTemperature;
-      this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.ColorTemperature);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
+      this.accessory.context.ColorTemperature = this.LightBulb.ColorTemperature;
+      this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.LightBulb.ColorTemperature);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+        + ` ColorTemperature: ${this.LightBulb.ColorTemperature}`);
     }
     // Hue
-    if (this.Hue === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
+    if (this.LightBulb.Hue === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
     } else {
-      this.accessory.context.Hue = this.Hue;
-      this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, this.Hue);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
+      this.accessory.context.Hue = this.LightBulb.Hue;
+      this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, this.LightBulb.Hue);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.LightBulb.Hue}`);
     }
     // Saturation
-    if (this.Saturation === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+    if (this.LightBulb.Saturation === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
     } else {
-      this.accessory.context.Saturation = this.Saturation;
-      this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, this.Saturation);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
+      this.accessory.context.Saturation = this.LightBulb.Saturation;
+      this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, this.LightBulb.Saturation);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.LightBulb.Saturation}`);
     }
   }
 
@@ -1118,35 +981,6 @@ export class ColorBulb {
     }
   }
 
-  async stopScanning(switchbot: any) {
-    switchbot.stopScan();
-    if (this.BLE_IsConnected) {
-      await this.BLEparseStatus();
-      await this.updateHomeKitCharacteristics();
-    } else {
-      await this.BLERefreshConnection(switchbot);
-    }
-  }
-
-  async getCustomBLEAddress(switchbot: any) {
-    if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);
-      (async () => {
-        // Start to monitor advertisement packets
-        await switchbot.startScan({
-          model: 'u',
-        });
-        // Set an event handler
-        switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-        };
-        await sleep(10000);
-        // Stop to monitor
-        switchbot.stopScan();
-      })();
-    }
-  }
-
   async BLEPushConnection() {
     if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
       this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
@@ -1163,284 +997,17 @@ export class ColorBulb {
     }
   }
 
-  async retry({ max, fn }: { max: number; fn: { (): any; (): Promise<any> } }): Promise<null> {
-    return fn().catch(async (e: any) => {
-      if (max === 0) {
-        throw e;
-      }
-      this.infoLog(e);
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
-      await sleep(1000);
-      return this.retry({ max: max - 1, fn });
-    });
-  }
-
-  maxRetry(): number {
-    if (this.device.maxRetry) {
-      return this.device.maxRetry;
-    } else {
-      return 5;
-    }
-  }
-
-  minStep(device: device & devicesConfig): number {
-    if (device.colorbulb?.set_minStep) {
-      this.set_minStep = device.colorbulb?.set_minStep;
-    } else {
-      this.set_minStep = 1;
-    }
-    return this.set_minStep;
-  }
-
-  async scan(device: device & devicesConfig): Promise<void> {
-    if (device.scanDuration) {
-      this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-      if (this.BLE) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-      }
-    } else {
-      this.scanDuration = this.accessory.context.scanDuration = 1;
-      if (this.BLE) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-      }
-    }
-  }
-
-  async statusCode(statusCode: number): Promise<void> {
-    switch (statusCode) {
-      case 151:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
-        break;
-      case 152:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
-        break;
-      case 160:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
-        break;
-      case 161:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
-        this.offlineOff();
-        break;
-      case 171:
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
-          `Hub: ${this.device.hubDeviceId}`,
-        );
-        this.offlineOff();
-        break;
-      case 190:
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-          ` Or command format is invalid, statusCode: ${statusCode}`,
-        );
-        break;
-      case 100:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
-        break;
-      case 200:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
-        break;
-      case 400:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
-          + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
-        break;
-      case 401:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized,	Authorization for the API is required, `
-          + `but the request has not been authenticated, statusCode: ${statusCode}`);
-        break;
-      case 403:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden,	The request has been authenticated but does not `
-          + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
-        break;
-      case 404:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found,	Specifies the requested path does not exist, `
-          + `statusCode: ${statusCode}`);
-        break;
-      case 406:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable,	The client has requested a MIME type via `
-          + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
-        break;
-      case 415:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type,	The client has defined a contentType `
-          + `header that is not supported by the server, statusCode: ${statusCode}`);
-        break;
-      case 422:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity,	The client has made a valid request, `
-          + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
-        break;
-      case 429:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests,	The client has exceeded the number of `
-          + `requests allowed for a given time window, statusCode: ${statusCode}`);
-        break;
-      case 500:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error,	An unexpected error on the SmartThings `
-          + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
-        break;
-      default:
-        this.infoLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
-          `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`,
-        );
-    }
-  }
-
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      await this.deviceContext();
-      await this.updateHomeKitCharacteristics();
+      this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, false);
     }
   }
 
   apiError(e: any): void {
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.On, e);
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, e);
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Brightness, e);
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, e);
-    this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
-  }
-
-  async deviceContext(): Promise<void> {
-    if (this.On === undefined) {
-      this.On = false;
-    } else {
-      this.On = this.accessory.context.On;
-    }
-    if (this.Hue === undefined) {
-      this.Hue = 0;
-    } else {
-      this.Hue = this.accessory.context.Hue;
-    }
-    if (this.Brightness === undefined) {
-      this.Brightness = 0;
-    } else {
-      this.Brightness = this.accessory.context.Brightness;
-    }
-    if (this.Saturation === undefined) {
-      this.Saturation = 0;
-    } else {
-      this.Saturation = this.accessory.context.Saturation;
-    }
-    if (this.ColorTemperature === undefined) {
-      this.ColorTemperature = 140;
-    } else {
-      this.ColorTemperature = this.accessory.context.ColorTemperature;
-    }
-    this.minKelvin = 2000;
-    this.maxKelvin = 9000;
-    if (this.FirmwareRevision === undefined) {
-      this.FirmwareRevision = this.platform.version;
-      this.accessory.context.FirmwareRevision = this.FirmwareRevision;
-    }
-  }
-
-  async refreshRate(device: device & devicesConfig): Promise<void> {
-    if (device.refreshRate) {
-      this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
-    } else if (this.platform.config.options!.refreshRate) {
-      this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
-    }
-  }
-
-  async deviceConfig(device: device & devicesConfig): Promise<void> {
-    let config = {};
-    if (device.colorbulb) {
-      config = device.colorbulb;
-    }
-    if (device.connectionType !== undefined) {
-      config['connectionType'] = device.connectionType;
-    }
-    if (device.external !== undefined) {
-      config['external'] = device.external;
-    }
-    if (device.logging !== undefined) {
-      config['logging'] = device.logging;
-    }
-    if (device.refreshRate !== undefined) {
-      config['refreshRate'] = device.refreshRate;
-    }
-    if (device.scanDuration !== undefined) {
-      config['scanDuration'] = device.scanDuration;
-    }
-    if (device.offline !== undefined) {
-      config['offline'] = device.offline;
-    }
-    if (device.maxRetry !== undefined) {
-      config['maxRetry'] = device.maxRetry;
-    }
-    if (device.webhook !== undefined) {
-      config['webhook'] = device.webhook;
-    }
-    if (Object.entries(config).length !== 0) {
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-    }
-  }
-
-  async deviceLogs(device: device & devicesConfig): Promise<void> {
-    if (this.platform.debugMode) {
-      this.deviceLogging = this.accessory.context.logging = 'debugMode';
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-    } else if (device.logging) {
-      this.deviceLogging = this.accessory.context.logging = device.logging;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
-    } else if (this.platform.config.options?.logging) {
-      this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
-    } else {
-      this.deviceLogging = this.accessory.context.logging = 'standard';
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-    }
-  }
-
-  /**
-   * Logging for Device
-   */
-  infoLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.info(String(...log));
-    }
-  }
-
-  warnLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.warn(String(...log));
-    }
-  }
-
-  debugWarnLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.warn('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  errorLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.error(String(...log));
-    }
-  }
-
-  debugErrorLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.error('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  debugLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging === 'debug') {
-        this.platform.log.info('[DEBUG]', String(...log));
-      } else {
-        this.platform.log.debug(String(...log));
-      }
-    }
-  }
-
-  enablingDeviceLogging(): boolean {
-    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, e);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, e);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, e);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, e);
+    this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
   }
 }