@switchbot/homebridge-switchbot 3.5.0-beta.22 → 3.5.0-beta.24

package/src/device/contact.ts

@@ -1,166 +1,136 @@
-import { sleep } from '../utils.js';
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * contact.ts: @switchbot/homebridge-switchbot.
+ */
+import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { SwitchBotPlatform } from '../platform.js';
-import { Service, PlatformAccessory, CharacteristicValue, API, Logging, HAP } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices, SwitchBotPlatformConfig } from '../settings.js';
+import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
 
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export class Contact {
-  public readonly api: API;
-  public readonly log: Logging;
-  public readonly config!: SwitchBotPlatformConfig;
-  protected readonly hap: HAP;
+export class Contact extends deviceBase {
   // Services
-  motionService?: Service;
-  batteryService: Service;
-  lightSensorService?: Service;
-  contactSensorservice: Service;
-
-  // Characteristic Values
-  BatteryLevel!: CharacteristicValue;
-  MotionDetected!: CharacteristicValue;
-  StatusLowBattery!: CharacteristicValue;
-  FirmwareRevision!: CharacteristicValue;
-  ContactSensorState!: CharacteristicValue;
-  CurrentAmbientLightLevel!: CharacteristicValue;
-
-  // OpenAPI Status
-  OpenAPI_BatteryLevel: deviceStatus['battery'];
-  OpenAPI_FirmwareRevision: deviceStatus['version'];
-  OpenAPI_MotionDetected: deviceStatus['moveDetected'];
-  OpenAPI_ContactSensorState: deviceStatus['openState'];
-  OpenAPI_CurrentAmbientLightLevel: deviceStatus['brightness'];
-
-  // BLE Status
-  BLE_BatteryLevel!: serviceData['battery'];
-  BLE_MotionDetected!: serviceData['movement'];
-  BLE_ContactSensorState!: serviceData['doorState'];
-  BLE_CurrentAmbientLightLevel: serviceData['lightLevel'];
-
-  // BLE Others
-  scanning!: boolean;
-  BLE_IsConnected?: boolean;
-
-  // Config
-  set_minLux!: number;
-  set_maxLux!: number;
-  scanDuration!: number;
-  deviceLogging!: string;
-  deviceRefreshRate!: number;
-  maxRetries!: number;
-  delayBetweenRetries!: number;
+  private ContactSensor!: {
+    Service: Service;
+    ContactSensorState: CharacteristicValue;
+  };
+
+  private MotionSensor?: {
+    Service: Service;
+    MotionDetected: CharacteristicValue;
+  };
+
+  private LightSensor?: {
+    Service: Service;
+    CurrentAmbientLightLevel: CharacteristicValue;
+  };
+
+  private Battery!: {
+    Service: Service;
+    BatteryLevel: CharacteristicValue;
+    StatusLowBattery: CharacteristicValue;
+  };
 
   // Updates
-  contactUbpdateInProgress!: boolean;
+  contactUpdateInProgress!: boolean;
   doContactUpdate!: Subject<void>;
 
-  // Connection
-  private readonly OpenAPI: boolean;
-  private readonly BLE: boolean;
-
   constructor(
-    private readonly platform: SwitchBotPlatform,
-    private accessory: PlatformAccessory,
-    public device: device & devicesConfig,
+    readonly platform: SwitchBotPlatform,
+    accessory: PlatformAccessory,
+    device: device & devicesConfig,
   ) {
-    this.api = this.platform.api;
-    this.log = this.platform.log;
-    this.config = this.platform.config;
-    this.hap = this.api.hap;
-    // Connection
-    this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
-    this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
-    // default placeholders
-    this.deviceLogs(device);
-    this.scan(device);
-    this.refreshRate(device);
-    this.deviceContext();
-    this.deviceRetry(device);
-    this.deviceConfig(device);
-
+    super(platform, accessory, device);
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doContactUpdate = new Subject();
-    this.contactUbpdateInProgress = false;
+    this.contactUpdateInProgress = false;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
 
-    // set accessory information
-    accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.hap.Characteristic.Model, 'W1201500')
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+    // Initialize Contact Sensor property
+    this.ContactSensor = {
+      Service: this.accessory.addService(this.hap.Service.ContactSensor),
+      ContactSensorState: this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
+    };
+
+    // Initialize Motion Sensor property
+    if (!this.device.contact?.hide_motionsensor) {
+      this.MotionSensor = {
+        Service: this.accessory.addService(this.hap.Service.MotionSensor),
+        MotionDetected: false,
+      };
+    }
+
+    // Initialize Light Sensor property
+    if (!this.device.contact?.hide_lightsensor) {
+      this.LightSensor = {
+        Service: this.accessory.addService(this.hap.Service.LightSensor),
+        CurrentAmbientLightLevel: 0,
+      };
+    }
 
     // get the Contact service if it exists, otherwise create a new Contact service
     // you can create multiple services for each accessory
-    const contactSensorservice = `${accessory.displayName} Contact Sensor`;
-    (this.contactSensorservice = accessory.getService(this.hap.Service.ContactSensor)
-      || accessory.addService(this.hap.Service.ContactSensor)), contactSensorservice;
+    const ContactSensorService = `${accessory.displayName} Contact Sensor`;
+    (this.ContactSensor.Service = accessory.getService(this.hap.Service.ContactSensor)
+      || accessory.addService(this.hap.Service.ContactSensor)), ContactSensorService;
 
-    this.contactSensorservice.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-    if (!this.contactSensorservice.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-      this.contactSensorservice.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-    }
+    this.ContactSensor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
 
     // Motion Sensor Service
     if (device.contact?.hide_motionsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
-      this.motionService = this.accessory.getService(this.hap.Service.MotionSensor);
-      accessory.removeService(this.motionService!);
-    } else if (!this.motionService) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Motion Sensor Service`);
-      const motionService = `${accessory.displayName} Motion Sensor`;
-      (this.motionService = this.accessory.getService(this.hap.Service.MotionSensor)
-        || this.accessory.addService(this.hap.Service.MotionSensor)), motionService;
-
-      this.motionService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Motion Sensor`);
-      this.motionService.setCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Motion Sensor`);
+      this.debugLog(`${device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
+      this.MotionSensor!.Service = accessory.getService(this.hap.Service.MotionSensor) as Service;
+      accessory.removeService(this.MotionSensor!.Service);
+    } else if (!this.MotionSensor!.Service && !device.contact?.hide_motionsensor) {
+      this.debugLog(`${device.deviceType}: ${accessory.displayName} Add Motion Sensor Service`);
+      const MotionService = `${accessory.displayName} Motion Sensor`;
+      (this.MotionSensor!.Service = accessory.getService(this.hap.Service.MotionSensor)
+        || accessory.addService(this.hap.Service.MotionSensor)), MotionService;
+
+      this.MotionSensor!.Service.setCharacteristic(this.hap.Characteristic.Name, MotionService);
     } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Motion Sensor Service Not Added`);
+      this.debugLog(`${device.deviceType}: ${accessory.displayName} Motion Sensor Service Not Added`);
     }
 
     // Light Sensor Service
     if (device.contact?.hide_lightsensor) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
-      this.lightSensorService = this.accessory.getService(this.hap.Service.LightSensor);
-      accessory.removeService(this.lightSensorService!);
-    } else if (!this.lightSensorService) {
+      this.LightSensor!.Service = accessory.getService(this.hap.Service.LightSensor) as Service;
+      accessory.removeService(this.LightSensor!.Service);
+    } else if (!this.LightSensor!.Service && !device.contact?.hide_lightsensor) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
 
-      const lightSensorService = `${accessory.displayName} Light Sensor`;
-      (this.lightSensorService = this.accessory.getService(this.hap.Service.LightSensor)
-        || this.accessory.addService(this.hap.Service.LightSensor)), lightSensorService;
+      const LightSensorService = `${accessory.displayName} Light Sensor`;
+      (this.LightSensor!.Service = this.accessory.getService(this.hap.Service.LightSensor)
+        || this.accessory.addService(this.hap.Service.LightSensor)), LightSensorService;
 
-      this.lightSensorService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Light Sensor`);
-      this.lightSensorService.setCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Light Sensor`);
+      this.LightSensor!.Service.setCharacteristic(this.hap.Characteristic.Name, LightSensorService);
     } else {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Light Sensor Service Not Added`);
     }
 
     // Battery Service
