@switchbot/homebridge-switchbot 1.8.2 → 1.8.3-beta.0

package/src/devices/motion.ts

@@ -1,8 +1,8 @@
-import { interval, Subject } from 'rxjs';
-import { skipWhile } from 'rxjs/operators';
-import { SwitchBotPlatform } from '../platform';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { DeviceURL, device, devicesConfig, serviceData, switchbot, deviceStatusResponse, deviceStatus } from '../settings';
+import * as rxjs from "rxjs";
+import * as operators from "rxjs/operators";
+import * as platform from "../platform";
+import * as homebridge from "homebridge";
+import * as settings from "../settings";
 
 /**
  * Platform Accessory
@@ -11,29 +11,29 @@ import { DeviceURL, device, devicesConfig, serviceData, switchbot, deviceStatusR
  */
 export class Motion {
   // Services
-  private service: Service;
-  private lightSensorService?: Service;
-  private batteryService?: Service;
+  private service: homebridge.Service;
+  private lightSensorService?: homebridge.Service;
+  private batteryService?: homebridge.Service;
 
   // Characteristic Values
-  MotionDetected!: CharacteristicValue;
-  CurrentAmbientLightLevel!: CharacteristicValue;
-  BatteryLevel?: CharacteristicValue;
-  StatusLowBattery?: CharacteristicValue;
+  MotionDetected!: homebridge.CharacteristicValue;
+  CurrentAmbientLightLevel!: homebridge.CharacteristicValue;
+  BatteryLevel?: homebridge.CharacteristicValue;
+  StatusLowBattery?: homebridge.CharacteristicValue;
 
   // OpenAPI Others
-  deviceStatus!: deviceStatusResponse;
-  moveDetected: deviceStatus['moveDetected'];
-  brightness: deviceStatus['brightness'];
+  deviceStatus!: settings.deviceStatusResponse;
+  moveDetected: settings.deviceStatus["moveDetected"];
+  brightness: settings.deviceStatus["brightness"];
 
   // BLE Others
   connected?: boolean;
-  switchbot!: switchbot;
+  switchbot!: settings.switchbot;
   SwitchToOpenAPI?: boolean;
-  serviceData!: serviceData;
-  battery!: serviceData['battery'];
-  movement!: serviceData['movement'];
-  lightLevel!: serviceData['lightLevel'];
+  serviceData!: settings.serviceData;
+  battery!: settings.serviceData["battery"];
+  movement!: settings.serviceData["movement"];
+  lightLevel!: settings.serviceData["lightLevel"];
 
   // Config
   set_minLux!: number;
@@ -44,12 +44,12 @@ export class Motion {
 
   // Updates
   motionUbpdateInProgress!: boolean;
-  doMotionUpdate!: Subject<void>;
+  doMotionUpdate!: rxjs.Subject<void>;
 
   constructor(
-    private readonly platform: SwitchBotPlatform,
-    private accessory: PlatformAccessory,
-    public device: device & devicesConfig,
+    private readonly platform: platform.SwitchBotPlatform,
+    private accessory: homebridge.PlatformAccessory,
+    public device: settings.device & settings.devicesConfig,
   ) {
     // default placeholders
     this.logs(device);
@@ -58,13 +58,8 @@ export class Motion {
     this.config(device);
     this.MotionDetected = false;
 
-    // Motion Config
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} Config: (ble: ${device.ble}, offline: ${device.offline},`
-      + ` hide_lightsensor: ${device.motion?.hide_lightsensor},`
-      + ` set_minLux: ${this.device.motion?.set_minLux}, set_maxLux: ${this.device.motion?.set_maxLux})`);
-
     // this is subject we use to track when we need to POST changes to the SwitchBot API
-    this.doMotionUpdate = new Subject();
+    this.doMotionUpdate = new rxjs.Subject();
     this.motionUbpdateInProgress = false;
 
     // Retrieve initial values and updateHomekit
@@ -73,15 +68,22 @@ export class Motion {
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
-      .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.platform.Characteristic.Model, 'SWITCHBOT-WOMOTION-W1101500')
-      .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId!);
+      .setCharacteristic(this.platform.Characteristic.Manufacturer, "SwitchBot")
+      .setCharacteristic(
+        this.platform.Characteristic.Model,
+        "SWITCHBOT-WOMOTION-W1101500",
+      )
+      .setCharacteristic(
+        this.platform.Characteristic.SerialNumber,
+        device.deviceId!,
+      );
 
     // get the Battery service if it exists, otherwise create a new Motion service
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.MotionSensor) ||
-      accessory.addService(this.platform.Service.MotionSensor)), `${accessory.displayName} Motion Sensor`;
+      accessory.addService(this.platform.Service.MotionSensor)),
+    `${accessory.displayName} Motion Sensor`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -89,51 +91,77 @@ export class Motion {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+    this.service.setCharacteristic(
+      this.platform.Characteristic.Name,
+      accessory.displayName,
+    );
 
     // each service must implement at-minimum the "required characteristics" for the given service type
     // see https://developers.homebridge.io/#/service/MotionSensor
 
     // Light Sensor Service
     if (device.motion?.hide_lightsensor) {
-      this.debugLog(`Motion Sensor: ${accessory.displayName} Removing Light Sensor Service`);
-      this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor);
+      this.debugLog(
+        `Motion Sensor: ${accessory.displayName} Removing Light Sensor Service`,
+      );
+      this.lightSensorService = this.accessory.getService(
+        this.platform.Service.LightSensor,
+      );
       accessory.removeService(this.lightSensorService!);
     } else if (!this.lightSensorService) {
-      this.debugLog(`Motion Sensor: ${accessory.displayName} Add Light Sensor Service`);
+      this.debugLog(
+        `Motion Sensor: ${accessory.displayName} Add Light Sensor Service`,
+      );
       (this.lightSensorService =
         this.accessory.getService(this.platform.Service.LightSensor) ||
-        this.accessory.addService(this.platform.Service.LightSensor)), `${accessory.displayName} Light Sensor`;
-
-      this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
+        this.accessory.addService(this.platform.Service.LightSensor)),
+      `${accessory.displayName} Light Sensor`;
 
+      this.lightSensorService.setCharacteristic(
+        this.platform.Characteristic.Name,
+        `${accessory.displayName} Light Sensor`,
+      );
     } else {
-      this.debugLog(`Motion Sensor: ${accessory.displayName} Light Sensor Service Not Added`);
+      this.debugLog(
+        `Motion Sensor: ${accessory.displayName} Light Sensor Service Not Added`,
+      );
     }
 
     // Battery Service
     if (!device.ble) {
-      this.debugLog(`Motion Sensor: ${accessory.displayName} Removing Battery Service`);
-      this.batteryService = this.accessory.getService(this.platform.Service.Battery);
+      this.debugLog(
+        `Motion Sensor: ${accessory.displayName} Removing Battery Service`,
+      );
+      this.batteryService = this.accessory.getService(
+        this.platform.Service.Battery,
+      );
       accessory.removeService(this.batteryService!);
     } else if (device.ble && !this.batteryService) {
-      this.debugLog(`Motion Sensor: ${accessory.displayName} Add Battery Service`);
+      this.debugLog(
+        `Motion Sensor: ${accessory.displayName} Add Battery Service`,
+      );
       (this.batteryService =
         this.accessory.getService(this.platform.Service.Battery) ||
-        this.accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
-
-      this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
+        this.accessory.addService(this.platform.Service.Battery)),
+      `${accessory.displayName} Battery`;
 
+      this.batteryService.setCharacteristic(
+        this.platform.Characteristic.Name,
+        `${accessory.displayName} Battery`,
+      );
     } else {
-      this.debugLog(`Motion Sensor: ${accessory.displayName} Battery Service Not Added`);
+      this.debugLog(
+        `Motion Sensor: ${accessory.displayName} Battery Service Not Added`,
+      );
     }
 
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();
 
     // Start an update interval
-    interval(this.deviceRefreshRate * 1000)
-      .pipe(skipWhile(() => this.motionUbpdateInProgress))
+    rxjs
+      .interval(this.deviceRefreshRate * 1000)
+      .pipe(operators.skipWhile(() => this.motionUbpdateInProgress))
       .subscribe(() => {
         this.refreshStatus();
       });
@@ -151,24 +179,30 @@ export class Motion {
   }
 
   private async BLEparseStatus() {
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} BLE parseStatus`);
+    this.debugLog(
+      `Motion Sensor: ${this.accessory.displayName} BLE parseStatus`,
+    );
     // Movement
     this.MotionDetected = this.movement!;
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+    this.debugLog(
+      `Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`,
+    );
     // Light Level
     if (!this.device.motion?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
       switch (this.lightLevel) {
-        case 'dark':
+        case "dark":
         case 1:
           this.CurrentAmbientLightLevel = this.set_minLux;
           break;
         default:
           this.CurrentAmbientLightLevel = this.set_maxLux;
       }
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
-        + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
+          ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+      );
     }
     // Battery
     if (this.battery === undefined) {
@@ -176,11 +210,15 @@ export class Motion {
     }
     this.BatteryLevel = this.battery!;
     if (this.BatteryLevel < 10) {
-      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+      this.StatusLowBattery =
+        this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
-      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+      this.StatusLowBattery =
+        this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     }
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
+    this.debugLog(
+      `Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`,
+    );
   }
 
   private async openAPIparseStatus() {
@@ -188,24 +226,29 @@ export class Motion {
       this.SwitchToOpenAPI = false;
     }
     if (this.platform.config.credentials?.openToken) {
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} OpenAPI parseStatus`);
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} OpenAPI parseStatus`,
+      );
       // Motion State
       this.MotionDetected = this.moveDetected!;
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`,
+      );
       // Light Level
       if (!this.device.motion?.hide_lightsensor) {
         this.set_minLux = this.minLux();
         this.set_maxLux = this.maxLux();
         switch (this.brightness) {
-          case 'dim':
+          case "dim":
             this.CurrentAmbientLightLevel = this.set_minLux;
             break;
-          case 'bright':
+          case "bright":
           default:
             this.CurrentAmbientLightLevel = this.set_maxLux;
         }
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
-
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+        );
       }
     }
   }
@@ -222,99 +265,133 @@ export class Motion {
   }
 
   private async BLERefreshStatus() {
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} BLE RefreshStatus`);
+    this.debugLog(
+      `Motion Sensor: ${this.accessory.displayName} BLE RefreshStatus`,
+    );
     const switchbot = await this.platform.connectBLE();
     // Convert to BLE Address
