@switchbot/homebridge-switchbot 3.5.1-beta.12 → 3.5.1-beta.14

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;
@@ -175,12 +184,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
@@ -293,22 +301,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 +326,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}`);
     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 +363,29 @@ 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}`);
     }
+
     // 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
@@ -383,16 +399,19 @@ export class Curtain extends deviceBase {
     }
   }
 
-  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 +448,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 +467,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 +486,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}`);

package/src/device/device.ts

@@ -5,9 +5,9 @@
 
 import { hostname } from 'os';
 import { request } from 'undici';
-import asyncmqtt from 'async-mqtt';
 import { Devices } from '../settings.js';
 import { BlindTiltMappingMode, sleep } from '../utils.js';
+import { SwitchBotModel, SwitchBotBLEModel, SwitchBotBLEModelName, SwitchBotBLEModelFriendlyName } from 'node-switchbot';
 
 import type { MqttClient } from 'mqtt';
 import type { device } from '../types/devicelist.js';
@@ -15,7 +15,6 @@ import type { ad } from '../types/bledevicestatus.js';
 import type { SwitchBotPlatform } from '../platform.js';
 import type { SwitchBotPlatformConfig, devicesConfig } from '../settings.js';
 import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service } from 'homebridge';
-import { SwitchBotModel, SwitchBotBLEModel, SwitchBotBLEModelName, SwitchBotBLEModelFriendlyName } from 'node-switchbot';
 
 export abstract class deviceBase {
   public readonly api: API;
@@ -39,6 +38,11 @@ export abstract class deviceBase {
   protected deviceModel!: SwitchBotModel;
   protected deviceBLEModel!: SwitchBotBLEModel;
 
+  // MQTT
+  protected deviceMqttURL!: string;
+  protected deviceMqttOptions!: any;
+  protected deviceMqttPubOptions!: any;
+
   // BLE
   protected scanDuration!: number;
 
@@ -68,7 +72,7 @@ export abstract class deviceBase {
     this.getDeviceConfigSettings(accessory, device);
     this.getDeviceContext(accessory, device);
     this.getDeviceScanDuration(accessory, device);
-    this.setupMqtt(device);
+    this.getMqttSettings(device);
 
     // Set accessory information
     accessory
@@ -76,82 +80,41 @@ export abstract class deviceBase {
       .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
       .setCharacteristic(this.hap.Characteristic.AppMatchingIdentifier, 'id1087374760')
       .setCharacteristic(this.hap.Characteristic.Name, device.deviceName ?? accessory.displayName)
-      .setCharacteristic(this.hap.Characteristic.ConfiguredName, device.deviceName ?? accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, String(device.deviceName ?? accessory.displayName))
       .setCharacteristic(this.hap.Characteristic.Model, device.model ?? accessory.context.model)
       .setCharacteristic(this.hap.Characteristic.ProductData, device.deviceId ?? accessory.context.deviceId)
       .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
   }
 
   async getDeviceLogSettings(accessory: PlatformAccessory, device: device & devicesConfig): Promise<void> {
-    if (this.platform.debugMode) {
-      this.deviceLogging = accessory.context.logging = 'debugMode';
-      this.debugWarnLog(`Using Debug Mode Logging: ${this.deviceLogging}`);
-    } else if (device.logging) {
-      this.deviceLogging = accessory.context.logging = device.logging;
-      this.debugWarnLog(`Using Device Config Logging: ${this.deviceLogging}`);
-    } else if (this.config.logging) {
-      this.deviceLogging = accessory.context.logging = this.config.logging;
-      this.debugWarnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
-    } else {
-      this.deviceLogging = accessory.context.logging = 'standard';
-      this.debugWarnLog(`Logging Not Set, Using: ${this.deviceLogging}`);
-    }
+    this.deviceLogging = this.platform.debugMode ? 'debugMode' : device.logging ?? this.config.logging ?? 'standard';
+    const logging = this.platform.debugMode ? 'Debug Mode' : device.logging ? 'Device Config' : this.config.logging ? 'Platform Config' : 'Default';
+    accessory.context.deviceLogging = this.deviceLogging;
+    await this.debugLog(`Using ${logging} Logging: ${this.deviceLogging}`);
   }
 
   async getDeviceRateSettings(accessory: PlatformAccessory, device: device & devicesConfig): Promise<void> {
     // refreshRate
-    if (device.refreshRate) {
-      this.deviceRefreshRate = device.refreshRate;
-      this.debugLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
-    } else if (this.config.options?.refreshRate) {
-      this.deviceRefreshRate = this.config.options.refreshRate;
-      this.debugLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
-    } else {
-      this.deviceRefreshRate = 5;
-      this.debugLog(`Using Default refreshRate: ${this.deviceRefreshRate}`);
-    }
+    this.deviceRefreshRate = device.refreshRate ?? this.config.options?.refreshRate ?? 5;
     accessory.context.deviceRefreshRate = this.deviceRefreshRate;
-    // updateRate
-    if (device.updateRate) {
-      this.deviceUpdateRate = device.updateRate;
-      this.debugLog(`Using Device Config updateRate: ${this.deviceUpdateRate}`);
-    } else if (this.config.options?.updateRate) {
-      this.deviceUpdateRate = this.config.options.updateRate;
-      this.debugLog(`Using Platform Config updateRate: ${this.deviceUpdateRate}`);
-    } else {
-      this.deviceUpdateRate = 5;
-      this.debugLog(`Using Default updateRate: ${this.deviceUpdateRate}`);
-    }
+    const refreshRate = device.refreshRate ? 'Device Config' : this.config.options?.refreshRate ? 'Platform Config' : 'Default';
+    this.deviceUpdateRate = device.updateRate ?? this.config.options?.updateRate ?? 5;
     accessory.context.deviceUpdateRate = this.deviceUpdateRate;
-    // pushRate
-    if (device.pushRate) {
-      this.devicePushRate = device.pushRate;
-      this.debugLog(`Using Device Config pushRate: ${this.deviceUpdateRate}`);
-    } else if (this.config.options?.pushRate) {
-      this.devicePushRate = this.config.options.pushRate;
-      this.debugLog(`Using Platform Config pushRate: ${this.deviceUpdateRate}`);
-    } else {
-      this.devicePushRate = 1;
-      this.debugLog(`Using Default pushRate: ${this.deviceUpdateRate}`);
-    }
+    const updateRate = device.updateRate ? 'Device Config' : this.config.options?.updateRate ? 'Platform Config' : 'Default';
+    this.devicePushRate = device.pushRate ?? this.config.options?.pushRate ?? 1;
     accessory.context.devicePushRate = this.devicePushRate;
+    const pushRate = device.pushRate ? 'Device Config' : this.config.options?.pushRate ? 'Platform Config' : 'Default';
+    await this.debugLog(`Using ${refreshRate} refreshRate: ${this.deviceRefreshRate}, ${updateRate} updateRate: ${this.deviceUpdateRate},`
+      + ` ${pushRate} pushRate: ${this.devicePushRate}`);
   }
 
   async getDeviceRetry(device: device & devicesConfig): Promise<void> {
-    if (device.maxRetries) {
-      this.deviceMaxRetries = device.maxRetries;
-      this.debugLog(`Using Device Max Retries: ${this.deviceMaxRetries}`);
-    } else {
-      this.deviceMaxRetries = 5; // Maximum number of retries
-      this.debugLog(`Max Retries Not Set, Using: ${this.deviceMaxRetries}`);
-    }
-    if (device.delayBetweenRetries) {
-      this.deviceDelayBetweenRetries = device.delayBetweenRetries * 1000;
-      this.debugLog(`Using Device Delay Between Retries: ${this.deviceDelayBetweenRetries}`);
-    } else {
-      this.deviceDelayBetweenRetries = 3000; // Delay between retries in milliseconds
-      this.debugLog(`Delay Between Retries Not Set, Using: ${this.deviceDelayBetweenRetries}`);
-    }
+    this.deviceMaxRetries = device.maxRetries ?? 5;
+    const maxRetries = device.maxRetries ? 'Device' : 'Default';
+    this.deviceDelayBetweenRetries = device.delayBetweenRetries ? (device.delayBetweenRetries * 1000) : 3000;
+    const delayBetweenRetries = device.delayBetweenRetries ? 'Device' : 'Default';
+    await this.debugLog(`Using ${maxRetries} Max Retries: ${this.deviceMaxRetries},`
+      + ` ${delayBetweenRetries} Delay Between Retries: ${this.deviceDelayBetweenRetries}`);
   }
 
   async retryBLE({ max, fn }: { max: number; fn: { (): any; (): Promise<any> } }): Promise<null> {
@@ -167,14 +130,12 @@ export abstract class deviceBase {
   }
 
   async maxRetryBLE(): Promise<number> {
-    if (this.device.maxRetry) {
-      return this.device.maxRetry;
-    } else {
-      return 5;
-    }
+    return this.device.maxRetry ? this.device.maxRetry : 5;
   }
 
   async getDeviceScanDuration(accessory: PlatformAccessory, device: device & devicesConfig): Promise<void> {
+    this.scanDuration = device.scanDuration ? (this.deviceUpdateRate > device.scanDuration) ? this.deviceUpdateRate : device.scanDuration
+      ? (this.deviceUpdateRate > 1) ? this.deviceUpdateRate : 1 : this.deviceUpdateRate : 1;
     if (device.scanDuration) {
       if (this.deviceUpdateRate > device.scanDuration) {
         this.scanDuration = this.deviceUpdateRate;
@@ -231,6 +192,12 @@ export abstract class deviceBase {
     if (device.mqttURL !== '') {
       deviceConfig['mqttURL'] = device.mqttURL;
     }
+    if (device.mqttOptions) {
+      deviceConfig['mqttOptions'] = device.mqttOptions;
+    }
+    if (device.mqttPubOptions) {
+      deviceConfig['mqttPubOptions'] = device.mqttPubOptions;
+    }
     if (device.maxRetries !== 0) {
       deviceConfig['maxRetries'] = device.maxRetries;
     }
@@ -319,21 +286,10 @@ export abstract class deviceBase {
     const numberOfLevels = spaceBetweenLevels + 1;
     this.debugLog(`LightLevel: ${lightLevel}, set_minLux: ${set_minLux}, set_maxLux: ${set_maxLux}, spaceBetweenLevels: ${spaceBetweenLevels},`
       + ` numberOfLevels: ${numberOfLevels}`);
-    let CurrentAmbientLightLevel: number;
-    switch (lightLevel) {
-      case 1:
-        CurrentAmbientLightLevel = set_minLux;
-        this.debugLog(`LightLevel: ${lightLevel}, set_minLux: ${set_minLux}`);
-        break;
-      case numberOfLevels:
-        CurrentAmbientLightLevel = set_maxLux;
-        this.debugLog(`LightLevel: ${lightLevel}, set_maxLux: ${set_maxLux}`);
-        break;
-      default:
-        CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * (Number(lightLevel) - 1);
-        this.debugLog(`LightLevel: ${lightLevel}`);
-    }
-    this.debugLog(`CurrentAmbientLightLevel: ${CurrentAmbientLightLevel}`);
+    const CurrentAmbientLightLevel = lightLevel === 1 ? set_minLux : lightLevel = numberOfLevels
+      ? set_maxLux : ((set_maxLux - set_minLux) / spaceBetweenLevels) * (Number(lightLevel) - 1);
+    await this.debugLog(`CurrentAmbientLightLevel: ${CurrentAmbientLightLevel}, LightLevel: ${lightLevel}, set_minLux: ${set_minLux},`
+      + ` set_maxLux: ${set_maxLux}`);
     return CurrentAmbientLightLevel;
   }
 
@@ -342,41 +298,29 @@ export abstract class deviceBase {
    * 'homebridge-switchbot/${this.device.deviceType}/xx:xx:xx:xx:xx:xx'
    */
   async mqttPublish(message: string, topic?: string) {
-    const mac = this.device.deviceId
-      ?.toLowerCase()
-      .match(/[\s\S]{1,2}/g)
-      ?.join(':');
-    const options = this.device.mqttPubOptions || {};
-    let mqttTopic: string;
-    let mqttMessageTopic: string;
-    if (topic) {
-      mqttTopic = `/${topic}`;
-      mqttMessageTopic = `${topic}/`;
-    } else {
-      mqttTopic = '';
-      mqttMessageTopic = '';
-    }
+    const mac = this.device.deviceId?.toLowerCase().match(/[\s\S]{1,2}/g)?.join(':');
+    const options = this.deviceMqttPubOptions ?? {};
+    const mqttTopic = topic ? `/${topic}` : '';
+    const mqttMessageTopic = topic ? `${topic}/` : '';
     this.mqttClient?.publish(`homebridge-switchbot/${this.device.deviceType}/${mac}${mqttTopic}`, `${message}`, options);
     this.debugLog(`MQTT message: ${mqttMessageTopic}${message} options:${JSON.stringify(options)}`);
   }
 
   /*
-   * Setup MQTT hadler if URL is specified.
+   * MQTT Settings
    */
-  async setupMqtt(device: device & devicesConfig): Promise<void> {
-    if (device.mqttURL) {
-      try {
-        const { connectAsync } = asyncmqtt;
-        this.mqttClient = await connectAsync(device.mqttURL, device.mqttOptions || {});
-        this.debugLog('MQTT connection has been established successfully.');
-        this.mqttClient.on('error', (e: Error) => {
-          this.errorLog(`Failed to publish MQTT messages. ${e}`);
-        });
-      } catch (e) {
-        this.mqttClient = null;
-        this.errorLog(`Failed to establish MQTT connection. ${e}`);
-      }
-    }
+  async getMqttSettings(device: device & devicesConfig): Promise<void> {
+    // mqttURL
+    this.deviceMqttURL = device.mqttURL ?? this.config.options?.mqttURL ?? '';
+    const mqttURL = device.mqttURL ? 'Device Config' : this.config.options?.mqttURL ? 'Platform Config' : 'Default';
+    // mqttOptions
+    this.deviceMqttOptions = device.mqttOptions ?? this.config.options?.mqttOptions ?? {};
+    const mqttOptions = device.mqttOptions ? 'Device Config' : this.config.options?.mqttOptions ? 'Platform Config' : 'Default';
+    // mqttPubOptions
+    this.deviceMqttPubOptions = device.mqttPubOptions ?? this.config.options?.mqttPubOptions ?? {};
+    const mqttPubOptions = device.mqttPubOptions ? 'Device Config' : this.config.options?.mqttPubOptions ? 'Platform Config' : 'Default';
+    await this.debugLog(`Using ${mqttURL} MQTT URL: ${this.deviceMqttURL}, ${mqttOptions} mqttOptions: ${JSON.stringify(this.deviceMqttOptions)},`
+      + ` ${mqttPubOptions} mqttPubOptions: ${JSON.stringify(this.deviceMqttPubOptions)}`);
   }
 
   /*

package/src/device/fan.ts

@@ -39,6 +39,15 @@ export class Fan extends deviceBase {
     Brightness: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: batteryCirculatorFanStatus;
+
+  //Webhook
+  webhookContext!: batteryCirculatorFanWebhookContext;
+
+  // BLE
+  serviceData!: batteryCirculatorFanServiceData;
+
   // Updates
   fanUpdateInProgress!: boolean;
   doFanUpdate!: Subject<void>;
@@ -149,10 +158,12 @@ export class Fan extends deviceBase {
       .onSet(this.BrightnessSet.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();
@@ -184,35 +195,45 @@ export class Fan extends deviceBase {
       });
   }
 
-  async BLEparseStatus(serviceData: batteryCirculatorFanServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
+    await this.debugLog(`(powerState, fanSpeed) = BLE:(${this.serviceData.state}, ${this.serviceData.fanSpeed}), current:(${this.Fan.Active},`
+      + ` ${this.Fan.RotationSpeed})`);
+
     // Active
-    this.Fan.Active = serviceData.state === 'on' ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
+    this.Fan.Active = this.serviceData.state === 'on' ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
     await this.debugLog(`Active: ${this.Fan.Active}`);
+
+    // RotationSpeed
+    this.Fan.RotationSpeed = this.serviceData.fanSpeed;
   }
 
-  async openAPIparseStatus(deviceStatus: batteryCirculatorFanStatus) {
+  async openAPIparseStatus() {
     await this.debugLog('openAPIparseStatus');
+    await this.debugLog(`(version, battery, powerState, oscillation, chargingStatus, fanSpeed) = OpenAPI:(${this.deviceStatus.version},`
+      + ` ${this.deviceStatus.battery}, ${this.deviceStatus.power}, ${this.deviceStatus.oscillation}, ${this.deviceStatus.chargingStatus},`
+      + ` ${this.deviceStatus.fanSpeed}), current:(${this.accessory.context.deviceVersion}, ${this.Battery.BatteryLevel}, ${this.Fan.Active},`
+      + ` ${this.Fan.SwingMode}, ${this.Battery.ChargingState}, ${this.Fan.RotationSpeed})`);
 
     // Active
-    this.Fan.Active = deviceStatus.power === 'on' ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
+    this.Fan.Active = this.deviceStatus.power === 'on' ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
     this.debugLog(`Active: ${this.Fan.Active}`);
 
     // SwingMode
-    this.Fan.SwingMode = deviceStatus.oscillation === 'on' ?
+    this.Fan.SwingMode = this.deviceStatus.oscillation === 'on' ?
       this.hap.Characteristic.SwingMode.SWING_ENABLED : this.hap.Characteristic.SwingMode.SWING_DISABLED;
     await this.debugLog(`SwingMode: ${this.Fan.SwingMode}`);
 
     // RotationSpeed
-    this.Fan.RotationSpeed = deviceStatus.fanSpeed;
+    this.Fan.RotationSpeed = this.deviceStatus.fanSpeed;
     await this.debugLog(`RotationSpeed: ${this.Fan.RotationSpeed}`);
 
     // ChargingState
-    this.Battery.ChargingState = deviceStatus.chargingStatus === 'charging' ?
+    this.Battery.ChargingState = this.deviceStatus.chargingStatus === 'charging' ?
       this.hap.Characteristic.ChargingState.CHARGING : this.hap.Characteristic.ChargingState.NOT_CHARGING;
 
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(deviceStatus.battery);
+    this.Battery.BatteryLevel = this.deviceStatus.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
 
     // StatusLowBattery
@@ -221,9 +242,9 @@ export class Fan extends deviceBase {
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // 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)!
@@ -236,36 +257,43 @@ export class Fan extends deviceBase {
     }
   }
 
-  async parseStatusWebhook(context: batteryCirculatorFanWebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(version, battery, powerState, oscillation, chargingStatus, fanSpeed) = Webhook:(${context.version}, ${context.battery},`
-      + ` ${context.powerState}, ${context.oscillation}, ${context.chargingStatus}, ${context.fanSpeed}),`
-      + ` current:(${this.accessory.context.deviceVersion}, ${this.Battery.BatteryLevel}, ${this.Fan.Active}, ${this.Fan.SwingMode},`
-      + ` ${this.Battery.ChargingState}, ${this.Fan.RotationSpeed})`);
+    await this.debugLog(`(version, battery, powerState, oscillation, chargingStatus, fanSpeed) = Webhook:(${this.webhookContext.version},`
+      + ` ${this.webhookContext.battery}, ${this.webhookContext.powerState}, ${this.webhookContext.oscillation},`
+      + ` ${this.webhookContext.chargingStatus}, ${this.webhookContext.fanSpeed}), current:(${this.accessory.context.deviceVersion},`
+      + ` ${this.Battery.BatteryLevel}, ${this.Fan.Active}, ${this.Fan.SwingMode}, ${this.Battery.ChargingState}, ${this.Fan.RotationSpeed})`);
+
     // Active