-    const batteryService = `${accessory.displayName} Battery`;
-    (this.batteryService = this.accessory.getService(this.hap.Service.Battery)
-      || accessory.addService(this.hap.Service.Battery)), batteryService;
+    const BatteryService = `${accessory.displayName} Battery`;
+    (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
+      || accessory.addService(this.hap.Service.Battery)), BatteryService;
 
-    this.batteryService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
-    if (!this.batteryService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-      this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
-    }
-    this.batteryService.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
+    this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
 
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();
 
     // Start an update interval
     interval(this.deviceRefreshRate * 1000)
-      .pipe(skipWhile(() => this.contactUbpdateInProgress))
+      .pipe(skipWhile(() => this.contactUpdateInProgress))
       .subscribe(async () => {
         await this.refreshStatus();
       });
@@ -172,16 +142,22 @@ export class Contact {
         try {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
           const { detectionState, brightness, openState } = context;
-          const { MotionDetected, CurrentAmbientLightLevel, ContactSensorState } = this;
+          const { ContactSensorState } = this.ContactSensor;
+          const { CurrentAmbientLightLevel } = this.LightSensor || {};
+          const { MotionDetected } = this.MotionSensor || {};
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
             '(detectionState, brightness, openState) = ' +
             `Webhook:(${detectionState}, ${brightness}, ${openState}), ` +
             `current:(${MotionDetected}, ${CurrentAmbientLightLevel}, ${ContactSensorState})`);
-          this.set_minLux = this.minLux();
-          this.set_maxLux = this.maxLux();
-          this.MotionDetected = detectionState === 'DETECTED' ? true : false;
-          this.CurrentAmbientLightLevel = brightness === 'bright' ? this.set_maxLux : this.set_minLux;
-          this.ContactSensorState = openState === 'open' ? 1 : 0;
+          const set_minLux = await this.minLux();
+          const set_maxLux = await this.maxLux();
+          this.ContactSensor.ContactSensorState = openState === 'open' ? 1 : 0;
+          if (!this.device.contact?.hide_motionsensor) {
+            this.MotionSensor!.MotionDetected = detectionState === 'DETECTED' ? true : false;
+          }
+          if (!this.device.contact?.hide_lightsensor) {
+            this.LightSensor!.CurrentAmbientLightLevel = brightness === 'bright' ? set_maxLux : set_minLux;
+          }
           this.updateHomeKitCharacteristics();
         } catch (e: any) {
           this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -191,136 +167,119 @@ export class Contact {
     }
   }
 