-    this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.device.bleMac = this.device
+      .deviceId!.match(/.{1,2}/g)!
+      .join(":")
+      .toLowerCase();
+    this.debugLog(
+      `Motion Sensor: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`,
+    );
     // Start to monitor advertisement packets
-    if (switchbot !== false) {
-      switchbot.startScan({
-        model: 's',
+    try {
+      await switchbot.discover({
+        model: "s",
+        quick: false,
+      });
+      // Start to monitor advertisement packets
+      await switchbot.startScan({
+        model: "s",
         id: this.device.bleMac,
-      }).then(() => {
-        // Set an event hander
-        switchbot.onadvertisement = (ad: any) => {
-          this.serviceData = ad.serviceData;
-          this.movement = ad.serviceData.movement;
-          this.battery = ad.serviceData.battery;
-          this.lightLevel = ad.serviceData.lightLevel;
-          this.debugLog(`Motion Sensor: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-          this.debugLog(`Motion Sensor: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, lightLevel: `
-            + `${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`);
-
-          if (this.serviceData) {
-            this.connected = true;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
-          } else {
-            this.connected = false;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
-          }
-        };
-        // Wait 10 seconds
-        return switchbot.wait(this.scanDuration * 1000);
-      }).then(async () => {
-        // Stop to monitor
-        switchbot.stopScan();
-        if (this.connected) {
-          this.parseStatus();
-          this.updateHomeKitCharacteristics();
+      });
+      // Set an event hander
+      switchbot.onadvertisement = (ad: settings.ad) => {
+        this.serviceData = ad.serviceData;
+        this.movement = ad.serviceData.movement;
+        this.battery = ad.serviceData.battery;
+        this.lightLevel = ad.serviceData.lightLevel;
+        this.debugLog(
+          `Motion Sensor: ${
+            this.accessory.displayName
+          } serviceData: ${JSON.stringify(ad.serviceData)}`,
+        );
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, lightLevel: ` +
+            `${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`,
+        );
+
+        if (this.serviceData) {
+          this.connected = true;
+          this.debugLog(
+            `Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`,
+          );
         } else {
-          await this.BLEconnection(switchbot);
-        }
-      }).catch(async (e: any) => {
-        this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-        if (this.deviceLogging === 'debug') {
-          this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-            + ` Error Message: ${JSON.stringify(e.message)}`);
-        }
-        if (this.platform.debugMode) {
-          this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-            + ` Error: ${JSON.stringify(e)}`);
+          this.connected = false;
+          this.debugLog(
+            `Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`,
+          );
         }
+      };
+      // Wait 10 seconds
+      await switchbot.wait(this.scanDuration * 1000);
+      // Stop to monitor
+      switchbot.stopScan();
+      if (this.connected) {
+        this.parseStatus();
+        this.updateHomeKitCharacteristics();
+      } else {
+        this.errorLog(
+          `Motion Sensor: ${this.accessory.displayName} wasn't able to establish BLE Connection`,
+        );
         if (this.platform.config.credentials?.openToken) {
-          this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
+          this.warnLog(
+            `Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`,
+          );
           this.SwitchToOpenAPI = true;
           await this.openAPIRefreshStatus();
         }
-        this.apiError(e);
-      });
-    } else {
-      await this.BLEconnection(switchbot);
-    }
-  }
-
-  public async BLEconnection(switchbot: any) {
-    this.errorLog(`Motion Sensor: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
-    if (this.platform.config.credentials?.openToken) {
-      this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
-      this.SwitchToOpenAPI = true;
-      await this.openAPIRefreshStatus();
+      }
+    } catch (e: any) {
+      this.errorLog(
+        `Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`,
+      );
+      if (this.deviceLogging.includes("debug")) {
+        this.errorLog(
+          `Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
+            ` Error Message: ${JSON.stringify(e.message)}`,
+        );
+      }
+      if (this.platform.config.credentials?.openToken) {
+        this.warnLog(
+          `Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`,
+        );
+        this.SwitchToOpenAPI = true;
+        await this.openAPIRefreshStatus();
+      }
+      this.apiError(e);
     }
   }
 
   private async openAPIRefreshStatus() {
     if (this.platform.config.credentials?.openToken) {
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} OpenAPI RefreshStatus`);
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} OpenAPI RefreshStatus`,
+      );
       try {
-        this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+        this.deviceStatus = (
+          await this.platform.axios.get(
+            `${settings.DeviceURL}/${this.device.deviceId}/status`,
+          )
+        ).data;
+        this.debugLog(
+          `Motion Sensor: ${
+            this.accessory.displayName
+          } refreshStatus: ${JSON.stringify(this.deviceStatus)}`,
+        );
         if (this.deviceStatus.body.moveDetected === undefined) {
-          this.errorLog(`Motion Sensor: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+          this.errorLog(
+            `Motion Sensor: ${
+              this.accessory.displayName
+            } refreshStatus: ${JSON.stringify(this.deviceStatus)}`,
+          );
         }
         this.moveDetected = this.deviceStatus.body.moveDetected;
         this.brightness = this.deviceStatus.body.brightness;
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
-        this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
-          this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
-            + ` Error Message: ${JSON.stringify(e.message)}`);
-        }
-        if (this.platform.debugMode) {
-          this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
-            + ` Error: ${JSON.stringify(e)}`);
+        this.errorLog(
+          `Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`,
+        );
+        if (this.deviceLogging.includes("debug")) {
+          this.errorLog(
+            `Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
+              ` Error Message: ${JSON.stringify(e.message)}`,
+          );
         }
         this.apiError(e);
       }
