@switchbot/homebridge-switchbot 3.5.0-beta.4 → 3.5.0-beta.41

package/dist/device/robotvacuumcleaner.js

@@ -1,87 +1,52 @@
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * robotvacuumcleaner.ts: @switchbot/homebridge-switchbot.
+ */
 import { request } from 'undici';
-import { sleep } from '../utils.js';
-import { interval, Subject } from 'rxjs';
-import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
+import { Subject, interval, skipWhile } from 'rxjs';
+import { deviceBase } from './device.js';
+import { debounceTime, take, tap } from 'rxjs/operators';
 import { Devices } from '../settings.js';
-export class RobotVacuumCleaner {
+export class RobotVacuumCleaner extends deviceBase {
     platform;
-    accessory;
-    device;
-    api;
-    log;
-    config;
-    hap;
     // Services
-    batteryService;
-    robotVacuumCleanerService;
-    // Characteristic Values
-    On;
-    Brightness;
-    BatteryLevel;
-    StatusLowBattery;
-    FirmwareRevision;
-    // OpenAPI Status
-    OpenAPI_On;
-    OpenAPI_BatteryLevel;
-    OpenAPI_FirmwareRevision;
-    // BLE Status
-    BLE_On;
-    // BLE Others
-    BLE_IsConnected;
-    // Config
-    scanDuration;
-    deviceLogging;
-    deviceRefreshRate;
+    LightBulb;
+    Battery;
     // Updates
     robotVacuumCleanerUpdateInProgress;
     doRobotVacuumCleanerUpdate;
-    // 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.deviceConfig(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doRobotVacuumCleanerUpdate = new Subject();
         this.robotVacuumCleanerUpdateInProgress = false;
+        // Initialize Lightbulb property
+        this.LightBulb = {
+            Service: accessory.getService(this.hap.Service.Lightbulb),
+            On: accessory.context.On || false,
+            Brightness: accessory.context.Brightness || 0,
+        };
+        // 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,
+        };
         // 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, this.model(device))
-            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
         // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
         // you can create multiple services for each accessory
-        const robotVacuumCleanerService = `${accessory.displayName} ${device.deviceType}`;
-        (this.robotVacuumCleanerService = accessory.getService(this.hap.Service.Lightbulb)
-            || accessory.addService(this.hap.Service.Lightbulb)), robotVacuumCleanerService;
-        this.robotVacuumCleanerService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-        if (!this.robotVacuumCleanerService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-            this.robotVacuumCleanerService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-        }
+        const LightBulbService = `${accessory.displayName} ${device.deviceType}`;
+        (this.LightBulb.Service = accessory.getService(this.hap.Service.Lightbulb)
+            || accessory.addService(this.hap.Service.Lightbulb)), LightBulbService;
+        this.LightBulb.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
         // each service must implement at-minimum the "required characteristics" for the given service type
         // see https://developers.homebridge.io/#/service/Lightbulb
         // create handlers for required characteristics
-        this.robotVacuumCleanerService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+        this.LightBulb.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         // handle Brightness events using the Brightness characteristic
-        this.robotVacuumCleanerService
+        this.LightBulb.Service
             .getCharacteristic(this.hap.Characteristic.Brightness)
             .setProps({
             minStep: 25,
@@ -91,17 +56,14 @@ export class RobotVacuumCleaner {
             validValueRanges: [0, 100],
         })
             .onGet(() => {
-            return this.Brightness;
+            return this.LightBulb.Brightness;
         })
             .onSet(this.BrightnessSet.bind(this));
         // 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`);
-        }
+        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);
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -111,19 +73,20 @@ export class RobotVacuumCleaner {
             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.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)}`);
                     const { onlineStatus, battery } = context;
-                    const { On, BatteryLevel } = this;
+                    const { On } = this.LightBulb;
+                    const { BatteryLevel } = this.Battery;
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
                         '(onlineStatus, battery) = ' +
                         `Webhook:(${onlineStatus}, ${battery}), ` +
                         `current:(${On}, ${BatteryLevel})`);
-                    this.On = onlineStatus === 'online' ? true : false;
-                    this.BatteryLevel = battery;
+                    this.LightBulb.On = onlineStatus === 'online' ? true : false;
+                    this.Battery.BatteryLevel = battery;
                     this.updateHomeKitCharacteristics();
                 }
                 catch (e) {
@@ -140,10 +103,10 @@ export class RobotVacuumCleaner {
         }), debounceTime(this.platform.config.options.pushRate * 1000))
             .subscribe(async () => {
             try {
-                if (this.On !== this.accessory.context.On) {
+                if (this.LightBulb.On !== this.accessory.context.On) {
                     await this.pushChanges();
                 }
-                if (this.On && this.Brightness !== this.accessory.context.Brightness) {
+                if (this.LightBulb.On && this.LightBulb.Brightness !== this.accessory.context.Brightness) {
                     await this.openAPIpushBrightnessChanges();
                 }
             }
@@ -155,57 +118,60 @@ export class RobotVacuumCleaner {
             this.robotVacuumCleanerUpdateInProgress = false;
         });
     }
-    /**
-     * 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();
+    async BLEparseStatus(serviceData) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
+        // Battery
+        this.Battery.BatteryLevel = Number(serviceData.battery);
+        if (this.Battery.BatteryLevel < 10) {
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            await this.offlineOff();
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-    }
-    async BLEparseStatus() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
+        this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         // State
-        switch (this.BLE_On) {
+        switch (serviceData.state) {
             case 'on':
-                this.On = true;
+                this.LightBulb.On = true;
                 break;
             default:
-                this.On = false;
+                this.LightBulb.On = false;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
     }
-    async openAPIparseStatus() {
+    async openAPIparseStatus(deviceStatus) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
-        switch (this.OpenAPI_On) {
+        switch (deviceStatus.body.power) {
             case 'on':
-                this.On = true;
+                this.LightBulb.On = true;
                 break;
             default:
-                this.On = false;
+                this.LightBulb.On = false;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
-        // Battery
-        this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
-        if (this.BatteryLevel < 15) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
+        // BatteryLevel
+        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;
+        }
+        if (Number.isNaN(this.Battery.BatteryLevel)) {
+            this.Battery.BatteryLevel = 100;
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+            + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+        // Firmware Version
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${deviceStatus.body.version}`);
+        if (deviceStatus.body.version) {
+            this.accessory.context.version = deviceStatus.body.version;
+            this.accessory
+                .getService(this.hap.Service.AccessoryInformation)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+                .updateValue(this.accessory.context.version);
         }
