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

package/src/device/colorbulb.ts

@@ -32,6 +32,15 @@ export class ColorBulb extends deviceBase {
     ColorTemperature?: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: colorBulbStatus;
+
+  //Webhook
+  webhookContext!: colorBulbWebhookContext;
+
+  // BLE
+  serviceData!: colorBulbServiceData;
+
   // Adaptive Lighting
   AdaptiveLightingController?: ControllerConstructor | Controller<ControllerServiceMap>;
   adaptiveLightingShift?: number;
@@ -46,6 +55,9 @@ export class ColorBulb extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.LIGHTBULB;
+
     // default placeholders
     this.adaptiveLighting(device);
 
@@ -79,10 +91,10 @@ export class ColorBulb extends deviceBase {
       });
       accessory.configureController(this.AdaptiveLightingController);
       accessory.context.adaptiveLighting = true;
-      this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting},`
+      this.debugLog(`adaptiveLighting: ${accessory.context.adaptiveLighting},`
         + ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
     }
-    this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+    this.debugLog(`adaptiveLightingShift: ${this.adaptiveLightingShift}`);
 
     // Initialize LightBulb Characteristics
     this.LightBulb.Service
@@ -143,10 +155,12 @@ export class ColorBulb extends deviceBase {
       .onSet(this.SaturationSet.bind(this));
 
     // Retrieve initial values and updateHomekit
+    this.debugLog('Retrieve initial values and update Homekit');
     this.refreshStatus();
 
-    // Update Homekit
-    this.updateHomeKitCharacteristics();
+    //regisiter webhook event handler
+    this.debugLog('Registering Webhook Event Handler');
+    this.registerWebhook();
 
     //regisiter webhook event handler
     this.registerWebhook();
@@ -181,18 +195,18 @@ export class ColorBulb extends deviceBase {
   /**
    * Parse the device status from the SwitchBotBLE API
    */
-  async BLEparseStatus(serviceData: colorBulbServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
     // On
-    this.LightBulb.On = serviceData.power;
+    this.LightBulb.On = this.serviceData.power;
     await this.debugLog(`On: ${this.LightBulb.On}`);
     // Brightness
-    this.LightBulb.Brightness = serviceData.brightness;
+    this.LightBulb.Brightness = this.serviceData.brightness;
     await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
     // Color, Hue & Brightness
-    await this.debugLog(`red: ${serviceData.red}, green: ${serviceData.green}, blue: ${serviceData.blue}`);
-    const [hue, saturation] = rgb2hs(serviceData.red, serviceData.green, serviceData.blue);
-    await this.debugLog(`hs: ${JSON.stringify(rgb2hs(serviceData.red, serviceData.green, serviceData.blue))}`);
+    await this.debugLog(`red: ${this.serviceData.red}, green: ${this.serviceData.green}, blue: ${this.serviceData.blue}`);
+    const [hue, saturation] = rgb2hs(this.serviceData.red, this.serviceData.green, this.serviceData.blue);
+    await this.debugLog(`hs: ${JSON.stringify(rgb2hs(this.serviceData.red, this.serviceData.green, this.serviceData.blue))}`);
     // Hue
     this.LightBulb.Hue = hue;
     await this.debugLog(`Hue: ${this.LightBulb.Hue}`);
@@ -200,48 +214,42 @@ export class ColorBulb extends deviceBase {
     this.LightBulb.Saturation = saturation;
     await this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
     // ColorTemperature
-    this.LightBulb.ColorTemperature = Math.max(Math.min(serviceData.color_temperature, 500), 140);
+    const miredColorTemperature = Math.round(1000000 / this.serviceData.color_temperature);
+    this.LightBulb.ColorTemperature = Math.max(Math.min(miredColorTemperature, 500), 140);
     await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
   }
 
   /**
    * Parse the device status from the SwitchBot OpenAPI
    */
-  async openAPIparseStatus(deviceStatus: colorBulbStatus): Promise<void> {
+  async openAPIparseStatus(): Promise<void> {
     await this.debugLog('openAPIparseStatus');
-
     // On
-    this.LightBulb.On = deviceStatus.power === 'on' ? true : false;
+    this.LightBulb.On = this.deviceStatus.power === 'on' ? true : false;
     await this.debugLog(`On: ${this.LightBulb.On}`);
-
     // Brightness
-    this.LightBulb.Brightness = deviceStatus.brightness;
+    this.LightBulb.Brightness = this.deviceStatus.brightness;
     await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
-
     // Color, Hue & Brightness
-    await this.debugLog(`color: ${JSON.stringify(deviceStatus.color)}`);
-    const [red, green, blue] = deviceStatus.color.split(':');
+    await this.debugLog(`color: ${JSON.stringify(this.deviceStatus.color)}`);
+    const [red, green, blue] = this.deviceStatus.color.split(':');
     await this.debugLog(`red: ${JSON.stringify(red)}, green: ${JSON.stringify(green)}, blue: ${JSON.stringify(blue)}`);
     const [hue, saturation] = rgb2hs(red, green, blue);
     await this.debugLog(`hs: ${JSON.stringify(rgb2hs(red, green, blue))}`);
-
     // Hue
     this.LightBulb.Hue = hue;
     await this.debugLog(`Hue: ${this.LightBulb.Hue}`);
-
     // Saturation
     this.LightBulb.Saturation = saturation;
     await this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
-
     // ColorTemperature
-    const miredColorTemperature = Math.round(1000000 / deviceStatus.colorTemperature);
+    const miredColorTemperature = Math.round(1000000 / this.deviceStatus.colorTemperature);
     this.LightBulb.ColorTemperature = Math.max(Math.min(miredColorTemperature, 500), 140);
     await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
-
     // Firmware Version
-    const version = deviceStatus.version.toString();
-    await this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
-    if (deviceStatus.version) {
+    if (this.deviceStatus.version) {
+      const version = this.deviceStatus.version.toString();
+      await this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
       const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
@@ -249,25 +257,25 @@ export class ColorBulb extends deviceBase {
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
         .updateValue(deviceVersion);
-      this.accessory.context.deviceVersion = deviceVersion;
-      await this.debugSuccessLog(`deviceVersion: ${this.accessory.context.deviceVersion}`);
+      this.accessory.context.version = deviceVersion;
+      await this.debugSuccessLog(`version: ${this.accessory.context.version}`);
     }
   }
 
-  async parseStatusWebhook(context: colorBulbWebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(powerState, brightness, color, colorTemperature) = Webhook:(${context.powerState}, ${context.brightness}, ${context.color},`
-    + ` ${context.colorTemperature}), current:(${this.LightBulb.On}, ${this.LightBulb.Brightness}, ${this.LightBulb.Hue},`
-    + ` ${this.LightBulb.Saturation}, ${this.LightBulb.ColorTemperature})`);
+    await this.debugLog(`(powerState, brightness, color, colorTemperature) = Webhook:(${this.webhookContext.powerState},`
+      + ` ${this.webhookContext.brightness}, ${this.webhookContext.color}, ${this.webhookContext.colorTemperature}), current:(${this.LightBulb.On},`
+      + ` ${this.LightBulb.Brightness}, ${this.LightBulb.Hue}, ${this.LightBulb.Saturation}, ${this.LightBulb.ColorTemperature})`);
     // On
