@switchbot/homebridge-switchbot 3.5.0-beta.3 → 3.5.0-beta.30

package/dist/device/waterdetector.js

@@ -1,7 +1,8 @@
-import { hostname } from 'os';
-import { request } from 'undici';
-import { sleep } from '../utils.js';
-import asyncmqtt from 'async-mqtt';
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * waterdetector.ts: @switchbot/homebridge-switchbot.
+ */
+import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { Devices } from '../settings.js';
@@ -10,172 +11,61 @@ import { Devices } from '../settings.js';
  * 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 WaterDetector {
+export class WaterDetector extends deviceBase {
     platform;
-    accessory;
-    device;
-    api;
-    log;
-    config;
-    hap;
     // Services
-    leakService;
-    batteryService;
-    humidityservice;
-    temperatureservice;
-    // Characteristic Values
-    StatusActive;
-    LeakDetected;
-    BatteryLevel;
-    ChargingState;
-    StatusLowBattery;
-    FirmwareRevision;
-    CurrentTemperature;
-    CurrentRelativeHumidity;
-    // OpenAPI Status
-    OpenAPI_BatteryLevel;
-    OpenAPI_FirmwareRevision;
-    OpenAPI_CurrentTemperature;
-    OpenAPI_CurrentRelativeHumidity;
-    // BLE Status
-    BLE_Celsius;
-    BLE_Fahrenheit;
-    BLE_BatteryLevel;
-    BLE_CurrentTemperature;
-    BLE_CurrentRelativeHumidity;
-    // BLE Others
-    BLE_IsConnected;
-    //MQTT stuff
-    mqttClient = null;
-    // EVE history service handler
-    historyService;
-    // Config
-    scanDuration;
-    deviceLogging;
-    deviceRefreshRate;
+    Battery;
+    LeakSensor;
     // Updates
     WaterDetectorUpdateInProgress;
     doWaterDetectorUpdate;
-    // Connection
-    OpenAPI;
-    BLE;
     constructor(platform, accessory, device) {
+        super(platform, accessory, device);
         this.platform = platform;
-        this.accessory = accessory;
-        this.device = device;
-        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.setupHistoryService(device);
-        this.setupMqtt(device);
-        this.deviceConfig(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doWaterDetectorUpdate = new Subject();
         this.WaterDetectorUpdateInProgress = false;
+        // Initialize Battery property
+        this.Battery = {
+            Service: accessory.getService(this.hap.Service.Battery),
+            BatteryLevel: accessory.context.BatteryLevel || 100,
+            StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+            ChargingState: accessory.context.ChargingState || this.hap.Characteristic.ChargingState.NOT_CHARGEABLE,
+        };
+        // Initialize Leak Sensor property
+        if (!this.device.waterdetector?.hide_leak) {
+            this.LeakSensor = {
+                Service: accessory.getService(this.hap.Service.LeakSensor),
+                StatusActive: accessory.context.StatusActive || false,
+                LeakDetected: accessory.context.LeakDetected || this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
+            };
+        }
         // 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, 'WoWaterDetector')
-            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
         // Leak Sensor Service
         if (device.waterdetector?.hide_leak) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leak Sensor Service`);
-            this.leakService = this.accessory.getService(this.hap.Service.LeakSensor);
-            accessory.removeService(this.leakService);
+            this.LeakSensor.Service = this.accessory.getService(this.hap.Service.LeakSensor);
+            accessory.removeService(this.LeakSensor.Service);
         }
-        else if (!this.leakService) {
+        else if (!this.LeakSensor?.Service) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Leak Sensor Service`);
-            const leakService = `${accessory.displayName} Leak Sensor`;
-            (this.leakService = this.accessory.getService(this.hap.Service.LeakSensor)
-                || this.accessory.addService(this.hap.Service.LeakSensor)), leakService;
-            this.leakService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Leak Sensor`);
-            if (!this.leakService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.leakService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Leak Sensor`);
-            }
+            const LeakSensorService = `${accessory.displayName} Leak Sensor`;
+            (this.LeakSensor.Service = this.accessory.getService(this.hap.Service.LeakSensor)
+                || this.accessory.addService(this.hap.Service.LeakSensor)), LeakSensorService;
+            this.LeakSensor.Service.setCharacteristic(this.hap.Characteristic.Name, LeakSensorService);
         }
         else {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Leak Sensor Service Not Added`);
         }
-        // Temperature Sensor Service
-        if (device.waterdetector?.hide_temperature) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
-            this.temperatureservice = this.accessory.getService(this.hap.Service.TemperatureSensor);
-            accessory.removeService(this.temperatureservice);
-        }
-        else if (!this.temperatureservice) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-            const temperatureservice = `${accessory.displayName} Temperature Sensor`;
-            (this.temperatureservice = this.accessory.getService(this.hap.Service.TemperatureSensor)
-                || this.accessory.addService(this.hap.Service.TemperatureSensor)), temperatureservice;
-            this.temperatureservice.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
-            if (!this.temperatureservice.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.temperatureservice.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
-            }
-            this.temperatureservice
-                .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
-                .setProps({
-                unit: "celsius" /* Units['CELSIUS'] */,
-                validValueRanges: [-273.15, 100],
-                minValue: -273.15,
-                maxValue: 100,
-                minStep: 0.1,
-            })
-                .onGet(() => {
-                return this.CurrentTemperature;
-            });
-        }
-        else {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
-        }
-        // Humidity Sensor Service
-        if (device.waterdetector?.hide_humidity) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
-            this.humidityservice = this.accessory.getService(this.hap.Service.HumiditySensor);
-            accessory.removeService(this.humidityservice);
-        }
-        else if (!this.humidityservice) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
-            const humidityservice = `${accessory.displayName} Humidity Sensor`;
-            (this.humidityservice = this.accessory.getService(this.hap.Service.HumiditySensor)
-                || this.accessory.addService(this.hap.Service.HumiditySensor)), humidityservice;
-            this.humidityservice.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
-            if (!this.humidityservice.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.humidityservice.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Humidity Sensor`);
-            }
-            this.humidityservice
-                .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
-                .setProps({
-                minStep: 0.1,
-            })
-                .onGet(() => {
-                return this.CurrentRelativeHumidity;
-            });
-        }
-        else {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Humidity 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;
-        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);
+        const BatteryService = `${accessory.displayName} Battery`;
+        (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
+            || accessory.addService(this.hap.Service.Battery)), BatteryService;
+        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
@@ -185,22 +75,21 @@ export class WaterDetector {
             await this.refreshStatus();
         });
         //regisiter webhook event handler
