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

package/src/device/plug.ts

@@ -21,6 +21,15 @@ export class Plug extends deviceBase {
     On: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: plugStatus | plugMiniStatus;
+
+  //Webhook
+  webhookContext!: plugWebhookContext | plugMiniUSWebhookContext | plugMiniJPWebhookContext;
+
+  // BLE
+  serviceData!: plugMiniUSServiceData | plugMiniJPServiceData;
+
   // Updates
   plugUpdateInProgress!: boolean;
   doPlugUpdate!: Subject<void>;
@@ -31,6 +40,9 @@ export class Plug extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.OUTLET;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doPlugUpdate = new Subject();
     this.plugUpdateInProgress = false;
@@ -54,12 +66,11 @@ export class Plug extends deviceBase {
       .onSet(this.OnSet.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();
 
     // Start an update interval
@@ -89,22 +100,27 @@ export class Plug extends deviceBase {
       });
   }
 
-  async BLEparseStatus(serviceData: plugMiniUSServiceData | plugMiniJPServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
+    await this.debugLog(`(powerState) = BLE: (${this.serviceData.state}), current:(${this.Outlet.On})`);
+
     // On
-    this.Outlet.On = serviceData.state === 'on' ? true : false;
+    this.Outlet.On = this.serviceData.state === 'on' ? true : false;
     await this.debugLog(`On: ${this.Outlet.On}`);
   }
 
-  async openAPIparseStatus(deviceStatus: plugStatus | plugMiniStatus) {
+  async openAPIparseStatus() {
     await this.debugLog('openAPIparseStatus');
+    await this.debugLog(`(powerState) = OpenAPI: (${this.deviceStatus.power}), current:(${this.Outlet.On})`);
+
     // On
-    this.Outlet.On = deviceStatus.power === 'on' ? true : false;
+    this.Outlet.On = this.deviceStatus.power === 'on' ? true : false;
     await this.debugLog(`On: ${this.Outlet.On}`);
+
     // 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)!
@@ -112,16 +128,17 @@ export class Plug 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: plugWebhookContext | plugMiniUSWebhookContext | plugMiniJPWebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(powerState) = Webhook: (${context.powerState}), current:(${this.Outlet.On})`);
+    await this.debugLog(`(powerState) = Webhook: (${this.webhookContext.powerState}), current:(${this.Outlet.On})`);
+
     // On
-    this.Outlet.On = context.powerState === 'ON' ? true : false;
+    this.Outlet.On = this.webhookContext.powerState === 'ON' ? true : false;
     await this.debugLog(`On: ${this.Outlet.On}`);
   }
 
@@ -155,7 +172,8 @@ export class Plug extends deviceBase {
         // Update HomeKit
         if ((serviceData.model === SwitchBotBLEModel.PlugMiniUS || SwitchBotBLEModel.PlugMiniJP)
           && serviceData.modelName === (SwitchBotBLEModelName.PlugMini || SwitchBotBLEModelName.PlugMini)) {
-          await this.BLEparseStatus(serviceData);
+          this.serviceData = serviceData;
+          await this.BLEparseStatus();
           await this.updateHomeKitCharacteristics();
         } else {
           await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
@@ -173,7 +191,8 @@ export class Plug 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)}`);
@@ -192,7 +211,8 @@ export class Plug extends deviceBase {
         | plugMiniJPWebhookContext) => {
         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/robotvacuumcleaner.ts

@@ -35,6 +35,15 @@ export class RobotVacuumCleaner extends deviceBase {
     ChargingState: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: robotVacuumCleanerS1Status | robotVacuumCleanerS1PlusStatus | floorCleaningRobotS10Status;
+
+  //Webhook
+  webhookContext!: robotVacuumCleanerS1WebhookContext | robotVacuumCleanerS1PlusWebhookContext | floorCleaningRobotS10WebhookContext;
+
+  // BLE
+  serviceData!: robotVacuumCleanerServiceData;
+
   // Updates
   robotVacuumCleanerUpdateInProgress!: boolean;
   doRobotVacuumCleanerUpdate!: Subject<void>;
@@ -45,6 +54,9 @@ export class RobotVacuumCleaner extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.OTHER;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doRobotVacuumCleanerUpdate = new Subject();
     this.robotVacuumCleanerUpdateInProgress = false;
@@ -115,12 +127,11 @@ export class RobotVacuumCleaner 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();
 
     // Start an update interval
@@ -150,39 +161,51 @@ export class RobotVacuumCleaner extends deviceBase {
       });
   }
 
-  async BLEparseStatus(serviceData: robotVacuumCleanerServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
+    await this.debugLog(`(state, battery) = BLE: (${this.serviceData.state}, ${this.serviceData.battery}),`
+      + ` current: (${this.LightBulb.On}, ${this.Battery.BatteryLevel})`);
+
     // On
-    this.LightBulb.On = serviceData.state === 'on' ? true : false;
+    this.LightBulb.On = this.serviceData.state === 'on' ? true : false;
     await this.debugLog(`On: ${this.LightBulb.On}`);
+
     // 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
       ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
 
-  async openAPIparseStatus(deviceStatus: robotVacuumCleanerS1Status | robotVacuumCleanerS1PlusStatus | floorCleaningRobotS10Status) {
+  async openAPIparseStatus() {
     await this.debugLog('openAPIparseStatus');
+    await this.debugLog(`(onlineStatus, battery, workingStatus) = API: (${this.deviceStatus.onlineStatus}, ${this.deviceStatus.battery},`
+      + ` ${this.deviceStatus.workingStatus}), current: (${this.LightBulb.On}, ${this.Battery.BatteryLevel}, ${this.Battery.ChargingState})`);
+
     // On
-    this.LightBulb.On = deviceStatus.onlineStatus === 'online' ? true : false;
+    this.LightBulb.On = this.deviceStatus.onlineStatus === 'online' ? true : false;
     await this.debugLog(`On: ${this.LightBulb.On}`);
+
     // 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}`);
+
     // ChargingState
-    this.Battery.ChargingState = deviceStatus.workingStatus === 'Charging'
+    this.Battery.ChargingState = this.deviceStatus.workingStatus === 'Charging'
       ? this.hap.Characteristic.ChargingState.CHARGING : this.hap.Characteristic.ChargingState.NOT_CHARGING;
     await this.debugLog(`ChargingState: ${this.Battery.ChargingState}`);
+
     // 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
@@ -191,28 +214,31 @@ export class RobotVacuumCleaner 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: robotVacuumCleanerS1WebhookContext | robotVacuumCleanerS1PlusWebhookContext
-    | floorCleaningRobotS10WebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(onlineStatus, battery, workingStatus) = Webhook: (${context.onlineStatus}, ${context.battery}, ${context.workingStatus}),`
-      + ` current: (${this.LightBulb.On}, ${this.Battery.BatteryLevel}, ${this.Battery.ChargingState})`);
+    await this.debugLog(`(onlineStatus, battery, workingStatus) = Webhook: (${this.webhookContext.onlineStatus}, ${this.webhookContext.battery},`
+      + ` ${this.webhookContext.workingStatus}), current: (${this.LightBulb.On}, ${this.Battery.BatteryLevel}, ${this.Battery.ChargingState})`);
+
     // On
-    this.LightBulb.On = context.onlineStatus === 'online' ? true : false;
+    this.LightBulb.On = this.webhookContext.onlineStatus === 'online' ? true : false;
     await this.debugLog(`On: ${this.LightBulb.On}`);
+
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(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.workingStatus === 'Charging'
+    this.Battery.ChargingState = this.webhookContext.workingStatus === 'Charging'
       ? this.hap.Characteristic.ChargingState.CHARGING : this.hap.Characteristic.ChargingState.NOT_CHARGING;
     await this.debugLog(`ChargingState: ${this.Battery.ChargingState}`);
   }
@@ -246,7 +272,8 @@ export class RobotVacuumCleaner extends deviceBase {
         const serviceData = await this.monitorAdvertisementPackets(switchbot) as unknown as robotVacuumCleanerServiceData;
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && serviceData.modelName === 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}`);
@@ -264,7 +291,8 @@ export class RobotVacuumCleaner 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)}`);
@@ -283,7 +311,8 @@ export class RobotVacuumCleaner extends deviceBase {
         | robotVacuumCleanerS1PlusWebhookContext | floorCleaningRobotS10WebhookContext) => {
         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/waterdetector.ts

@@ -36,6 +36,15 @@ export class WaterDetector extends deviceBase {
     LeakDetected: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: waterLeakDetectorStatus;
+
+  //Webhook
+  webhookContext!: waterLeakDetectorWebhookContext;
+
+  // BLE
+  serviceData!: waterLeakDetectorServiceData;
+
   // Updates
   WaterDetectorUpdateInProgress!: boolean;
   doWaterDetectorUpdate: Subject<void>;
@@ -46,6 +55,9 @@ export class WaterDetector 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.doWaterDetectorUpdate = new Subject();
     this.WaterDetectorUpdateInProgress = false;
@@ -79,11 +91,11 @@ export class WaterDetector extends deviceBase {
     // Initialize Leak Sensor Service
     if (device.waterdetector?.hide_leak) {
       if (this.LeakSensor) {
-        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leak Sensor Service`);
+        this.debugLog('Removing Leak Sensor Service');
         this.LeakSensor.Service = this.accessory.getService(this.hap.Service.LeakSensor) as Service;
         accessory.removeService(this.LeakSensor.Service);
       } else {
-        this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Leak Sensor Service Not Found`);
+        this.debugLog('Leak Sensor Service Not Found');
       }
     } else {
       accessory.context.LeakSensor = accessory.context.LeakSensor ?? {};
@@ -106,34 +118,40 @@ export class WaterDetector 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();
 
     // Start an update interval
     interval(this.deviceRefreshRate * 1000)
       .pipe(skipWhile(() => this.WaterDetectorUpdateInProgress))
       .subscribe(async () => {
+        await this.debugLog(`update interval: ${this.deviceRefreshRate * 1000} seconds`);
         await this.refreshStatus();
       });
   }
 
-  async BLEparseStatus(serviceData: waterLeakDetectorServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
+    await this.debugLog(`(state, status, battery) = BLE: (${this.serviceData.state}, ${this.serviceData.status}, ${this.serviceData.battery}),`
+      + ` current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`);
+
+    //LeakSensor
     if (this.device.waterdetector?.hide_leak && this.LeakSensor?.Service) {
+
       // StatusActive
-      this.LeakSensor.StatusActive = serviceData.state;
+      this.LeakSensor.StatusActive = this.serviceData.state;
       await this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`);