-  /**
-   * Parse the device status from the SwitchBot api
-   */
-  async parseStatus(): Promise<void> {
-    if (!this.device.enableCloudService && this.OpenAPI) {
-      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
-    } else if (this.BLE) {
-      await this.BLEparseStatus();
-    } else if (this.OpenAPI && this.platform.config.credentials?.token) {
-      await this.openAPIparseStatus();
-    } else {
-      await this.offlineOff();
-      this.debugWarnLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`,
-      );
-    }
-  }
-
-  async BLEparseStatus(): Promise<void> {
+  async BLEparseStatus(serviceData: serviceData): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
     // Door State
-    switch (this.BLE_ContactSensorState) {
+    switch (serviceData.doorState) {
       case 'open':
       case 1:
-        this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
+        this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
         break;
       case 'close':
       case 0:
-        this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
+        this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
         break;
       default:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} timeout no closed, doorstate: ${this.BLE_ContactSensorState}`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} timeout no closed, doorstate: ${serviceData.doorState}`);
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
     if (
-      this.ContactSensorState !== this.accessory.context.ContactSensorState &&
+      this.ContactSensor.ContactSensorState !== this.accessory.context.ContactSensorState &&
       this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
     ) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Opened`);
     }
     // Movement
     if (!this.device.contact?.hide_motionsensor) {
-      this.MotionDetected = Boolean(this.BLE_MotionDetected);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
-      if (this.MotionDetected !== this.accessory.context.MotionDetected && this.MotionDetected) {
+      this.MotionSensor!.MotionDetected = Boolean(serviceData.movement);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionSensor!.MotionDetected}`);
+      if (this.MotionSensor!.MotionDetected !== this.accessory.context.MotionDetected && this.MotionSensor!.MotionDetected) {
         this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Detected Motion`);
       }
     }
     // Light Level
     if (!this.device.contact?.hide_lightsensor) {
-      this.set_minLux = this.minLux();
-      this.set_maxLux = this.maxLux();
-      switch (this.BLE_CurrentAmbientLightLevel) {
+      const set_minLux = await this.minLux();
+      const set_maxLux = await this.maxLux();
+      switch (serviceData.lightLevel) {
         case true:
-          this.CurrentAmbientLightLevel = this.set_minLux;
+          this.LightSensor!.CurrentAmbientLightLevel = set_minLux;
           break;
         default:
-          this.CurrentAmbientLightLevel = this.set_maxLux;
+          this.LightSensor!.CurrentAmbientLightLevel = set_maxLux;
       }
       this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
-        ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel},` +
+        ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`,
       );