@@ -326,103 +403,167 @@ export class Motion {
    */
   updateHomeKitCharacteristics() {
     if (this.MotionDetected === undefined) {
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`,
+      );
     } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected);
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`);
+      this.service.updateCharacteristic(
+        this.platform.Characteristic.MotionDetected,
+        this.MotionDetected,
+      );
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`,
+      );
     }
     if (this.device.ble) {
       if (this.BatteryLevel === undefined) {
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`,
+        );
       } else {
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+        this.batteryService?.updateCharacteristic(
+          this.platform.Characteristic.BatteryLevel,
+          this.BatteryLevel,
+        );
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`,
+        );
       }
       if (this.StatusLowBattery === undefined) {
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`,
+        );
       } else {
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+        this.batteryService?.updateCharacteristic(
+          this.platform.Characteristic.StatusLowBattery,
+          this.StatusLowBattery,
+        );
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`,
+        );
       }
       if (this.CurrentAmbientLightLevel === undefined) {
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+        );
       } else {
-        this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName}`
-          + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+        this.lightSensorService?.updateCharacteristic(
+          this.platform.Characteristic.CurrentAmbientLightLevel,
+          this.CurrentAmbientLightLevel,
+        );
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName}` +
+            ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+        );
       }
     }
   }
 
   public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.MotionDetected, e);
+    this.service.updateCharacteristic(
+      this.platform.Characteristic.MotionDetected,
+      e,
+    );
     if (this.device.ble) {
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-      this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
+      this.batteryService?.updateCharacteristic(
+        this.platform.Characteristic.BatteryLevel,
+        e,
+      );
+      this.batteryService?.updateCharacteristic(
+        this.platform.Characteristic.StatusLowBattery,
+        e,
+      );
+      this.lightSensorService?.updateCharacteristic(
+        this.platform.Characteristic.CurrentAmbientLightLevel,
+        e,
+      );
     }
     //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
-  config(device: device & devicesConfig) {
+  config(device: settings.device & settings.devicesConfig) {
     let config = {};
     if (device.motion) {
       config = device.motion;
     }
     if (device.ble !== undefined) {
-      config['ble'] = device.ble;
+      config["ble"] = device.ble;
     }
     if (device.logging !== undefined) {
-      config['logging'] = device.logging;
+      config["logging"] = device.logging;
     }
     if (device.refreshRate !== undefined) {
-      config['refreshRate'] = device.refreshRate;
+      config["refreshRate"] = device.refreshRate;
     }
     if (device.scanDuration !== undefined) {
-      config['scanDuration'] = device.scanDuration;
+      config["scanDuration"] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Motion Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.warnLog(
+        `Motion Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(
+          config,
+        )}`,
+      );
     }
   }
 
-  refreshRate(device: device & devicesConfig) {
+  refreshRate(device: settings.device & settings.devicesConfig) {
     if (device.refreshRate) {
-      this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      this.deviceRefreshRate = this.accessory.context.refreshRate =
+        device.refreshRate;
+      this.debugLog(
+        `Motion Sensor: ${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(`Motion Sensor: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      this.deviceRefreshRate = this.accessory.context.refreshRate =
+        this.platform.config.options!.refreshRate;
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`,
+      );
     }
   }
 