-    this.LightBulb.On = context.powerState === 'ON' ? true : false;
+    this.LightBulb.On = this.webhookContext.powerState === 'ON' ? true : false;
     await this.debugLog(`On: ${this.LightBulb.On}`);
     // Brightness
-    this.LightBulb.Brightness = context.brightness;
+    this.LightBulb.Brightness = this.webhookContext.brightness;
     await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
     // Color, Hue & Brightness
-    await this.debugLog(`color: ${JSON.stringify(context.color)}`);
-    const [red, green, blue] = context.color.split(':');
+    await this.debugLog(`color: ${JSON.stringify(this.webhookContext.color)}`);
+    const [red, green, blue] = this.webhookContext.color.split(':');
     await this.debugLog(`red: ${JSON.stringify(red)}, green: ${JSON.stringify(green)}, blue: ${JSON.stringify(blue)}`);
     const [hue, saturation] = rgb2hs(red, green, blue);
     await this.debugLog(`hs: ${JSON.stringify(rgb2hs(red, green, blue))}`);
@@ -278,7 +286,8 @@ export class ColorBulb extends deviceBase {
     this.LightBulb.Saturation = saturation;
     await this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
     // ColorTemperature
-    this.LightBulb.ColorTemperature = context.colorTemperature;
+    const miredColorTemperature = Math.round(1000000 / this.webhookContext.colorTemperature);
+    this.LightBulb.ColorTemperature = Math.max(Math.min(miredColorTemperature, 500), 140);
     await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
   }
 