-        if (this.device.webhook) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+        if (device.webhook && !this.device.waterdetector?.hide_leak) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
             this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
                 try {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
-                    if (context.scale === 'CELSIUS') {
-                        const { temperature, humidity } = context;
-                        const { CurrentTemperature, CurrentRelativeHumidity } = this;
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
-                            '(temperature, humidity) = ' +
-                            `Webhook:(${temperature}, ${humidity}), ` +
-                            `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
-                        this.CurrentRelativeHumidity = humidity;
-                        this.CurrentTemperature = temperature;
-                        this.updateHomeKitCharacteristics();
-                    }
+                    const { detectionState, battery } = context;
+                    const { LeakDetected } = this.LeakSensor;
+                    const { BatteryLevel } = this.Battery;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
+                        '(detectionState, battery) = ' +
+                        `Webhook:(${detectionState}, ${battery}), ` +
+                        `current:(${LeakDetected}, ${BatteryLevel})`);
+                    this.LeakSensor.LeakDetected = detectionState;
+                    this.Battery.BatteryLevel = battery;
+                    this.updateHomeKitCharacteristics();
                 }
                 catch (e) {
                     this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -209,88 +98,52 @@ export class WaterDetector {
             };
         }
     }
-    /**
-     * Parse the device status from the SwitchBot api
-     */
-    async parseStatus() {
-        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() {
+    async BLEparseStatus(serviceData) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // Battery
-        this.BatteryLevel = Number(this.BLE_BatteryLevel);
-        if (this.BatteryLevel < 15) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        this.Battery.BatteryLevel = Number(serviceData.battery);
+        if (this.Battery.BatteryLevel < 15) {
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-        }
-        this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
-        // Humidity
-        if (!this.device.waterdetector?.hide_humidity) {
-            this.CurrentRelativeHumidity = this.BLE_CurrentRelativeHumidity;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-        // Current Temperature
-        if (!this.device.waterdetector?.hide_temperature) {
-            this.BLE_Celsius < 0 ? 0 : this.BLE_Celsius > 100 ? 100 : this.BLE_Celsius;
-            this.CurrentTemperature = this.BLE_Celsius;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
+        this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+        // LeakDetected
+        if (this.device.waterdetector?.hide_leak) {
+            this.LeakSensor.LeakDetected = serviceData.status;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LeakDetected: ${this.LeakSensor.LeakDetected}`);
         }
     }