-      if (this.CurrentAmbientLightLevel !== this.accessory.context.CurrentAmbientLightLevel) {
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+      if (this.LightSensor!.CurrentAmbientLightLevel !== this.accessory.context.CurrentAmbientLightLevel) {
+        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+          + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
       }
     }
     // Battery
-    if (this.BLE_BatteryLevel === undefined) {
-      this.BLE_BatteryLevel === 100;
+    if (serviceData.battery === undefined) {
+      serviceData.battery === 100;
     }
-    this.BatteryLevel = Number(this.BLE_BatteryLevel);
-    if (this.BatteryLevel < 10) {
-      this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+    this.Battery.BatteryLevel = Number(serviceData.battery);
+    if (this.Battery.BatteryLevel < 10) {
+      this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
-      this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+      this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     }
     this.debugLog(
-      `${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, ` + `StatusLowBattery: ${this.StatusLowBattery}`,
+      `${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, `
+      + `StatusLowBattery: ${this.Battery.StatusLowBattery}`,
     );
   }
 
-  async openAPIparseStatus(): Promise<void> {
+  async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
     // Contact State
-    if (this.OpenAPI_ContactSensorState === 'open') {
-      this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
-    } else if (this.OpenAPI_ContactSensorState === 'close') {
-      this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
+    if (deviceStatus.body.openState === 'open') {
+      this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
+    } else if (deviceStatus.body.openState === 'close') {
+      this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
     } else {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openState: ${this.OpenAPI_ContactSensorState}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openState: ${deviceStatus.body.openState}`);
     }
     // Motion State
     if (!this.device.contact?.hide_motionsensor) {
-      this.MotionDetected = this.OpenAPI_MotionDetected!;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+      this.MotionSensor!.MotionDetected = deviceStatus.body.moveDetected!;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionSensor!.MotionDetected}`);
     }
     // Light Level
     if (!this.device.contact?.hide_lightsensor) {
-      this.set_minLux = this.minLux();
-      this.set_maxLux = this.maxLux();
-      switch (this.OpenAPI_CurrentAmbientLightLevel) {
+      const set_minLux = await this.minLux();
+      const set_maxLux = await this.maxLux();
+      switch (deviceStatus.body.brightness) {
         case 'dim':
-          this.CurrentAmbientLightLevel = this.set_minLux;
+          this.LightSensor!.CurrentAmbientLightLevel = set_minLux;
           break;
         case 'bright':
         default:
-          this.CurrentAmbientLightLevel = this.set_maxLux;
+          this.LightSensor!.CurrentAmbientLightLevel = set_maxLux;
       }
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
     }
     // Battery
-    if (this.OpenAPI_BatteryLevel === undefined) {
-      this.OpenAPI_BatteryLevel === 100;
+    if (deviceStatus.body.battery === undefined) {
+      deviceStatus.body.battery === 100;
     }
-    this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
-    if (this.BatteryLevel < 10) {
-      this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+    this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
+    if (this.Battery.BatteryLevel < 10) {
+      this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
-      this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+      this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     }
-    this.debugLog(
-      `${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, ` + `StatusLowBattery: ${this.StatusLowBattery}`,
-    );
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, `
+      + `StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
-    this.accessory.context.FirmwareRevision = this.FirmwareRevision;
+    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
   }
 
   /**
@@ -346,103 +305,44 @@ export class Contact {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
     const switchbot = await this.platform.connectBLE();
     // Convert to BLE Address
-    this.device.bleMac =
-      this.device.customBLEaddress ||
-      this.device
-        .deviceId!.match(/.{1,2}/g)!
-        .join(':')
-        .toLowerCase();
+    this.device.bleMac = this.device
+      .deviceId!.match(/.{1,2}/g)!
+      .join(':')
+      .toLowerCase();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     this.getCustomBLEAddress(switchbot);
     // Start to monitor advertisement packets
     (async () => {
-      await switchbot.startScan({
-        model: 'd',
-        id: this.device.bleMac,
-      });
+      // Start to monitor advertisement packets
+      await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
       // Set an event handler
       switchbot.onadvertisement = (ad: any) => {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
-        if (this.device.bleMac === ad.address && ad.serviceData.model === 'd') {
+        if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-          this.BLE_MotionDetected = ad.serviceData.movement;
-          this.BLE_BatteryLevel = ad.serviceData.battery;
-          this.BLE_CurrentAmbientLightLevel = ad.serviceData.lightLevel;
         } else {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         }
       };
-      // Wait 1 seconds
+      // Wait 10 seconds
       await switchbot.wait(this.scanDuration * 1000);
       // Stop to monitor
       await switchbot.stopScan();
       // Update HomeKit
-      await this.BLEparseStatus();
+      await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
       await this.updateHomeKitCharacteristics();
     })();
-    /*if (switchbot !== false) {
-      await switchbot
-        .startScan({
-          model: 'd',
-          id: this.device.bleMac,
-        })
-        .then(async () => {
-          // Set an event handler
-          this.scanning = true;
-          switchbot.onadvertisement = async (ad: ad) => {
-            this.debugLog(
-              `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-              ` BLE Address Found: ${ad.address}`,
-            );
-            this.BLE_MotionDetected = ad.serviceData.movement;
-            this.BLE_BatteryLevel = ad.serviceData.battery;
-            this.BLE_ContactSensorState = ad.serviceData.doorState;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-            this.debugLog(
-              `${this.device.deviceType}: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, doorState: ` +
-              `${ad.serviceData.doorState}, battery: ${ad.serviceData.battery}`,
-            );
-
-            if (ad.serviceData) {
-              this.BLE_IsConnected = true;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-              await this.stopScanning(switchbot);
-              this.scanning = false;
-            } else {
-              this.BLE_IsConnected = false;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-            }
-          };
-          // Wait
-          return await sleep(this.scanDuration * 1000);
-        })
-        .then(async () => {
-          // Stop to monitor
-          if (this.scanning) {
-            await this.stopScanning(switchbot);
-          }
-        })
-        .catch(async (e: any) => {
-          this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
-            ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-          );
-          await this.BLERefreshConnection(switchbot);
-        });
-    } else {
+    if (switchbot === undefined) {
       await this.BLERefreshConnection(switchbot);
-    }*/
+    }
   }
 
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode } = await this.platform.retryRequest(this.maxRetries, this.delayBetweenRetries,
-        `${Devices}/${this.device.deviceId}/status`, {
-          headers: this.platform.generateHeaders(),
-        });
+      const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries,
+        `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
@@ -450,16 +350,14 @@ export class Contact {
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
         this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
           + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-        this.OpenAPI_ContactSensorState = deviceStatus.body.openState;
-        this.OpenAPI_MotionDetected = deviceStatus.body.moveDetected;
-        this.OpenAPI_CurrentAmbientLightLevel = deviceStatus.body.brightness;
-        this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
-        this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-        this.openAPIparseStatus();
+        this.openAPIparseStatus(deviceStatus);
         this.updateHomeKitCharacteristics();
       } else {
         this.statusCode(statusCode);
         this.statusCode(deviceStatus.statusCode);
+        if (deviceStatus.statusCode === 161 || deviceStatus.statusCode === 171) {
+          this.offlineOff();
+        }
       }
     } catch (e: any) {
       this.apiError(e);
@@ -474,75 +372,51 @@ export class Contact {
    * Updates the status for each of the HomeKit Characteristics
    */
   async updateHomeKitCharacteristics(): Promise<void> {
-    if (this.ContactSensorState === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
+    if (this.ContactSensor.ContactSensorState === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
     } else {
-      this.accessory.context.ContactSensorState = this.ContactSensorState;
-      this.contactSensorservice.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.ContactSensorState);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ContactSensorState: ${this.ContactSensorState}`);
+      this.accessory.context.ContactSensorState = this.ContactSensor.ContactSensorState;
+      this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.ContactSensor.ContactSensorState);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+        + ` ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
     }
     if (!this.device.contact?.hide_motionsensor) {
-      if (this.MotionDetected === undefined) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+      if (this.MotionSensor!.MotionDetected === undefined) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionSensor!.MotionDetected}`);
       } else {
-        this.accessory.context.MotionDetected = this.MotionDetected;
-        this.motionService?.updateCharacteristic(this.hap.Characteristic.MotionDetected, this.MotionDetected);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`);
+        this.accessory.context.MotionDetected = this.MotionSensor!.MotionDetected;
+        this.MotionSensor!.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, this.MotionSensor!.MotionDetected);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+          + ` MotionDetected: ${this.MotionSensor!.MotionDetected}`);
       }
     }
     if (!this.device.contact?.hide_lightsensor) {
-      if (this.CurrentAmbientLightLevel === undefined) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+      if (this.LightSensor?.CurrentAmbientLightLevel === undefined) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+          + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
       } else {
-        this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
-        this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
+        this.accessory.context.CurrentAmbientLightLevel = this.LightSensor.CurrentAmbientLightLevel;
+        this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.LightSensor.CurrentAmbientLightLevel);
         this.debugLog(
           `${this.device.deviceType}: ${this.accessory.displayName}` +
-          ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+          ` updateCharacteristic CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`,
         );
       }
     }
-    if (this.BatteryLevel === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+    if (this.Battery.BatteryLevel === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
     } else {
-      this.accessory.context.BatteryLevel = this.BatteryLevel;
-      this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.BatteryLevel);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+      this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
+      this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
     }
-    if (this.StatusLowBattery === undefined) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+    if (this.Battery.StatusLowBattery === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     } else {
-      this.accessory.context.StatusLowBattery = this.StatusLowBattery;
-      this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.StatusLowBattery);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
-    }
-  }
-
-  async stopScanning(switchbot: any) {
-    switchbot.stopScan();
-    if (this.BLE_IsConnected) {
-      await this.BLEparseStatus();
-      await this.updateHomeKitCharacteristics();
-    } else {
-      await this.BLERefreshConnection(switchbot);
-    }
-  }
-
-  async getCustomBLEAddress(switchbot: any) {
-    if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-      (async () => {
-        // Start to monitor advertisement packets
-        await switchbot.startScan({
-          model: 'd',
-        });
-        // Set an event handler
-        switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-        };
-        await sleep(10000);
-        // Stop to monitor
-        switchbot.stopScan();
-      })();
+      this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
+      this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+        + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
   }
 
@@ -555,277 +429,48 @@ export class Contact {
     }
   }
 
-  minLux(): number {
+  async minLux(): Promise<number> {
+    let set_minLux: number;
     if (this.device.contact?.set_minLux) {
-      this.set_minLux = this.device.contact!.set_minLux!;
+      set_minLux = this.device.contact!.set_minLux!;
     } else {
-      this.set_minLux = 1;
+      set_minLux = 1;
     }
-    return this.set_minLux;
+    return set_minLux;
   }
 
-  maxLux(): number {
+  async maxLux(): Promise<number> {
+    let set_maxLux: number;
     if (this.device.contact?.set_maxLux) {
-      this.set_maxLux = this.device.contact!.set_maxLux!;
+      set_maxLux = this.device.contact!.set_maxLux!;
     } else {
-      this.set_maxLux = 6001;
-    }
-    return this.set_maxLux;
-  }
-
-  async scan(device: device & devicesConfig): Promise<void> {
-    if (device.scanDuration) {
-      this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-      if (this.BLE) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-      }
-    } else {
-      this.scanDuration = this.accessory.context.scanDuration = 1;
-      if (this.BLE) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-      }
-    }
-  }
-
-  async statusCode(statusCode: number): Promise<void> {
-    switch (statusCode) {
-      case 151:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
-        break;
-      case 152:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
-        break;
-      case 160:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
-        break;
-      case 161:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
-        this.offlineOff();
-        break;
-      case 171:
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
-          `Hub: ${this.device.hubDeviceId}`,
-        );
-        this.offlineOff();
-        break;
-      case 190:
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-          ` Or command format is invalid, statusCode: ${statusCode}`,
-        );
-        break;
-      case 100:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
-        break;
-      case 200:
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
-        break;
-      case 400:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
-            + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
-        break;
-      case 401:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized,	Authorization for the API is required, `
-            + `but the request has not been authenticated, statusCode: ${statusCode}`);
-        break;
-      case 403:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden,	The request has been authenticated but does not `
-            + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
-        break;
-      case 404:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found,	Specifies the requested path does not exist, `
-        + `statusCode: ${statusCode}`);
-        break;
-      case 406:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable,	The client has requested a MIME type via `
-            + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
-        break;
-      case 415:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type,	The client has defined a contentType `
-            + `header that is not supported by the server, statusCode: ${statusCode}`);
-        break;
-      case 422:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity,	The client has made a valid request, `
-            + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
-        break;
-      case 429:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests,	The client has exceeded the number of `
-            + `requests allowed for a given time window, statusCode: ${statusCode}`);
-        break;
-      case 500:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error,	An unexpected error on the SmartThings `
-            + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
-        break;
-      default:
-        this.infoLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
-          `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`,
-        );
+      set_maxLux = 6001;
     }
+    return set_maxLux;
   }
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      await this.deviceContext();
-      await this.updateHomeKitCharacteristics();
+      this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState,
+        this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED);
+      if (!this.device.contact?.hide_motionsensor) {
+      this.MotionSensor!.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
+      }
+      if (!this.device.contact?.hide_lightsensor) {
+      this.LightSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, 100);
+      }
     }
   }
 
   async apiError(e: any): Promise<void> {
-    this.contactSensorservice.updateCharacteristic(this.hap.Characteristic.ContactSensorState, e);
+    this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, e);
     if (!this.device.contact?.hide_motionsensor) {
-      this.motionService?.updateCharacteristic(this.hap.Characteristic.MotionDetected, e);
+      this.MotionSensor!.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, e);
     }
     if (!this.device.contact?.hide_lightsensor) {
-      this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
-    }
-    this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
-    this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
-  }
-
-  async deviceContext() {
-    if (this.MotionDetected === undefined) {
-      this.MotionDetected = false;
-    } else {
-      this.MotionDetected = this.accessory.context.MotionDetected;
-    }
-    if (this.ContactSensorState === undefined) {
-      this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
-    } else {
-      this.ContactSensorState = this.accessory.context.ContactSensorState;
-    }
-    if (this.FirmwareRevision === undefined) {
-      this.FirmwareRevision = this.platform.version;
-      this.accessory.context.FirmwareRevision = this.FirmwareRevision;
-    }
-  }
-
-  async refreshRate(device: device & devicesConfig): Promise<void> {
-    if (device.refreshRate) {
-      this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
-    } else if (this.platform.config.options!.refreshRate) {
-      this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
-    }
-  }
-
-  async deviceRetry(device: device & devicesConfig): Promise<void> {
-    if (!device.maxRetries) {
-      this.maxRetries = 5; // Maximum number of retries
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Max Retries Not Set, Using: ${this.maxRetries}`);
-    } else {
-      this.maxRetries = device.maxRetries;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Max Retries: ${this.maxRetries}`);
-    }
-    if (!device.delayBetweenRetries) {
-      this.delayBetweenRetries = 3000; // Delay between retries in milliseconds
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Delay Between Retries Not Set, Using: ${this.delayBetweenRetries}`);
-    } else {
-      this.delayBetweenRetries = device.delayBetweenRetries * 1000;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Delay Between Retries: ${this.delayBetweenRetries}`);
-    }
-  }
-
-  async deviceConfig(device: device & devicesConfig): Promise<void> {
-    let config = {};
-    if (device.contact) {
-      config = device.contact;
-    }
-    if (device.connectionType !== undefined) {
-      config['connectionType'] = device.connectionType;
-    }
-    if (device.external !== undefined) {
-      config['external'] = device.external;
-    }
-    if (device.logging !== undefined) {
-      config['logging'] = device.logging;
-    }
-    if (device.refreshRate !== undefined) {
-      config['refreshRate'] = device.refreshRate;
-    }
-    if (device.scanDuration !== undefined) {
-      config['scanDuration'] = device.scanDuration;
-    }
-    if (device.webhook !== undefined) {
-      config['webhook'] = device.webhook;
-    }
-    if (Object.entries(config).length !== 0) {
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.LightSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
     }
-  }
-
-  async deviceLogs(device: device & devicesConfig): Promise<void> {
-    if (this.platform.debugMode) {
-      this.deviceLogging = this.accessory.context.logging = 'debugMode';
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-    } else if (device.logging) {
-      this.deviceLogging = this.accessory.context.logging = device.logging;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
-    } else if (this.platform.config.options?.logging) {
-      this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
-    } else {
-      this.deviceLogging = this.accessory.context.logging = 'standard';
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-    }
-  }
-
-  /**
-   * Logging for Device
-   */
-  successLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.success(String(...log));
-    }
-  }
-
-  infoLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.info(String(...log));
-    }
-  }
-
-  warnLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.warn(String(...log));
-    }
-  }
-
-  debugWarnLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.warn('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  errorLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.error(String(...log));
-    }
-  }
-
-  debugErrorLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.error('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  debugLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging === 'debug') {
-        this.platform.log.info('[DEBUG]', String(...log));
-      } else {
-        this.platform.log.debug(String(...log));
-      }
-    }
-  }
-
-  enablingDeviceLogging(): boolean {
-    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
+    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
+    this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
   }
 }