+
       // LeakDetected
-      this.LeakSensor.LeakDetected = serviceData.status;
+      this.LeakSensor.LeakDetected = this.serviceData.status;
       this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`);
     }
     // 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
@@ -141,27 +159,36 @@ export class WaterDetector extends deviceBase {
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
 
-  async openAPIparseStatus(deviceStatus: waterLeakDetectorStatus): Promise<void> {
+  async openAPIparseStatus(): Promise<void> {
     await this.debugLog('openAPIparseStatus');
+    await this.debugLog(`(status, battery) = OpenAPI: (${this.deviceStatus.status}, ${this.deviceStatus.battery}),`
+      + ` current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`);
+
+    //LeakSensor
     if (!this.device.waterdetector?.hide_leak && this.LeakSensor?.Service) {
+
       // StatusActive
-      this.LeakSensor.StatusActive = deviceStatus.battery === 0 ? false : true;
+      this.LeakSensor.StatusActive = this.deviceStatus.battery === 0 ? false : true;
       await this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`);
+
       // LeakDetected
-      this.LeakSensor.LeakDetected = deviceStatus.status;
+      this.LeakSensor.LeakDetected = this.deviceStatus.status;
       this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`);
     }
+
     // 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(`FirmwareVersion: ${version.replace(/^V|-.*$/g, '')}`);
       const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
@@ -169,26 +196,32 @@ export class WaterDetector 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: waterLeakDetectorWebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(detectionState, battery) = Webhook: (${context.detectionState}, ${context.battery}),`
+    await this.debugLog(`(detectionState, battery) = Webhook: (${this.webhookContext.detectionState}, ${this.webhookContext.battery}),`
       + ` current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`);