-  scan(device: device & devicesConfig) {
+  scan(device: settings.device & settings.devicesConfig) {
     if (device.scanDuration) {
-      this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
+      this.scanDuration = this.accessory.context.scanDuration =
+        device.scanDuration;
       if (device.ble) {
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`,
+        );
       }
     } else {
       this.scanDuration = this.accessory.context.scanDuration = 1;
       if (this.device.ble) {
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+        this.debugLog(
+          `Motion Sensor: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`,
+        );
       }
     }
   }
 
-  logs(device: device & devicesConfig) {
+  logs(device: settings.device & settings.devicesConfig) {
     if (this.platform.debugMode) {
-      this.deviceLogging = this.accessory.context.logging = 'debugMode';
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+      this.deviceLogging = this.accessory.context.logging = "debugMode";
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`,
+      );
     } else if (device.logging) {
       this.deviceLogging = this.accessory.context.logging = device.logging;
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+      this.debugLog(
+        `Motion Sensor: ${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(`Motion Sensor: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
+      this.deviceLogging = this.accessory.context.logging =
+        this.platform.config.options?.logging;
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`,
+      );
     } else {
-      this.deviceLogging = this.accessory.context.logging = 'standard';
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+      this.deviceLogging = this.accessory.context.logging = "standard";
+      this.debugLog(
+        `Motion Sensor: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`,
+      );
     }
   }
 
@@ -445,30 +586,30 @@ export class Motion {
   }
 
   /**
- * Logging for Device
- */
-  infoLog(...log: any[]) {
+   * Logging for Device
+   */
+  infoLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.info(String(...log));
     }
   }
 
-  warnLog(...log: any[]) {
+  warnLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.warn(String(...log));
     }
   }
 
-  errorLog(...log: any[]) {
+  errorLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       this.platform.log.error(String(...log));
     }
   }
 
-  debugLog(...log: any[]) {
+  debugLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging === 'debug') {
-        this.platform.log.info('[DEBUG]', String(...log));
+      if (this.deviceLogging === "debug") {
+        this.platform.log.info("[DEBUG]", String(...log));
       } else {
         this.platform.log.debug(String(...log));
       }
@@ -476,6 +617,8 @@ export class Motion {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return (
+      this.deviceLogging.includes("debug") || this.deviceLogging === "standard"
+    );
   }
 }