-        this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
-        // FirmwareRevision
-        this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
-        this.accessory.context.FirmwareRevision = this.FirmwareRevision;
     }
     /**
      * Asks the SwitchBot API for the latest device information
@@ -247,7 +213,6 @@ export class RobotVacuumCleaner {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
                 if (this.device.bleMac === ad.address && ad.serviceData.model === '?') {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                    this.BLE_On = ad.serviceData.state;
                 }
                 else {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
@@ -258,7 +223,7 @@ export class RobotVacuumCleaner {
             // Stop to monitor
             await switchbot.stopScan();
             // Update HomeKit
-            await this.BLEparseStatus();
+            await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
             await this.updateHomeKitCharacteristics();
         })();
         /*if (switchbot !== false) {
@@ -274,7 +239,7 @@ export class RobotVacuumCleaner {
                   `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
                   ` BLE Address Found: ${ad.address}`,
                 );
-                this.BLE_On = ad.serviceData.state;
+                serviceData.state = ad.serviceData.state;
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
                 this.debugLog(
                   `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
@@ -313,7 +278,7 @@ export class RobotVacuumCleaner {
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
+            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}`);
@@ -321,12 +286,9 @@ export class RobotVacuumCleaner {
             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_On = deviceStatus.body.power;
-                this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
-                this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-                this.openAPIparseStatus();
+                this.openAPIparseStatus(deviceStatus);
                 this.updateHomeKitCharacteristics();
             }
             else {
@@ -371,8 +333,9 @@ export class RobotVacuumCleaner {
     }
     async BLEpushChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
-        if (this.On !== this.accessory.context.On) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+        if (this.LightBulb.On !== this.accessory.context.On) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`
+                + ` On: ${this.LightBulb.On} OnCached: ${this.accessory.context.On}`);
             const switchbot = await this.platform.connectBLE();
             // Convert to BLE Address
             this.device.bleMac = this.device
@@ -386,11 +349,11 @@ export class RobotVacuumCleaner {
                 id: this.device.bleMac,
             })
                 .then(async (device_list) => {
-                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
-                return await this.retry({
-                    max: this.maxRetry(),
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
+                return await this.retryBLE({
+                    max: await this.maxRetryBLE(),
                     fn: async () => {
-                        if (this.On) {
+                        if (this.LightBulb.On) {
                             return await device_list[0].turnOn({ id: this.device.bleMac });
                         }
                         else {
@@ -401,7 +364,9 @@ export class RobotVacuumCleaner {
             })
                 .then(() => {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-                this.On = false;
+                this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                    + `On: ${this.LightBulb.On} sent over BLE,  sent successfully`);
+                this.LightBulb.On = false;
             })
                 .catch(async (e) => {
                 this.apiError(e);
@@ -411,24 +376,14 @@ export class RobotVacuumCleaner {
             });
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, ` + `OnCached: ${this.accessory.context.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges,`
+                + ` On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
         }
     }
     async openAPIpushChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
-        if (this.On !== this.accessory.context.On) {
-            let command = '';
-            if (this.On) {
-                command = 'turnOn';
-            }
-            else {
-                command = 'turnOff';
-            }
-            const bodyChange = JSON.stringify({
-                command: `${command}`,
-                parameter: 'default',
-                commandType: 'command',
-            });
+        if (this.LightBulb.On !== this.accessory.context.On) {
+            const bodyChange = await this.commands();
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
                 const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
@@ -444,6 +399,8 @@ export class RobotVacuumCleaner {
                 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.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                        + `request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
                 }
                 else {
                     this.statusCode(statusCode);
@@ -458,16 +415,17 @@ export class RobotVacuumCleaner {
         }
         else {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` +
-                `On: ${this.On}, ` +
+                `On: ${this.LightBulb.On}, ` +
                 `OnCached: ${this.accessory.context.On}`);
         }
     }
     async openAPIpushBrightnessChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushBrightnessChanges`);
-        const body = await this.brightnessCommands();
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+        const bodyChange = await this.brightnessCommands();
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
         try {
             const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+                body: bodyChange,
                 method: 'POST',
                 headers: this.platform.generateHeaders(),
             });
@@ -476,8 +434,10 @@ export class RobotVacuumCleaner {
             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.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                    + `request to SwitchBot API, body: ${deviceStatus} sent successfully`);
             }
             else {
                 this.statusCode(statusCode);
@@ -490,10 +450,10 @@ export class RobotVacuumCleaner {
                 ` Connection, Error Message: ${JSON.stringify(e.message)}`);
         }
     }
-    commands() {
+    async commands() {
         let command;
         let parameter;
-        if (this.On) {
+        if (this.LightBulb.On) {
             command = 'start';
             parameter = 'default';
         }
@@ -508,22 +468,22 @@ export class RobotVacuumCleaner {
         });
         return body;
     }
-    brightnessCommands() {
+    async brightnessCommands() {
         let command;
         let parameter;
-        if (this.Brightness === 25) {
+        if (this.LightBulb.Brightness === 25) {
             command = 'PowLevel';
             parameter = '0';
         }
-        else if (this.Brightness === 50) {
+        else if (this.LightBulb.Brightness === 50) {
             command = 'PowLevel';
             parameter = '1';
         }
-        else if (this.Brightness === 75) {
+        else if (this.LightBulb.Brightness === 75) {
             command = 'PowLevel';
             parameter = '2';
         }
-        else if (this.Brightness === 100) {
+        else if (this.LightBulb.Brightness === 100) {
             command = 'PowLevel';
             parameter = '3';
         }
@@ -531,105 +491,79 @@ export class RobotVacuumCleaner {
             command = 'dock';
             parameter = 'default';
         }
-        const body = JSON.stringify({
+        const bodyChange = JSON.stringify({
             command: `${command}`,
             parameter: `${parameter}`,
             commandType: 'command',
         });
-        return body;
+        return bodyChange;
     }
     /**
      * Handle requests to set the value of the "On" characteristic
      */
     async OnSet(value) {
-        if (this.On === this.accessory.context.On) {
+        if (this.LightBulb.On === this.accessory.context.On) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set On: ${value}`);
         }
         else {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
         }
-        this.On = value;
+        this.LightBulb.On = value;
         this.doRobotVacuumCleanerUpdate.next();
     }
     /**
      * Handle requests to set the value of the "Brightness" characteristic
      */
     async BrightnessSet(value) {
-        if (this.Brightness === this.accessory.context.Brightness) {
+        if (this.LightBulb.Brightness === this.accessory.context.Brightness) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Brightness: ${value}`);
         }