-    async openAPIparseStatus() {
+    async openAPIparseStatus(deviceStatus) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
-        // Battery
-        this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
-        if (this.BatteryLevel < 15) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        // StatusLowBattery
+        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.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
-        // Current Relative Humidity
-        if (!this.device.waterdetector?.hide_humidity) {
-            this.CurrentRelativeHumidity = this.OpenAPI_CurrentRelativeHumidity;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
-        }
-        // Current Temperature
-        if (!this.device.waterdetector?.hide_temperature) {
-            this.CurrentTemperature = this.OpenAPI_CurrentTemperature;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
+        this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         // BatteryLevel
-        this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
-        if (this.BatteryLevel < 10) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        if (Number.isNaN(this.Battery.BatteryLevel)) {
+            this.Battery.BatteryLevel = 100;
         }
-        else {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-        }
-        if (Number.isNaN(this.BatteryLevel)) {
-            this.BatteryLevel = 100;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
+        // LeakDetected
+        if (!this.device.waterdetector?.hide_leak) {
+            this.LeakSensor.LeakDetected = deviceStatus.body.status;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LeakDetected: ${this.LeakSensor.LeakDetected}`);
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-            + ` StatusLowBattery: ${this.StatusLowBattery}`);
         // FirmwareRevision
-        this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
-        this.accessory.context.FirmwareRevision = this.FirmwareRevision;
+        this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+        this.accessory
+            .getService(this.hap.Service.AccessoryInformation)
+            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+            .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+            .updateValue(this.accessory.context.FirmwareRevision);
     }
-    /**
-     * Asks the SwitchBot API for the latest device information
-     */
     async refreshStatus() {
         if (!this.device.enableCloudService && this.OpenAPI) {
             this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
@@ -320,107 +173,42 @@ export class WaterDetector {
         // Start to monitor advertisement packets
         (async () => {
             // Start to monitor advertisement packets
-            await switchbot.startScan({
-                model: 'w',
-                id: this.device.bleMac,
-            });
+            await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
             // Set an event handler
             switchbot.onadvertisement = (ad) => {
-                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 === 'w') {
+                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_CurrentTemperature = ad.serviceData.temperature;
-                    this.BLE_Celsius = ad.serviceData.temperature.c;
-                    this.BLE_Fahrenheit = ad.serviceData.temperature.f;
-                    this.BLE_BatteryLevel = ad.serviceData.battery;
                 }
                 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) {
-          switchbot
-            .startScan({
-              model: 'w',
-              id: this.device.bleMac,
-            })
-            .then(async () => {
-              // Set an event handler
-              switchbot.onadvertisement = async (ad: ad) => {
-                this.debugLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-                  ` BLE Address Found: ${ad.address}`,
-                );
-                if (ad.serviceData.humidity! > 0) {
-                  // reject unreliable data
-                  this.BLE_CurrentRelativeHumidity = ad.serviceData.humidity;
-                }
-                this.BLE_CurrentTemperature = ad.serviceData.temperature;
-                this.BLE_Celsius = ad.serviceData.temperature!.c;
-                this.BLE_Fahrenheit = ad.serviceData.temperature!.f;
-                this.BLE_BatteryLevel = ad.serviceData.battery;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                this.debugLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName}, ` +
-                  `temperature: ${JSON.stringify(ad.serviceData.temperature?.c)}, humidity: ${ad.serviceData.humidity}, ` +
-                  `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);
-                } 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
-              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 {
-          await this.BLERefreshConnection(switchbot);
-        }*/
+        if (switchbot === undefined) {
+            await this.BLERefreshConnection(switchbot);
+        }
     }
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode } = await request(`${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 = await body.json();
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
             if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-                this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
                     + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-                this.OpenAPI_CurrentRelativeHumidity = deviceStatus.body.humidity;
-                this.OpenAPI_CurrentTemperature = deviceStatus.body.temperature;
-                this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
-                this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-                this.openAPIparseStatus();
+                this.openAPIparseStatus(deviceStatus);
                 this.updateHomeKitCharacteristics();
             }
             else {
@@ -441,161 +229,56 @@ export class WaterDetector {
         const mqttmessage = [];
         const entry = { time: Math.round(new Date().valueOf() / 1000) };
         if (!this.device.waterdetector?.hide_leak) {
-            if (this.LeakDetected === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LeakDetected: ${this.LeakDetected}`);
-            }
-            else {
-                if (this.device.mqttURL) {
-                    mqttmessage.push(`"LeakDetected": ${this.LeakDetected}`);
-                }
-                if (this.device.history) {
-                    entry['leak'] = this.LeakDetected;
-                }
-                this.accessory.context.LeakDetected = this.LeakDetected;
-                this.leakService?.updateCharacteristic(this.hap.Characteristic.LeakDetected, this.LeakDetected);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic LeakDetected: ${this.LeakDetected}`);
-            }
-        }
-        if (!this.device.waterdetector?.hide_humidity) {
-            if (this.CurrentRelativeHumidity === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
-            }
-            else {
-                this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidity;
-                this.humidityservice?.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
-                    ` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
-                if (this.device.mqttURL) {
-                    mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
-                }
-                if (this.device.history) {
-                    entry['humidity'] = this.CurrentRelativeHumidity;
-                }
-            }
-        }
-        if (!this.device.waterdetector?.hide_temperature) {
-            if (this.CurrentTemperature === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
+            if (this.LeakSensor.LeakDetected === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LeakDetected: ${this.LeakSensor.LeakDetected}`);
             }
             else {
                 if (this.device.mqttURL) {
-                    mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
+                    mqttmessage.push(`"LeakDetected": ${this.LeakSensor.LeakDetected}`);
                 }
                 if (this.device.history) {
-                    entry['temp'] = this.CurrentTemperature;
+                    entry['leak'] = this.LeakSensor.LeakDetected;
                 }
-                this.accessory.context.CurrentTemperature = this.CurrentTemperature;
-                this.temperatureservice?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.CurrentTemperature);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
+                this.accessory.context.LeakDetected = this.LeakSensor.LeakDetected;
+                this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.LeakDetected, this.LeakSensor.LeakDetected);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic LeakDetected: ${this.LeakSensor.LeakDetected}`);
             }
         }
-        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 {
             if (this.device.mqttURL) {
-                mqttmessage.push(`"battery": ${this.BatteryLevel}`);
+                mqttmessage.push(`"battery": ${this.Battery.BatteryLevel}`);
             }
-            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 {
             if (this.device.mqttURL) {
-                mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
+                mqttmessage.push(`"lowBattery": ${this.Battery.StatusLowBattery}`);
             }
-            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}`);
+            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}`);
         }
         if (this.device.mqttURL) {
             this.mqttPublish(`{${mqttmessage.join(',')}}`);
         }
-        if (Number(this.CurrentRelativeHumidity) > 0) {
-            // reject unreliable data
-            if (this.device.history) {
-                this.historyService?.addEntry(entry);
-            }
-        }
-    }
-    /*
-     * Publish MQTT message for topics of
-     * 'homebridge-switchbot/meter/xx:xx:xx:xx:xx:xx'
-     */
-    mqttPublish(message) {
-        const mac = this.device.deviceId
-            ?.toLowerCase()
-            .match(/[\s\S]{1,2}/g)
-            ?.join(':');
-        const options = this.device.mqttPubOptions || {};
-        this.mqttClient?.publish(`homebridge-switchbot/meter/${mac}`, `${message}`, options);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT message: ${message} options:${JSON.stringify(options)}`);
-    }
-    /*
-     * Setup MQTT hadler if URL is specified.
-     */
-    async setupMqtt(device) {
-        if (device.mqttURL) {
-            try {
-                const { connectAsync } = asyncmqtt;
-                this.mqttClient = await connectAsync(device.mqttURL, device.mqttOptions || {});
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT connection has been established successfully.`);
-                this.mqttClient.on('error', (e) => {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to publish MQTT messages. ${e}`);
-                });
-            }
-            catch (e) {
-                this.mqttClient = null;
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to establish MQTT connection. ${e}`);
+        if (!this.device.waterdetector?.hide_leak) {
+            if (Number(this.LeakSensor.LeakDetected) > 0) {
+                // reject unreliable data
+                if (this.device.history) {
+                    this.historyService?.addEntry(entry);
+                }
             }
         }
     }
-    /*
-     * Setup EVE history graph feature if enabled.
-     */
-    async setupHistoryService(device) {
-        const mac = this.device
-            .deviceId.match(/.{1,2}/g)
-            .join(':')
-            .toLowerCase();
-        this.historyService = device.history
-            ? new this.platform.fakegatoAPI('room', this.accessory, {
-                log: this.platform.log,
-                storage: 'fs',
-                filename: `${hostname().split('.')[0]}_${mac}_persist.json`,
-            })
-            : null;
-    }
-    async stopScanning(switchbot) {
-        switchbot.stopScan();
-        if (this.BLE_IsConnected) {
-            await this.BLEparseStatus();
-            await this.updateHomeKitCharacteristics();
-        }
-        else {
-            await this.BLERefreshConnection(switchbot);
-        }
-    }
-    async getCustomBLEAddress(switchbot) {
-        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: 'i',
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await sleep(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
-        }
-    }
     async BLERefreshConnection(switchbot) {
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot:`
             + ` ${JSON.stringify(switchbot)}`);