-    this.Fan.Active = context.powerState === 'ON' ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
+    this.Fan.Active = this.webhookContext.powerState === 'ON' ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
     await this.debugLog(`Active: ${this.Fan.Active}`);
+
     // SwingMode
-    this.Fan.SwingMode = context.oscillation === 'on' ?
+    this.Fan.SwingMode = this.webhookContext.oscillation === 'on' ?
       this.hap.Characteristic.SwingMode.SWING_ENABLED : this.hap.Characteristic.SwingMode.SWING_DISABLED;
     await this.debugLog(`SwingMode: ${this.Fan.SwingMode}`);
+
     // RotationSpeed
-    this.Fan.RotationSpeed = context.fanSpeed;
+    this.Fan.RotationSpeed = this.webhookContext.fanSpeed;
     await this.debugLog(`RotationSpeed: ${this.Fan.RotationSpeed}`);
+
     // 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;
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+
     // ChargingState
-    this.Battery.ChargingState = context.chargingStatus === 'charging' ?
+    this.Battery.ChargingState = this.webhookContext.chargingStatus === 'charging' ?
       this.hap.Characteristic.ChargingState.CHARGING : this.hap.Characteristic.ChargingState.NOT_CHARGING;
     await this.debugLog(`ChargingState: ${this.Battery.ChargingState}`);
+
     // FirmwareVersion
-    if (context.version) {
-      const deviceVersion = context.version.replace(/^V|-.*$/g, '') ?? '0.0.0';
+    if (this.webhookContext.version) {
+      const deviceVersion = this.webhookContext.version.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
@@ -303,10 +331,11 @@ export class Fan extends deviceBase {
       // Start to monitor advertisement packets
       (async () => {
         // Start to monitor advertisement packets
-        const serviceData = await this.monitorAdvertisementPackets(switchbot) as unknown as batteryCirculatorFanServiceData;
+        const serviceData = await this.monitorAdvertisementPackets(switchbot) as batteryCirculatorFanServiceData;
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && SwitchBotBLEModelName.Unknown) {
-          await this.BLEparseStatus(serviceData);
+          this.serviceData = serviceData;
+          await this.BLEparseStatus();
           await this.updateHomeKitCharacteristics();
         } else {
           await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
@@ -324,7 +353,8 @@ export class Fan 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)}`);
@@ -342,7 +372,8 @@ export class Fan extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: batteryCirculatorFanWebhookContext) => {
         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}`);