-        else if (this.On) {
+        else if (this.LightBulb.On) {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
         }
         else {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
         }
-        this.Brightness = value;
+        this.LightBulb.Brightness = value;
         this.doRobotVacuumCleanerUpdate.next();
     }
     async updateHomeKitCharacteristics() {
         // On
-        if (this.On === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+        if (this.LightBulb.On === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
         }
         else {
-            this.accessory.context.On = this.On;
-            this.robotVacuumCleanerService.updateCharacteristic(this.hap.Characteristic.On, this.On);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            this.accessory.context.On = this.LightBulb.On;
+            this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.LightBulb.On}`);
         }
         // Brightness
-        if (this.Brightness === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+        if (this.LightBulb.Brightness === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
         }
         else {
-            this.accessory.context.Brightness = this.Brightness;
-            this.robotVacuumCleanerService.updateCharacteristic(this.hap.Characteristic.Brightness, this.Brightness);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
+            this.accessory.context.Brightness = this.LightBulb.Brightness;
+            this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, this.LightBulb.Brightness);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.LightBulb.Brightness}`);
         }
         // BatteryLevel
-        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}`);
         }
         // StatusLowBattery
-        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) {
-        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: '?',
-                });
-                // 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();
-            })();
+            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}`);
         }
     }
     async BLEPushConnection() {
@@ -646,255 +580,13 @@ export class RobotVacuumCleaner {
             await this.openAPIRefreshStatus();
         }
     }