@@ -604,243 +287,17 @@ export class WaterDetector {
             await this.openAPIRefreshStatus();
         }
     }
-    async scan(device) {
-        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) {
-        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`);
-        }
-    }
     async offlineOff() {
-        if (this.device.offline) {
-            await this.deviceContext();
-            await this.updateHomeKitCharacteristics();
+        if (this.device.offline && !this.device.waterdetector?.hide_leak) {
+            this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.LeakDetected, this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED);
         }
     }
     async apiError(e) {
         if (!this.device.waterdetector?.hide_leak) {
-            this.leakService?.updateCharacteristic(this.hap.Characteristic.LeakDetected, e);
-        }
-        if (!this.device.waterdetector?.hide_humidity) {
-            this.humidityservice?.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
-        }
-        if (!this.device.waterdetector?.hide_temperature) {
-            this.temperatureservice?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
-        }
-        this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
-        this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
-    }
-    async deviceContext() {
-        if (this.CurrentRelativeHumidity === undefined) {
-            this.CurrentRelativeHumidity = 0;
-        }
-        else {
-            this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
-        }
-        if (this.CurrentTemperature === undefined) {
-            this.CurrentTemperature = 0;
-        }
-        else {
-            this.CurrentTemperature = this.accessory.context.CurrentTemperature;
-        }
-        if (this.BatteryLevel === undefined) {
-            this.BatteryLevel = 100;
-        }
-        else {
-            this.BatteryLevel = this.accessory.context.BatteryLevel;
-        }
-        if (this.StatusLowBattery === undefined) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-            this.accessory.context.StatusLowBattery = this.StatusLowBattery;
-        }
-        else {
-            this.StatusLowBattery = this.accessory.context.StatusLowBattery;
-        }
-        if (this.FirmwareRevision === undefined) {
-            this.FirmwareRevision = this.platform.version;
-            this.accessory.context.FirmwareRevision = this.FirmwareRevision;
-        }
-    }
-    async refreshRate(device) {
-        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}`);
+            this.LeakSensor.Service.updateCharacteristic(this.hap.Characteristic.LeakDetected, e);
         }
-    }
-    async deviceConfig(device) {
-        let config = {};
-        if (device.waterdetector) {
-            config = device.waterdetector;
-        }
-        if (device.connectionType !== undefined) {
-            config['connectionType'] = device.connectionType;
-        }
-        if (device.external !== undefined) {
-            config['external'] = device.external;
-        }
-        if (device.mqttURL !== undefined) {
-            config['mqttURL'] = device.mqttURL;
-        }
-        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)}`);
-        }
-    }
-    async deviceLogs(device) {
-        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
-     */
-    infoLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.info(String(...log));
-        }
-    }
-    warnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.warn(String(...log));
-        }
-    }
-    debugWarnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.warn('[DEBUG]', String(...log));
-            }
-        }
-    }
-    errorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.error(String(...log));
-        }
-    }
-    debugErrorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.error('[DEBUG]', String(...log));
-            }
-        }
-    }
-    debugLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging === 'debug') {
-                this.platform.log.info('[DEBUG]', String(...log));
-            }
-            else {
-                this.platform.log.debug(String(...log));
-            }
-        }
-    }
-    enablingDeviceLogging() {
-        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);
     }
 }
 //# sourceMappingURL=waterdetector.js.map