@switchbot/homebridge-switchbot 3.7.1-beta.2 → 3.7.1-beta.21

package/src/device/motion.ts

@@ -1,19 +1,24 @@
-
 /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
  *
  * motion.ts: @switchbot/homebridge-switchbot.
  */
-import { deviceBase } from './device.js';
-import { Subject, interval, skipWhile } from 'rxjs';
-import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot';
-
-import type { devicesConfig } from '../settings.js';
-import type { device } from '../types/devicelist.js';
-import type { SwitchBotPlatform } from '../platform.js';
-import type { motionSensorServiceData } from '../types/bledevicestatus.js';
-import type { motionSensorStatus } from '../types/devicestatus.js';
-import type { motionSensorWebhookContext } from '../types/devicewebhookstatus.js';
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+
+import type { SwitchBotPlatform } from '../platform.js'
+import type { devicesConfig } from '../settings.js'
+import type { motionSensorServiceData } from '../types/bledevicestatus.js'
+import type { device } from '../types/devicelist.js'
+import type { motionSensorStatus } from '../types/devicestatus.js'
+import type { motionSensorWebhookContext } from '../types/devicewebhookstatus.js'
+
+/*
+* For Testing Locally:
+* import { SwitchBotBLEModel, SwitchBotBLEModelName } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
+*/
+import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot'
+import { interval, skipWhile, Subject } from 'rxjs'
+
+import { deviceBase } from './device.js'
 
 /**
  * Platform Accessory
@@ -23,211 +28,214 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class Motion extends deviceBase {
   // Services
   private Battery: {
-    Name: CharacteristicValue;
-    Service: Service;
-    BatteryLevel: CharacteristicValue;
-    StatusLowBattery: CharacteristicValue;
-  };
+    Name: CharacteristicValue
+    Service: Service
+    BatteryLevel: CharacteristicValue
+    StatusLowBattery: CharacteristicValue
+  }
 
   private MotionSensor: {
-    Name: CharacteristicValue;
-    Service: Service;
-    MotionDetected: CharacteristicValue;
-  };
+    Name: CharacteristicValue
+    Service: Service
+    MotionDetected: CharacteristicValue
+  }
 
   private LightSensor?: {
-    Name: CharacteristicValue;
-    Service: Service;
-    CurrentAmbientLightLevel: CharacteristicValue;
-  };
+    Name: CharacteristicValue
+    Service: Service
+    CurrentAmbientLightLevel: CharacteristicValue
+  }
 
   // OpenAPI
-  deviceStatus!: motionSensorStatus;
+  deviceStatus!: motionSensorStatus
 
-  //Webhook
-  webhookContext!: motionSensorWebhookContext;
+  // Webhook
+  webhookContext!: motionSensorWebhookContext
 
   // BLE
-  serviceData!: motionSensorServiceData;
+  serviceData!: motionSensorServiceData
 
   // Updates
-  motionUbpdateInProgress!: boolean;
-  doMotionUpdate!: Subject<void>;
+  motionUbpdateInProgress!: boolean
+  doMotionUpdate!: Subject<void>
 
   constructor(
     readonly platform: SwitchBotPlatform,
     accessory: PlatformAccessory,
     device: device & devicesConfig,
   ) {
-    super(platform, accessory, device);
+    super(platform, accessory, device)
     // Set category
-    accessory.category = this.hap.Categories.SENSOR;
+    accessory.category = this.hap.Categories.SENSOR
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
-    this.doMotionUpdate = new Subject();
-    this.motionUbpdateInProgress = false;
+    this.doMotionUpdate = new Subject()
+    this.motionUbpdateInProgress = false
 
     // Initialize Motion Sensor property
-    accessory.context.MotionSensor = accessory.context.MotionSensor ?? {};
+    accessory.context.MotionSensor = accessory.context.MotionSensor ?? {}
     this.MotionSensor = {
       Name: `${accessory.displayName} Motion Sensor`,
       Service: accessory.getService(this.hap.Service.MotionSensor) ?? accessory.addService(this.hap.Service.MotionSensor) as Service,
       MotionDetected: accessory.context.MotionDetected ?? false,
-    };
-    accessory.context.MotionSensor = this.MotionSensor as object;
+    }
+    accessory.context.MotionSensor = this.MotionSensor as object
 
     // Initialize Motion Sensor Characteristics
-    this.MotionSensor.Service
-      .setCharacteristic(this.hap.Characteristic.Name, this.MotionSensor.Name)
-      .setCharacteristic(this.hap.Characteristic.StatusActive, true)
-      .getCharacteristic(this.hap.Characteristic.MotionDetected)
-      .onGet(() => {
-        return this.MotionSensor.MotionDetected;
-      });
+    this.MotionSensor.Service.setCharacteristic(this.hap.Characteristic.Name, this.MotionSensor.Name).setCharacteristic(this.hap.Characteristic.StatusActive, true).getCharacteristic(this.hap.Characteristic.MotionDetected).onGet(() => {
+      return this.MotionSensor.MotionDetected
+    })
 
     // Initialize Battery Service
-    accessory.context.Battery = accessory.context.Battery ?? {};
+    accessory.context.Battery = accessory.context.Battery ?? {}
     this.Battery = {
       Name: `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
-    };
-    accessory.context.Battery = this.Battery as object;
+    }
+    accessory.context.Battery = this.Battery as object
 
     // Initialize Battery Characteristics
-    this.Battery.Service
-      .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
-      .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE)
-      .getCharacteristic(this.hap.Characteristic.BatteryLevel)
-      .onGet(() => {
-        return this.Battery.BatteryLevel;
-      });
-
-    this.Battery.Service
-      .setCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery)
-      .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
-      .onGet(() => {
-        return this.Battery.StatusLowBattery;
-      });
+    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name).setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE).getCharacteristic(this.hap.Characteristic.BatteryLevel).onGet(() => {
+      return this.Battery.BatteryLevel
+    })
+
+    this.Battery.Service.setCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery).getCharacteristic(this.hap.Characteristic.StatusLowBattery).onGet(() => {
+      return this.Battery.StatusLowBattery
+    })
 
     // Initialize Light Sensor Service
     if (device.motion?.hide_lightsensor) {
       if (this.LightSensor) {
-        this.debugLog('Removing Light Sensor Service');
-        this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
-        accessory.removeService(this.LightSensor.Service);
+        this.debugLog('Removing Light Sensor Service')
+        this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service
+        accessory.removeService(this.LightSensor.Service)
       }
     } else {
-      accessory.context.LightSensor = accessory.context.LightSensor ?? {};
+      accessory.context.LightSensor = accessory.context.LightSensor ?? {}
       this.LightSensor = {
         Name: `${accessory.displayName} Light Sensor`,
         Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
-      };
-      accessory.context.LightSensor = this.LightSensor as object;
+      }
+      accessory.context.LightSensor = this.LightSensor as object
 
       // Initialize LightSensor Characteristics
-      this.LightSensor.Service
-        .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name)
-        .setCharacteristic(this.hap.Characteristic.StatusActive, true)
-        .getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel)
-        .onGet(() => {
-          return this.LightSensor!.CurrentAmbientLightLevel;
-        });
+      this.LightSensor.Service.setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name).setCharacteristic(this.hap.Characteristic.StatusActive, true).getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel).onGet(() => {
+        return this.LightSensor!.CurrentAmbientLightLevel
+      })
     };
 
     // Retrieve initial values and updateHomekit
-    this.debugLog('Retrieve initial values and update Homekit');
-    this.refreshStatus();
+    try {
+      this.debugLog('Retrieve initial values and update Homekit')
+      this.refreshStatus()
+    } catch (e: any) {
+      this.errorLog(`failed to retrieve initial values and update Homekit, Error: ${e}`)
+    }
+
+    // regisiter webhook event handler if enabled
+    try {
+      this.debugLog('Registering Webhook Event Handler')
+      this.registerWebhook()
+    } catch (e: any) {
+      this.errorLog(`failed to registerWebhook, Error: ${e}`)
+    }
 
-    //regisiter webhook event handler
-    this.debugLog('Registering Webhook Event Handler');
-    this.registerWebhook();
+    // regisiter platform BLE event handler if enabled
+    try {
+      this.debugLog('Registering Platform BLE Event Handler')
+      this.registerPlatformBLE()
+    } catch (e: any) {
+      this.errorLog(`failed to registerPlatformBLE, Error: ${e}`)
+    }
 
     // Start an update interval
     interval(this.deviceRefreshRate * 1000)
       .pipe(skipWhile(() => this.motionUbpdateInProgress))
       .subscribe(async () => {
-        await this.refreshStatus();
-      });
+        await this.refreshStatus()
+      })
   }
 
   async BLEparseStatus(): Promise<void> {
-    await this.debugLog('BLEparseStatus');
-    await this.debugLog(`(moveDetected) = BLE: (${this.serviceData.movement}), current: (${this.MotionSensor.MotionDetected})`);
+    await this.debugLog('BLEparseStatus')
+    await this.debugLog(`(moveDetected) = BLE: (${this.serviceData.movement}), current: (${this.MotionSensor.MotionDetected})`)
 
     // Movement
-    this.MotionSensor.MotionDetected = this.serviceData.movement;
-    await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`);
+    this.MotionSensor.MotionDetected = this.serviceData.movement
+    await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`)
 
     // CurrentAmbientLightLevel
     if (!this.device.motion?.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 = this.serviceData.lightLevel === 'bright' ? set_maxLux : set_minLux;
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2);
-      await this.debugLog(`LightLevel: ${this.serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+      const set_minLux = this.device.blindTilt?.set_minLux ?? 1
+      const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001
+      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: ${this.serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`)
     }
 
     // BatteryLevel
-    this.Battery.BatteryLevel = this.serviceData.battery;
-    await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
+    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}`);
+      ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+      : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
+    await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
   }
 
   async openAPIparseStatus(): Promise<void> {
-    await this.debugLog('openAPIparseStatus');
-    await this.debugLog(`(moveDetected) = OpenAPI: (${this.deviceStatus.moveDetected}), current: (${this.MotionSensor.MotionDetected})`);
+    await this.debugLog('openAPIparseStatus')
+    await this.debugLog(`(moveDetected) = OpenAPI: (${this.deviceStatus.moveDetected}), current: (${this.MotionSensor.MotionDetected})`)
 
     // Motion State
-    this.MotionSensor.MotionDetected = this.deviceStatus.moveDetected;
-    await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`);
+    this.MotionSensor.MotionDetected = this.deviceStatus.moveDetected
+    await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`)
 
     // CurrentAmbientLightLevel
     if (!this.device.motion?.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 = this.deviceStatus.brightness === 'bright' ? set_maxLux : set_minLux;
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2);
-      await this.debugLog(`LightLevel: ${this.deviceStatus.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+      const set_minLux = this.device.blindTilt?.set_minLux ?? 1
+      const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001
+      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: ${this.deviceStatus.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`)
     }
     // BatteryLevel
-    this.Battery.BatteryLevel = this.deviceStatus.battery;
-    await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
+    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}`);
+      ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+      : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
+    await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
 
     // FirmwareVersion
     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';
+      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)!
         .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(deviceVersion);
-      this.accessory.context.version = deviceVersion;
-      await this.debugLog(`version: ${this.accessory.context.version}`);
+        .updateValue(deviceVersion)
+      this.accessory.context.version = deviceVersion
+      await this.debugLog(`version: ${this.accessory.context.version}`)
     }
   }
 
   async parseStatusWebhook(): Promise<void> {
-    await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(detectionState) = Webhook: (${this.webhookContext.detectionState}), current: (${this.MotionSensor.MotionDetected})`);
+    await this.debugLog('parseStatusWebhook')
+    await this.debugLog(`(detectionState) = Webhook: (${this.webhookContext.detectionState}), current: (${this.MotionSensor.MotionDetected})`)
 
     // MotionDetected
-    this.MotionSensor.MotionDetected = this.webhookContext.detectionState === 'DETECTED' ? true : false;
-    await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`);
+    this.MotionSensor.MotionDetected = this.webhookContext.detectionState === 'DETECTED'
+    await this.debugLog(`MotionDetected: ${this.MotionSensor.MotionDetected}`)
   }
 
   /**
@@ -235,93 +243,97 @@ export class Motion extends deviceBase {
    */
   async refreshStatus(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
-      await this.errorLog(`refreshStatus enableCloudService: ${this.device.enableCloudService}`);
-    } else if (this.BLE || this.config.options?.BLE) {
-      await this.BLERefreshStatus();
+      await this.errorLog(`refreshStatus enableCloudService: ${this.device.enableCloudService}`)
+    } else if (this.BLE) {
+      await this.BLERefreshStatus()
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
-      await this.openAPIRefreshStatus();
+      await this.openAPIRefreshStatus()
     } else {
-      await this.offlineOff();
-      await this.debugWarnLog(`Connection Type: ${this.device.connectionType}, refreshStatus will not happen.`);
+      await this.offlineOff()
+      await this.debugWarnLog(`Connection Type: ${this.device.connectionType}, refreshStatus will not happen.`)
     }
   }
 
   async BLERefreshStatus(): Promise<void> {
-    await this.debugLog('BLERefreshStatus');
+    await this.debugLog('BLERefreshStatus')
+    const switchbot = await this.switchbotBLE()
+    if (switchbot === undefined) {
+      await this.BLERefreshConnection(switchbot)
+    } else {
+      // Start to monitor advertisement packets
+      (async () => {
+        // Start to monitor advertisement packets
+        const serviceData = await this.monitorAdvertisementPackets(switchbot) as motionSensorServiceData
+        // Update HomeKit
+        if (serviceData.model === SwitchBotBLEModel.MotionSensor && serviceData.modelName === SwitchBotBLEModelName.MotionSensor) {
+          this.serviceData = serviceData
+          await this.BLEparseStatus()
+          await this.updateHomeKitCharacteristics()
+        } else {
+          await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`)
+          await this.BLERefreshConnection(switchbot)
+        }
+      })()
+    }
+  }
+
+  async registerPlatformBLE(): Promise<void> {
+    await this.debugLog('registerPlatformBLE')
     if (this.config.options?.BLE) {
-      await this.debugLog('is listening to Platform BLE.');
-      this.device.bleMac = this.device.deviceId!.match(/.{1,2}/g)!.join(':').toLowerCase();
-      await this.debugLog(`bleMac: ${this.device.bleMac}`);
+      await this.debugLog('is listening to Platform BLE.')
+      this.device.bleMac = this.device.deviceId!.match(/.{1,2}/g)!.join(':').toLowerCase()
+      await this.debugLog(`bleMac: ${this.device.bleMac}`)
       this.platform.bleEventHandler[this.device.bleMac] = async (context: motionSensorServiceData) => {
         try {
-          await this.debugLog(`received BLE: ${JSON.stringify(context)}`);
-          this.serviceData = context;
-          await this.BLEparseStatus();
-          await this.updateHomeKitCharacteristics();
+          await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
+          this.serviceData = context
+          await this.BLEparseStatus()
+          await this.updateHomeKitCharacteristics()
         } catch (e: any) {
-          await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`);
+          await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
         }
-      };
-    } else {
-      await this.debugLog('is using Device BLE Scanning.');
-      const switchbot = await this.switchbotBLE();
-      if (switchbot === undefined) {
-        await this.BLERefreshConnection(switchbot);
-      } else {
-        // Start to monitor advertisement packets
-        (async () => {
-          // Start to monitor advertisement packets
-          const serviceData = await this.monitorAdvertisementPackets(switchbot) as motionSensorServiceData;
-          // Update HomeKit
-          if (serviceData.model === SwitchBotBLEModel.MotionSensor && serviceData.modelName === SwitchBotBLEModelName.MotionSensor) {
-            this.serviceData = serviceData;
-            await this.BLEparseStatus();
-            await this.updateHomeKitCharacteristics();
-          } else {
-            await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
-            await this.BLERefreshConnection(switchbot);
-          }
-        })();
       }
+    } else {
+      await this.debugLog('is not listening to Platform BLE')
     }
   }
 
   async openAPIRefreshStatus(): Promise<void> {
-    await this.debugLog('openAPIRefreshStatus');
+    await this.debugLog('openAPIRefreshStatus')
     try {
-      const { body, statusCode } = await this.deviceRefreshStatus();
-      const deviceStatus: any = await body.json();
-      await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);;
+      const { body, statusCode } = await this.deviceRefreshStatus()
+      const deviceStatus: any = await body.json()
+      await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
       if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-        await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-        this.deviceStatus = deviceStatus.body;
-        await this.openAPIparseStatus();
-        await this.updateHomeKitCharacteristics();
+        await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
+        this.deviceStatus = deviceStatus.body
+        await this.openAPIparseStatus()
+        await this.updateHomeKitCharacteristics()
       } else {
-        await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-        await this.debugWarnLog(statusCode, deviceStatus);
+        await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
+        await this.debugWarnLog(statusCode, deviceStatus)
       }
     } catch (e: any) {
-      await this.apiError(e);
-      await this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+      await this.apiError(e)
+      await this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
     }
   }
 
   async registerWebhook() {
     if (this.device.webhook) {
-      await this.debugLog('is listening webhook.');
+      await this.debugLog('is listening webhook.')
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: motionSensorWebhookContext) => {
         try {
-          await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
-          this.webhookContext = context;
-          await this.parseStatusWebhook();
-          await this.updateHomeKitCharacteristics();
+          await this.debugLog(`received Webhook: ${JSON.stringify(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}`);
+          await this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`)
         }
-      };
+      }
     } else {
-      await this.debugLog('is not listening webhook.');
+      await this.debugLog('is not listening webhook.')
     }
   }
 
@@ -330,41 +342,37 @@ export class Motion extends deviceBase {
    */
   async updateHomeKitCharacteristics(): Promise<void> {
     // MotionDetected
-    await this.updateCharacteristic(this.MotionSensor.Service, this.hap.Characteristic.MotionDetected,
-      this.MotionSensor.MotionDetected, 'MotionDetected');
+    await this.updateCharacteristic(this.MotionSensor.Service, this.hap.Characteristic.MotionDetected, this.MotionSensor.MotionDetected, 'MotionDetected')
     // BatteryLevel
-    await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.BatteryLevel,
-      this.Battery.BatteryLevel, 'BatteryLevel');
+    await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel, 'BatteryLevel')
     // StatusLowBattery
-    await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.StatusLowBattery,
-      this.Battery.StatusLowBattery, 'StatusLowBattery');
+    await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery, 'StatusLowBattery')
     // CurrentAmbientLightLevel
     if (!this.device.motion?.hide_lightsensor && this.LightSensor?.Service) {
-      await this.updateCharacteristic(this.LightSensor.Service, this.hap.Characteristic.CurrentAmbientLightLevel,
-        this.LightSensor.CurrentAmbientLightLevel, 'CurrentAmbientLightLevel');
+      await this.updateCharacteristic(this.LightSensor.Service, this.hap.Characteristic.CurrentAmbientLightLevel, this.LightSensor.CurrentAmbientLightLevel, 'CurrentAmbientLightLevel')
     }
   }
 
   async BLERefreshConnection(switchbot: any): Promise<void> {
-    await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+    await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
     if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
-      await this.warnLog('Using OpenAPI Connection to Refresh Status');
-      await this.openAPIRefreshStatus();
+      await this.warnLog('Using OpenAPI Connection to Refresh Status')
+      await this.openAPIRefreshStatus()
     }
   }
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
+      this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false)
     }
   }
 
   async apiError(e: any): Promise<void> {
-    this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, e);
-    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
-    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
+    this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, e)
+    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e)
+    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e)
     if (!this.device.motion?.hide_lightsensor && this.LightSensor?.Service) {
-      this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
+      this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e)
     }
   }
 }