@@ -311,7 +320,8 @@ export class ColorBulb extends deviceBase {
         const serviceData = await this.monitorAdvertisementPackets(switchbot) as colorBulbServiceData;
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.ColorBulb && serviceData.modelName === SwitchBotBLEModelName.ColorBulb) {
-          await this.BLEparseStatus(serviceData);
+          this.serviceData = serviceData;
+          await this.BLEparseStatus();
           await this.updateHomeKitCharacteristics();
         } else {
           await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
@@ -329,7 +339,8 @@ export class ColorBulb extends deviceBase {
       await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);;
       if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
         await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-        await this.openAPIparseStatus(deviceStatus.body);
+        this.deviceStatus = deviceStatus.body;
+        await this.openAPIparseStatus();
         await this.updateHomeKitCharacteristics();
       } else {
         await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
@@ -347,7 +358,8 @@ export class ColorBulb extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: colorBulbWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
-          await this.parseStatusWebhook(context);
+          this.webhookContext = context;
+          await this.parseStatusWebhook();
           await this.updateHomeKitCharacteristics();
         } catch (e: any) {
           await this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
@@ -464,7 +476,7 @@ export class ColorBulb extends deviceBase {
         switchbot
           .discover({ model: this.device.bleModel, id: this.device.bleMac })
           .then(async (device_list: any) => {
-            await this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.LightBulb.Brightness}`);
+            await this.infoLog(`Target Brightness: ${this.LightBulb.Brightness}`);
             return await device_list[0].setBrightness(this.LightBulb.Brightness);
           })
           .then(async () => {
@@ -489,6 +501,8 @@ export class ColorBulb extends deviceBase {
   async BLEpushColorTemperatureChanges(): Promise<void> {
     await this.debugLog('BLEpushColorTemperatureChanges');
     if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
+      const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
+      this.accessory.context.kelvin = kelvin;
       const switchbot = await this.platform.connectBLE(this.accessory, this.device);
       await this.convertBLEAddress();
       if (switchbot !== false) {
@@ -496,7 +510,7 @@ export class ColorBulb extends deviceBase {
           .discover({ model: this.device.bleModel, id: this.device.bleMac })
           .then(async (device_list: any) => {
             await this.infoLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
-            return await device_list[0].setColorTemperature(this.LightBulb.ColorTemperature);
+            return await device_list[0].setColorTemperature(kelvin);
           })
           .then(async () => {
             await this.successLog(`ColorTemperature: ${this.LightBulb.ColorTemperature} sent over SwitchBot BLE,  sent successfully`);

package/src/device/contact.ts

@@ -46,6 +46,15 @@ export class Contact extends deviceBase {
     CurrentAmbientLightLevel: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: contactSensorStatus;
+
+  //Webhook
+  webhookContext!: contactSensorWebhookContext;
+
+  // BLE
+  serviceData!: contactSensorServiceData;
+
   // Updates
   contactUpdateInProgress!: boolean;
   doContactUpdate!: Subject<void>;
@@ -56,6 +65,9 @@ export class Contact extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doContactUpdate = new Subject();
     this.contactUpdateInProgress = false;
@@ -107,7 +119,7 @@ export class Contact extends deviceBase {
     // Initialize Motion Sensor Service
     if (this.device.contact?.hide_motionsensor) {
       if (this.MotionSensor) {
-        this.debugLog(`${device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
+        this.debugLog('Removing Motion Sensor Service');
         this.MotionSensor.Service = accessory.getService(this.hap.Service.MotionSensor) as Service;
         accessory.removeService(this.MotionSensor.Service);
       }
@@ -133,7 +145,7 @@ export class Contact extends deviceBase {
     // Initialize Light Sensor Service
     if (device.contact?.hide_lightsensor) {
       if (this.LightSensor) {
-        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
+        this.debugLog('Removing Light Sensor Service');
         this.LightSensor.Service = accessory.getService(this.hap.Service.LightSensor) as Service;
         accessory.removeService(this.LightSensor.Service);
       }
@@ -157,10 +169,12 @@ export class Contact extends deviceBase {
     }
 
     // Retrieve initial values and updateHomekit
+    this.debugLog('Retrieve initial values and update Homekit');
     this.refreshStatus();
 
-    // Retrieve initial values and updateHomekit
-    this.updateHomeKitCharacteristics();
+    //regisiter webhook event handler
+    this.debugLog('Registering Webhook Event Handler');
+    this.registerWebhook();
 
     //regisiter webhook event handler
     this.registerWebhook();
@@ -173,28 +187,28 @@ export class Contact extends deviceBase {
       });
   }
 
-  async BLEparseStatus(serviceData: contactSensorServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
     // ContactSensorState
-    this.ContactSensor.ContactSensorState = serviceData.doorState === 'open'
+    this.ContactSensor.ContactSensorState = this.serviceData.doorState === 'open'
       ? this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
     await this.debugLog(`ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
 
     // MotionDetected
     if (!this.device.contact?.hide_motionsensor && this.MotionSensor?.Service) {
-      this.MotionSensor.MotionDetected = serviceData.movement;
+      this.MotionSensor.MotionDetected = this.serviceData.movement;
       await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`);
     }
     // CurrentAmbientLightLevel
     if (!this.device.contact?.hide_lightsensor && this.LightSensor?.Service) {
       const set_minLux = this.device.blindTilt?.set_minLux ?? 1;
       const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001;
-      const lightLevel = serviceData.lightLevel === 'bright' ? set_maxLux : set_minLux;
+      const lightLevel = this.serviceData.lightLevel === 'bright' ? set_maxLux : set_minLux;
       this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2);
-      await this.debugLog(`LightLevel: ${serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+      await this.debugLog(`LightLevel: ${this.serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
     }
     // BatteryLevel
-    this.Battery.BatteryLevel = serviceData.battery;
+    this.Battery.BatteryLevel = this.serviceData.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
@@ -202,37 +216,37 @@ export class Contact extends deviceBase {
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
 
-  async openAPIparseStatus(deviceStatus: contactSensorStatus): Promise<void> {
+  async openAPIparseStatus(): Promise<void> {
     await this.debugLog('openAPIparseStatus');
     // Contact State
-    this.ContactSensor.ContactSensorState = deviceStatus.openState === 'open'
+    this.ContactSensor.ContactSensorState = this.deviceStatus.openState === 'open'
       ? this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
     await this.debugLog(`ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
 
     // MotionDetected
     if (!this.device.contact?.hide_motionsensor && this.MotionSensor?.Service) {
-      this.MotionSensor.MotionDetected = deviceStatus.moveDetected;
+      this.MotionSensor.MotionDetected = this.deviceStatus.moveDetected;
       await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`);
     }
     // Light Level
     if (!this.device.contact?.hide_lightsensor && this.LightSensor?.Service) {
       const set_minLux = this.device.blindTilt?.set_minLux ?? 1;
       const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001;
-      const lightLevel = deviceStatus.brightness === 'bright' ? set_maxLux : set_minLux;
+      const lightLevel = this.deviceStatus.brightness === 'bright' ? set_maxLux : set_minLux;
       this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2);
-      await this.debugLog(`LightLevel: ${deviceStatus.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+      await this.debugLog(`LightLevel: ${this.deviceStatus.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
     }
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(deviceStatus.battery);
+    this.Battery.BatteryLevel = this.deviceStatus.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
       ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     // FirmwareVersion
-    const version = deviceStatus.version.toString();
-    await this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
-    if (deviceStatus.version) {
+    if (this.deviceStatus.version) {
+      const version = this.deviceStatus.version.toString();
+      await this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
       const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
@@ -240,29 +254,30 @@ export class Contact extends deviceBase {
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
         .updateValue(deviceVersion);
-      this.accessory.context.deviceVersion = deviceVersion;
-      await this.debugLog(`deviceVersion: ${this.accessory.context.deviceVersion}`);
+      this.accessory.context.version = deviceVersion;
+      await this.debugLog(`version: ${this.accessory.context.version}`);
     }
   }
 
-  async parseStatusWebhook(context: contactSensorWebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(detectionState, brightness, openState) = Webhook:(${context.detectionState}, ${context.brightness}, ${context.openState}),`
-      + ` current:(${this.MotionSensor?.MotionDetected}, ${this.LightSensor?.CurrentAmbientLightLevel}, ${this.ContactSensor.ContactSensorState})`);
+    await this.debugLog(`(detectionState, brightness, openState) = Webhook:(${this.webhookContext.detectionState}, ${this.webhookContext.brightness},`
+      + ` ${this.webhookContext.openState}), current:(${this.MotionSensor?.MotionDetected}, ${this.LightSensor?.CurrentAmbientLightLevel},`
+      + ` ${this.ContactSensor.ContactSensorState})`);
     // ContactSensorState
-    this.ContactSensor.ContactSensorState = context.openState === 'open' ? 1 : 0;
+    this.ContactSensor.ContactSensorState = this.webhookContext.openState === 'open' ? 1 : 0;
     await this.debugLog(`ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
     if (!this.device.contact?.hide_motionsensor && this.MotionSensor?.Service) {
       // MotionDetected
-      this.MotionSensor.MotionDetected = context.detectionState === 'DETECTED' ? true : false;
+      this.MotionSensor.MotionDetected = this.webhookContext.detectionState === 'DETECTED' ? true : false;
       await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`);
     }
     if (!this.device.contact?.hide_lightsensor && this.LightSensor?.Service) {
       const set_minLux = this.device.blindTilt?.set_minLux ?? 1;
       const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001;
-      const lightLevel = context.brightness === 'bright' ? set_maxLux : set_minLux;
+      const lightLevel = this.webhookContext.brightness === 'bright' ? set_maxLux : set_minLux;
       this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2);
-      await this.debugLog(`LightLevel: ${context.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+      await this.debugLog(`LightLevel: ${this.webhookContext.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
     }
   }
 
@@ -295,7 +310,8 @@ export class Contact extends deviceBase {
         const serviceData = await this.monitorAdvertisementPackets(switchbot) as contactSensorServiceData;
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.ContactSensor && serviceData.modelName === SwitchBotBLEModelName.ContactSensor) {
-          await this.BLEparseStatus(serviceData);
+          this.serviceData = serviceData;
+          await this.BLEparseStatus();
           await this.updateHomeKitCharacteristics();
         } else {
           await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
@@ -313,7 +329,8 @@ export class Contact extends deviceBase {
       await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);;
       if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
         await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-        await this.openAPIparseStatus(deviceStatus.body);
+        this.deviceStatus = deviceStatus.body;
+        await this.openAPIparseStatus();
         await this.updateHomeKitCharacteristics();
       } else {
         await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
@@ -331,7 +348,8 @@ export class Contact extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: contactSensorWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
-          await this.parseStatusWebhook(context);
+          this.webhookContext = context;
+          await this.parseStatusWebhook();
           await this.updateHomeKitCharacteristics();
         } catch (e: any) {
           await this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);

package/src/device/curtain.ts

@@ -40,6 +40,15 @@ export class Curtain extends deviceBase {
     CurrentAmbientLightLevel?: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: curtainStatus;
+
+  //Webhook
+  webhookContext!: curtainWebhookContext | curtain3WebhookContext;
+
+  // BLE
+  serviceData!: curtainServiceData | curtain3ServiceData;
+
   // Target
   setNewTarget!: boolean;
   setNewTargetTimer!: NodeJS.Timeout;
@@ -54,6 +63,8 @@ export class Curtain extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.WINDOW_COVERING;
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doCurtainUpdate = new Subject();
@@ -175,12 +186,11 @@ export class Curtain extends deviceBase {
     }
 
     // Retrieve initial values and updateHomekit
+    this.debugLog('Retrieve initial values and update Homekit');
     this.refreshStatus();
 
-    // Update Homekit
-    this.updateHomeKitCharacteristics();
-
     //regisiter webhook event handler
+    this.debugLog('Registering Webhook Event Handler');
     this.registerWebhook();
 
     // History
@@ -256,7 +266,7 @@ export class Curtain extends deviceBase {
     });
     const motion: Service =
       this.accessory.getService(this.hap.Service.MotionSensor) ||
-      this.accessory.addService(this.hap.Service.MotionSensor, `${this.accessory.displayName} Motion`);
+      this.accessory.addService(this.hap.Service.MotionSensor, 'Motion');
     motion.addOptionalCharacteristic(this.platform.eve.Characteristics.LastActivation);
     motion.getCharacteristic(this.platform.eve.Characteristics.LastActivation).onGet(() => {
       const lastActivation = this.accessory.context.lastActivation
@@ -293,22 +303,24 @@ export class Curtain extends deviceBase {
     }, 10 * 60 * 1000);
   }
 
-  async BLEparseStatus(serviceData: curtainServiceData | curtain3ServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
+    await this.debugLog(`(position, battery) = BLE:(${this.serviceData.position}, ${this.serviceData.battery}),`
+      + ` current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
     // CurrentPosition
-    this.WindowCovering.CurrentPosition = 100 - serviceData.position;
+    this.WindowCovering.CurrentPosition = 100 -this.serviceData.position;
     await this.getCurrentPostion();
     // CurrentAmbientLightLevel
     if (!this.device.curtain?.hide_lightsensor && this.LightSensor?.Service) {
       const set_minLux = this.device.curtain?.set_minLux ?? 1;
       const set_maxLux = this.device.curtain?.set_maxLux ?? 6001;
-      const lightLevel = Number(serviceData.lightLevel);
+      const lightLevel = this.serviceData.lightLevel;
       this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 19);
-      this.debugLog(`LightLevel: ${serviceData.lightLevel},`
+      this.debugLog(`LightLevel: ${this.serviceData.lightLevel},`
         + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
     }
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(serviceData.battery);
+    this.Battery.BatteryLevel = this.serviceData.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
@@ -316,16 +328,18 @@ export class Curtain extends deviceBase {
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
 
-  async openAPIparseStatus(deviceStatus: curtainStatus): Promise<void> {
+  async openAPIparseStatus(): Promise<void> {
     await this.debugLog('openAPIparseStatus');
+    await this.debugLog(`(slidePosition, battery) = OpenAPI:(${this.deviceStatus.slidePosition}, ${this.deviceStatus.battery}),`
+      + ` current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
     // CurrentPosition
-    this.WindowCovering.CurrentPosition = 100 - deviceStatus.slidePosition;
+    this.WindowCovering.CurrentPosition = 100 - this.deviceStatus.slidePosition;
     await this.setMinMax();
-    await this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+    await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
     if (this.setNewTarget) {
       await this.infoLog('Checking Status ...');
     }
-    if (this.setNewTarget && deviceStatus.moving) {
+    if (this.setNewTarget && this.deviceStatus.moving) {
       await this.setMinMax();
       if (Number(this.WindowCovering.TargetPosition) > this.WindowCovering.CurrentPosition) {
         await this.debugLog(`Closing, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
@@ -351,25 +365,28 @@ export class Curtain extends deviceBase {
     }
     await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition},`
       + ` PositionState: ${this.WindowCovering.PositionState},`);
+
     // Brightness
     if (!this.device.curtain?.hide_lightsensor && this.LightSensor?.Service) {
       const set_minLux = this.device.curtain?.set_minLux ?? 1;
       const set_maxLux = this.device.curtain?.set_maxLux ?? 6001;
-      const lightLevel = deviceStatus.lightLevel === 'bright' ? set_maxLux : set_minLux;
+      const lightLevel = this.deviceStatus.lightLevel === 'bright' ? set_maxLux : set_minLux;
       this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2);
-      await this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-        + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+      await this.debugLog(`CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
     }
+
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(deviceStatus.battery);
+    this.Battery.BatteryLevel = this.deviceStatus.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
+
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
       ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+
     // Firmware Version
-    if (deviceStatus.version) {
-      const version = deviceStatus.version.toString();
+    if (this.deviceStatus.version) {
+      const version = this.deviceStatus.version.toString();
       await this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
       const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
@@ -378,21 +395,24 @@ export class Curtain extends deviceBase {
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
         .updateValue(deviceVersion);
-      this.accessory.context.deviceVersion = deviceVersion;
-      await this.debugSuccessLog(`deviceVersion: ${this.accessory.context.deviceVersion}`);
+      this.accessory.context.version = deviceVersion;
+      await this.debugSuccessLog(`version: ${this.accessory.context.version}`);
     }
   }
 
-  async parseStatusWebhook(context: curtainWebhookContext | curtain3WebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(slidePosition, battery) = Webhook:(${context.slidePosition}, ${context.battery}),`
+    await this.debugLog(`(slidePosition, battery) = Webhook:(${this.webhookContext.slidePosition}, ${this.webhookContext.battery}),`
       + ` current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
+
     // CurrentPosition
-    this.WindowCovering.CurrentPosition = 100 - context.slidePosition;
+    this.WindowCovering.CurrentPosition = 100 - this.webhookContext.slidePosition;
     await this.getCurrentPostion();
+
     // BatteryLevel
-    this.Battery.BatteryLevel = context.battery;
+    this.Battery.BatteryLevel = this.webhookContext.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
+
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
       ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
@@ -429,7 +449,8 @@ export class Curtain extends deviceBase {
         // Update HomeKit
         if ((serviceData.model === SwitchBotBLEModel.Curtain || SwitchBotBLEModel.Curtain3)
           && (serviceData.modelName === SwitchBotBLEModelName.Curtain || SwitchBotBLEModelName.Curtain3)) {
-          await this.BLEparseStatus(serviceData);
+          this.serviceData = serviceData;
+          await this.BLEparseStatus();
           await this.updateHomeKitCharacteristics();
         } else {
           await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
@@ -447,7 +468,8 @@ export class Curtain extends deviceBase {
       await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);;
       if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
         await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-        await this.openAPIparseStatus(deviceStatus.body);
+        this.deviceStatus = deviceStatus.body;
+        await this.openAPIparseStatus();
         await this.updateHomeKitCharacteristics();
       } else {
         await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
@@ -465,7 +487,8 @@ export class Curtain extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: curtainWebhookContext | curtain3WebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
-          await this.parseStatusWebhook(context);
+          this.webhookContext = context;
+          await this.parseStatusWebhook();
           await this.updateHomeKitCharacteristics();
         } catch (e: any) {
           await this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);