-    async retry({ max, fn }) {
-        return fn().catch(async (e) => {
-            if (max === 0) {
-                throw e;
-            }
-            this.infoLog(e);
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
-            await sleep(1000);
-            return this.retry({ max: max - 1, fn });
-        });
-    }
-    maxRetry() {
-        if (this.device.maxRetry) {
-            return this.device.maxRetry;
-        }
-        else {
-            return 5;
-        }
-    }
-    model(device) {
-        let model;
-        if (device.deviceType === 'Robot Vacuum Cleaner S1 Plus') {
-            model = 'W3011010';
-        }
-        else if (device.deviceType === 'Robot Vacuum Cleaner S1') {
-            model = 'W3011000';
-        }
-        else {
-            model = 'N/A';
-        }
-        return model;
-    }
-    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();
+            this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, false);
         }
     }
     async apiError(e) {
-        this.robotVacuumCleanerService.updateCharacteristic(this.hap.Characteristic.On, e);
-    }
-    async deviceContext() {
-        if (this.On === undefined) {
-            this.On = false;
-        }
-        else {
-            this.On = this.accessory.context.On;
-        }
-        if (this.Brightness === undefined) {
-            this.Brightness = 0;
-        }
-        else {
-            this.Brightness = this.accessory.context.Brightness;
-        }
-        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}`);
-        }
-    }
-    async deviceConfig(device) {
-        let config = {};
-        if (device.plug) {
-            config = device.plug;
-        }
-        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.offline !== undefined) {
-            config['offline'] = device.offline;
-        }
-        if (device.maxRetry !== undefined) {
-            config['maxRetry'] = device.maxRetry;
-        }
-        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.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, e);
     }
 }
 //# sourceMappingURL=robotvacuumcleaner.js.map