+
+    //LeakSensor
     if (!this.device.waterdetector?.hide_leak && this.LeakSensor?.Service) {
+
       // StatusActive
-      this.LeakSensor.StatusActive = context.detectionState ? true : false;
+      this.LeakSensor.StatusActive = this.webhookContext.detectionState ? true : false;
       await this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`);
+
       // LeakDetected
-      this.LeakSensor.LeakDetected = context.detectionState;
+      this.LeakSensor.LeakDetected = this.webhookContext.detectionState;
       await this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`);
     }
+
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(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;
@@ -221,10 +254,11 @@ export class WaterDetector extends deviceBase {
       // Start to monitor advertisement packets
       (async () => {
         // Start to monitor advertisement packets
-        const serviceData = await this.monitorAdvertisementPackets(switchbot) as unknown as waterLeakDetectorServiceData;
+        const serviceData = await this.monitorAdvertisementPackets(switchbot) as waterLeakDetectorServiceData;
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && serviceData.modelName === 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}`);
@@ -242,7 +276,8 @@ export class WaterDetector 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)}`);
@@ -260,7 +295,8 @@ export class WaterDetector extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: waterLeakDetectorWebhookContext) => {
         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/homebridge-ui/public/index.html

@@ -51,7 +51,7 @@
       <tbody>
         <tr>
           <th scope="row">Device ID</th>
-          <td id="deviceID"></td>
+          <td id="deviceId"></td>
         </tr>
         <tr>
           <th scope="row">Model</th>
@@ -166,7 +166,7 @@
           const thisAcc = cachedAccessories.find((x) => x.UUID === UUID);
           const context = thisAcc.context;
           document.getElementById('displayName').innerHTML = thisAcc.displayName;
-          document.getElementById('deviceID').innerHTML = context.deviceID;
+          document.getElementById('deviceId').innerHTML = context.deviceId;
           document.getElementById('model').innerHTML = context.model;
           document.getElementById('version').innerHTML = context.version;
           document.getElementById('deviceType').innerHTML = context.deviceType;